move uploadcharinfo into separate file.

4 files changed, 44 insertions, 17 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 04c2217df..7d03d60d0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -510,6 +510,7 @@ SET(SRCS
     net/skillhandler.h
     net/tradehandler.h
     net/updatetype.h
+    net/uploadcharinfo.h
     net/worldinfo.h
     net/packetcounters.cpp
     net/packetcounters.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 92e140d6c..412df5d47 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -635,6 +635,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      net/skillhandler.h \
 	      net/tradehandler.h \
 	      net/updatetype.h \
+	      net/uploadcharinfo.h \
 	      net/worldinfo.h \
 	      net/packetcounters.cpp \
 	      net/packetcounters.h \
diff --git a/src/commands.cpp b/src/commands.cpp
index 0db774ada..6be14ee16 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -64,6 +64,7 @@
 #include "net/gamehandler.h"
 #include "net/guildhandler.h"
 #include "net/net.h"
+#include "net/uploadcharinfo.h"
 #include "net/partyhandler.h"
 #include "net/pethandler.h"
 #include "net/tradehandler.h"
@@ -1286,23 +1287,6 @@ impHandler1(gm)
     Net::getChatHandler()->talk("@wgm " + args, GENERAL_CHANNEL);
 }
 
-struct UploadChatInfo
-{
-    UploadChatInfo() :
-        tab(nullptr),
-        upload(nullptr),
-        text(),
-        addStr()
-    { }
-
-    A_DELETE_COPY(UploadChatInfo)
-
-    ChatTab *tab;
-    Net::Download *upload;
-    std::string text;
-    std::string addStr;
-};
-
 static int uploadUpdate(void *ptr,
                         DownloadStatus::Type status,
                         size_t total A_UNUSED,
diff --git a/src/net/uploadcharinfo.h b/src/net/uploadcharinfo.h
new file mode 100644
index 000000000..c8f15050c
--- /dev/null
+++ b/src/net/uploadcharinfo.h
@@ -0,0 +1,41 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_UPLOADCHRINFO_H
+#define NET_UPLOADCHRINFO_H
+
+struct UploadChatInfo final
+{
+    UploadChatInfo() :
+        tab(nullptr),
+        upload(nullptr),
+        text(),
+        addStr()
+    { }
+
+    A_DELETE_COPY(UploadChatInfo)
+
+    ChatTab *tab;
+    Net::Download *upload;
+    std::string text;
+    std::string addStr;
+};
+
+#endif  // NET_UPLOADCHRINFO_H