moved around some header hopefully minimizing recompilation times on small changes

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5280 17fca916-40b9-46aa-a4ea-0a15b648b75c

19 files changed, 51 insertions, 41 deletions

diff --git a/src/kvilib/core/KviError.cpp b/src/kvilib/core/KviError.cpp
index 8cb4876f6..b0ba5af8c 100644
--- a/src/kvilib/core/KviError.cpp
+++ b/src/kvilib/core/KviError.cpp
@@ -28,7 +28,7 @@
 #include "KviLocale.h"
 #include "KviError.h"
 #include "kvi_settings.h"
-
+#include "KviQString.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	#include <winsock2.h> // for the WSAE* error codes
diff --git a/src/kvilib/core/KviError.h b/src/kvilib/core/KviError.h
index bffb67ba3..534ece863 100644
--- a/src/kvilib/core/KviError.h
+++ b/src/kvilib/core/KviError.h
@@ -31,7 +31,8 @@
 */
 
 #include "kvi_settings.h"
-#include "KviQString.h"
+
+class QString;
 
 /**
 * \namespace KviError
diff --git a/src/kvilib/core/KviQString.cpp b/src/kvilib/core/KviQString.cpp
index 435b2fda1..999cd32e9 100644
--- a/src/kvilib/core/KviQString.cpp
+++ b/src/kvilib/core/KviQString.cpp
@@ -1356,11 +1356,10 @@ namespace KviQString
 		if(uFlags & EscapeSpace)
 			szData->replace(" ","\\ ");
 
-		/*
-		szData->replace("(","\\(");
-		szData->replace(")","\\)");
-		szData->replace("-","\\-");
-		szData->replace("+","\\+");
-		*/
+		if(uFlags & EscapeParenthesis)
+		{
+			szData->replace("(","\\(");
+			szData->replace(")","\\)");
+		}
 	}
 }
diff --git a/src/kvilib/file/KviPackageIOEngine.cpp b/src/kvilib/file/KviPackageIOEngine.cpp
index f36f3e564..07bdd69a6 100644
--- a/src/kvilib/file/KviPackageIOEngine.cpp
+++ b/src/kvilib/file/KviPackageIOEngine.cpp
@@ -25,6 +25,7 @@
 #include "KviPackageIOEngine.h"
 #include "KviLocale.h"
 
+#include <QApplication>
 #include <QProgressDialog>
 #include <QLabel>
 
diff --git a/src/kvilib/system/KviLocale.cpp b/src/kvilib/system/KviLocale.cpp
index 20aabf710..36d7f0a9b 100644
--- a/src/kvilib/system/KviLocale.cpp
+++ b/src/kvilib/system/KviLocale.cpp
@@ -29,16 +29,18 @@
 #define _KVI_LOCALE_CPP_
 #include "KviLocale.h"
 
+#include <QApplication>
 #include <QtGlobal>
 #include <QTextCodec>
 #include <QDir>
 #include <QLocale>
 #include <QByteArray>
 
-#include "KviCString.h"
+#include "KviQString.h"
 #include "KviEnvironment.h"
 #include "KviFileUtils.h"
 #include "KviFile.h"
+#include "KviPointerHashTable.h"
 
 
 KVILIB_API KviMessageCatalogue           * g_pMainCatalogue       = 0;
@@ -1009,7 +1011,7 @@ namespace KviLocale
 		{
 			app->removeTranslator(g_pTranslator);
 			delete g_pTranslator;
-            g_pTranslator = 0;
+			g_pTranslator = 0;
 		}
 	}
 
diff --git a/src/kvilib/system/KviLocale.h b/src/kvilib/system/KviLocale.h
index ca9bdf1a2..e28781b78 100644
--- a/src/kvilib/system/KviLocale.h
+++ b/src/kvilib/system/KviLocale.h
@@ -27,14 +27,13 @@
 
 
 #include "kvi_settings.h"
-#include "KviQString.h"
 #include "KviCString.h"
-#include "KviPointerHashTable.h"
-
-#include <QApplication>
 
+class QApplication;
+class QString;
 class QTextCodec;
 class KviMessageCatalogue;
