aboutsummaryrefslogtreecommitdiffstats
path: root/src/kvilib/irc
diff options
context:
space:
mode:
Diffstat (limited to 'src/kvilib/irc')
-rw-r--r--src/kvilib/irc/KviAvatar.h6
-rw-r--r--src/kvilib/irc/KviAvatarCache.cpp4
-rw-r--r--src/kvilib/irc/KviAvatarCache.h6
-rw-r--r--src/kvilib/irc/KviControlCodes.cpp2
-rw-r--r--src/kvilib/irc/KviIdentityProfile.h1
-rw-r--r--src/kvilib/irc/KviIdentityProfileSet.h2
-rw-r--r--src/kvilib/irc/KviIrcMask.cpp1
-rw-r--r--src/kvilib/irc/KviIrcMask.h3
-rw-r--r--src/kvilib/irc/KviIrcNetwork.cpp1
-rw-r--r--src/kvilib/irc/KviIrcNetwork.h2
-rw-r--r--src/kvilib/irc/KviIrcServer.h3
-rw-r--r--src/kvilib/irc/KviIrcServerDataBase.cpp2
-rw-r--r--src/kvilib/irc/KviIrcServerDataBase.h9
-rw-r--r--src/kvilib/irc/KviIrcUserDataBase.cpp3
-rw-r--r--src/kvilib/irc/KviIrcUserDataBase.h10
-rw-r--r--src/kvilib/irc/KviIrcUserEntry.cpp2
-rw-r--r--src/kvilib/irc/KviIrcUserEntry.h4
-rw-r--r--src/kvilib/irc/KviNickServRule.cpp2
-rw-r--r--src/kvilib/irc/KviNickServRuleSet.cpp1
-rw-r--r--src/kvilib/irc/KviNickServRuleSet.h5
-rw-r--r--src/kvilib/irc/KviUserIdentity.cpp1
-rw-r--r--src/kvilib/irc/KviUserIdentity.h6
-rw-r--r--src/kvilib/irc/KviUserIdentityManager.cpp5
-rw-r--r--src/kvilib/irc/KviUserIdentityManager.h2
24 files changed, 55 insertions, 28 deletions
diff --git a/src/kvilib/irc/KviAvatar.h b/src/kvilib/irc/KviAvatar.h
index 1ff37060c..17d78ad57 100644
--- a/src/kvilib/irc/KviAvatar.h
+++ b/src/kvilib/irc/KviAvatar.h
@@ -30,12 +30,14 @@
* \brief Avatar handling
*/
-#include "KviHeapObject.h"
#include "kvi_settings.h"
#include "KviAnimatedPixmap.h"
+#include "KviHeapObject.h"
-#include <QPixmap>
#include <QHash>
+#include <QPixmap>
+#include <QSize>
+#include <QString>
/**
* \brief Returns an hash based on avatar dimensions
diff --git a/src/kvilib/irc/KviAvatarCache.cpp b/src/kvilib/irc/KviAvatarCache.cpp
index 9d3c374ab..473667916 100644
--- a/src/kvilib/irc/KviAvatarCache.cpp
+++ b/src/kvilib/irc/KviAvatarCache.cpp
@@ -23,8 +23,10 @@
//=============================================================================
#include "KviAvatarCache.h"
-#include "KviPointerList.h"
#include "KviConfigurationFile.h"
+#include "KviIrcMask.h"
+#include "KviPointerList.h"
+#include "KviQString.h"
// this level triggers a cleanup
#define MAX_AVATARS_IN_CACHE 100
diff --git a/src/kvilib/irc/KviAvatarCache.h b/src/kvilib/irc/KviAvatarCache.h
index 0e62b57d6..9bc17e792 100644
--- a/src/kvilib/irc/KviAvatarCache.h
+++ b/src/kvilib/irc/KviAvatarCache.h
@@ -31,11 +31,13 @@
*/
#include "kvi_settings.h"
-#include "KviQString.h"
#include "KviTimeUtils.h"
-#include "KviIrcMask.h"
#include "KviPointerHashTable.h"
+#include <QString>
+
+class KviIrcMask;
+
/**
* \typedef KviAvatarCacheEntry
* \struct _KviAvatarCacheEntry
diff --git a/src/kvilib/irc/KviControlCodes.cpp b/src/kvilib/irc/KviControlCodes.cpp
index b357c5d64..3f49652b5 100644
--- a/src/kvilib/irc/KviControlCodes.cpp
+++ b/src/kvilib/irc/KviControlCodes.cpp
@@ -26,6 +26,8 @@
#include "KviControlCodes.h"
+#include <QString>
+
namespace KviControlCodes
{
QString stripControlBytes(const QString & szData)
diff --git a/src/kvilib/irc/KviIdentityProfile.h b/src/kvilib/irc/KviIdentityProfile.h
index 774fc8299..b37e58177 100644
--- a/src/kvilib/irc/KviIdentityProfile.h
+++ b/src/kvilib/irc/KviIdentityProfile.h
@@ -32,7 +32,6 @@
#include "kvi_settings.h"
#include "KviHeapObject.h"
-#include "KviPointerList.h"
#include <QString>
diff --git a/src/kvilib/irc/KviIdentityProfileSet.h b/src/kvilib/irc/KviIdentityProfileSet.h
index 94268b358..c15076db8 100644
--- a/src/kvilib/irc/KviIdentityProfileSet.h
+++ b/src/kvilib/irc/KviIdentityProfileSet.h
@@ -32,8 +32,8 @@
#include "kvi_settings.h"
#include "KviHeapObject.h"
-#include "KviPointerList.h"
#include "KviIdentityProfile.h"
+#include "KviPointerList.h"
class KviConfigurationFile;
diff --git a/src/kvilib/irc/KviIrcMask.cpp b/src/kvilib/irc/KviIrcMask.cpp
index 673c58850..74d776c6c 100644
--- a/src/kvilib/irc/KviIrcMask.cpp
+++ b/src/kvilib/irc/KviIrcMask.cpp
@@ -24,6 +24,7 @@
#include "kvi_debug.h"
#include "KviIrcMask.h"
+#include "KviQString.h"
#include <QRegExp>
diff --git a/src/kvilib/irc/KviIrcMask.h b/src/kvilib/irc/KviIrcMask.h
index b440abf64..bb45c009c 100644
--- a/src/kvilib/irc/KviIrcMask.h
+++ b/src/kvilib/irc/KviIrcMask.h
@@ -37,7 +37,8 @@
#include "kvi_settings.h"
#include "KviHeapObject.h"
-#include "KviQString.h"
+
+#include <QString>
/**
* \class KviIrcMask
diff --git a/src/kvilib/irc/KviIrcNetwork.cpp b/src/kvilib/irc/KviIrcNetwork.cpp
index a138cdf64..453bb3b10 100644
--- a/src/kvilib/irc/KviIrcNetwork.cpp
+++ b/src/kvilib/irc/KviIrcNetwork.cpp
@@ -25,6 +25,7 @@
#include "KviIrcNetwork.h"
#include "KviIrcServer.h"
#include "KviNickServRuleSet.h"
+#include "KviQString.h"
KviIrcNetwork::KviIrcNetwork(const KviIrcNetwork & src)
{
diff --git a/src/kvilib/irc/KviIrcNetwork.h b/src/kvilib/irc/KviIrcNetwork.h
index 5d4f1edf8..41af48e23 100644
--- a/src/kvilib/irc/KviIrcNetwork.h
+++ b/src/kvilib/irc/KviIrcNetwork.h
@@ -2,7 +2,7 @@
#define KVI_NETWORK_H_
//=============================================================================
//
-// File : KviIrcNetwork.cpp
+// File : KviIrcNetwork.h
// Creation date : Wed Aug 27 2008 17:44:56 by Alexey Uzhva
//
// This file is part of the KVIrc IRC client distribution
diff --git a/src/kvilib/irc/KviIrcServer.h b/src/kvilib/irc/KviIrcServer.h
index a638ec55d..605cd1dd5 100644
--- a/src/kvilib/irc/KviIrcServer.h
+++ b/src/kvilib/irc/KviIrcServer.h
@@ -31,10 +31,11 @@
*/
#include "kvi_settings.h"
+#include "kvi_inttypes.h"
#include "KviHeapObject.h"
-#include "KviQString.h"
#include "KviPointerList.h"
+#include <QString>
#include <QStringList>
class KviConfigurationFile;
diff --git a/src/kvilib/irc/KviIrcServerDataBase.cpp b/src/kvilib/irc/KviIrcServerDataBase.cpp
index 872f88a82..4346e5be3 100644
--- a/src/kvilib/irc/KviIrcServerDataBase.cpp
+++ b/src/kvilib/irc/KviIrcServerDataBase.cpp
@@ -24,6 +24,8 @@
#include "KviIrcServerDataBase.h"
#include "KviConfigurationFile.h"
+#include "KviIrcNetwork.h"
+#include "KviIrcServer.h"
#include "KviLocale.h"
#include "KviNetUtils.h"
#include "KviNickServRuleSet.h"
diff --git a/src/kvilib/irc/KviIrcServerDataBase.h b/src/kvilib/irc/KviIrcServerDataBase.h
index 64ad9650a..18639ba1a 100644
--- a/src/kvilib/irc/KviIrcServerDataBase.h
+++ b/src/kvilib/irc/KviIrcServerDataBase.h
@@ -31,11 +31,14 @@
*/
#include "kvi_settings.h"
-#include "KviQString.h"
-#include "KviIrcServer.h"
-#include "KviIrcNetwork.h"
+#include "kvi_inttypes.h"
#include "KviPointerHashTable.h"
+#include <QString>
+
+class KviIrcNetwork;
+class KviIrcServer;
+
/**
* \typedef KviIrcServerDefinition
* \struct _KviIrcServerDefinition
diff --git a/src/kvilib/irc/KviIrcUserDataBase.cpp b/src/kvilib/irc/KviIrcUserDataBase.cpp
index aa1ecedda..42c7fff72 100644
--- a/src/kvilib/irc/KviIrcUserDataBase.cpp
+++ b/src/kvilib/irc/KviIrcUserDataBase.cpp
@@ -24,7 +24,8 @@
#include "kvi_debug.h"
#include "KviIrcUserDataBase.h"
-#include "KviQString.h"
+#include "KviRegisteredUser.h"
+#include "KviRegisteredUserDataBase.h"
#include "KviStringConversion.h"
KviIrcUserDataBase::KviIrcUserDataBase()
diff --git a/src/kvilib/irc/KviIrcUserDataBase.h b/src/kvilib/irc/KviIrcUserDataBase.h
index f2fdee8e2..9ed8faaba 100644
--- a/src/kvilib/irc/KviIrcUserDataBase.h
+++ b/src/kvilib/irc/KviIrcUserDataBase.h
@@ -31,11 +31,13 @@
*/
#include "kvi_settings.h"
-#include "KviPointerHashTable.h"
-#include "KviCString.h"
-#include "KviAvatar.h"
-#include "KviRegisteredUserDataBase.h"
#include "KviIrcUserEntry.h"
+#include "KviPointerHashTable.h"
+
+#include <QObject>
+#include <QString>
+
+class KviRegisteredUser;
/**
* \class KviIrcUserDataBase
diff --git a/src/kvilib/irc/KviIrcUserEntry.cpp b/src/kvilib/irc/KviIrcUserEntry.cpp
index cd9bf8f08..a93bb869e 100644
--- a/src/kvilib/irc/KviIrcUserEntry.cpp
+++ b/src/kvilib/irc/KviIrcUserEntry.cpp
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : KviIrcUserEntry.h
+// File : KviIrcUserEntry.cpp
// Creation date : Tue Jan 04 2010 22:45:12 by Elvio Basello
//
// This file is part of the KVIrc IRC client distribution
diff --git a/src/kvilib/irc/KviIrcUserEntry.h b/src/kvilib/irc/KviIrcUserEntry.h
index 542c4b982..79c262520 100644
--- a/src/kvilib/irc/KviIrcUserEntry.h
+++ b/src/kvilib/irc/KviIrcUserEntry.h
@@ -32,11 +32,11 @@
* This file was originally part of KviIrcUserDataBase.h
*/
-#include <memory>
-
#include "kvi_settings.h"
#include "KviAvatar.h"
+#include <memory>
+
/**
* \class KviIrcUserEntry
* \brief A class to handle the entries of the user database
diff --git a/src/kvilib/irc/KviNickServRule.cpp b/src/kvilib/irc/KviNickServRule.cpp
index d79240a42..e1caca5f1 100644
--- a/src/kvilib/irc/KviNickServRule.cpp
+++ b/src/kvilib/irc/KviNickServRule.cpp
@@ -22,9 +22,9 @@
//
//=============================================================================
-#include "KviNickServRule.h"
#include "KviConfigurationFile.h"
#include "KviIrcMask.h"
+#include "KviNickServRule.h"
void KviNickServRule::copyFrom(const KviNickServRule & src)
{
diff --git a/src/kvilib/irc/KviNickServRuleSet.cpp b/src/kvilib/irc/KviNickServRuleSet.cpp
index 9e47eb14e..d113f908e 100644
--- a/src/kvilib/irc/KviNickServRuleSet.cpp
+++ b/src/kvilib/irc/KviNickServRuleSet.cpp
@@ -25,6 +25,7 @@
#include "KviNickServRuleSet.h"
#include "KviConfigurationFile.h"
#include "KviIrcMask.h"
+#include "KviQString.h"
#include <QRegExp>
diff --git a/src/kvilib/irc/KviNickServRuleSet.h b/src/kvilib/irc/KviNickServRuleSet.h
index a761a17a4..9da65dba8 100644
--- a/src/kvilib/irc/KviNickServRuleSet.h
+++ b/src/kvilib/irc/KviNickServRuleSet.h
@@ -25,14 +25,15 @@
//=============================================================================
#include "kvi_settings.h"
-#include "KviQString.h"
#include "KviHeapObject.h"
-#include "KviPointerList.h"
#include "KviNickServRule.h"
+#include "KviPointerList.h"
class KviConfigurationFile;
class KviIrcMask;
+class QString;
+
class KVILIB_API KviNickServRuleSet : public KviHeapObject
{
public:
diff --git a/src/kvilib/irc/KviUserIdentity.cpp b/src/kvilib/irc/KviUserIdentity.cpp
index 0e8efe2df..e5c73bd67 100644
--- a/src/kvilib/irc/KviUserIdentity.cpp
+++ b/src/kvilib/irc/KviUserIdentity.cpp
@@ -23,6 +23,7 @@
//=============================================================================
#include "KviUserIdentity.h"
+#include "KviConfigurationFile.h"
#include "KviLocale.h"
#include "kvi_defaults.h"
diff --git a/src/kvilib/irc/KviUserIdentity.h b/src/kvilib/irc/KviUserIdentity.h
index 752e205ba..9267feedd 100644
--- a/src/kvilib/irc/KviUserIdentity.h
+++ b/src/kvilib/irc/KviUserIdentity.h
@@ -32,8 +32,10 @@
#include "kvi_settings.h"
#include "KviHeapObject.h"
#include "KviPixmap.h"
-#include "KviConfigurationFile.h"
-#include "KviPointerHashTable.h"
+
+#include <QString>
+
+class KviConfigurationFile;
/**
* \class KviUserIdentity
diff --git a/src/kvilib/irc/KviUserIdentityManager.cpp b/src/kvilib/irc/KviUserIdentityManager.cpp
index 5c72bc563..f8e1d6cef 100644
--- a/src/kvilib/irc/KviUserIdentityManager.cpp
+++ b/src/kvilib/irc/KviUserIdentityManager.cpp
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : KviUserIdentityManager.h
+// File : KviUserIdentityManager.cpp
// Creation date : Thu Dec Jan 2007 05:03:47 by Elvio Basello
//
// This file is part of the KVIrc IRC Client distribution
@@ -23,8 +23,9 @@
//=============================================================================
#include "KviUserIdentityManager.h"
-#include "KviUserIdentity.h"
+#include "KviConfigurationFile.h"
#include "KviLocale.h"
+#include "KviUserIdentity.h"
#include "kvi_defaults.h"
KviUserIdentityManager * KviUserIdentityManager::m_pInstance = nullptr;
diff --git a/src/kvilib/irc/KviUserIdentityManager.h b/src/kvilib/irc/KviUserIdentityManager.h
index a555b269d..ef2e38a6d 100644
--- a/src/kvilib/irc/KviUserIdentityManager.h
+++ b/src/kvilib/irc/KviUserIdentityManager.h
@@ -36,6 +36,8 @@
#include "KviHeapObject.h"
#include "KviPointerHashTable.h"
+#include <QString>
+
class KviUserIdentity;
/**