From a8c9ba0380825c99e852b4ed6f647f6f4eda7a50 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Thu, 1 Oct 2015 21:50:02 +0000 Subject: [PATCH] A little header reorganization Many of the constants were already moved to Constants.h, but still some #include directives pointed to the original header. --- .svn-revision | 2 +- src/Constants.h | 12 ++++ src/DataToText.cpp | 7 +-- src/Makefile.am | 3 +- src/Makefile.in | 122 +++++++++++++++++----------------------- src/PartFileConvert.h | 21 +------ src/TextClient.cpp | 4 +- src/utils/fileview/Print.cpp | 2 +- src/webserver/src/WebServer.cpp | 3 + src/webserver/src/WebServer.h | 2 +- 10 files changed, 79 insertions(+), 99 deletions(-) diff --git a/.svn-revision b/.svn-revision index 92dfe9ab..53391361 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -10875 +10876 diff --git a/src/Constants.h b/src/Constants.h index 727afcca..d9a92da8 100644 --- a/src/Constants.h +++ b/src/Constants.h @@ -182,6 +182,18 @@ enum { MS_UNABLETOCONNECT }; +// partfile converter status codes +enum ConvStatus { + CONV_OK = 0, + CONV_QUEUE, + CONV_INPROGRESS, + CONV_OUTOFDISKSPACE, + CONV_PARTMETNOTFOUND, + CONV_IOERROR, + CONV_FAILED, + CONV_BADFORMAT, + CONV_ALREADYEXISTS +}; #endif diff --git a/src/DataToText.cpp b/src/DataToText.cpp index 00d25630..34c9944d 100644 --- a/src/DataToText.cpp +++ b/src/DataToText.cpp @@ -22,12 +22,9 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // +#include -#include "KnownFile.h" // Needed by PriorityToStr -#include "Constants.h" // Needed by DownloadStateToStr and GetSoftName -#define __need_convstatus // Only the conversion status enum is needed -#include "PartFileConvert.h" // Needed by GetConversionState - +#include "Constants.h" #include wxString PriorityToStr( int priority, bool isAuto ) diff --git a/src/Makefile.am b/src/Makefile.am index 22bcb6bc..9f4edeab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -72,6 +72,7 @@ libmulesocket_a_CPPFLAGS = $(AM_CPPFLAGS) $(WXBASE_CPPFLAGS) $(BOOST_CPPFLAGS) - libmuleappcommon_a_SOURCES = \ CFile.cpp \ ClientCredits.cpp \ + DataToText.cpp \ ED2KLink.cpp \ Friend.cpp \ GapList.cpp \ @@ -212,7 +213,6 @@ gui_sources = \ common_sources = \ amuleAppCommon.cpp \ ClientRef.cpp \ - DataToText.cpp \ ECSpecialMuleTags.cpp \ KnownFile.cpp \ GetTickCount.cpp \ @@ -307,6 +307,7 @@ endif amulecmd_SOURCES = \ TextClient.cpp \ + DataToText.cpp \ ExternalConnector.cpp \ LoggerConsole.cpp \ OtherFunctions.cpp \ diff --git a/src/Makefile.in b/src/Makefile.in index 8d94e3bb..9dcc5367 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -96,6 +96,7 @@ libmuleappcommon_a_AR = $(AR) $(ARFLAGS) libmuleappcommon_a_LIBADD = am_libmuleappcommon_a_OBJECTS = libmuleappcommon_a-CFile.$(OBJEXT) \ libmuleappcommon_a-ClientCredits.$(OBJEXT) \ + libmuleappcommon_a-DataToText.$(OBJEXT) \ libmuleappcommon_a-ED2KLink.$(OBJEXT) \ libmuleappcommon_a-Friend.$(OBJEXT) \ libmuleappcommon_a-GapList.$(OBJEXT) \ @@ -204,14 +205,13 @@ am__objects_2 = amule-amule-gui.$(OBJEXT) amule-amuleDlg.$(OBJEXT) \ amule-SharedFilesCtrl.$(OBJEXT) amule-MuleTrayIcon.$(OBJEXT) \ amule-TransferWnd.$(OBJEXT) am__objects_3 = amule-amuleAppCommon.$(OBJEXT) \ - amule-ClientRef.$(OBJEXT) amule-DataToText.$(OBJEXT) \ - amule-ECSpecialMuleTags.$(OBJEXT) amule-KnownFile.$(OBJEXT) \ - amule-GetTickCount.$(OBJEXT) amule-GuiEvents.$(OBJEXT) \ - amule-HTTPDownload.$(OBJEXT) amule-Logger.$(OBJEXT) \ - amule-PartFile.$(OBJEXT) amule-Preferences.$(OBJEXT) \ - amule-Proxy.$(OBJEXT) amule-Server.$(OBJEXT) \ - amule-Statistics.$(OBJEXT) amule-StatTree.$(OBJEXT) \ - amule-UserEvents.$(OBJEXT) + amule-ClientRef.$(OBJEXT) amule-ECSpecialMuleTags.$(OBJEXT) \ + amule-KnownFile.$(OBJEXT) amule-GetTickCount.$(OBJEXT) \ + amule-GuiEvents.$(OBJEXT) amule-HTTPDownload.$(OBJEXT) \ + amule-Logger.$(OBJEXT) amule-PartFile.$(OBJEXT) \ + amule-Preferences.$(OBJEXT) amule-Proxy.$(OBJEXT) \ + amule-Server.$(OBJEXT) amule-Statistics.$(OBJEXT) \ + amule-StatTree.$(OBJEXT) amule-UserEvents.$(OBJEXT) am_amule_OBJECTS = amule-CaptchaDialog.$(OBJEXT) \ amule-CaptchaGenerator.$(OBJEXT) \ amule-PartFileConvert.$(OBJEXT) \ @@ -229,6 +229,7 @@ am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ amule_LINK = $(CXXLD) $(amule_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ am_amulecmd_OBJECTS = amulecmd-TextClient.$(OBJEXT) \ + amulecmd-DataToText.$(OBJEXT) \ amulecmd-ExternalConnector.$(OBJEXT) \ amulecmd-LoggerConsole.$(OBJEXT) \ amulecmd-OtherFunctions.$(OBJEXT) \ @@ -262,14 +263,13 @@ am__objects_4 = amuled-amule.$(OBJEXT) amuled-BaseClient.$(OBJEXT) \ amuled-PacketTracking.$(OBJEXT) amuled-Contact.$(OBJEXT) \ amuled-RoutingZone.$(OBJEXT) am__objects_5 = amuled-amuleAppCommon.$(OBJEXT) \ - amuled-ClientRef.$(OBJEXT) amuled-DataToText.$(OBJEXT) \ - amuled-ECSpecialMuleTags.$(OBJEXT) amuled-KnownFile.$(OBJEXT) \ - amuled-GetTickCount.$(OBJEXT) amuled-GuiEvents.$(OBJEXT) \ - amuled-HTTPDownload.$(OBJEXT) amuled-Logger.$(OBJEXT) \ - amuled-PartFile.$(OBJEXT) amuled-Preferences.$(OBJEXT) \ - amuled-Proxy.$(OBJEXT) amuled-Server.$(OBJEXT) \ - amuled-Statistics.$(OBJEXT) amuled-StatTree.$(OBJEXT) \ - amuled-UserEvents.$(OBJEXT) + amuled-ClientRef.$(OBJEXT) amuled-ECSpecialMuleTags.$(OBJEXT) \ + amuled-KnownFile.$(OBJEXT) amuled-GetTickCount.$(OBJEXT) \ + amuled-GuiEvents.$(OBJEXT) amuled-HTTPDownload.$(OBJEXT) \ + amuled-Logger.$(OBJEXT) amuled-PartFile.$(OBJEXT) \ + amuled-Preferences.$(OBJEXT) amuled-Proxy.$(OBJEXT) \ + amuled-Server.$(OBJEXT) amuled-Statistics.$(OBJEXT) \ + amuled-StatTree.$(OBJEXT) amuled-UserEvents.$(OBJEXT) am_amuled_OBJECTS = amuled-amuled.$(OBJEXT) $(am__objects_4) \ $(am__objects_5) @NEED_RC_TRUE@nodist_amuled_OBJECTS = amuled-version.$(OBJEXT) @@ -299,7 +299,7 @@ am__objects_6 = amulegui-amule-gui.$(OBJEXT) \ amulegui-SharedFilesCtrl.$(OBJEXT) \ amulegui-MuleTrayIcon.$(OBJEXT) amulegui-TransferWnd.$(OBJEXT) am__objects_7 = amulegui-amuleAppCommon.$(OBJEXT) \ - amulegui-ClientRef.$(OBJEXT) amulegui-DataToText.$(OBJEXT) \ + amulegui-ClientRef.$(OBJEXT) \ amulegui-ECSpecialMuleTags.$(OBJEXT) \ amulegui-KnownFile.$(OBJEXT) amulegui-GetTickCount.$(OBJEXT) \ amulegui-GuiEvents.$(OBJEXT) amulegui-HTTPDownload.$(OBJEXT) \ @@ -646,6 +646,7 @@ libmulesocket_a_CPPFLAGS = $(AM_CPPFLAGS) $(WXBASE_CPPFLAGS) $(BOOST_CPPFLAGS) - libmuleappcommon_a_SOURCES = \ CFile.cpp \ ClientCredits.cpp \ + DataToText.cpp \ ED2KLink.cpp \ Friend.cpp \ GapList.cpp \ @@ -779,7 +780,6 @@ gui_sources = \ common_sources = \ amuleAppCommon.cpp \ ClientRef.cpp \ - DataToText.cpp \ ECSpecialMuleTags.cpp \ KnownFile.cpp \ GetTickCount.cpp \ @@ -862,6 +862,7 @@ ed2k_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_STD_STRING @NEED_CORESERVICES_TRUE@ed2k_LDFLAGS = $(AM_LDFLAGS) -framework CoreServices amulecmd_SOURCES = \ TextClient.cpp \ + DataToText.cpp \ ExternalConnector.cpp \ LoggerConsole.cpp \ OtherFunctions.cpp \ @@ -1155,7 +1156,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-CommentDialogLst.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-Contact.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-CorruptionBlackBox.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-DataToText.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-DirectoryTreeCtrl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-DownloadClient.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-DownloadListCtrl.Po@am__quote@ @@ -1225,6 +1225,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-amule.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-amuleAppCommon.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-amuleDlg.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulecmd-DataToText.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulecmd-ExternalConnector.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulecmd-LoggerConsole.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulecmd-NetworkFunctions.Po@am__quote@ @@ -1238,7 +1239,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-ClientUDPSocket.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-Contact.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-CorruptionBlackBox.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-DataToText.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-DownloadClient.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-DownloadQueue.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-ECSpecialCoreTags.Po@am__quote@ @@ -1294,7 +1294,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-ClientRef.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-CommentDialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-CommentDialogLst.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-DataToText.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-DirectoryTreeCtrl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-DownloadListCtrl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-ECSpecialMuleTags.Po@am__quote@ @@ -1336,6 +1335,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ed2k-MuleCollection.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-CFile.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-ClientCredits.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-DataToText.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-ED2KLink.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-Friend.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-GapList.Po@am__quote@ @@ -1433,6 +1433,22 @@ libmuleappcommon_a-ClientCredits.obj: ClientCredits.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-ClientCredits.obj `if test -f 'ClientCredits.cpp'; then $(CYGPATH_W) 'ClientCredits.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCredits.cpp'; fi` +libmuleappcommon_a-DataToText.o: DataToText.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-DataToText.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-DataToText.Tpo -c -o libmuleappcommon_a-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-DataToText.Tpo $(DEPDIR)/libmuleappcommon_a-DataToText.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DataToText.cpp' object='libmuleappcommon_a-DataToText.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp + +libmuleappcommon_a-DataToText.obj: DataToText.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-DataToText.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-DataToText.Tpo -c -o libmuleappcommon_a-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-DataToText.Tpo $(DEPDIR)/libmuleappcommon_a-DataToText.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DataToText.cpp' object='libmuleappcommon_a-DataToText.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi` + libmuleappcommon_a-ED2KLink.o: ED2KLink.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-ED2KLink.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-ED2KLink.Tpo -c -o libmuleappcommon_a-ED2KLink.o `test -f 'ED2KLink.cpp' || echo '$(srcdir)/'`ED2KLink.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-ED2KLink.Tpo $(DEPDIR)/libmuleappcommon_a-ED2KLink.Po @@ -3369,22 +3385,6 @@ amule-ClientRef.obj: ClientRef.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientRef.obj `if test -f 'ClientRef.cpp'; then $(CYGPATH_W) 'ClientRef.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientRef.cpp'; fi` -amule-DataToText.o: DataToText.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DataToText.o -MD -MP -MF $(DEPDIR)/amule-DataToText.Tpo -c -o amule-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amule-DataToText.Tpo $(DEPDIR)/amule-DataToText.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DataToText.cpp' object='amule-DataToText.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp - -amule-DataToText.obj: DataToText.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DataToText.obj -MD -MP -MF $(DEPDIR)/amule-DataToText.Tpo -c -o amule-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amule-DataToText.Tpo $(DEPDIR)/amule-DataToText.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DataToText.cpp' object='amule-DataToText.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi` - amule-ECSpecialMuleTags.o: ECSpecialMuleTags.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ECSpecialMuleTags.o -MD -MP -MF $(DEPDIR)/amule-ECSpecialMuleTags.Tpo -c -o amule-ECSpecialMuleTags.o `test -f 'ECSpecialMuleTags.cpp' || echo '$(srcdir)/'`ECSpecialMuleTags.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amule-ECSpecialMuleTags.Tpo $(DEPDIR)/amule-ECSpecialMuleTags.Po @@ -3609,6 +3609,22 @@ amulecmd-TextClient.obj: TextClient.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-TextClient.obj `if test -f 'TextClient.cpp'; then $(CYGPATH_W) 'TextClient.cpp'; else $(CYGPATH_W) '$(srcdir)/TextClient.cpp'; fi` +amulecmd-DataToText.o: DataToText.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-DataToText.o -MD -MP -MF $(DEPDIR)/amulecmd-DataToText.Tpo -c -o amulecmd-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-DataToText.Tpo $(DEPDIR)/amulecmd-DataToText.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DataToText.cpp' object='amulecmd-DataToText.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp + +amulecmd-DataToText.obj: DataToText.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-DataToText.obj -MD -MP -MF $(DEPDIR)/amulecmd-DataToText.Tpo -c -o amulecmd-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-DataToText.Tpo $(DEPDIR)/amulecmd-DataToText.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DataToText.cpp' object='amulecmd-DataToText.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi` + amulecmd-ExternalConnector.o: ExternalConnector.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-ExternalConnector.o -MD -MP -MF $(DEPDIR)/amulecmd-ExternalConnector.Tpo -c -o amulecmd-ExternalConnector.o `test -f 'ExternalConnector.cpp' || echo '$(srcdir)/'`ExternalConnector.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-ExternalConnector.Tpo $(DEPDIR)/amulecmd-ExternalConnector.Po @@ -4345,22 +4361,6 @@ amuled-ClientRef.obj: ClientRef.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientRef.obj `if test -f 'ClientRef.cpp'; then $(CYGPATH_W) 'ClientRef.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientRef.cpp'; fi` -amuled-DataToText.o: DataToText.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-DataToText.o -MD -MP -MF $(DEPDIR)/amuled-DataToText.Tpo -c -o amuled-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amuled-DataToText.Tpo $(DEPDIR)/amuled-DataToText.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DataToText.cpp' object='amuled-DataToText.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp - -amuled-DataToText.obj: DataToText.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-DataToText.obj -MD -MP -MF $(DEPDIR)/amuled-DataToText.Tpo -c -o amuled-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amuled-DataToText.Tpo $(DEPDIR)/amuled-DataToText.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DataToText.cpp' object='amuled-DataToText.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi` - amuled-ECSpecialMuleTags.o: ECSpecialMuleTags.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ECSpecialMuleTags.o -MD -MP -MF $(DEPDIR)/amuled-ECSpecialMuleTags.Tpo -c -o amuled-ECSpecialMuleTags.o `test -f 'ECSpecialMuleTags.cpp' || echo '$(srcdir)/'`ECSpecialMuleTags.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ECSpecialMuleTags.Tpo $(DEPDIR)/amuled-ECSpecialMuleTags.Po @@ -5065,22 +5065,6 @@ amulegui-ClientRef.obj: ClientRef.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ClientRef.obj `if test -f 'ClientRef.cpp'; then $(CYGPATH_W) 'ClientRef.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientRef.cpp'; fi` -amulegui-DataToText.o: DataToText.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-DataToText.o -MD -MP -MF $(DEPDIR)/amulegui-DataToText.Tpo -c -o amulegui-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-DataToText.Tpo $(DEPDIR)/amulegui-DataToText.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DataToText.cpp' object='amulegui-DataToText.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp - -amulegui-DataToText.obj: DataToText.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-DataToText.obj -MD -MP -MF $(DEPDIR)/amulegui-DataToText.Tpo -c -o amulegui-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-DataToText.Tpo $(DEPDIR)/amulegui-DataToText.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DataToText.cpp' object='amulegui-DataToText.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi` - amulegui-ECSpecialMuleTags.o: ECSpecialMuleTags.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ECSpecialMuleTags.o -MD -MP -MF $(DEPDIR)/amulegui-ECSpecialMuleTags.Tpo -c -o amulegui-ECSpecialMuleTags.o `test -f 'ECSpecialMuleTags.cpp' || echo '$(srcdir)/'`ECSpecialMuleTags.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ECSpecialMuleTags.Tpo $(DEPDIR)/amulegui-ECSpecialMuleTags.Po diff --git a/src/PartFileConvert.h b/src/PartFileConvert.h index 216343fc..daa7c9d5 100644 --- a/src/PartFileConvert.h +++ b/src/PartFileConvert.h @@ -24,31 +24,14 @@ // #ifndef PARTFILECONVERT_H -#if !(defined __need_convertinfo || defined __need_convstatus) +#if !defined __need_convertinfo # define PARTFILECONVERT_H #endif -#ifndef __have_convstatus -#define __have_convstatus - -enum ConvStatus { - CONV_OK = 0, - CONV_QUEUE, - CONV_INPROGRESS, - CONV_OUTOFDISKSPACE, - CONV_PARTMETNOTFOUND, - CONV_IOERROR, - CONV_FAILED, - CONV_BADFORMAT, - CONV_ALREADYEXISTS -}; - -#endif /* convstatus */ -#undef __need_convstatus - #if !defined __have_convertinfo && (defined __need_convertinfo || defined PARTFILECONVERT_H) #define __have_convertinfo +#include "Constants.h" #include "Types.h" #include diff --git a/src/TextClient.cpp b/src/TextClient.cpp index 791a82e7..895c1813 100644 --- a/src/TextClient.cpp +++ b/src/TextClient.cpp @@ -48,8 +48,8 @@ #include // Needed for CFormat #include "OtherFunctions.h" -#include "KnownFile.h" // Needed for Priority Levels -#include "DataToText.cpp" // Needed for PriorityToStr +#include "Constants.h" // Needed for Priority Levels +#include "DataToText.h" // Needed for PriorityToStr //------------------------------------------------------------------- diff --git a/src/utils/fileview/Print.cpp b/src/utils/fileview/Print.cpp index fe415508..aad2ae0c 100644 --- a/src/utils/fileview/Print.cpp +++ b/src/utils/fileview/Print.cpp @@ -31,7 +31,7 @@ #include #include "../../OtherFunctions.h" #include "../../Friend.h" // Needed for FF_NAME -#include "../../KnownFile.h" // Needed for PR_* +#include "../../Constants.h" // Needed for PR_* #include "../../NetworkFunctions.h" // Needed for Uint32toStringIP #include diff --git a/src/webserver/src/WebServer.cpp b/src/webserver/src/WebServer.cpp index 2571e406..0d8bca19 100644 --- a/src/webserver/src/WebServer.cpp +++ b/src/webserver/src/WebServer.cpp @@ -41,6 +41,9 @@ #include #include // Needed for CFormat +#include // Needed for PARTSIZE +#include "Constants.h" // Needed for PR_* + //------------------------------------------------------------------- #include "WebSocket.h" // Needed for StopSockets() diff --git a/src/webserver/src/WebServer.h b/src/webserver/src/WebServer.h index 93469eb3..c8b7702a 100644 --- a/src/webserver/src/WebServer.h +++ b/src/webserver/src/WebServer.h @@ -32,7 +32,7 @@ #endif #include "WebInterface.h" -#include "KnownFile.h" +#include // Needed for std::set #include "RLE.h" #include "OtherStructs.h" #include // Needed for CECID -- 2.11.4.GIT