+template<typename Key,typename T> class KviPointerHashTable;
 
 namespace KviLocale
 {
@@ -97,7 +96,6 @@ public:
 	KviMessageCatalogue();
 	~KviMessageCatalogue();
 protected:
-	//KviPointerHashTable<const char *,KviTranslationEntry> * m_pMessages;
 	KviPointerHashTable<const char *,KviTranslationEntry> * m_pMessages;
 	QTextCodec                                            * m_pTextCodec;
 public:
diff --git a/src/kvilib/system/KviThread.cpp b/src/kvilib/system/KviThread.cpp
index 5ab839e74..a3a5a209d 100644
--- a/src/kvilib/system/KviThread.cpp
+++ b/src/kvilib/system/KviThread.cpp
@@ -40,12 +40,12 @@
 
 #include <errno.h>
 
-
 #include "KviCString.h"
+#include "KviQString.h"
 #include "kvi_settings.h"
 #include "KviError.h"
 
-
+#include <QSocketNotifier>
 #include <QApplication>
 
 
diff --git a/src/kvilib/system/KviThread.h b/src/kvilib/system/KviThread.h
index 6efd8d8cd..a943a7c5e 100644
--- a/src/kvilib/system/KviThread.h
+++ b/src/kvilib/system/KviThread.h
@@ -26,13 +26,12 @@
 
 #include "kvi_settings.h"
 #include "KviHeapObject.h"
-#include "KviCString.h"
+#include "KviPointerList.h"
 
 #include <QObject>
-#include <QSocketNotifier>
-#include "KviPointerList.h"
 #include <QEvent>
 
+class QSocketNotifier;
 
 //
 // Simple thread implementation
diff --git a/src/kvilib/system/KviTimeUtils.h b/src/kvilib/system/KviTimeUtils.h
index 0f2c705de..ef43937ad 100644
--- a/src/kvilib/system/KviTimeUtils.h
+++ b/src/kvilib/system/KviTimeUtils.h
@@ -32,10 +32,9 @@
 
 #include "kvi_settings.h"
 
-#include <QString>
-
 #include <time.h> // for time()
 
+class QString;
 
 #define kvi_unixTime() time(0)
 #define kvi_timeSpan(_time_now,_time_before) ((_time_now) - (_time_before))
diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp
index e7ada0166..754282dd0 100644
--- a/src/kvirc/kernel/KviApplication.cpp
+++ b/src/kvirc/kernel/KviApplication.cpp
@@ -89,6 +89,10 @@
 	#include "KviIpcSentinel.h"
 #endif
 
+#ifdef COMPILE_CRYPT_SUPPORT
+	#include "KviCryptEngineManager.h"
+#endif
+
 #ifdef COMPILE_SSL_SUPPORT
 	#include "KviSSL.h"
 #endif
diff --git a/src/kvirc/module/KviModule.cpp b/src/kvirc/module/KviModule.cpp
index 7151adf49..b45183d91 100644
--- a/src/kvirc/module/KviModule.cpp
+++ b/src/kvirc/module/KviModule.cpp
@@ -30,10 +30,18 @@
 #include "KviKvsEventManager.h"
 #include "KviKvsEventHandler.h"
 #include "KviModuleManager.h"
+#include "KviCString.h"
+#include "KviPointerHashTable.h"
+
+#include <QLibrary>
 
 #include <time.h>
 
 #ifdef COMPILE_CRYPT_SUPPORT
+	#include "KviCryptEngine.h"
+	#include "KviCryptEngineDescription.h"
+	#include "KviCryptEngineManager.h"
+
 	extern KviCryptEngineManager * g_pCryptEngineManager;
 #endif
 
diff --git a/src/kvirc/module/KviModule.h b/src/kvirc/module/KviModule.h
index 10407562d..fdb979d55 100644
--- a/src/kvirc/module/KviModule.h
+++ b/src/kvirc/module/KviModule.h
@@ -26,19 +26,16 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "KviCString.h"
-#include "KviParameterList.h"
-#include <QLibrary>
-#include "KviPointerList.h"
+
 #include "KviModuleExtension.h"
 #include "KviKvsModuleInterface.h"
 
-#include "KviPointerHashTable.h"
+template<typename Key,typename T> class KviPointerHashTable;
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	#include "KviCryptEngine.h"
-	#include "KviCryptEngineDescription.h"
-	#include "KviCryptEngineManager.h"
+	class KviCryptEngine;
+	class KviCryptEngineDescription;
+	class KviCryptEngineManager;
 #endif
 
 
@@ -57,7 +54,8 @@
 #endif
 
 class KviModule;
-
+class KviCString;
+class QLibrary;
 
 typedef bool (*KviModuleSystemRoutine)(KviModule *);
 typedef bool (*KviModuleCtrlRoutine)(KviModule *,const char *,void *);
diff --git a/src/kvirc/module/KviModuleManager.cpp b/src/kvirc/module/KviModuleManager.cpp
index 0cf22d6b8..d2b3b8c66 100644
--- a/src/kvirc/module/KviModuleManager.cpp
+++ b/src/kvirc/module/KviModuleManager.cpp
@@ -35,6 +35,7 @@
 #include "kvi_out.h"
 
 #include <QDir>
+#include <QLibrary>
 
 KviModuleManager * g_pModuleManager = 0;
 
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 702a7a7ee..fad936528 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -270,9 +270,9 @@ static bool chan_kvs_fnc_topicsetat(KviKvsModuleFunctionCall * c)
 		is a channel at all). If the current window is not a channel, a warning is printed
 		and an empty string is returned.[br]
 		The second form returns the number of users on the channel specified by <window_id>.[br]
