diff options
| author |  IceN9ne | 2016-10-28 16:06:33 -0400 |
|---|---|---|
| committer | IceN9ne | 2016-10-28 17:24:29 -0400 |
| commit | 96ca5fbe4e047d59e4bcc28d012bfe92e3a2d228 (patch) | |
| tree | 228f94cd41fa95d6ff52d5fd660d542ab5f6d7f8 | |
| parent | update po{t}s and pos, specify package name and version in po{t}s (diff) | |
| download | KVIrc-96ca5fbe4e047d59e4bcc28d012bfe92e3a2d228.tar.gz KVIrc-96ca5fbe4e047d59e4bcc28d012bfe92e3a2d228.tar.bz2 KVIrc-96ca5fbe4e047d59e4bcc28d012bfe92e3a2d228.zip | |
Cleanup included files
221 files changed, 526 insertions, 397 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 diff --git a/src/kvirc/kernel/KviAction.h b/src/kvirc/kernel/KviAction.h index 29550c492..67507acc6 100644 --- a/src/kvirc/kernel/KviAction.h +++ b/src/kvirc/kernel/KviAction.h @@ -36,16 +36,16 @@ #include <QObject> #include <QPointer> #include <QShortcut> +#include <QString> #include <memory> #include <unordered_set> #include <utility> #include <vector> -class QShortcut; -class QPixmap; -class QMenu; class KviCustomToolBar; +class QMenu; +class QPixmap; #undef None diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp index 063cc7042..a9fe60c25 100644 --- a/src/kvirc/kernel/KviApplication.cpp +++ b/src/kvirc/kernel/KviApplication.cpp @@ -86,6 +86,7 @@ #include "KviCaster.h" #include "KviSignalHandler.h" #include "KviPtrListIterator.h" +#include "KviIrcNetwork.h" #include <QMenu> #include <algorithm> diff --git a/src/kvirc/kernel/KviIpcSentinel.cpp b/src/kvirc/kernel/KviIpcSentinel.cpp index 068674d63..6647f22d1 100644 --- a/src/kvirc/kernel/KviIpcSentinel.cpp +++ b/src/kvirc/kernel/KviIpcSentinel.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviIpcSentinel.hcpp +// File : KviIpcSentinel.cpp // Creation date : Tue Apr 10 2001 15:04:45 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp index e126a8beb..052ea5125 100644 --- a/src/kvirc/kernel/KviIrcConnection.cpp +++ b/src/kvirc/kernel/KviIrcConnection.cpp @@ -65,6 +65,7 @@ #include "KviIdentityProfileSet.h" #include "KviSASL.h" #include "KviNickColors.h" +#include "KviIrcNetwork.h" #include <QTimer> #include <QTextCodec> diff --git a/src/kvirc/kernel/KviIrcConnectionAsyncData.h b/src/kvirc/kernel/KviIrcConnectionAsyncData.h index 1855c34f8..89acde382 100644 --- a/src/kvirc/kernel/KviIrcConnectionAsyncData.h +++ b/src/kvirc/kernel/KviIrcConnectionAsyncData.h @@ -2,7 +2,7 @@ #define _KVI_IRCCONNECTIONASYNCTEMPLATEDATA_H_ //============================================================================= // -// File : KviIrcConnectionAsyncWhoisData.h +// File : KviIrcConnectionAsyncData.h // Creation date : Sat 26 Jun 2004 19:40:20 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp b/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp index 82e71c36f..35071f27a 100644 --- a/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp +++ b/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp @@ -41,6 +41,7 @@ #include "kvi_debug.h" #include "KviIrcConnection.h" #include "KviIrcConnectionTarget.h" +#include "KviIrcNetwork.h" #include <stdlib.h> diff --git a/src/kvirc/kernel/KviIrcContext.cpp b/src/kvirc/kernel/KviIrcContext.cpp index 57942d469..d3ff543f1 100644 --- a/src/kvirc/kernel/KviIrcContext.cpp +++ b/src/kvirc/kernel/KviIrcContext.cpp @@ -54,6 +54,7 @@ #include "KviUserIdentity.h" #include "KviUserIdentityManager.h" #include "KviPtrListIterator.h" +#include "KviIrcNetwork.h" #include "kvi_debug.h" diff --git a/src/kvirc/kernel/KviNotifyList.cpp b/src/kvirc/kernel/KviNotifyList.cpp index 3cd4e3ef8..a46fff6c2 100644 --- a/src/kvirc/kernel/KviNotifyList.cpp +++ b/src/kvirc/kernel/KviNotifyList.cpp @@ -41,6 +41,7 @@ #include "KviQString.h" #include "KviLagMeter.h" #include "KviKvsEventTriggers.h" +#include "KviIrcMessage.h" #include <QStringList> #include <QByteArray> diff --git a/src/kvirc/kernel/KviSSLMaster.cpp b/src/kvirc/kernel/KviSSLMaster.cpp index 9a03a0ec5..721e308c5 100644 --- a/src/kvirc/kernel/KviSSLMaster.cpp +++ b/src/kvirc/kernel/KviSSLMaster.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviSSLmanager.cpp +// File : KviSSLMaster.cpp // Creation date : Mon Jun 17 2002 20:34:00 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvirc/kernel/KviTheme.cpp b/src/kvirc/kernel/KviTheme.cpp index f51a8abe3..6a3a79b00 100644 --- a/src/kvirc/kernel/KviTheme.cpp +++ b/src/kvirc/kernel/KviTheme.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_themeinfo.cpp +// File : KviTheme.cpp // Creation date : Mon Jan 08 2007 03:23:00 CEST by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvirc/kernel/KviTheme.h b/src/kvirc/kernel/KviTheme.h index 4c6dc6d9b..c143c815d 100644 --- a/src/kvirc/kernel/KviTheme.h +++ b/src/kvirc/kernel/KviTheme.h @@ -25,13 +25,13 @@ //============================================================================= #include "kvi_settings.h" -#include "KviQString.h" #include "KviHeapObject.h" #include "kvi_fileextensions.h" #include "KviApplication.h" #include "KviFileUtils.h" #include <QPixmap> +#include <QString> #define KVI_THEMEINFO_FILE_NAME "themeinfo" KVI_FILEEXTENSION_CONFIG #define KVI_THEMEDATA_FILE_NAME "themedata" KVI_FILEEXTENSION_CONFIG diff --git a/src/kvirc/kernel/KviUserAction.cpp b/src/kvirc/kernel/KviUserAction.cpp index ca9fe20b6..868e4b19f 100644 --- a/src/kvirc/kernel/KviUserAction.cpp +++ b/src/kvirc/kernel/KviUserAction.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviUserListView.cpp +// File : KviUserAction.cpp // Creation date : Tue Mar 18 2003 13:36:12 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvirc/kvs/object/KviKvsObjectClass.cpp b/src/kvirc/kvs/object/KviKvsObjectClass.cpp index bcf00adb0..b900689b6 100644 --- a/src/kvirc/kvs/object/KviKvsObjectClass.cpp +++ b/src/kvirc/kvs/object/KviKvsObjectClass.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_kvs_objectclass.cpp +// File : KviKvsObjectClass.cpp // Creation date : Sat 23 Apr 2005 20:31:32 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvirc/kvs/object/KviKvsObjectClass.h b/src/kvirc/kvs/object/KviKvsObjectClass.h index 71801dd49..db417773d 100644 --- a/src/kvirc/kvs/object/KviKvsObjectClass.h +++ b/src/kvirc/kvs/object/KviKvsObjectClass.h @@ -2,7 +2,7 @@ #define _KVI_KVS_OBJECTCLASS_H_ //============================================================================= // -// File : kvi_kvs_objectclass.h +// File : KviKvsObjectClass.h // Creation date : Sat 23 Apr 2005 20:31:32 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvirc/module/KviModuleExtension.cpp b/src/kvirc/module/KviModuleExtension.cpp index d808c5a25..afec88961 100644 --- a/src/kvirc/module/KviModuleExtension.cpp +++ b/src/kvirc/module/KviModuleExtension.cpp @@ -30,6 +30,7 @@ #include "KviApplication.h" #include "KviPtrListIterator.h" +#include <QPixmap> #include <vector> // created and destroyed in KviApplication.cpp diff --git a/src/kvirc/module/KviModuleExtension.h b/src/kvirc/module/KviModuleExtension.h index 0c093f421..1eef5533b 100644 --- a/src/kvirc/module/KviModuleExtension.h +++ b/src/kvirc/module/KviModuleExtension.h @@ -30,13 +30,13 @@ #include "KviHeapObject.h" #include "KviPointerHashTable.h" -#include <QPixmap> #include <QVariant> -class KviWindow; class KviModule; class KviModuleExtension; class KviModuleExtensionDescriptor; +class KviWindow; +class QPixmap; typedef struct _KviModuleExtensionAllocStructTag { diff --git a/src/kvirc/sparser/KviAntiSpam.cpp b/src/kvirc/sparser/KviAntiSpam.cpp index 46dd605ca..3877b2f0f 100644 --- a/src/kvirc/sparser/KviAntiSpam.cpp +++ b/src/kvirc/sparser/KviAntiSpam.cpp @@ -25,6 +25,7 @@ #define _KVI_ANTISPAM_CPP_ #include "KviAntiSpam.h" +#include "KviCString.h" #include "KviOptions.h" // - A spam message is generally a single PRIVMSG <mynick> :<text> diff --git a/src/kvirc/sparser/KviAntiSpam.h b/src/kvirc/sparser/KviAntiSpam.h index 739c75508..f34ef9d1d 100644 --- a/src/kvirc/sparser/KviAntiSpam.h +++ b/src/kvirc/sparser/KviAntiSpam.h @@ -25,7 +25,8 @@ //============================================================================= #include "kvi_settings.h" -#include "KviCString.h" + +class KviCString; extern KVIRC_API bool kvi_mayBeSpam(KviCString msg, KviCString & spamWord); diff --git a/src/kvirc/sparser/KviIrcMessage.cpp b/src/kvirc/sparser/KviIrcMessage.cpp index 91be10bff..e5d8eea9a 100644 --- a/src/kvirc/sparser/KviIrcMessage.cpp +++ b/src/kvirc/sparser/KviIrcMessage.cpp @@ -24,7 +24,7 @@ #include "KviIrcMessage.h" #include "KviIrcConnection.h" -#include "KviConsoleWindow.h" +#include "KviKvsHash.h" KviIrcMessage::KviIrcMessage(const char * message, KviIrcConnection * pConnection) { diff --git a/src/kvirc/sparser/KviIrcMessage.h b/src/kvirc/sparser/KviIrcMessage.h index 459968338..75f49090a 100644 --- a/src/kvirc/sparser/KviIrcMessage.h +++ b/src/kvirc/sparser/KviIrcMessage.h @@ -26,16 +26,16 @@ #include "kvi_settings.h" #include "KviCString.h" -#include "KviQString.h" #include "KviConsoleWindow.h" -#include "KviKvsHash.h" #include <QDateTime> +#include <QString> #include <vector> +class KviConneciton; class KviIrcConnection; class KviIrcContext; -class KviConneciton; +class KviKvsHash; // // This is a single IRC message received from the server. diff --git a/src/kvirc/sparser/KviIrcServerParser.cpp b/src/kvirc/sparser/KviIrcServerParser.cpp index ca82c5ac0..8b68e0371 100644 --- a/src/kvirc/sparser/KviIrcServerParser.cpp +++ b/src/kvirc/sparser/KviIrcServerParser.cpp @@ -33,6 +33,7 @@ #include "KviKvsEventManager.h" #include "KviKvsEventTriggers.h" #include "KviIrcConnectionStateData.h" +#include "KviIrcMessage.h" KviIrcServerParser * g_pServerParser = nullptr; diff --git a/src/kvirc/sparser/KviIrcServerParser.h b/src/kvirc/sparser/KviIrcServerParser.h index 67d06180c..f07e5eca6 100644 --- a/src/kvirc/sparser/KviIrcServerParser.h +++ b/src/kvirc/sparser/KviIrcServerParser.h @@ -27,18 +27,18 @@ #include "kvi_settings.h" #include "KviQString.h" #include "KviConsoleWindow.h" -#include "KviIrcMessage.h" #include <QObject> -#include <QByteArray> #include <time.h> -class KviWindow; class KviChannelWindow; +class KviIrcConnection; +class KviIrcMessage; class KviIrcServerParser; class KviMainWindow; -class KviIrcConnection; +class KviWindow; +class QByteArray; #define UNRECOGNIZED_MESSAGE(_msg, _err) \ _msg->setUnrecognized(); \ diff --git a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp index ad5f0a65a..2190098af 100644 --- a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp @@ -55,6 +55,7 @@ #include "KviRegisteredUserDataBase.h" #include "KviBuildInfo.h" #include "KviIrcConnectionServerInfo.h" +#include "KviIrcMessage.h" #ifdef COMPILE_CRYPT_SUPPORT #include "KviCryptEngine.h" diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp index 38ef19582..b8cca3a50 100644 --- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp @@ -58,6 +58,7 @@ #include "KviKvsEventTriggers.h" #include "KviIrcNetwork.h" #include "kvi_settings.h" +#include "KviIrcMessage.h" #ifdef COMPILE_CRYPT_SUPPORT #include "KviCryptEngine.h" diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp index f283266c1..33160ba4f 100644 --- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp @@ -52,6 +52,7 @@ #include "KviKvsScript.h" #include "KviKvsVariantList.h" #include "KviIdentityProfileSet.h" +#include "KviIrcMessage.h" #ifdef COMPILE_CRYPT_SUPPORT #include "KviCryptEngine.h" diff --git a/src/kvirc/sparser/KviIrcServerParser_tables.cpp b/src/kvirc/sparser/KviIrcServerParser_tables.cpp index 146dd7714..c78a50502 100644 --- a/src/kvirc/sparser/KviIrcServerParser_tables.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_tables.cpp @@ -48,7 +48,7 @@ KviLiteralMessageParseStruct KviIrcServerParser::m_literalParseProcTable[] = { { "QUIT" , PTM(parseLiteralQuit) }, { "TOPIC" , PTM(parseLiteralTopic) }, { "WALLOPS" , PTM(parseLiteralWallops) }, - { nullptr , nullptr } + { nullptr , nullptr } // clang-format on }; @@ -62,7 +62,7 @@ KviCtcpMessageParseStruct KviIrcServerParser::m_ctcpParseProcTable[] = { { "CLIENTINFO" , PTM(REQ(Clientinfo)) , PTM(RPL(Generic)) , 0 }, { "DCC" , PTM(REQ(Dcc)) , PTM(REQ(Dcc)) , 0 }, { "FINGER" , PTM(REQ(Finger)) , PTM(RPL(Generic)) , 0 }, - { "LAGCHECK" , nullptr , PTM(RPL(Lagcheck)) , KVI_CTCP_MESSAGE_PARSE_TRIGGERNOEVENT }, + { "LAGCHECK" , nullptr , PTM(RPL(Lagcheck)) , KVI_CTCP_MESSAGE_PARSE_TRIGGERNOEVENT }, { "PAGE" , PTM(REQ(Page)) , PTM(RPL(Generic)) , 0 }, { "PING" , PTM(REQ(Ping)) , PTM(RPL(Ping)) , 0 }, { "SOURCE" , PTM(REQ(Source)) , PTM(RPL(Generic)) , 0 }, @@ -71,7 +71,7 @@ KviCtcpMessageParseStruct KviIrcServerParser::m_ctcpParseProcTable[] = { { "USERINFO" , PTM(REQ(Userinfo)) , PTM(RPL(Userinfo)) , 0 }, { "VERSION" , PTM(REQ(Version)) , PTM(RPL(Generic)) , 0 }, { "XDCC" , PTM(REQ(Dcc)) , PTM(REQ(Dcc)) , 0 }, - { nullptr , nullptr , nullptr , 0 } + { nullptr , nullptr , nullptr , 0 } // clang-format on }; diff --git a/src/kvirc/ui/KviActionDrawer.h b/src/kvirc/ui/KviActionDrawer.h index 64a570509..a02eb50dc 100644 --- a/src/kvirc/ui/KviActionDrawer.h +++ b/src/kvirc/ui/KviActionDrawer.h @@ -31,15 +31,15 @@ */ #include "kvi_settings.h" -#include "KviQString.h" #include "KviTalListWidget.h" -#include <QWidget> +#include <QString> #include <QTabWidget> +#include <QWidget> -class QPixmap; class KviAction; class KviActionDrawerPageListWidget; +class QPixmap; /** * \class KviActionDrawer diff --git a/src/kvirc/ui/KviChannelWindow.h b/src/kvirc/ui/KviChannelWindow.h index 5f06db89b..ad0360b79 100644 --- a/src/kvirc/ui/KviChannelWindow.h +++ b/src/kvirc/ui/KviChannelWindow.h @@ -33,15 +33,15 @@ #include "kvi_settings.h" #include "KviConsoleWindow.h" #include "KviWindow.h" -#include "KviCString.h" #include "KviIrcUserDataBase.h" #include "KviPixmap.h" #include "KviUserListView.h" #include "KviTimeUtils.h" #include "KviModeWidget.h" -#include <QList> #include <QDateTime> +#include <QList> +#include <QString> #include <QStringList> #include <QToolButton> @@ -49,12 +49,12 @@ #include <vector> class KviConsoleWindow; -class KviTopicWidget; class KviIrcMask; -class KviThemedLabel; -class KviTalHBox; class KviMaskEditor; class KviModeEditor; +class KviTalHBox; +class KviThemedLabel; +class KviTopicWidget; #ifdef COMPILE_ON_WINDOWS // windows compiler wants this instead of the forward decl diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp index dd59910d8..9a8d46291 100644 --- a/src/kvirc/ui/KviConsoleWindow.cpp +++ b/src/kvirc/ui/KviConsoleWindow.cpp @@ -37,6 +37,7 @@ #include "KviError.h" #include "KviProxyDataBase.h" #include "KviNetUtils.h" +#include "KviIrcNetwork.h" #include "KviIrcServer.h" #include "KviIrcServerDataBase.h" #include "KviDnsResolver.h" diff --git a/src/kvirc/ui/KviCryptController.cpp b/src/kvirc/ui/KviCryptController.cpp index 818f5c5e2..012d4a306 100644 --- a/src/kvirc/ui/KviCryptController.cpp +++ b/src/kvirc/ui/KviCryptController.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviCryptEngine.cpp +// File : KviCryptController.cpp // Creation date : Fri Nov 03 2000 14:16:33 CEST by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution @@ -26,6 +26,7 @@ #ifdef COMPILE_CRYPT_SUPPORT #include "KviCryptController.h" +#include "KviCryptEngine.h" #include "KviWindow.h" #include "KviLocale.h" #include "kvi_out.h" @@ -36,7 +37,12 @@ #include "KviWindowToolWidget.h" #include "KviPointerHashTable.h" +#include <QCheckBox> +#include <QLabel> #include <QLayout> +#include <QLineEdit> +#include <QPushButton> +#include <QTextEdit> // KviApplication.cpp extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager; diff --git a/src/kvirc/ui/KviCryptController.h b/src/kvirc/ui/KviCryptController.h index 2ddb49e2f..12b3d459d 100644 --- a/src/kvirc/ui/KviCryptController.h +++ b/src/kvirc/ui/KviCryptController.h @@ -2,7 +2,7 @@ #define _KVI_CRYPTCONTROLLER_H_ //============================================================================= // -// File : KviCryptEngine.h +// File : KviCryptController.h // Creation date : Fri Nov 03 2000 14:11:03 CEST by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution @@ -27,22 +27,22 @@ #include "kvi_settings.h" #if defined(COMPILE_CRYPT_SUPPORT) -#include "KviCryptEngine.h" #include "KviCryptEngineDescription.h" #include "KviCryptEngineManager.h" #include "KviHeapObject.h" -#include "KviWindowToolWidget.h" #include "KviTalListWidget.h" +#include "KviWindowToolWidget.h" -#include <QWidget> -#include <QPushButton> -#include <QToolButton> -#include <QLabel> -#include <QLineEdit> -#include <QCheckBox> -#include <QTextEdit> +#include <QString> +class KviCryptEngine; class KviWindow; +class QCheckBox; +class QLabel; +class QLineEdit; +class QPushButton; +class QTextEdit; +class QWidget; class KVIRC_API KviCryptSessionInfo : public KviHeapObject { diff --git a/src/kvirc/ui/KviHistoryWindow.cpp b/src/kvirc/ui/KviHistoryWindow.cpp index 790f14e26..85b309f29 100644 --- a/src/kvirc/ui/KviHistoryWindow.cpp +++ b/src/kvirc/ui/KviHistoryWindow.cpp @@ -26,13 +26,13 @@ #include "KviHistoryWindow.h" #include "KviApplication.h" -#include "KviOptions.h" #include "KviInput.h" #include "KviInputHistory.h" +#include "KviOptions.h" #include <QEvent> -#include <QMouseEvent> #include <QListWidget> +#include <QMouseEvent> #include <ctype.h> diff --git a/src/kvirc/ui/KviHistoryWindow.h b/src/kvirc/ui/KviHistoryWindow.h index 1e9e50c8d..297aeb277 100644 --- a/src/kvirc/ui/KviHistoryWindow.h +++ b/src/kvirc/ui/KviHistoryWindow.h @@ -33,7 +33,6 @@ */ #include "kvi_settings.h" -#include "KviCString.h" #include <QListWidget> diff --git a/src/kvirc/ui/KviImageDialog.cpp b/src/kvirc/ui/KviImageDialog.cpp index b85bade20..36a21bb4a 100644 --- a/src/kvirc/ui/KviImageDialog.cpp +++ b/src/kvirc/ui/KviImageDialog.cpp @@ -23,18 +23,18 @@ //============================================================================= #include "KviImageDialog.h" +#include "KviApplication.h" #include "KviFileUtils.h" -#include "KviLocale.h" #include "KviIconManager.h" +#include "KviLocale.h" #include "KviOptions.h" -#include "KviApplication.h" +#include <QDir> +#include <QFileInfo> +#include <QImage> #include <QLayout> -#include <QPushButton> #include <QPainter> -#include <QImage> -#include <QFileInfo> -#include <QDir> +#include <QPushButton> int KviImageDialogItem::height(const KviTalListWidget * lb) const { @@ -43,13 +43,10 @@ int KviImageDialogItem::height(const KviTalListWidget * lb) const int KviImageDialogItem::width(const KviTalListWidget * lb) const { - int w; - if(text().isEmpty()) - w = 24; - w = lb->fontMetrics().width(text()) + 4; + int w = lb->fontMetrics().width(text()) + 4; if(w > 100) w = 100; - if(w < 24) + else if(w < 24) w = 24; return qMax(pixmap()->width() + 10, w); } diff --git a/src/kvirc/ui/KviImageDialog.h b/src/kvirc/ui/KviImageDialog.h index 442a27379..af05dba36 100644 --- a/src/kvirc/ui/KviImageDialog.h +++ b/src/kvirc/ui/KviImageDialog.h @@ -27,7 +27,6 @@ #include "kvi_settings.h" #include "KviDynamicToolTip.h" #include "KviTalListWidget.h" -#include "KviIconManager.h" #include <QDialog> #include <QComboBox> diff --git a/src/kvirc/ui/KviInputHistory.cpp b/src/kvirc/ui/KviInputHistory.cpp index e9c650b70..3cc53ec34 100644 --- a/src/kvirc/ui/KviInputHistory.cpp +++ b/src/kvirc/ui/KviInputHistory.cpp @@ -30,6 +30,8 @@ #include "KviConfigurationFile.h" #include "KviCString.h" +#include <QString> + KviInputHistory * KviInputHistory::m_pSelf = nullptr; unsigned int KviInputHistory::m_uCount = 0; diff --git a/src/kvirc/ui/KviInputHistory.h b/src/kvirc/ui/KviInputHistory.h index b8884dd5e..7dd7255ca 100644 --- a/src/kvirc/ui/KviInputHistory.h +++ b/src/kvirc/ui/KviInputHistory.h @@ -41,6 +41,8 @@ #include <vector> +class QString; + #define KVI_INPUT_MAX_GLOBAL_HISTORY_ENTRIES 500 #define KVI_INPUT_MAX_LOCAL_HISTORY_ENTRIES 50 diff --git a/src/kvirc/ui/KviIpEditor.cpp b/src/kvirc/ui/KviIpEditor.cpp index 0e49e0596..ead3381dc 100644 --- a/src/kvirc/ui/KviIpEditor.cpp +++ b/src/kvirc/ui/KviIpEditor.cpp @@ -25,12 +25,12 @@ #include "KviIpEditor.h" #include <QApplication> -#include <QLineEdit> -#include <QLabel> -#include <QFrame> +#include <QByteArray> #include <QEvent> +#include <QFrame> #include <QKeyEvent> -#include <QByteArray> +#include <QLabel> +#include <QLineEdit> #include <ctype.h> @@ -89,16 +89,10 @@ KviIpEditor::AddressType KviIpEditor::addressType() const bool KviIpEditor::hasEmptyFields() const { - bool bHasEF = false; for(auto i : m_pEdit) - { - if(i) - { - if(i->text().isEmpty()) - bHasEF = true; - } - } - return bHasEF; + if(i && i->text().isEmpty()) + return true; + return false; } void KviIpEditor::clear() @@ -107,9 +101,7 @@ void KviIpEditor::clear() return; int maxW = (m_addrType == IPv4) ? 4 : 8; for(int i = 0; i < maxW; i++) - { m_pEdit[i]->setText(""); - } } bool KviIpEditor::setAddress(const QString & ipAddr) diff --git a/src/kvirc/ui/KviIpEditor.h b/src/kvirc/ui/KviIpEditor.h index b79d001ab..c688eafda 100644 --- a/src/kvirc/ui/KviIpEditor.h +++ b/src/kvirc/ui/KviIpEditor.h @@ -26,12 +26,12 @@ #include "kvi_settings.h" -#include <QWidget> -#include <QString> #include <QFrame> +#include <QString> +#include <QWidget> -class QLineEdit; class QLabel; +class QLineEdit; class KVIRC_API KviIpEditor : public QFrame { diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp index 52a1d7658..35248b064 100644 --- a/src/kvirc/ui/KviMainWindow.cpp +++ b/src/kvirc/ui/KviMainWindow.cpp @@ -73,6 +73,7 @@ #include <QMenu> #include <QWindowStateChangeEvent> #include <QCheckBox> +#include <QString> #include <time.h> #include <algorithm> diff --git a/src/kvirc/ui/KviMainWindow.h b/src/kvirc/ui/KviMainWindow.h index d8f481915..61beaf239 100644 --- a/src/kvirc/ui/KviMainWindow.h +++ b/src/kvirc/ui/KviMainWindow.h @@ -32,7 +32,6 @@ #include "kvi_settings.h" #include "KviTalMainWindow.h" -#include "KviQString.h" #include <algorithm> #include <list> @@ -53,6 +52,7 @@ class KviStatusBar; class QMenu; class KviTrayIcon; class QShortcut; +class QString; class KVIRC_API KviMainWindow : public KviTalMainWindow //, public KviIrcContextManager { diff --git a/src/kvirc/ui/KviMaskEditor.cpp b/src/kvirc/ui/KviMaskEditor.cpp index 4a9a81502..c0b1d036c 100644 --- a/src/kvirc/ui/KviMaskEditor.cpp +++ b/src/kvirc/ui/KviMaskEditor.cpp @@ -23,17 +23,19 @@ //============================================================================= #include "KviMaskEditor.h" -#include "KviLocale.h" -#include "KviQString.h" #include "KviChannelWindow.h" #include "KviIrcConnectionServerInfo.h" #include "KviIrcConnectionUserInfo.h" -#include "KviWindowToolWidget.h" -#include "KviChannelWindow.h" +#include "KviLocale.h" #include "KviOptions.h" +#include "KviQString.h" +#include "KviWindowToolWidget.h" -#include <QLayout> +#include <QDateTime> #include <QLabel> +#include <QLayout> +#include <QLineEdit> +#include <QPushButton> #include <QValidator> KviMaskItem::KviMaskItem(QTreeWidget * pParent, KviMaskEntry * pEntry) diff --git a/src/kvirc/ui/KviMaskEditor.h b/src/kvirc/ui/KviMaskEditor.h index 206cbafc1..4cfe2e0d9 100644 --- a/src/kvirc/ui/KviMaskEditor.h +++ b/src/kvirc/ui/KviMaskEditor.h @@ -25,20 +25,20 @@ //============================================================================= #include "kvi_settings.h" -#include "KviCString.h" #include "KviWindowToolWidget.h" #include "KviIconManager.h" -#include <QTreeWidget> -#include <QPushButton> #include <QDialog> -#include <QLineEdit> +#include <QString> +#include <QTreeWidget> #include <QWidget> #include <vector> -class KviMaskEditor; class KviChannelWindow; +class KviMaskEditor; +class QLineEdit; +class QPushButton; typedef struct _KviMaskEntry { diff --git a/src/kvirc/ui/KviMenuBar.cpp b/src/kvirc/ui/KviMenuBar.cpp index 308078273..bf4f535fb 100644 --- a/src/kvirc/ui/KviMenuBar.cpp +++ b/src/kvirc/ui/KviMenuBar.cpp @@ -29,7 +29,6 @@ #include "KviWindowStack.h" #include "KviIconManager.h" #include "KviInternalCommand.h" -#include "kvi_settings.h" #include "KviIrcUrl.h" #include "KviConsoleWindow.h" #include "KviKvsPopupMenu.h" @@ -362,7 +361,7 @@ void KviMenuBar::setupToolsPopup(QMenu * pop) // moved the old tools here m->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::IconManager)), __tr2qs("Show &Icon Table"), g_pIconManager, SLOT(showIconWidget())); #ifdef COMPILE_KDE4_SUPPORT - QAction * pAction = 0; + QAction * pAction = nullptr; pAction = m->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Terminal)), __tr2qs("Open &Terminal"), this, SLOT(actionTriggered(bool))); pAction->setData(KVI_INTERNALCOMMAND_TERM_OPEN); #endif diff --git a/src/kvirc/ui/KviMenuBar.h b/src/kvirc/ui/KviMenuBar.h index 3bd63b9f7..1416a9e1e 100644 --- a/src/kvirc/ui/KviMenuBar.h +++ b/src/kvirc/ui/KviMenuBar.h @@ -25,13 +25,14 @@ //============================================================================= #include "kvi_settings.h" -#include "KviPointerList.h" #include "KviCString.h" +#include "KviPointerList.h" #include "KviTalMenuBar.h" +class KviKvsPopupMenu; class KviMainWindow; +class QAction; class QMenu; -class KviKvsPopupMenu; typedef struct _KviScriptMenuBarItem { @@ -74,11 +75,11 @@ public: protected slots: void menuDestroyed(); - void setupMainPopup(QMenu * pop = 0); - void setupSettingsPopup(QMenu * pop = 0); - void setupHelpPopup(QMenu * pop = 0); - void setupScriptingPopup(QMenu * pop = 0); - void setupToolsPopup(QMenu * pop = 0); + void setupMainPopup(QMenu * pop = nullptr); + void setupSettingsPopup(QMenu * pop = nullptr); + void setupHelpPopup(QMenu * pop = nullptr); + void setupScriptingPopup(QMenu * pop = nullptr); + void setupToolsPopup(QMenu * pop = nullptr); void updateMainPopup(); void updateSettingsPopup(); diff --git a/src/kvirc/ui/KviModeEditor.cpp b/src/kvirc/ui/KviModeEditor.cpp index b4c8810d7..5a05289cd 100644 --- a/src/kvirc/ui/KviModeEditor.cpp +++ b/src/kvirc/ui/KviModeEditor.cpp @@ -23,21 +23,20 @@ //============================================================================= #include "KviModeEditor.h" +#include "KviChannelWindow.h" #include "KviIconManager.h" -#include "KviLocale.h" -#include "KviQString.h" #include "KviIrcConnection.h" #include "KviIrcConnectionServerInfo.h" -#include "KviChannelWindow.h" #include "KviIrcConnectionUserInfo.h" -#include "KviWindowToolWidget.h" +#include "KviLocale.h" -#include <QScrollArea> -#include <QLayout> -#include <QLabel> #include <QCheckBox> +#include <QLabel> +#include <QLayout> #include <QLineEdit> #include <QPushButton> +#include <QScrollArea> +#include <QString> KviModeEditor::KviModeEditor(QWidget * par, KviWindowToolPageButton * button, const char * name, KviChannelWindow * pChan) : KviWindowToolWidget(par, button) diff --git a/src/kvirc/ui/KviModeEditor.h b/src/kvirc/ui/KviModeEditor.h index a63a3e28a..7c23d6795 100644 --- a/src/kvirc/ui/KviModeEditor.h +++ b/src/kvirc/ui/KviModeEditor.h @@ -25,8 +25,6 @@ //============================================================================= #include "kvi_settings.h" -#include "KviCString.h" -#include "KviPointerList.h" #include "KviWindowToolWidget.h" #include <QMap> @@ -34,6 +32,7 @@ class QCheckBox; class QLineEdit; class QPushButton; +class QString; class KviIrcConnectionServerInfo; class KviChannelWindow; diff --git a/src/kvirc/ui/KviOptionsWidget.cpp b/src/kvirc/ui/KviOptionsWidget.cpp index 732ad477f..46794891a 100644 --- a/src/kvirc/ui/KviOptionsWidget.cpp +++ b/src/kvirc/ui/KviOptionsWidget.cpp @@ -31,6 +31,9 @@ #include "KviApplication.h" #include "KviTalToolTip.h" +#include <QLabel> +#include <QPushButton> + #define KVI_OPTIONSWIDGET_GRIDLAYOUT_BORDER 4 #define KVI_OPTIONSWIDGET_GRIDLAYOUT_SPACE 6 diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp index 4d171c539..e45023604 100644 --- a/src/kvirc/ui/KviQueryWindow.cpp +++ b/src/kvirc/ui/KviQueryWindow.cpp @@ -49,13 +49,13 @@ #include "KviCryptController.h" #endif //COMPILE_CRYPT_SUPPORT +#include <QByteArray> +#include <QDate> #include <QDir> #include <QFileInfo> -#include <QDate> -#include <QByteArray> -#include <QPixmap> #include <QList> -#include <QByteArray> +#include <QPixmap> +#include <QString> KviQueryWindow::KviQueryWindow(KviConsoleWindow * lpConsole, const QString & szNick) : KviWindow(KviWindow::Query, szNick, lpConsole) diff --git a/src/kvirc/ui/KviQueryWindow.h b/src/kvirc/ui/KviQueryWindow.h index ef133add1..c1dcc687d 100644 --- a/src/kvirc/ui/KviQueryWindow.h +++ b/src/kvirc/ui/KviQueryWindow.h @@ -32,15 +32,15 @@ #include "kvi_settings.h" #include "KviWindow.h" -#include "KviCString.h" #include "KviIrcUserDataBase.h" #include "KviUserListView.h" #include "KviThemedLabel.h" #include "KviPointerHashTable.h" -class KviConsoleWindow; class KviConfigurationFile; +class KviConsoleWindow; class KviWindowToolPageButton; +class QString; /** * \class KviQueryWindow diff --git a/src/kvirc/ui/KviScriptButton.cpp b/src/kvirc/ui/KviScriptButton.cpp index 193e356da..5e319ebd9 100644 --- a/src/kvirc/ui/KviScriptButton.cpp +++ b/src/kvirc/ui/KviScriptButton.cpp @@ -23,12 +23,14 @@ //============================================================================= #include "KviScriptButton.h" -#include "KviIrcToolBar.h" -#include "KviWindow.h" -#include "KviConsoleWindow.h" #include "KviApplication.h" -#include "KviKvsVariantList.h" +#include "KviConsoleWindow.h" +#include "KviIrcToolBar.h" #include "KviKvsScript.h" +#include "KviKvsVariantList.h" +#include "KviWindow.h" + +#include <QString> KviScriptUserButton::KviScriptUserButton(QWidget * par, const char * name) : QToolButton(par) diff --git a/src/kvirc/ui/KviScriptButton.h b/src/kvirc/ui/KviScriptButton.h index be1b164b5..7fe4307c1 100644 --- a/src/kvirc/ui/KviScriptButton.h +++ b/src/kvirc/ui/KviScriptButton.h @@ -25,13 +25,13 @@ //============================================================================= #include "kvi_settings.h" -#include "KviCString.h" #include <QToolButton> #include <QToolBar> class KviKvsScript; class KviWindow; +class QString; class KVIRC_API KviScriptUserButton : public QToolButton { diff --git a/src/kvirc/ui/KviScriptEditor.cpp b/src/kvirc/ui/KviScriptEditor.cpp index 0c389fb4e..52867e40a 100644 --- a/src/kvirc/ui/KviScriptEditor.cpp +++ b/src/kvirc/ui/KviScriptEditor.cpp @@ -29,6 +29,8 @@ #include "KviScriptEditor.h" #include "KviModuleManager.h" +#include <QLineEdit> + void KviScriptEditor::setText(const QString & txt) { setText(QByteArray(txt.toUtf8())); diff --git a/src/kvirc/ui/KviScriptEditor.h b/src/kvirc/ui/KviScriptEditor.h index 74be0b29c..da014f997 100644 --- a/src/kvirc/ui/KviScriptEditor.h +++ b/src/kvirc/ui/KviScriptEditor.h @@ -27,9 +27,10 @@ #include "kvi_settings.h" #include <QWidget> -#include <QLineEdit> #include <QByteArray> +class QLineEdit; + // // This is the basic interface of a script editor widget // diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp index 14d959004..2e50c41cc 100644 --- a/src/kvirc/ui/KviSelectors.cpp +++ b/src/kvirc/ui/KviSelectors.cpp @@ -31,7 +31,6 @@ #include "KviFileDialog.h" #include "KviKvsScript.h" -#include <QLabel> #include <QPainter> #include <QLayout> #include <QColorDialog> diff --git a/src/kvirc/ui/KviSelectors.h b/src/kvirc/ui/KviSelectors.h index 810b68d56..961f5448e 100644 --- a/src/kvirc/ui/KviSelectors.h +++ b/src/kvirc/ui/KviSelectors.h @@ -25,22 +25,22 @@ //============================================================================= #include "kvi_settings.h" -#include "KviCString.h" #include "KviPixmap.h" #include "KviTalHBox.h" -#include "KviTalVBox.h" #include "KviTalListWidget.h" +#include "KviTalVBox.h" -#include <QTreeWidget> -#include <QScrollArea> #include <QCheckBox> -#include <QLineEdit> -#include <QLabel> -#include <QPushButton> #include <QColor> #include <QFont> +#include <QLabel> +#include <QLineEdit> +#include <QPushButton> +#include <QScrollArea> #include <QSpinBox> +#include <QString> #include <QStringList> +#include <QTreeWidget> #include <QValidator> class KVIRC_API KviSelectorInterface diff --git a/src/kvirc/ui/KviStatusBar.cpp b/src/kvirc/ui/KviStatusBar.cpp index 1dbe17f14..8aed13490 100644 --- a/src/kvirc/ui/KviStatusBar.cpp +++ b/src/kvirc/ui/KviStatusBar.cpp @@ -23,36 +23,36 @@ //============================================================================= #include "KviStatusBar.h" -#include "KviMainWindow.h" +#include "KviApplication.h" +#include "KviConfigurationFile.h" +#include "KviDynamicToolTip.h" #include "KviIconManager.h" -#include "KviWindow.h" -#include "KviIrcContext.h" #include "KviIrcConnection.h" #include "KviIrcConnectionUserInfo.h" +#include "KviIrcContext.h" #include "KviLocale.h" -#include "KviApplication.h" -#include "KviConfigurationFile.h" -#include "KviTimeUtils.h" -#include "KviQString.h" +#include "KviMainWindow.h" #include "KviModuleManager.h" #include "KviStatusBarApplet.h" -#include "KviDynamicToolTip.h" +#include "KviTimeUtils.h" +#include "KviWindow.h" -#include <QDrag> -#include <QPainter> -#include <QStyle> -#include <QLayout> -#include <QTimer> #include <QCursor> -#include <QPixmap> -#include <QLabel> -#include <QFont> +#include <QDrag> #include <QEvent> +#include <QFont> +#include <QHelpEvent> +#include <QLabel> +#include <QLayout> +#include <QMenu> +#include <QMessageBox> #include <QMimeData> #include <QMouseEvent> -#include <QMessageBox> +#include <QPainter> +#include <QPixmap> +#include <QStyle> +#include <QTimer> #include <QWidgetAction> -#include <QMenu> KviStatusBar::KviStatusBar(KviMainWindow * pFrame) : QStatusBar(pFrame) diff --git a/src/kvirc/ui/KviStatusBar.h b/src/kvirc/ui/KviStatusBar.h index 9c8d47135..1094b1f50 100644 --- a/src/kvirc/ui/KviStatusBar.h +++ b/src/kvirc/ui/KviStatusBar.h @@ -36,23 +36,23 @@ */ #include "kvi_settings.h" -#include "KviPointerList.h" #include "KviHeapObject.h" #include "KviPointerHashTable.h" +#include "KviPointerList.h" #include "KviTalHBox.h" -#include <QString> #include <QStatusBar> -#include <QHelpEvent> +#include <QString> -class QTimer; -class QLabel; +class KviDynamicToolTip; +class KviIrcContext; class KviMainWindow; -class QMenu; class KviStatusBarApplet; class KviStatusBarAppletDescriptor; -class KviIrcContext; -class KviDynamicToolTip; +class QHelpEvent; +class QLabel; +class QMenu; +class QTimer; #define VMARGIN 3 //#define HMARGIN 4 diff --git a/src/kvirc/ui/KviThemedComboBox.cpp b/src/kvirc/ui/KviThemedComboBox.cpp index 0ad01c966..194c48fd8 100644 --- a/src/kvirc/ui/KviThemedComboBox.cpp +++ b/src/kvirc/ui/KviThemedComboBox.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviThemedLineEdit.cpp +// File : KviThemedComboBox.cpp // Creation date : Sun Jan 10 2010 12:17:00 by Fabio Bas // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvirc/ui/KviThemedTreeWidget.cpp b/src/kvirc/ui/KviThemedTreeWidget.cpp index ed80a149c..29e850964 100644 --- a/src/kvirc/ui/KviThemedTreeWidget.cpp +++ b/src/kvirc/ui/KviThemedTreeWidget.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviThemedLabel.cpp +// File : KviThemedTreeWidget.cpp // Creation date : Tue Aug 29 2000 21:17:01 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvirc/ui/KviThemedTreeWidget.h b/src/kvirc/ui/KviThemedTreeWidget.h index 8006cce9d..886ad01c9 100644 --- a/src/kvirc/ui/KviThemedTreeWidget.h +++ b/src/kvirc/ui/KviThemedTreeWidget.h @@ -2,7 +2,7 @@ #define _KVI_THEMEDTREEWIDGET_H_ //============================================================================= // -// File : KviThemedLineEdit.h +// File : KviThemedTreeWidget.h // Creation date : Sun Jan 10 2010 12:17:00 by Fabio Bas // // This file is part of the KVIrc IRC client distribution diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp index 1d4f39a58..f715b90b8 100644 --- a/src/kvirc/ui/KviTopicWidget.cpp +++ b/src/kvirc/ui/KviTopicWidget.cpp @@ -27,7 +27,6 @@ #include "KviControlCodes.h" #include "KviLocale.h" #include "kvi_defaults.h" -#include "kvi_settings.h" #include "KviIconManager.h" #include "KviTextIconManager.h" #include "KviApplication.h" @@ -42,14 +41,15 @@ #include "KviTalToolTip.h" #include "KviThemedLabel.h" -#include <QLineEdit> -#include <QPainter> -#include <QFontMetrics> -#include <QRegExp> #include <QClipboard> #include <QEvent> -#include <QMouseEvent> +#include <QFontMetrics> +#include <QLineEdit> #include <QMenu> +#include <QMouseEvent> +#include <QPainter> +#include <QPushButton> +#include <QRegExp> extern KviColorWindow * g_pColorWindow; diff --git a/src/kvirc/ui/KviTopicWidget.h b/src/kvirc/ui/KviTopicWidget.h index 8dc93c677..123567be3 100644 --- a/src/kvirc/ui/KviTopicWidget.h +++ b/src/kvirc/ui/KviTopicWidget.h @@ -31,14 +31,14 @@ #include "KviTalListWidget.h" #include "KviTalIconAndRichTextItemDelegate.h" -#include <QFrame> -#include <QPushButton> +#include <QString> -class QComboBox; class KviChannelWindow; -class QMenu; class KviIrcConnection; class KviThemedLabel; +class QComboBox; +class QMenu; +class QPushButton; class KVIRC_API KviTopicListBoxItemDelegate : public KviTalIconAndRichTextItemDelegate { diff --git a/src/kvirc/ui/KviWindowStack.h b/src/kvirc/ui/KviWindowStack.h index 05cd08683..00c549e52 100644 --- a/src/kvirc/ui/KviWindowStack.h +++ b/src/kvirc/ui/KviWindowStack.h @@ -2,7 +2,7 @@ #define _KviWindowStack_h_ //============================================================================= // -// File : kvi+_mdimanager.h +// File : KviWindowStack.h // Creation date : Wed Jun 21 2000 17:28:04 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp index 3cfdd9c07..19d6cddd3 100644 --- a/src/modules/actioneditor/ActionEditor.cpp +++ b/src/modules/actioneditor/ActionEditor.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : AliasEditorWindow.cpp +// File : ActionEditor.cpp // Creation date : Tue 29 Dec 2004 02:45:59 2002 GMT by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution @@ -39,7 +39,7 @@ #include "KviKvsUserAction.h" #include "KviCustomToolBarManager.h" #include "KviTalVBox.h" -#include <KviTalGroupBox.h> +#include "KviTalGroupBox.h" #include "KviTalIconAndRichTextItemDelegate.h" #include "kvi_fileextensions.h" diff --git a/src/modules/addon/WebAddonInterfaceDialog.h b/src/modules/addon/WebAddonInterfaceDialog.h index 14872d1af..89afb8001 100644 --- a/src/modules/addon/WebAddonInterfaceDialog.h +++ b/src/modules/addon/WebAddonInterfaceDialog.h @@ -44,7 +44,7 @@ public: /// /// Creates an instance of WebAddonInterfaceDialog /// - WebAddonInterfaceDialog(QWidget * pParent = NULL); + WebAddonInterfaceDialog(QWidget * pParent = nullptr); /// /// Destroys the instance of WebAddonInterfaceDialog diff --git a/src/modules/avatar/libkviavatar.h b/src/modules/avatar/libkviavatar.h index 60b71af8d..0509ebc2f 100644 --- a/src/modules/avatar/libkviavatar.h +++ b/src/modules/avatar/libkviavatar.h @@ -2,7 +2,7 @@ #define _LIBKVIAVATAR_H_ //============================================================================= // -// File : libkviavatar.cpp +// File : libkviavatar.h // Creation date : Thu Nov 12 02:32:59 2004 GMT by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp index bb470b9b7..005bb25fc 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -25,7 +25,6 @@ //============================================================================= #include "KviModule.h" -#include "KviCString.h" #include "KviApplication.h" #include "KviChannelWindow.h" #include "KviLocale.h" @@ -33,9 +32,10 @@ #include "KviIrcMask.h" #include "KviMaskEditor.h" #include "KviIrcUrl.h" -#include "KviIrcConnectionTarget.h" #include "KviIrcConnection.h" +#include "KviIrcConnectionTarget.h" +#include <QString> #include <vector> static KviChannelWindow * chan_kvs_find_channel(KviKvsModuleFunctionCall * c, QString & szChan, bool bNoWarnings = false) diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp index 64290ea3e..9c1ccfdd0 100644 --- a/src/modules/channelsjoin/ChannelsJoinDialog.cpp +++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp @@ -24,30 +24,30 @@ #include "ChannelsJoinDialog.h" -#include "KviLocale.h" -#include "KviOptions.h" -#include "KviSelectors.h" #include "KviApplication.h" -#include "KviCString.h" -#include "KviQString.h" +#include "KviConsoleWindow.h" #include "KviIconManager.h" +#include "KviKvsScript.h" +#include "KviLocale.h" #include "KviMainWindow.h" -#include "KviConsoleWindow.h" +#include "KviOptions.h" +#include "KviQString.h" #include "KviRegisteredChannel.h" #include "KviRegisteredChannelDataBase.h" -#include "KviKvsScript.h" +#include "KviSelectors.h" #include "KviTalGroupBox.h" +#include <QCheckBox> +#include <QCloseEvent> +#include <QDesktopWidget> +#include <QEvent> +#include <QHeaderView> #include <QLabel> -#include <QLineEdit> #include <QLayout> -#include <QPushButton> -#include <QEvent> -#include <QCloseEvent> +#include <QLineEdit> #include <QMouseEvent> -#include <QHeaderView> -#include <QCheckBox> -#include <QDesktopWidget> +#include <QPushButton> +#include <QString> extern ChannelsJoinDialog * g_pChannelsWindow; extern QRect g_rectChannelsJoinGeometry; diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.h b/src/modules/channelsjoin/ChannelsJoinDialog.h index af54f6f1d..5b2c7d6bc 100644 --- a/src/modules/channelsjoin/ChannelsJoinDialog.h +++ b/src/modules/channelsjoin/ChannelsJoinDialog.h @@ -31,17 +31,17 @@ */ #include "KviWindow.h" -#include "KviCString.h" -#include <QTreeWidget> #include <QDialog> #include <QMenu> +#include <QTreeWidget> -class QCheckBox; -class QPushButton; -class QLineEdit; class KviConsoleWindow; class KviTalGroupBox; +class QCheckBox; +class QLineEdit; +class QPushButton; +class QString; /** * \class ChannelsJoinDialogTreeWidget @@ -52,7 +52,7 @@ class ChannelsJoinDialogTreeWidget : public QTreeWidget Q_OBJECT public: ChannelsJoinDialogTreeWidget(QWidget * par) - : QTreeWidget(par), m_pJoinPopup(0){}; + : QTreeWidget(par), m_pJoinPopup(nullptr){}; ~ChannelsJoinDialogTreeWidget() { diff --git a/src/modules/channelsjoin/libkvichannelsjoin.cpp b/src/modules/channelsjoin/libkvichannelsjoin.cpp index 073c040fd..f5bd2511c 100644 --- a/src/modules/channelsjoin/libkvichannelsjoin.cpp +++ b/src/modules/channelsjoin/libkvichannelsjoin.cpp @@ -22,13 +22,13 @@ // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // //============================================================================= -#include "ChannelsJoinDialog.h" #include "KviModule.h" -#include "KviWindow.h" -#include "KviMainWindow.h" -#include "KviLocale.h" +#include "ChannelsJoinDialog.h" #include "KviConfigurationFile.h" +#include "KviLocale.h" +#include "KviMainWindow.h" +#include "KviWindow.h" #include <QSplitter> diff --git a/src/modules/codetester/CodeTesterWindow.h b/src/modules/codetester/CodeTesterWindow.h index b7a82bee0..992ce52e5 100644 --- a/src/modules/codetester/CodeTesterWindow.h +++ b/src/modules/codetester/CodeTesterWindow.h @@ -2,7 +2,7 @@ #define _CODETESTER_H_ //============================================================================= // -// File : EventEditorWindow.h +// File : CodeTesterWindow.h // Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp index 3a355dc67..443eb8b32 100644 --- a/src/modules/config/libkviconfig.cpp +++ b/src/modules/config/libkviconfig.cpp @@ -23,13 +23,14 @@ //============================================================================= #include "KviModule.h" -#include "KviCString.h" #include "KviConfigurationFile.h" #include "KviFileUtils.h" #include "KviApplication.h" #include "KviLocale.h" #include "KviPointerHashTable.h" +#include <QString> + static KviPointerHashTable<QString, KviConfigurationFile> * g_pConfigDict = nullptr; static int g_iNextConfigId = 0; diff --git a/src/modules/dcc/DccBroker.cpp b/src/modules/dcc/DccBroker.cpp index d85b2f83c..dda25a544 100644 --- a/src/modules/dcc/DccBroker.cpp +++ b/src/modules/dcc/DccBroker.cpp @@ -49,6 +49,7 @@ #include "KviMediaManager.h" #include "KviIrcConnection.h" #include "KviSharedFilesManager.h" +#include "KviIrcMessage.h" #include <QFileInfo> #include <QString> diff --git a/src/modules/dcc/DccMarshal.h b/src/modules/dcc/DccMarshal.h index b9a3e17b1..19a0d9aa0 100644 --- a/src/modules/dcc/DccMarshal.h +++ b/src/modules/dcc/DccMarshal.h @@ -2,7 +2,7 @@ #define _MARSHAL_H_ //============================================================================= // -// File DccMarshal.h +// File : DccMarshal.h // Creation date : Sun Sep 17 2000 10:44:20 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/dcc/DccVoiceAdpcmCodec.cpp b/src/modules/dcc/DccVoiceAdpcmCodec.cpp index 70f2cb227..f3b9e0334 100644 --- a/src/modules/dcc/DccVoiceAdpcmCodec.cpp +++ b/src/modules/dcc/DccVoiceAdpcmCodec.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : DccVoiceAdpcmCodec.h +// File : DccVoiceAdpcmCodec.cpp // Creation date : Wed Aug 22 19:12:46 2001 GMT by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index ab1b55c55..2e856ac44 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -54,6 +54,7 @@ #include "KviApplication.h" #include "KviIrcConnection.h" #include "KviIrcConnectionUserInfo.h" +#include "KviIrcMessage.h" #include <QFileInfo> diff --git a/src/modules/dialog/libkvidialog.h b/src/modules/dialog/libkvidialog.h index 39f66ceb2..5bec526e4 100644 --- a/src/modules/dialog/libkvidialog.h +++ b/src/modules/dialog/libkvidialog.h @@ -25,13 +25,13 @@ //============================================================================= #include "KviWindow.h" -#include "KviCString.h" #include "KviFileDialog.h" #include "KviImageDialog.h" #include "KviKvsCallbackObject.h" -#include <QMessageBox> #include <QDialog> +#include <QMessageBox> +#include <QString> class KviKvsCallbackMessageBox : public QMessageBox, public KviKvsCallbackObject { diff --git a/src/modules/fish/libkvifish.cpp b/src/modules/fish/libkvifish.cpp index 153eeaf27..40862ca98 100644 --- a/src/modules/fish/libkvifish.cpp +++ b/src/modules/fish/libkvifish.cpp @@ -55,7 +55,7 @@ extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager; #if defined(COMPILE_SSL_SUPPORT) -#include <KviSSL.h> +#include "KviSSL.h" #include <openssl/blowfish.h> #include <openssl/bn.h> #include <openssl/dh.h> diff --git a/src/modules/iograph/libkviiograph.h b/src/modules/iograph/libkviiograph.h index 9c3a10667..c66812b48 100644 --- a/src/modules/iograph/libkviiograph.h +++ b/src/modules/iograph/libkviiograph.h @@ -2,7 +2,7 @@ #define _LIBKVIIOGRAPH_H_ //============================================================================= // -// File : libkviiograph.cpp +// File : libkviiograph.h // Creation date : Tue Oct 31 2000 00:14:12 CEST by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution @@ -24,13 +24,13 @@ // //============================================================================= -#include <QQueue> - -#include "KviMainWindow.h" #include "kvi_inttypes.h" +#include "KviMainWindow.h" #include "KviModuleExtension.h" #include "KviWindow.h" +#include <QQueue> + #define KVI_IOGRAPH_NUMBER_POINTS 60 #define KVI_IOGRAPH_HORIZ_SEGMENTS 10 #define KVI_IOGRAPH_VERT_SEGMENTS 10 diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp index cacd961de..2ffb0bb88 100644 --- a/src/modules/links/LinksWindow.cpp +++ b/src/modules/links/LinksWindow.cpp @@ -35,6 +35,7 @@ #include "KviIrcContext.h" #include "KviIrcConnection.h" #include "KviTalHBox.h" +#include "KviIrcMessage.h" #include <QToolTip> #include <QLabel> diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp index 0dc0af318..392ab9d60 100644 --- a/src/modules/list/ListWindow.cpp +++ b/src/modules/list/ListWindow.cpp @@ -40,6 +40,7 @@ #include "KviTalHBox.h" #include "KviHtmlGenerator.h" #include "KviThemedLineEdit.h" +#include "KviIrcMessage.h" #include <QTimer> #include <QHeaderView> diff --git a/src/modules/mediaplayer/MpAmipInterface.h b/src/modules/mediaplayer/MpAmipInterface.h index 8e39a5057..80b95f6de 100644 --- a/src/modules/mediaplayer/MpAmipInterface.h +++ b/src/modules/mediaplayer/MpAmipInterface.h @@ -2,7 +2,7 @@ #define _MP_AMIPINTERFACE_H_ //============================================================================= // -// File : MpAmipInterface.cpp +// File : MpAmipInterface.h // Creation date : Sun 27 Mar 2005 16:55:09 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index ed97e6ae8..5b3512636 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -33,9 +33,12 @@ #include "KviConfigurationFile.h" #include "KviApplication.h" #include "KviTalVBox.h" +#include "KviIrcServer.h" -#include <QMessageBox> #include <QDir> +#include <QLabel> +#include <QLineEdit> +#include <QMessageBox> #include <QPushButton> KviMircServersIniImport * g_pMircServersIniImport = nullptr; diff --git a/src/modules/mircimport/libkvimircimport.h b/src/modules/mircimport/libkvimircimport.h index 9f8629d0a..3069849b4 100644 --- a/src/modules/mircimport/libkvimircimport.h +++ b/src/modules/mircimport/libkvimircimport.h @@ -25,14 +25,14 @@ //============================================================================= #include "KviMexServerImport.h" -#include "KviCString.h" #include "KviHttpRequest.h" -#include <KviTalWizard.h> +#include "KviTalWizard.h" -#include <QLineEdit> -#include <QLabel> +#include <QString> class KviRemoteMircServerImportWizard; +class QLabel; +class QLineEdit; class KviMircServersIniImport : public KviMexServerImport { diff --git a/src/modules/objects/KvsObject_buttonGroup.h b/src/modules/objects/KvsObject_buttonGroup.h index 7610695b3..a712affac 100644 --- a/src/modules/objects/KvsObject_buttonGroup.h +++ b/src/modules/objects/KvsObject_buttonGroup.h @@ -2,7 +2,7 @@ #define _CLASS_BUTTONGROUP_H_ //============================================================================= // -// File : KvsObject_buttonGroup.cpp +// File : KvsObject_buttonGroup.h // Creation date : Fri Jan 28 14:21:48 CEST 2005 // by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor) // diff --git a/src/modules/objects/KvsObject_file.h b/src/modules/objects/KvsObject_file.h index a19a0c220..8b66e9c76 100644 --- a/src/modules/objects/KvsObject_file.h +++ b/src/modules/objects/KvsObject_file.h @@ -2,7 +2,7 @@ #define _CLASS_FILE_H_ //============================================================================= // -// File : KvsObject_memoryBuffer.h +// File : KvsObject_file.h // Creation date : Fri Mar 18 21:30:48 CEST 2005 // by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor) // diff --git a/src/modules/objects/KvsObject_multiLineEdit.h b/src/modules/objects/KvsObject_multiLineEdit.h index db4b72f5e..a17bbb39b 100644 --- a/src/modules/objects/KvsObject_multiLineEdit.h +++ b/src/modules/objects/KvsObject_multiLineEdit.h @@ -2,7 +2,7 @@ #define _CLASS_MULTILINEEDIT_H_ //============================================================================= // -// File : KvsObject_multiLineEdit.cpp +// File : KvsObject_multiLineEdit.h // Creation date : Mon Feb 19 2000 00:45:34 CET by Krzysztof Godlewski // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/objects/KvsObject_sql.h b/src/modules/objects/KvsObject_sql.h index 71451610e..f38d6bf8c 100644 --- a/src/modules/objects/KvsObject_sql.h +++ b/src/modules/objects/KvsObject_sql.h @@ -2,7 +2,7 @@ #define _CLASS_SQLITE_H_ //============================================================================= // -// File : class_sqlite.h +// File : KvsObject_sql.h // Creation date : Wed Gen 28 2009 21:07:55 by Alessandro Carbone // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/options/OptionsWidget_avatar.h b/src/modules/options/OptionsWidget_avatar.h index 2aa2ca0b7..82077b4be 100644 --- a/src/modules/options/OptionsWidget_avatar.h +++ b/src/modules/options/OptionsWidget_avatar.h @@ -2,7 +2,7 @@ #define _OPTW_AVATAR_H_ //============================================================================= // -// File : OptionsWidget_avatar.cpp +// File : OptionsWidget_avatar.h // Creation date : Wed Nov 19 09:25:16 2005 GMT by Grifisx & Noldor // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/options/OptionsWidget_ignore.cpp b/src/modules/options/OptionsWidget_ignore.cpp index a12038b15..4c7c5260a 100644 --- a/src/modules/options/OptionsWidget_ignore.cpp +++ b/src/modules/options/OptionsWidget_ignore.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : OptionsWidget_ignore.h +// File : OptionsWidget_ignore.cpp // Creation date : Thu Feb 12 15:11:29 2002 GMT by Juanjo Álvarez // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index 329c91d23..6e3af5daf 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -54,6 +54,7 @@ #include "KviKvsScript.h" #include "KviPointerHashTable.h" #include "KviTalToolTip.h" +#include "KviIrcNetwork.h" #include <QLineEdit> #include <QCursor> diff --git a/src/modules/options/OptionsWidget_tray.h b/src/modules/options/OptionsWidget_tray.h index 49c46cac8..7c585dd0f 100644 --- a/src/modules/options/OptionsWidget_tray.h +++ b/src/modules/options/OptionsWidget_tray.h @@ -2,7 +2,7 @@ #define _OPTW_TRAY_H_ //============================================================================= // -// File : OptionsWidget_tray.cpp +// File : OptionsWidget_tray.h // Creation date : Mon 14 Aug 2006 by Alexey Uzhva // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/raweditor/RawEditorWindow.h b/src/modules/raweditor/RawEditorWindow.h index 7cbfa407d..903c76c94 100644 --- a/src/modules/raweditor/RawEditorWindow.h +++ b/src/modules/raweditor/RawEditorWindow.h @@ -2,7 +2,7 @@ #define _RAWEDITOR_H_ //============================================================================= // -// File : EventEditorWindow.h +// File : RawEditorWindow.h // Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp index f065b470a..f571165af 100644 --- a/src/modules/reguser/RegisteredUsersDialog.cpp +++ b/src/modules/reguser/RegisteredUsersDialog.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : RegisteredUserEntryDialog.cpp +// File : RegisteredUsersDialog.cpp // Creation date : Tue Dec 26 2000 12:24:12 CEST by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/reguser/RegisteredUsersDialog.h b/src/modules/reguser/RegisteredUsersDialog.h index 6fadf08b3..5a049dc20 100644 --- a/src/modules/reguser/RegisteredUsersDialog.h +++ b/src/modules/reguser/RegisteredUsersDialog.h @@ -2,7 +2,7 @@ #define _DIALOG_H_ //============================================================================= // -// File : RegisteredUserEntryDialog.h +// File : RegisteredUsersDialog.h // Creation date : Sun Dec 24 2000 15:16:17 CEST by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp index cadd9e916..90aefecc1 100644 --- a/src/modules/reguser/libkvireguser.cpp +++ b/src/modules/reguser/libkvireguser.cpp @@ -38,6 +38,7 @@ #include "KviWindow.h" #include "KviMainWindow.h" #include "KviPointerList.h" +#include "KviIrcMask.h" #include <QSplitter> // FIXME: REmove this! diff --git a/src/modules/rijndael/UglyBase64.cpp b/src/modules/rijndael/UglyBase64.cpp index 8c075d6e3..4cb4424f7 100644 --- a/src/modules/rijndael/UglyBase64.cpp +++ b/src/modules/rijndael/UglyBase64.cpp @@ -23,8 +23,8 @@ //============================================================================= #include "UglyBase64.h" -#include "KviMemory.h" #include "KviCString.h" +#include "KviMemory.h" namespace UglyBase64 { diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp index 7d6654f27..693ee8559 100644 --- a/src/modules/serverdb/libkviserverdb.cpp +++ b/src/modules/serverdb/libkviserverdb.cpp @@ -27,6 +27,7 @@ #include "KviLocale.h" #include "KviIrcServer.h" #include "KviIrcServerDataBase.h" +#include "KviIrcNetwork.h" #include <QString> diff --git a/src/modules/socketspy/SocketSpyWindow.cpp b/src/modules/socketspy/SocketSpyWindow.cpp index 47edbd4a0..03df1b107 100644 --- a/src/modules/socketspy/SocketSpyWindow.cpp +++ b/src/modules/socketspy/SocketSpyWindow.cpp @@ -31,6 +31,7 @@ #include "KviLocale.h" #include "KviConsoleWindow.h" +#include <QString> #include <unordered_set> extern std::unordered_set<SocketSpyWindow *> g_pSocketSpyWindowList; diff --git a/src/modules/socketspy/SocketSpyWindow.h b/src/modules/socketspy/SocketSpyWindow.h index 0201f172b..ce9af543a 100644 --- a/src/modules/socketspy/SocketSpyWindow.h +++ b/src/modules/socketspy/SocketSpyWindow.h @@ -25,7 +25,6 @@ //============================================================================= #include "KviWindow.h" -#include "KviCString.h" #include "KviIrcDataStreamMonitor.h" class KviConsoleWindow; diff --git a/src/modules/spaste/SlowPasteController.cpp b/src/modules/spaste/SlowPasteController.cpp index 4f432b0a6..726d0cc85 100644 --- a/src/modules/spaste/SlowPasteController.cpp +++ b/src/modules/spaste/SlowPasteController.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : SlowPasteController.h +// File : SlowPasteController.cpp // Creation date : Thu Apr 30 2002 17:13:12 GMT by Juanjo Álvarez // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index 3714211d8..307b9e9d9 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -40,7 +40,7 @@ #ifdef COMPILE_SSL_SUPPORT // The current implementation -#include <KviSSL.h> +#include "KviSSL.h" #include <openssl/evp.h> #include <openssl/pem.h> #else diff --git a/src/modules/tip/libkvitip.h b/src/modules/tip/libkvitip.h index 150309b5d..09f06a120 100644 --- a/src/modules/tip/libkvitip.h +++ b/src/modules/tip/libkvitip.h @@ -2,7 +2,7 @@ #define _LIBKVITIP_H_ //============================================================================= // -// File : kvi_tip.cpp +// File : libkvitip.h // Creation date : Thu May 10 2001 13:49:12 CEST by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution diff --git a/src/modules/torrent/KTorrentDbusInterface.cpp b/src/modules/torrent/KTorrentDbusInterface.cpp index f41994c03..5341ddc8f 100644 --- a/src/modules/torrent/KTorrentDbusInterface.cpp +++ b/src/modules/torrent/KTorrentDbusInterface.cpp @@ -2,7 +2,7 @@ // // DBus interface for KTorrent client. // -// File : KTorrentDbusInterface.h +// File : KTorrentDbusInterface.cpp // Creation date : Mon Nov 17 13:46:00 2008 GMT by Fabio Bas // // This file is part of the KVIrc IRC client distribution |