From f8a9cbf78a0ae2f1d571f773275cd6493fb1a4ea Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 11 May 2020 12:20:48 +0300
Subject: Remove useless struct keyword

---
 src/chatlogger.cpp              | 2 +-
 src/commandline.cpp             | 2 +-
 src/fs/files.cpp                | 4 ++--
 src/fs/paths.cpp                | 2 +-
 src/fs/virtfs/fsdir.cpp         | 8 ++++----
 src/game.cpp                    | 2 +-
 src/gui/windows/whoisonline.cpp | 2 +-
 src/resources/db/unitsdb.cpp    | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp
index 4b26db452..76e765692 100644
--- a/src/chatlogger.cpp
+++ b/src/chatlogger.cpp
@@ -129,7 +129,7 @@ std::string ChatLogger::getDir() const
     char buffer [81];
 
     time(&rawtime);
-    struct tm *const timeinfo = localtime(&rawtime);
+    tm *const timeinfo = localtime(&rawtime);
 
     strftime(buffer, 79, "%Y-%m/%d", timeinfo);
 
diff --git a/src/commandline.cpp b/src/commandline.cpp
index 99cd04e0f..ba0a54d69 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -137,7 +137,7 @@ void parseOptions(const int argc, char *const argv[])
 {
     const char *const optstring = "hvud:U:P:Dc:p:y:l:L:C:s:t:T:a:r:e:V";
 
-    const struct option long_options[] =
+    const option long_options[] =
     {
         { "config-dir",     required_argument, nullptr, 'C' },
         { "data",           required_argument, nullptr, 'd' },
diff --git a/src/fs/files.cpp b/src/fs/files.cpp
index 1ff57ad9f..fcce1c0ea 100644
--- a/src/fs/files.cpp
+++ b/src/fs/files.cpp
@@ -271,7 +271,7 @@ void Files::saveTextFile(const std::string &path,
 void Files::deleteFilesInDirectory(std::string path)
 {
     path = pathJoin(path, dirSeparator);
-    const struct dirent *next_file = nullptr;
+    const dirent *next_file = nullptr;
     DIR *const dir = opendir(path.c_str());
 
     if (dir != nullptr)
@@ -296,7 +296,7 @@ void Files::enumFiles(StringVect &files,
 
     if (dir != nullptr)
     {
-        const struct dirent *next_file = nullptr;
+        const dirent *next_file = nullptr;
         while ((next_file = readdir(dir)) != nullptr)
         {
             const std::string file = next_file->d_name;
diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp
index a639dacba..273dbd59f 100644
--- a/src/fs/paths.cpp
+++ b/src/fs/paths.cpp
@@ -264,7 +264,7 @@ std::string getHomePath()
     if (path == nullptr)
     {
         const uid_t uid = getuid();
-        const struct passwd *const pw = getpwuid(uid);
+        const passwd *const pw = getpwuid(uid);
         if (pw != nullptr &&
             pw->pw_dir != nullptr)
         {
diff --git a/src/fs/virtfs/fsdir.cpp b/src/fs/virtfs/fsdir.cpp
index dcac978c7..285104146 100644
--- a/src/fs/virtfs/fsdir.cpp
+++ b/src/fs/virtfs/fsdir.cpp
@@ -194,7 +194,7 @@ namespace FsDir
     {
         const std::string path = static_cast<DirEntry*>(entry)->rootSubDir +
             dirName;
-        const struct dirent *next_file = nullptr;
+        const dirent *next_file = nullptr;
         DIR *const dir = opendir(path.c_str());
         if (dir != nullptr)
         {
@@ -538,7 +538,7 @@ namespace FsDir
     {
         const std::string path = static_cast<DirEntry*>(entry)->rootSubDir +
             dirName;
-        const struct dirent *next_file = nullptr;
+        const dirent *next_file = nullptr;
         DIR *const dir = opendir(path.c_str());
         if (dir != nullptr)
         {
@@ -588,7 +588,7 @@ namespace FsDir
     {
         const std::string path = static_cast<DirEntry*>(entry)->rootSubDir +
             dirName;
-        const struct dirent *next_file = nullptr;
+        const dirent *next_file = nullptr;
         DIR *const dir = opendir(path.c_str());
         if (dir != nullptr)
         {
@@ -638,7 +638,7 @@ namespace FsDir
     {
         const std::string path = static_cast<DirEntry*>(entry)->rootSubDir +
             dirName;
-        const struct dirent *next_file = nullptr;
+        const dirent *next_file = nullptr;
         DIR *const dir = opendir(path.c_str());
         if (dir != nullptr)
         {
diff --git a/src/game.cpp b/src/game.cpp
index e747bf6bb..4e3c399cd 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -578,7 +578,7 @@ bool Game::saveScreenshot(SDL_Surface *const screenshot,
     time_t rawtime;
     char buffer [100];
     time(&rawtime);
-    struct tm *const timeinfo = localtime(&rawtime);
+    tm *const timeinfo = localtime(&rawtime);
     strftime(buffer, 99, "%Y-%m-%d_%H-%M-%S", timeinfo);
 
     const std::string serverName = settings.serverName;
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index b55515208..0e79a9bda 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -576,7 +576,7 @@ int WhoIsOnline::downloadThread(void *ptr)
 
             // Make sure the resources2.txt and news.txt aren't cached,
             // in order to always get the latest version.
-            struct curl_slist *pHeaders = nullptr;
+            curl_slist *pHeaders = nullptr;
             pHeaders = curl_slist_append(
                 pHeaders, "pragma: no-cache");
             pHeaders = curl_slist_append(pHeaders,
diff --git a/src/resources/db/unitsdb.cpp b/src/resources/db/unitsdb.cpp
index efd747fcf..73952db8d 100644
--- a/src/resources/db/unitsdb.cpp
+++ b/src/resources/db/unitsdb.cpp
@@ -52,7 +52,7 @@ namespace
     {
         A_DEFAULT_COPY(UnitDescription)
 
-        STD_VECTOR<struct UnitLevel> levels;
+        STD_VECTOR<UnitLevel> levels;
         double conversion;
         bool mix;
     };
-- 
cgit v1.2.3-60-g2f50