-		The number of users is returned if it is known form at the call time: this means that
-		if the channel is not synchronized with the server (as just after the join, for example)
-		you might get a number that is actually smaller.[br]
+		The number of users returned depends on the state of KVIrc's data on the channel, which will be 
+		out-of-synch with the server just after the channel is joined. If the function is used prior to 
+		the channel's OnChannelSync event, a smaller user count than there really is will be returned. 
 */
 static bool chan_kvs_fnc_usercount(KviKvsModuleFunctionCall * c)
 {
diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp
index 0041deb35..409c4d0eb 100644
--- a/src/modules/lamerizer/libkvilamerizer.cpp
+++ b/src/modules/lamerizer/libkvilamerizer.cpp
@@ -48,9 +48,8 @@
 #ifdef COMPILE_CRYPT_SUPPORT
 	
 	#include "KviMemory.h"
-	#include "KviMemory.h"
-
 	#include "KviPointerList.h"
+	#include "KviCryptEngineDescription.h"
 
 	static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
 
diff --git a/src/modules/popup/libkvipopup.cpp b/src/modules/popup/libkvipopup.cpp
index 3151f8181..e31142226 100644
--- a/src/modules/popup/libkvipopup.cpp
+++ b/src/modules/popup/libkvipopup.cpp
@@ -706,10 +706,10 @@ static bool popup_kvs_fnc_isEmpty(KviKvsModuleFunctionCall * c)
 	@syntax:
 		$popup.currentItemId()
 	@short:
-		Returns the current id popup
+		Returns the popup item id that owns the executing code
 	@description:
-		When called inside a popup item's callback, this functions returns the id of that popup item.
-		This function returns $null when called outside a popup item's callback.
+		When called inside a popup item's callback, this function returns the id of the popup item.
+		Outside of callback code, $null is returned. 
 	@examples:
 		[example]
 			#clean any previous popup by the same name
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index c5cf5bd0b..d4c3fd83c 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -64,6 +64,7 @@
 #if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN)
 	#include "KviMemory.h"
 	#include "KviPointerList.h"
+	#include "KviCryptEngineDescription.h"
 
 	static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
 
diff --git a/src/modules/rijndael/libkvirijndael_cryptopp.cpp b/src/modules/rijndael/libkvirijndael_cryptopp.cpp
index 8b8c7fb8d..19cd42dcd 100644
--- a/src/modules/rijndael/libkvirijndael_cryptopp.cpp
+++ b/src/modules/rijndael/libkvirijndael_cryptopp.cpp
@@ -30,6 +30,7 @@
 #include "KviLocale.h"
 #include "KviMircCntrl.h"
 #include "KviPointerList.h"
+#include "KviCryptEngineDescription.h"
 
 #include <cryptopp/aes.h>
 #include <cryptopp/blowfish.h>
diff --git a/src/modules/rot13/libkvirot13.cpp b/src/modules/rot13/libkvirot13.cpp
index 622c23616..ad31af3b2 100644
--- a/src/modules/rot13/libkvirot13.cpp
+++ b/src/modules/rot13/libkvirot13.cpp
@@ -48,9 +48,8 @@
 #ifdef COMPILE_CRYPT_SUPPORT
 
 	#include "KviMemory.h"
-	#include "KviMemory.h"
-
 	#include "KviPointerList.h"
+	#include "KviCryptEngineDescription.h"
 
 	static KviPointerList<KviCryptEngine> * g_pEngineList = 0;