diff options
Diffstat (limited to 'src/kvilib')
116 files changed, 268 insertions, 168 deletions
diff --git a/src/kvilib/config/KviBuildInfo.cpp b/src/kvilib/config/KviBuildInfo.cpp index f3f9b1e0d..0e6507a8a 100644 --- a/src/kvilib/config/KviBuildInfo.cpp +++ b/src/kvilib/config/KviBuildInfo.cpp @@ -27,6 +27,7 @@ #include "kvi_sourcesdate.h" #include "kvi_sysbuildinfo.h" +#include <QString> #include <QStringList> const char * feature_array[] = { @@ -155,7 +156,7 @@ namespace KviBuildInfo { QString flags = QString(KVIRC_BUILD_COMPILER_FLAGS); if(flags.isEmpty()) - return "N/A"; + return QString("N/A"); else return flags; } diff --git a/src/kvilib/config/KviBuildInfo.h b/src/kvilib/config/KviBuildInfo.h index 5dc442944..7e3680e80 100644 --- a/src/kvilib/config/KviBuildInfo.h +++ b/src/kvilib/config/KviBuildInfo.h @@ -34,7 +34,7 @@ #include "kvi_settings.h" #include "kvi_sourcesdate.h" -#include <QString> +class QString; extern KVILIB_API const char * feature_array[]; diff --git a/src/kvilib/core/KviCString.cpp b/src/kvilib/core/KviCString.cpp index add17c034..def9ddea8 100644 --- a/src/kvilib/core/KviCString.cpp +++ b/src/kvilib/core/KviCString.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_string.cpp +// File : KviCString.cpp // Creation date : Fri Mar 19 1999 03:20:45 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution @@ -29,6 +29,8 @@ #include "KviCString.h" #include "KviMemory.h" +#include <QString> + static char hexdigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; kvi_wslen_t kvi_wstrlen(const kvi_wchar_t * str) diff --git a/src/kvilib/core/KviCString.h b/src/kvilib/core/KviCString.h index 9291655ec..f295baa54 100644 --- a/src/kvilib/core/KviCString.h +++ b/src/kvilib/core/KviCString.h @@ -34,13 +34,12 @@ #include <strings.h> // useless ? #endif -#include <QtGlobal> -#include <QString> #include <QByteArray> +#include <QtGlobal> #include "kvi_inttypes.h" -#include "KviHeapObject.h" #include "kvi_stdarg.h" +#include "KviHeapObject.h" // // IRC is not UNICODE ...(yet) :( diff --git a/src/kvilib/core/KviError.cpp b/src/kvilib/core/KviError.cpp index 0cc912460..dade349b3 100644 --- a/src/kvilib/core/KviError.cpp +++ b/src/kvilib/core/KviError.cpp @@ -24,10 +24,11 @@ #define _KVI_ERROR_CPP_ -#include "KviLocale.h" #include "KviError.h" +#include "KviLocale.h" #include "kvi_settings.h" -#include "KviQString.h" + +#include <QString> #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include <winsock2.h> // for the WSAE* error codes diff --git a/src/kvilib/core/KviQString.h b/src/kvilib/core/KviQString.h index cc540f917..fce342a20 100644 --- a/src/kvilib/core/KviQString.h +++ b/src/kvilib/core/KviQString.h @@ -34,8 +34,9 @@ #include "kvi_inttypes.h" #include "kvi_stdarg.h" -#include <QString> #include <QByteArray> +#include <QChar> +#include <QString> /** * \namespace KviQString diff --git a/src/kvilib/core/KviShortcut.h b/src/kvilib/core/KviShortcut.h index e4c14f502..4f7b0eac3 100644 --- a/src/kvilib/core/KviShortcut.h +++ b/src/kvilib/core/KviShortcut.h @@ -42,7 +42,7 @@ private: public: static QShortcut * create(const char * key, QWidget * parent, const char * member = 0, const char * ambiguousMember = 0, Qt::ShortcutContext context = Qt::WindowShortcut); static QShortcut * create(const QKeySequence & key, QWidget * parent, const char * member = 0, const char * ambiguousMember = 0, Qt::ShortcutContext context = Qt::WindowShortcut); - static void create(QKeySequence::StandardKey key, QWidget * parent, const char * member = 0, const char * ambiguousMember = 0, Qt::ShortcutContext context = Qt::WindowShortcut, KviPointerList<QShortcut> * pBufferList = NULL); + static void create(QKeySequence::StandardKey key, QWidget * parent, const char * member = 0, const char * ambiguousMember = 0, Qt::ShortcutContext context = Qt::WindowShortcut, KviPointerList<QShortcut> * pBufferList = nullptr); }; #endif //_KVI_SHORTCUT_CLASSFILE_H_ diff --git a/src/kvilib/ext/KviAnimatedPixmap.cpp b/src/kvilib/ext/KviAnimatedPixmap.cpp index e0673c70c..202c35c04 100644 --- a/src/kvilib/ext/KviAnimatedPixmap.cpp +++ b/src/kvilib/ext/KviAnimatedPixmap.cpp @@ -23,11 +23,8 @@ //============================================================================= #include "KviAnimatedPixmap.h" -#include "kvi_settings.h" #include <QImageReader> -#include <QTime> -#include <QHash> KviAnimatedPixmap::KviAnimatedPixmap(QString fileName, int iWidth, int iHeight) : QObject(), diff --git a/src/kvilib/ext/KviAnimatedPixmap.h b/src/kvilib/ext/KviAnimatedPixmap.h index 623165506..6b5a86a52 100644 --- a/src/kvilib/ext/KviAnimatedPixmap.h +++ b/src/kvilib/ext/KviAnimatedPixmap.h @@ -24,13 +24,15 @@ // //============================================================================= -#include <QObject> -#include <QPixmap> -#include <QList> -#include <QTimer> #include "kvi_settings.h" #include "KviAnimatedPixmapCache.h" +#include <QObject> +#include <QString> +#include <QTimer> + +class QPixmap; + /** * This class should not be here, because we already have QMovie * with the same functionality. @@ -67,7 +69,6 @@ class KVILIB_API KviAnimatedPixmap : public QObject, public KviAnimatedPixmapInterface { Q_OBJECT - protected: QString m_szFileName; KviAnimatedPixmapCache::Data * m_pFrameData; diff --git a/src/kvilib/ext/KviAnimatedPixmapCache.h b/src/kvilib/ext/KviAnimatedPixmapCache.h index 1e4b3ca2b..fcee84734 100644 --- a/src/kvilib/ext/KviAnimatedPixmapCache.h +++ b/src/kvilib/ext/KviAnimatedPixmapCache.h @@ -27,10 +27,11 @@ #include "kvi_settings.h" #include "KviAnimatedPixmapInterface.h" -#include <QMutex> -#include <QPixmap> #include <QMultiHash> #include <QMultiMap> +#include <QMutex> +#include <QObject> +#include <QPixmap> #include <QTimer> class KVILIB_API KviAnimatedPixmapCache : public QObject diff --git a/src/kvilib/ext/KviCommandFormatter.cpp b/src/kvilib/ext/KviCommandFormatter.cpp index 2ce62246d..af17fa033 100644 --- a/src/kvilib/ext/KviCommandFormatter.cpp +++ b/src/kvilib/ext/KviCommandFormatter.cpp @@ -23,8 +23,11 @@ //============================================================================= #include "KviCommandFormatter.h" +#include "KviCString.h" #include "KviQString.h" +#include <QStringList> + namespace KviCommandFormatter { bool hasLeadingChars(KviCString ** pszArray, char c) diff --git a/src/kvilib/ext/KviCommandFormatter.h b/src/kvilib/ext/KviCommandFormatter.h index c378e049b..b16b7199e 100644 --- a/src/kvilib/ext/KviCommandFormatter.h +++ b/src/kvilib/ext/KviCommandFormatter.h @@ -24,10 +24,11 @@ // //============================================================================= -#include "KviCString.h" #include "kvi_settings.h" -#include <QStringList> +class KviCString; +class QChar; +class QStringList; namespace KviCommandFormatter { diff --git a/src/kvilib/ext/KviConfigurationFile.cpp b/src/kvilib/ext/KviConfigurationFile.cpp index 0e70a2854..8b75384a5 100644 --- a/src/kvilib/ext/KviConfigurationFile.cpp +++ b/src/kvilib/ext/KviConfigurationFile.cpp @@ -30,6 +30,9 @@ #include "KviMemory.h" #include "KviFile.h" +#include <QColor> +#include <QRect> + KviConfigurationFile::KviConfigurationFile(const QString & filename, FileMode f, bool bLocal8Bit) { m_bLocal8Bit = bLocal8Bit; diff --git a/src/kvilib/ext/KviConfigurationFile.h b/src/kvilib/ext/KviConfigurationFile.h index 8e2fb9636..06e625f61 100644 --- a/src/kvilib/ext/KviConfigurationFile.h +++ b/src/kvilib/ext/KviConfigurationFile.h @@ -25,21 +25,22 @@ // //============================================================================= -#include "KviCString.h" #include "kvi_settings.h" +#include "KviCString.h" #include "KviHeapObject.h" #include "KviPointerHashTable.h" #include <QList> -#include <QColor> #include <QFont> -#include <QRect> +#include <QString> #include <QStringList> #define KVI_CONFIG_DEFAULT_GROUP "KVIrc" class KviPixmap; class KviMessageTypeSettings; +class QColor; +class QRect; typedef KviPointerHashTable<QString, QString> KviConfigurationFileGroup; typedef KviPointerHashTableIterator<QString, QString> KviConfigurationFileGroupIterator; diff --git a/src/kvilib/ext/KviCryptEngine.cpp b/src/kvilib/ext/KviCryptEngine.cpp index 98cdb517f..5b5b101b8 100644 --- a/src/kvilib/ext/KviCryptEngine.cpp +++ b/src/kvilib/ext/KviCryptEngine.cpp @@ -23,8 +23,8 @@ //============================================================================= #include "KviCryptEngine.h" -#include "KviLocale.h" #include "KviCString.h" +#include "KviLocale.h" #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include "KviMemory.h" diff --git a/src/kvilib/ext/KviCryptEngineDescription.h b/src/kvilib/ext/KviCryptEngineDescription.h index b84dff7af..524e1d311 100644 --- a/src/kvilib/ext/KviCryptEngineDescription.h +++ b/src/kvilib/ext/KviCryptEngineDescription.h @@ -2,7 +2,7 @@ #define _KVI_CRYPT_ENGINE_DESC_H_ //============================================================================= // -// File : KviCryptEngineManager.h +// File : KviCryptEngineDescription.h // Creation date : Wed Dec 29 2010 22:10:05 CEST by Elvio Basello // // This file is part of the KVIrc IRC client distribution @@ -29,10 +29,14 @@ // #include "kvi_settings.h" -#include "KviHeapObject.h" #ifdef COMPILE_CRYPT_SUPPORT +#include "KviCryptEngine.h" +#include "KviHeapObject.h" + +#include <QString> + class KVILIB_API KviCryptEngineDescription : public KviHeapObject { public: diff --git a/src/kvilib/ext/KviCryptEngineManager.h b/src/kvilib/ext/KviCryptEngineManager.h index d972ecba2..0b07940a9 100644 --- a/src/kvilib/ext/KviCryptEngineManager.h +++ b/src/kvilib/ext/KviCryptEngineManager.h @@ -34,6 +34,8 @@ class KviCryptEngineDescription; #ifdef COMPILE_CRYPT_SUPPORT +class QString; + class KVILIB_API KviCryptEngineManager { public: diff --git a/src/kvilib/ext/KviMediaManager.cpp b/src/kvilib/ext/KviMediaManager.cpp index 45106d8ea..7dc78cd51 100644 --- a/src/kvilib/ext/KviMediaManager.cpp +++ b/src/kvilib/ext/KviMediaManager.cpp @@ -25,16 +25,14 @@ //#define _KVI_DEBUG_CHECK_RANGE_ #include "KviMediaManager.h" -#include "kvi_debug.h" #include "KviConfigurationFile.h" +#include "KviFile.h" #include "KviFileUtils.h" #include "KviLocale.h" -#include "KviFile.h" - -#include "kvi_settings.h" +#include "kvi_debug.h" -#include <QRegExp> #include <QDir> +#include <QRegExp> #include <sys/types.h> #include <sys/stat.h> diff --git a/src/kvilib/ext/KviMediaManager.h b/src/kvilib/ext/KviMediaManager.h index 2caa6eb8d..1f32d2be6 100644 --- a/src/kvilib/ext/KviMediaManager.h +++ b/src/kvilib/ext/KviMediaManager.h @@ -26,10 +26,10 @@ // This file was originally part of KviMediaType.h -#include "KviMediaType.h" #include "kvi_settings.h" -#include "KviThread.h" +#include "KviMediaType.h" #include "KviPointerList.h" +#include "KviThread.h" class KVILIB_API KviMediaManager : public KviMutex { diff --git a/src/kvilib/ext/KviMessageTypeSettings.h b/src/kvilib/ext/KviMessageTypeSettings.h index d6b59eaa3..ae63d6f7d 100644 --- a/src/kvilib/ext/KviMessageTypeSettings.h +++ b/src/kvilib/ext/KviMessageTypeSettings.h @@ -25,7 +25,6 @@ //============================================================================= #include "kvi_settings.h" -#include "KviCString.h" #define KVI_MSGTYPE_MINLEVEL 0 #define KVI_MSGTYPE_LEVEL_0 0 diff --git a/src/kvilib/ext/KviMiscUtils.cpp b/src/kvilib/ext/KviMiscUtils.cpp index 3a147ebe4..21e19701a 100644 --- a/src/kvilib/ext/KviMiscUtils.cpp +++ b/src/kvilib/ext/KviMiscUtils.cpp @@ -24,6 +24,7 @@ #include "KviMiscUtils.h" +#include <QString> #include <QStringList> namespace KviMiscUtils diff --git a/src/kvilib/ext/KviMiscUtils.h b/src/kvilib/ext/KviMiscUtils.h index 5291e2c6f..279243cc1 100644 --- a/src/kvilib/ext/KviMiscUtils.h +++ b/src/kvilib/ext/KviMiscUtils.h @@ -31,7 +31,8 @@ */ #include "kvi_settings.h" -#include "KviQString.h" + +class QString; /** * \namespace KviMiscUtils diff --git a/src/kvilib/ext/KviNickColors.cpp b/src/kvilib/ext/KviNickColors.cpp index 3a1b28c1d..974252d1d 100644 --- a/src/kvilib/ext/KviNickColors.cpp +++ b/src/kvilib/ext/KviNickColors.cpp @@ -23,9 +23,10 @@ //============================================================================= #include "KviNickColors.h" - #include "KviMemory.h" + #include <stdio.h> +#include <QString> namespace KviNickColors { diff --git a/src/kvilib/ext/KviNickColors.h b/src/kvilib/ext/KviNickColors.h index 37e1abfb0..f4fdf89ea 100644 --- a/src/kvilib/ext/KviNickColors.h +++ b/src/kvilib/ext/KviNickColors.h @@ -26,7 +26,7 @@ #include "kvi_settings.h" -#include <QString> +class QString; namespace KviNickColors { diff --git a/src/kvilib/ext/KviOggTheoraEncoder.cpp b/src/kvilib/ext/KviOggTheoraEncoder.cpp index 85038890b..ca0ced24d 100644 --- a/src/kvilib/ext/KviOggTheoraEncoder.cpp +++ b/src/kvilib/ext/KviOggTheoraEncoder.cpp @@ -29,9 +29,10 @@ #include "KviOggIrcText.h" #include "KviDataBuffer.h" +#include <math.h> #include <stdlib.h> #include <time.h> -#include <math.h> +#include <QColor> using namespace KviOggIrcText; diff --git a/src/kvilib/ext/KviOggTheoraEncoder.h b/src/kvilib/ext/KviOggTheoraEncoder.h index 090c18bfe..97f5423ab 100644 --- a/src/kvilib/ext/KviOggTheoraEncoder.h +++ b/src/kvilib/ext/KviOggTheoraEncoder.h @@ -39,9 +39,8 @@ #include "theora/theoraenc.h" -#include <QColor> - class KviDataBuffer; +class QRgb; /** * \def YUV444_BPP Bytes per pixel in a YUV444 image diff --git a/src/kvilib/ext/KviPixmap.cpp b/src/kvilib/ext/KviPixmap.cpp index f191ba927..a16ecaf25 100644 --- a/src/kvilib/ext/KviPixmap.cpp +++ b/src/kvilib/ext/KviPixmap.cpp @@ -26,6 +26,8 @@ #include "KviPixmap.h" #include "KviQString.h" +#include <QString> + KviPixmap::KviPixmap() = default; diff --git a/src/kvilib/ext/KviPixmap.h b/src/kvilib/ext/KviPixmap.h index 4e1b26fc1..a3c28bd9b 100644 --- a/src/kvilib/ext/KviPixmap.h +++ b/src/kvilib/ext/KviPixmap.h @@ -26,9 +26,10 @@ #include "kvi_settings.h" +#include <memory> #include <QPixmap> -#include <memory> +class QString; class KVILIB_API KviPixmap { diff --git a/src/kvilib/ext/KviPixmapUtils.cpp b/src/kvilib/ext/KviPixmapUtils.cpp index ad668713e..b026f48c3 100644 --- a/src/kvilib/ext/KviPixmapUtils.cpp +++ b/src/kvilib/ext/KviPixmapUtils.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviPixmapUtils.h +// File : KviPixmapUtils.cpp // Creation date : Wed Dec 29 2010 01:10:05 CEST by Elvio Basello // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvilib/ext/KviProxy.cpp b/src/kvilib/ext/KviProxy.cpp index c5729c631..4df3ad135 100644 --- a/src/kvilib/ext/KviProxy.cpp +++ b/src/kvilib/ext/KviProxy.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviProxy.h +// File : KviProxy.cpp // Creation date : Wed Dec 29 2010 01:58:01 by Elvio Basello // // This file is part of the KVIrc IRC client distribution @@ -23,7 +23,6 @@ //============================================================================= #include "KviProxy.h" -#include "KviQString.h" #include "KviCString.h" #include <QStringList> diff --git a/src/kvilib/ext/KviProxyDataBase.cpp b/src/kvilib/ext/KviProxyDataBase.cpp index 419b42d4a..4ba770276 100644 --- a/src/kvilib/ext/KviProxyDataBase.cpp +++ b/src/kvilib/ext/KviProxyDataBase.cpp @@ -24,8 +24,11 @@ #include "KviProxyDataBase.h" #include "KviConfigurationFile.h" +#include "KviCString.h" #include "KviProxy.h" +#include <QString> + void KviProxyDataBase::updateProxyIp(const char * proxy, const char * ip) { for(auto & prx : m_pProxyList) diff --git a/src/kvilib/ext/KviProxyDataBase.h b/src/kvilib/ext/KviProxyDataBase.h index 826b0662b..35b3af6c0 100644 --- a/src/kvilib/ext/KviProxyDataBase.h +++ b/src/kvilib/ext/KviProxyDataBase.h @@ -24,13 +24,15 @@ // //============================================================================= -#include "KviProxy.h" #include "kvi_settings.h" +#include "KviProxy.h" #include <memory> #include <utility> #include <vector> +class QString; + class KVILIB_API KviProxyDataBase { public: diff --git a/src/kvilib/ext/KviRegisteredChannel.cpp b/src/kvilib/ext/KviRegisteredChannel.cpp index 0e6c7fa1a..910136283 100644 --- a/src/kvilib/ext/KviRegisteredChannel.cpp +++ b/src/kvilib/ext/KviRegisteredChannel.cpp @@ -25,6 +25,8 @@ #include "kvi_debug.h" #include "KviRegisteredChannel.h" +#include <QString> + KviRegisteredChannel::KviRegisteredChannel(const QString & szName, const QString & szNetMask) { m_szName = szName; diff --git a/src/kvilib/ext/KviRegisteredChannel.h b/src/kvilib/ext/KviRegisteredChannel.h index df70e5309..d1870a1c4 100644 --- a/src/kvilib/ext/KviRegisteredChannel.h +++ b/src/kvilib/ext/KviRegisteredChannel.h @@ -26,10 +26,10 @@ #include "kvi_settings.h" #include "KviHeapObject.h" -#include "KviCString.h" #include "KviPointerList.h" #include <QHash> +#include <QString> class KVILIB_API KviRegisteredChannel : public KviHeapObject { diff --git a/src/kvilib/ext/KviRegisteredChannelDataBase.cpp b/src/kvilib/ext/KviRegisteredChannelDataBase.cpp index 12836d9e1..07f000d9c 100644 --- a/src/kvilib/ext/KviRegisteredChannelDataBase.cpp +++ b/src/kvilib/ext/KviRegisteredChannelDataBase.cpp @@ -24,6 +24,9 @@ #include "KviRegisteredChannelDataBase.h" #include "KviConfigurationFile.h" +#include "KviQString.h" + +#include <QString> KviRegisteredChannelDataBase::KviRegisteredChannelDataBase() { diff --git a/src/kvilib/ext/KviRegisteredChannelDataBase.h b/src/kvilib/ext/KviRegisteredChannelDataBase.h index 86b270cb3..45aedcdba 100644 --- a/src/kvilib/ext/KviRegisteredChannelDataBase.h +++ b/src/kvilib/ext/KviRegisteredChannelDataBase.h @@ -31,6 +31,8 @@ #include <QHash> +class QString; + class KVILIB_API KviRegisteredChannelDataBase { public: diff --git a/src/kvilib/ext/KviRegisteredUser.cpp b/src/kvilib/ext/KviRegisteredUser.cpp index fec63aa61..f2575a77d 100644 --- a/src/kvilib/ext/KviRegisteredUser.cpp +++ b/src/kvilib/ext/KviRegisteredUser.cpp @@ -25,6 +25,9 @@ //============================================================================= #include "KviRegisteredUser.h" +#include "KviIrcMask.h" + +#include <QString> KviRegisteredUser::KviRegisteredUser(const QString & name) { diff --git a/src/kvilib/ext/KviRegisteredUser.h b/src/kvilib/ext/KviRegisteredUser.h index d66a48b7c..07f0b0eff 100644 --- a/src/kvilib/ext/KviRegisteredUser.h +++ b/src/kvilib/ext/KviRegisteredUser.h @@ -30,9 +30,11 @@ #include "kvi_settings.h" #include "KviHeapObject.h" -#include "KviIrcMask.h" -#include "KviPointerList.h" #include "KviPointerHashTable.h" +#include "KviPointerList.h" + +class KviIrcMask; +class QString; class KVILIB_API KviRegisteredUser : public KviHeapObject { diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.cpp b/src/kvilib/ext/KviRegisteredUserDataBase.cpp index 975969f6d..8469bd2c9 100644 --- a/src/kvilib/ext/KviRegisteredUserDataBase.cpp +++ b/src/kvilib/ext/KviRegisteredUserDataBase.cpp @@ -27,8 +27,11 @@ #include "kvi_debug.h" #include "KviRegisteredUserDataBase.h" #include "KviConfigurationFile.h" +#include "KviIrcMask.h" #include "KviLocale.h" +#include <QString> + /* @doc: registered_users @title: diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.h b/src/kvilib/ext/KviRegisteredUserDataBase.h index 00bd13487..cb2d7fdf6 100644 --- a/src/kvilib/ext/KviRegisteredUserDataBase.h +++ b/src/kvilib/ext/KviRegisteredUserDataBase.h @@ -33,13 +33,16 @@ #include "kvi_settings.h" #include "kvi_debug.h" -#include "KviHeapObject.h" #include "KviPointerHashTable.h" #include "KviRegisteredUserGroup.h" #include "KviRegisteredUserMask.h" +#include "KviRegisteredUser.h" #include <QObject> +class KviIrcMask; +class QString; + // // KviRegisteredUserDataBase // diff --git a/src/kvilib/ext/KviRegisteredUserMask.cpp b/src/kvilib/ext/KviRegisteredUserMask.cpp index 03a5c0a0e..917b485c3 100644 --- a/src/kvilib/ext/KviRegisteredUserMask.cpp +++ b/src/kvilib/ext/KviRegisteredUserMask.cpp @@ -23,6 +23,8 @@ //============================================================================= #include "KviRegisteredUserMask.h" +#include "KviIrcMask.h" +#include "KviRegisteredUser.h" KviRegisteredUserMask::KviRegisteredUserMask(KviRegisteredUser * pUser, KviIrcMask * pMask) { diff --git a/src/kvilib/ext/KviRegisteredUserMask.h b/src/kvilib/ext/KviRegisteredUserMask.h index 017553f78..9b45a527f 100644 --- a/src/kvilib/ext/KviRegisteredUserMask.h +++ b/src/kvilib/ext/KviRegisteredUserMask.h @@ -27,8 +27,10 @@ // this file was originally part of KviRegisteredUserDataBase.h #include "kvi_settings.h" -#include "KviIrcMask.h" -#include "KviRegisteredUser.h" +#include "KviPointerList.h" + +class KviIrcMask; +class KviRegisteredUser; class KVILIB_API KviRegisteredUserMask { diff --git a/src/kvilib/ext/KviRuntimeInfo.cpp b/src/kvilib/ext/KviRuntimeInfo.cpp index 035191bbc..51938eed5 100644 --- a/src/kvilib/ext/KviRuntimeInfo.cpp +++ b/src/kvilib/ext/KviRuntimeInfo.cpp @@ -27,6 +27,7 @@ #include "KviQString.h" #include <QApplication> +#include <QString> #include <QStyle> #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) diff --git a/src/kvilib/ext/KviRuntimeInfo.h b/src/kvilib/ext/KviRuntimeInfo.h index 424753994..58fc9be1f 100644 --- a/src/kvilib/ext/KviRuntimeInfo.h +++ b/src/kvilib/ext/KviRuntimeInfo.h @@ -26,7 +26,7 @@ #include "kvi_settings.h" -#include <QString> +class QString; namespace KviRuntimeInfo { diff --git a/src/kvilib/ext/KviSharedFile.cpp b/src/kvilib/ext/KviSharedFile.cpp index 29127bf26..bbaede770 100644 --- a/src/kvilib/ext/KviSharedFile.cpp +++ b/src/kvilib/ext/KviSharedFile.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviSharedFile.h +// File : KviSharedFile.cpp // Creation date : Wed Dec 29 2010 03:40:05 CEST by Elvio Basello // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvilib/ext/KviSharedFilesManager.cpp b/src/kvilib/ext/KviSharedFilesManager.cpp index f0c33b8ad..f9270eefd 100644 --- a/src/kvilib/ext/KviSharedFilesManager.cpp +++ b/src/kvilib/ext/KviSharedFilesManager.cpp @@ -28,6 +28,7 @@ #include "KviIrcMask.h" #include <QFileInfo> +#include <QTimer> // TODO: Match servers that the file requests come from // TODO: Max number of downloads ? diff --git a/src/kvilib/ext/KviSharedFilesManager.h b/src/kvilib/ext/KviSharedFilesManager.h index f1a07cedc..3912ebae4 100644 --- a/src/kvilib/ext/KviSharedFilesManager.h +++ b/src/kvilib/ext/KviSharedFilesManager.h @@ -28,9 +28,11 @@ #include "KviPointerHashTable.h" #include "KviSharedFile.h" -#include <QTimer> +#include <QObject> class KviIrcMask; +class QString; +class QTimer; class KVILIB_API KviSharedFilesManager : public QObject { diff --git a/src/kvilib/ext/KviStringConversion.cpp b/src/kvilib/ext/KviStringConversion.cpp index cfbdf8acb..5bb63f0f0 100644 --- a/src/kvilib/ext/KviStringConversion.cpp +++ b/src/kvilib/ext/KviStringConversion.cpp @@ -24,8 +24,16 @@ #define _KVI_STRINGCONVERSION_CPP_ #include "KviStringConversion.h" - +#include "KviCString.h" +#include "KviMessageTypeSettings.h" +#include "KviPixmap.h" #include "KviQString.h" + +#include <QColor> +#include <QFont> +#include <QRect> +#include <QString> +#include <QStringList> #include <stdio.h> QString g_szGlobalDir; diff --git a/src/kvilib/ext/KviStringConversion.h b/src/kvilib/ext/KviStringConversion.h index 877347c0b..22f16af57 100644 --- a/src/kvilib/ext/KviStringConversion.h +++ b/src/kvilib/ext/KviStringConversion.h @@ -25,15 +25,14 @@ //============================================================================= #include "kvi_settings.h" -#include "KviCString.h" -#include "KviPixmap.h" -#include "KviMessageTypeSettings.h" -#include <QRect> -#include <QColor> -#include <QFont> -#include <QStringList> -#include <QString> +class KviMessageTypeSettings; +class KviPixmap; +class QColor; +class QFont; +class QRect; +class QString; +class QStringList; namespace KviStringConversion { diff --git a/src/kvilib/file/KviFile.cpp b/src/kvilib/file/KviFile.cpp index e285ed13d..19816bb79 100644 --- a/src/kvilib/file/KviFile.cpp +++ b/src/kvilib/file/KviFile.cpp @@ -25,6 +25,7 @@ #include "KviFile.h" #include "KviByteOrder.h" +#include "KviCString.h" #include <QByteArray> diff --git a/src/kvilib/file/KviFile.h b/src/kvilib/file/KviFile.h index 0b0d9f554..40004eb20 100644 --- a/src/kvilib/file/KviFile.h +++ b/src/kvilib/file/KviFile.h @@ -32,14 +32,12 @@ #include "kvi_settings.h" #include "KviHeapObject.h" -#include "KviCString.h" #include "KviPointerList.h" #include "kvi_inttypes.h" #include <QFile> -#include <time.h> - +class KviCString; class QByteArray; #define kvi_file_offset_t qlonglong diff --git a/src/kvilib/file/KviFileUtils.cpp b/src/kvilib/file/KviFileUtils.cpp index fecbe0b64..8a0d60519 100644 --- a/src/kvilib/file/KviFileUtils.cpp +++ b/src/kvilib/file/KviFileUtils.cpp @@ -31,6 +31,8 @@ #include <QDir> #include <QFileInfo> +#include <QString> +#include <QStringList> #include <QtGlobal> #include <QTextCodec> #include <QTextStream> diff --git a/src/kvilib/file/KviFileUtils.h b/src/kvilib/file/KviFileUtils.h index e54896108..b75366965 100644 --- a/src/kvilib/file/KviFileUtils.h +++ b/src/kvilib/file/KviFileUtils.h @@ -34,12 +34,12 @@ */ #include "kvi_settings.h" -#include "KviCString.h" #include <QFile> -#include <QStringList> -#include <time.h> +class QByteArray; +class QString; +class QStringList; #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #define KVI_PATH_SEPARATOR "\\" diff --git a/src/kvilib/file/KviPackageIOEngine.cpp b/src/kvilib/file/KviPackageIOEngine.cpp index da67c2bd4..1e6542933 100644 --- a/src/kvilib/file/KviPackageIOEngine.cpp +++ b/src/kvilib/file/KviPackageIOEngine.cpp @@ -26,8 +26,9 @@ #include "KviLocale.h" #include <QApplication> -#include <QProgressDialog> +#include <QByteArray> #include <QLabel> +#include <QProgressDialog> // // A KVIrc Package File is basically a simple zip file with some additional meta-data. diff --git a/src/kvilib/file/KviPackageIOEngine.h b/src/kvilib/file/KviPackageIOEngine.h index 4b941357b..d45e6366a 100644 --- a/src/kvilib/file/KviPackageIOEngine.h +++ b/src/kvilib/file/KviPackageIOEngine.h @@ -32,12 +32,11 @@ #include "kvi_settings.h" -#include "KviQString.h" #include "KviPointerHashTable.h" -#include <QObject> -#include <QByteArray> +#include <QString> +class QByteArray; class QProgressDialog; class QLabel; diff --git a/src/kvilib/file/KviPackageReader.cpp b/src/kvilib/file/KviPackageReader.cpp index ce358d38c..63c9a5d48 100644 --- a/src/kvilib/file/KviPackageReader.cpp +++ b/src/kvilib/file/KviPackageReader.cpp @@ -23,13 +23,13 @@ //============================================================================= #include "KviPackageReader.h" - #include "KviFile.h" #include "KviFileUtils.h" #include "KviLocale.h" - #include "kvi_inttypes.h" +#include <QString> + #ifdef COMPILE_ZLIB_SUPPORT #include <zlib.h> #endif diff --git a/src/kvilib/file/KviPackageReader.h b/src/kvilib/file/KviPackageReader.h index 75633625e..f6643eb9e 100644 --- a/src/kvilib/file/KviPackageReader.h +++ b/src/kvilib/file/KviPackageReader.h @@ -31,11 +31,10 @@ */ #include "kvi_settings.h" - -#include "KviQString.h" #include "KviPackageIOEngine.h" class KviFile; +class QString; /** * \class KviPackageReader diff --git a/src/kvilib/file/KviPackageWriter.cpp b/src/kvilib/file/KviPackageWriter.cpp index f4bc2b3a1..ce1965894 100644 --- a/src/kvilib/file/KviPackageWriter.cpp +++ b/src/kvilib/file/KviPackageWriter.cpp @@ -23,15 +23,15 @@ //============================================================================= #include "KviPackageWriter.h" - #include "KviFile.h" #include "KviFileUtils.h" #include "KviLocale.h" #include "KviPointerList.h" - #include "kvi_inttypes.h" +#include <QByteArray> #include <QDir> +#include <QString> #ifdef COMPILE_ZLIB_SUPPORT #include <zlib.h> diff --git a/src/kvilib/file/KviPackageWriter.h b/src/kvilib/file/KviPackageWriter.h index b736118e1..b419be91d 100644 --- a/src/kvilib/file/KviPackageWriter.h +++ b/src/kvilib/file/KviPackageWriter.h @@ -31,17 +31,14 @@ */ #include "kvi_settings.h" - -#include "KviQString.h" #include "KviPackageIOEngine.h" -#include <QByteArray> - -class QFileInfo; class KviFile; - class KviPackageWriterPrivate; class KviPackageWriterDataField; +class QByteArray; +class QFileInfo; +class QString; /** * \class KviPackageWriter 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; /** diff --git a/src/kvilib/locale/KviLocale.cpp b/src/kvilib/locale/KviLocale.cpp index 3cd141802..8f8db9db7 100644 --- a/src/kvilib/locale/KviLocale.cpp +++ b/src/kvilib/locale/KviLocale.cpp @@ -38,12 +38,13 @@ #include "KviPointerHashTable.h" #include "KviTranslator.h" -#include <QtGlobal> #include <QApplication> -#include <QTextCodec> +#include <QByteArray> #include <QDir> #include <QLocale> -#include <QByteArray> +#include <QString> +#include <QTextCodec> +#include <QtGlobal> KVILIB_API KviMessageCatalogue * g_pMainCatalogue = nullptr; diff --git a/src/kvilib/locale/KviMessageCatalogue.cpp b/src/kvilib/locale/KviMessageCatalogue.cpp index 2e50dea2a..b1b2618e9 100644 --- a/src/kvilib/locale/KviMessageCatalogue.cpp +++ b/src/kvilib/locale/KviMessageCatalogue.cpp @@ -58,6 +58,7 @@ #include "KviPointerHashTable.h" #include "KviTranslationEntry.h" +#include <QString> #include <QTextCodec> #include <stdio.h> diff --git a/src/kvilib/locale/KviMessageCatalogue.h b/src/kvilib/locale/KviMessageCatalogue.h index 0e47e5359..c012539dc 100644 --- a/src/kvilib/locale/KviMessageCatalogue.h +++ b/src/kvilib/locale/KviMessageCatalogue.h @@ -29,12 +29,11 @@ #include "kvi_settings.h" #include "KviHeapObject.h" -#include <QString> - template <typename A, typename B> class KviPointerHashTable; class KviTranslationEntry; +class QString; class QTextCodec; /** diff --git a/src/kvilib/locale/KviTranslationEntry.cpp b/src/kvilib/locale/KviTranslationEntry.cpp index f770d29ed..27d751673 100644 --- a/src/kvilib/locale/KviTranslationEntry.cpp +++ b/src/kvilib/locale/KviTranslationEntry.cpp @@ -26,6 +26,8 @@ #include "KviTranslationEntry.h" +#include <QString> + KviTranslationEntry::KviTranslationEntry(char * pcKey, int iKeyLen, char * pcTr, int iTrLen) : m_szKey(pcKey, iKeyLen), m_szEncodedTranslation(pcTr, iTrLen) { diff --git a/src/kvilib/locale/KviTranslationEntry.h b/src/kvilib/locale/KviTranslationEntry.h index cf0068a7b..8e79dc073 100644 --- a/src/kvilib/locale/KviTranslationEntry.h +++ b/src/kvilib/locale/KviTranslationEntry.h @@ -35,10 +35,10 @@ */ #include "kvi_settings.h" -#include "KviHeapObject.h" #include "KviCString.h" +#include "KviHeapObject.h" -#include <QString> +class QString; /** * \class KviTranslationEntry diff --git a/src/kvilib/locale/KviTranslator.h b/src/kvilib/locale/KviTranslator.h index a719a07d1..1103ab85d 100644 --- a/src/kvilib/locale/KviTranslator.h +++ b/src/kvilib/locale/KviTranslator.h @@ -37,7 +37,8 @@ #include "kvi_settings.h" #include <QTranslator> -#include <QString> + +class QString; /** * \class KviTranslator diff --git a/src/kvilib/net/KviDnsResolver.cpp b/src/kvilib/net/KviDnsResolver.cpp index cfa526f9f..530f139ef 100644 --- a/src/kvilib/net/KviDnsResolver.cpp +++ b/src/kvilib/net/KviDnsResolver.cpp @@ -25,6 +25,7 @@ #include "KviDnsResolver.h" #include "KviError.h" #include "KviNetUtils.h" +#include "KviQString.h" #include <QApplication> diff --git a/src/kvilib/net/KviDnsResolver.h b/src/kvilib/net/KviDnsResolver.h index 7caf84d47..c1458b967 100644 --- a/src/kvilib/net/KviDnsResolver.h +++ b/src/kvilib/net/KviDnsResolver.h @@ -25,10 +25,11 @@ //============================================================================= #include "kvi_settings.h" -#include "KviHeapObject.h" -#include "KviQString.h" #include "KviError.h" +#include "KviHeapObject.h" +#include <QObject> +#include <QString> #include <vector> class KviDnsResolverThread; @@ -149,8 +150,8 @@ signals: // INTERNAL CLASSES // -#include <QThread> #include <QEvent> +#include <QThread> #include "kvi_debug.h" @@ -175,7 +176,7 @@ public: KviDnsResolverResult * releaseResult() { KviDnsResolverResult * pResult = m_pResult; - m_pResult = NULL; + m_pResult = nullptr; return pResult; } }; diff --git a/src/kvilib/net/KviDnsResolverNew.cpp b/src/kvilib/net/KviDnsResolverNew.cpp index 67c190920..f6d3adc31 100644 --- a/src/kvilib/net/KviDnsResolverNew.cpp +++ b/src/kvilib/net/KviDnsResolverNew.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviDnsResolver.cpp +// File : KviDnsResolverNew.cpp // Creation date : Sat Jul 21 2000 17:19:31 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution @@ -23,12 +23,11 @@ //============================================================================= #include "KviDnsResolver.h" - #include "KviLocale.h" - #include "kvi_debug.h" #include <QHostInfo> +#include <QString> class KviDnsResolverPrivate { diff --git a/src/kvilib/net/KviDnsResolverNew.h b/src/kvilib/net/KviDnsResolverNew.h index 8b6684d27..067397ef7 100644 --- a/src/kvilib/net/KviDnsResolverNew.h +++ b/src/kvilib/net/KviDnsResolverNew.h @@ -2,7 +2,7 @@ #define _KviDnsResolver_h_ //============================================================================= // -// File : KviDnsResolver.h +// File : KviDnsResolverNew.h // Creation date : Sat Jul 21 2000 13:59:11 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution @@ -36,15 +36,14 @@ // Check it again with newer Qt versions and verify. #include "kvi_settings.h" - -#include <KviError.h> // FIXME: Get rid of this at all.. -#include <KviPointerList.h> +#include "KviError.h" // FIXME: Get rid of this at all.. +#include "KviPointerList.h" #include <QObject> class KviDnsResolverPrivate; - class QHostInfo; +class QString; /// /// \class KviDnsResolver @@ -55,12 +54,11 @@ class QHostInfo; class KVILIB_API KviDnsResolver : public QObject { Q_OBJECT - public: /// /// Creates an instance of KviDnsResolver /// - KviDnsResolver(QObject * pParent = NULL); + KviDnsResolver(QObject * pParent = nullptr); /// /// Destroys the instance of KviDnsResolver diff --git a/src/kvilib/net/KviHttpRequest.cpp b/src/kvilib/net/KviHttpRequest.cpp index 9f6c9cd17..ae1804921 100644 --- a/src/kvilib/net/KviHttpRequest.cpp +++ b/src/kvilib/net/KviHttpRequest.cpp @@ -23,23 +23,25 @@ //============================================================================= #include "KviHttpRequest.h" -#include "KviLocale.h" -#include "KviNetUtils.h" +#include "KviCString.h" +#include "KviDataBuffer.h" #include "KviDnsResolver.h" #include "KviError.h" -#include "kvi_debug.h" -#include "KviTimeUtils.h" -#include "KviDataBuffer.h" #include "KviFile.h" +#include "KviLocale.h" +#include "KviNetUtils.h" +#include "KviTimeUtils.h" +#include "kvi_debug.h" #include <QTcpSocket> #ifdef COMPILE_SSL_SUPPORT #include <QSslSocket> #endif -#include <QTimer> #include <QDir> #include <QHostAddress> +#include <QString> #include <QStringList> +#include <QTimer> //#include <zlib.h> diff --git a/src/kvilib/net/KviHttpRequest.h b/src/kvilib/net/KviHttpRequest.h index 3a3326f7d..6d165d011 100644 --- a/src/kvilib/net/KviHttpRequest.h +++ b/src/kvilib/net/KviHttpRequest.h @@ -34,14 +34,13 @@ #include <QTextStream> // with automoc we need this to be included before the other files #include "KviHeapObject.h" -#include "KviCString.h" -#include "KviUrl.h" #include "KviPointerHashTable.h" +#include "KviUrl.h" +#include <QAbstractSocket> #include <QObject> -#include <QtNetwork/QAbstractSocket> - +class KviCString; class KviDnsResolver; class KviDataBuffer; diff --git a/src/kvilib/net/KviNetUtils.cpp b/src/kvilib/net/KviNetUtils.cpp index 9353601a3..82b5804d9 100644 --- a/src/kvilib/net/KviNetUtils.cpp +++ b/src/kvilib/net/KviNetUtils.cpp @@ -25,8 +25,10 @@ #define _KVI_NETUTILS_CPP_ #include "KviNetUtils.h" +#include "KviCString.h" #include "KviMemory.h" +#include <QString> #include <QStringList> #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) diff --git a/src/kvilib/net/KviNetUtils.h b/src/kvilib/net/KviNetUtils.h index 0a7145886..a01923570 100644 --- a/src/kvilib/net/KviNetUtils.h +++ b/src/kvilib/net/KviNetUtils.h @@ -51,7 +51,7 @@ #include <arpa/inet.h> //inet_ntoa inet_ntop and inet_pton depend on this one. #endif -#include "KviCString.h" +class QString; class KVILIB_API KviSockaddr { diff --git a/src/kvilib/net/KviNetworkAccessManager.cpp b/src/kvilib/net/KviNetworkAccessManager.cpp index c3409afc4..dc8d9ec51 100644 --- a/src/kvilib/net/KviNetworkAccessManager.cpp +++ b/src/kvilib/net/KviNetworkAccessManager.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviNetworkAccessManager.h +// File : KviNetworkAccessManager.cpp // Creation date : Sat Sep 29 2012 17:15:12 CEST by Fabio Bas // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvilib/net/KviSASL.cpp b/src/kvilib/net/KviSASL.cpp index 7e37e284a..9ea64ffe4 100644 --- a/src/kvilib/net/KviSASL.cpp +++ b/src/kvilib/net/KviSASL.cpp @@ -24,8 +24,11 @@ #include "KviSASL.h" +#include "KviCString.h" #include "KviMemory.h" +#include <QByteArray> + namespace KviSASL { diff --git a/src/kvilib/net/KviSASL.h b/src/kvilib/net/KviSASL.h index 86f7aa0f5..8c177329d 100644 --- a/src/kvilib/net/KviSASL.h +++ b/src/kvilib/net/KviSASL.h @@ -25,7 +25,9 @@ //============================================================================= #include "kvi_settings.h" -#include "KviCString.h" + +class KviCString; +class QByteArray; /** * \namespace KviSASL diff --git a/src/kvilib/net/KviSSL.h b/src/kvilib/net/KviSSL.h index fa7c705b1..6c7798d29 100644 --- a/src/kvilib/net/KviSSL.h +++ b/src/kvilib/net/KviSSL.h @@ -29,9 +29,8 @@ #ifdef COMPILE_SSL_SUPPORT #include "KviCString.h" -#include "kvi_sockettype.h" - #include "KviPointerHashTable.h" +#include "kvi_sockettype.h" // Apple deprecated openssl since osx 10.7: diff --git a/src/kvilib/net/KviUrl.cpp b/src/kvilib/net/KviUrl.cpp index 6a1779b2d..5de804a80 100644 --- a/src/kvilib/net/KviUrl.cpp +++ b/src/kvilib/net/KviUrl.cpp @@ -23,6 +23,7 @@ //============================================================================= #include "KviUrl.h" + #include <QUrl> KviUrl::KviUrl() diff --git a/src/kvilib/net/KviUrl.h b/src/kvilib/net/KviUrl.h index 4871e1cf6..0c98c7989 100644 --- a/src/kvilib/net/KviUrl.h +++ b/src/kvilib/net/KviUrl.h @@ -24,10 +24,11 @@ // //============================================================================= -#include "KviCString.h" #include "KviHeapObject.h" #include "kvi_inttypes.h" +#include <QString> + class KVILIB_API KviUrl : public KviHeapObject { public: diff --git a/src/kvilib/system/KviSignalHandler.cpp b/src/kvilib/system/KviSignalHandler.cpp index bf8c43144..14b3aed3f 100644 --- a/src/kvilib/system/KviSignalHandler.cpp +++ b/src/kvilib/system/KviSignalHandler.cpp @@ -38,6 +38,7 @@ #include <unistd.h> #include <QApplication> +#include <QSocketNotifier> // Adapted from http://doc.qt.io/qt-5/unix-signals.html diff --git a/src/kvilib/system/KviSignalHandler.h b/src/kvilib/system/KviSignalHandler.h index dc22d2673..b5be82547 100644 --- a/src/kvilib/system/KviSignalHandler.h +++ b/src/kvilib/system/KviSignalHandler.h @@ -29,7 +29,8 @@ #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include <QObject> -#include <QSocketNotifier> + +class QSocketNotifier; // Adapted from http://doc.qt.io/qt-5/unix-signals.html diff --git a/src/kvilib/system/KviThread.cpp b/src/kvilib/system/KviThread.cpp index d4273c43f..3ed70ce60 100644 --- a/src/kvilib/system/KviThread.cpp +++ b/src/kvilib/system/KviThread.cpp @@ -39,7 +39,6 @@ #include <errno.h> #include "kvi_settings.h" -#include "KviCString.h" #include "KviError.h" #include <QSocketNotifier> diff --git a/src/kvilib/system/KviTimeUtils.cpp b/src/kvilib/system/KviTimeUtils.cpp index 0caf327af..3eca41ee0 100644 --- a/src/kvilib/system/KviTimeUtils.cpp +++ b/src/kvilib/system/KviTimeUtils.cpp @@ -25,6 +25,8 @@ #include "KviTimeUtils.h" #include "KviLocale.h" +#include <QString> + #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) // Call SystemTimeToFileTime to copy the system time to a FILETIME structure. diff --git a/src/kvilib/tal/KviTalFileDialog.h b/src/kvilib/tal/KviTalFileDialog.h index dca8e4ed9..0c91ea03d 100644 --- a/src/kvilib/tal/KviTalFileDialog.h +++ b/src/kvilib/tal/KviTalFileDialog.h @@ -108,7 +108,7 @@ public: * \param pParent The parent object * \return QString */ - static QString getExistingDirectoryPath(const QString & szDir = QString(), const QString & szCaption = QString(), QWidget * pParent = 0) + static QString getExistingDirectoryPath(const QString & szDir = QString(), const QString & szCaption = QString(), QWidget * pParent = nullptr) { #if defined(COMPILE_KDE4_SUPPORT) // QFileDialog allows making new directories...kfiledialog not :/ diff --git a/src/kvilib/tal/KviTalGroupBox.cpp b/src/kvilib/tal/KviTalGroupBox.cpp index 3e9f80796..9e84cbed8 100644 --- a/src/kvilib/tal/KviTalGroupBox.cpp +++ b/src/kvilib/tal/KviTalGroupBox.cpp @@ -25,7 +25,6 @@ #include "KviTalGroupBox.h" #include <QChildEvent> -#include <QGroupBox> KviTalGroupBox::KviTalGroupBox(QWidget * pParent, char * pcName) : QGroupBox(pParent) diff --git a/src/kvilib/tal/KviTalGroupBox.h b/src/kvilib/tal/KviTalGroupBox.h index bce8af56d..e98e3f44f 100644 --- a/src/kvilib/tal/KviTalGroupBox.h +++ b/src/kvilib/tal/KviTalGroupBox.h @@ -35,6 +35,8 @@ #include <QGroupBox> #include <QLayout> +class QChildEvent; + /** * \class KviTalGroupBox * \brief Toolkit Abstraction Layer: groupbox class diff --git a/src/kvilib/tal/KviTalHBox.h b/src/kvilib/tal/KviTalHBox.h index e9616d52c..c2c37b880 100644 --- a/src/kvilib/tal/KviTalHBox.h +++ b/src/kvilib/tal/KviTalHBox.h @@ -33,8 +33,8 @@ #include "kvi_settings.h" -#include <QWidget> #include <QHBoxLayout> +#include <QWidget> /** * \class KviTalHBox diff --git a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp index 725ddfbff..cfa87ba75 100644 --- a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp +++ b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp @@ -24,10 +24,11 @@ #include "KviTalIconAndRichTextItemDelegate.h" +#include <QAbstractItemView> +#include <QAbstractTextDocumentLayout> +#include <QApplication> #include <QListWidget> #include <QPainter> -#include <QApplication> -#include <QAbstractTextDocumentLayout> #define LVI_AFTER_ICON (LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING) diff --git a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h index 7e24b5718..60581a315 100644 --- a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h +++ b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h @@ -32,10 +32,12 @@ #include "kvi_settings.h" -#include <QStyledItemDelegate> #include <QListWidget> -#include <QTreeWidget> -#include <QAbstractItemView> +#include <QPixmap> +#include <QSize> +#include <QStyledItemDelegate> + +class QAbstractItemView; #define LVI_ICON_SIZE 32 #define LVI_BORDER 4 diff --git a/src/kvilib/tal/KviTalMainWindow.cpp b/src/kvilib/tal/KviTalMainWindow.cpp index 9f05c9a23..4011d280d 100644 --- a/src/kvilib/tal/KviTalMainWindow.cpp +++ b/src/kvilib/tal/KviTalMainWindow.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviTalMainWindow.coo +// File : KviTalMainWindow.cpp // Creation date : Sun Aug 12 2001 04:40:24 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvilib/tal/KviTalSplitter.h b/src/kvilib/tal/KviTalSplitter.h index 2ff68692b..e49279e36 100644 --- a/src/kvilib/tal/KviTalSplitter.h +++ b/src/kvilib/tal/KviTalSplitter.h @@ -2,7 +2,7 @@ #define _KVI_TAL_SPLITTER_H_ //============================================================================= // -// File : KviTalSplitter.cpp +// File : KviTalSplitter.h // Creation date : Mon Aug 31 2009 19:47:08 by Fabio Bas // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvilib/tal/KviTalWizard.h b/src/kvilib/tal/KviTalWizard.h index 9fe5888f2..13fd7bac2 100644 --- a/src/kvilib/tal/KviTalWizard.h +++ b/src/kvilib/tal/KviTalWizard.h @@ -28,10 +28,10 @@ #include <QDialog> -class QShowEvent; -class QPushButton; -class KviTalWizardPrivate; class KviTalWizardPageData; +class KviTalWizardPrivate; +class QPushButton; +class QShowEvent; /// /// \class KviTalWizard |