Move downloadstatus.h into enums directory.

6 files changed, 15 insertions, 14 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ca1648ee..a234347aa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -538,7 +538,7 @@ SET(SRCS
     net/elementalhandler.h
     net/download.cpp
     net/download.h
-    net/downloadstatus.h
+    enums/net/downloadstatus.h
     net/gamehandler.h
     net/generalhandler.h
     net/guildhandler.h
diff --git a/src/Makefile.am b/src/Makefile.am
index f63ebdb90..21fe8b12e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -668,7 +668,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      net/friendshandler.h \
 	      net/download.cpp \
 	      net/download.h \
-	      net/downloadstatus.h \
+	      enums/net/downloadstatus.h \
 	      net/gamehandler.h \
 	      net/generalhandler.h \
 	      net/guildhandler.h \
diff --git a/src/net/downloadstatus.h b/src/enums/net/downloadstatus.h
index 4582c0ae5..a217e7a78 100644
--- a/src/net/downloadstatus.h
+++ b/src/enums/net/downloadstatus.h
@@ -19,20 +19,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_DOWNLOADSTATUS_H
-#define NET_DOWNLOADSTATUS_H
+#ifndef ENUMS_NET_DOWNLOADSTATUS_H
+#define ENUMS_NET_DOWNLOADSTATUS_H
 
 namespace DownloadStatus
 {
     enum Type
     {
-        Cancelled = -3,
+        Cancelled   = -3,
         ThreadError = -2,
-        Error = -1,
-        Starting = 0,
-        Idle,
-        Complete
+        Error       = -1,
+        Starting    = 0,
+        Idle        = 1,
+        Complete    = 2
     };
 }  // namespace DownloadStatus
 
-#endif  // NET_DOWNLOADSTATUS_H
+#endif  // ENUMS_NET_DOWNLOADSTATUS_H
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index 067993947..f59ff4ab7 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -25,7 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include "net/downloadstatus.h"
+#include "enums/net/downloadstatus.h"
+
 #include "net/serverinfo.h"
 
 #include "utils/mutex.h"
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index f808d040a..6d3d7f49b 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -23,6 +23,8 @@
 #ifndef GUI_WINDOWS_UPDATERWINDOW_H
 #define GUI_WINDOWS_UPDATERWINDOW_H
 
+#include "enums/net/downloadstatus.h"
+
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
 
@@ -33,8 +35,6 @@
 #include "listeners/actionlistener.h"
 #include "listeners/keylistener.h"
 
-#include "net/downloadstatus.h"
-
 #include <string>
 #include <vector>
 
diff --git a/src/net/download.h b/src/net/download.h
index afb3c8d6b..c4cd8bbca 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -22,7 +22,7 @@
 #ifndef NET_DOWNLOAD_H
 #define NET_DOWNLOAD_H
 
-#include "net/downloadstatus.h"
+#include "enums/net/downloadstatus.h"
 
 #include <string>
 #include <queue>