diff options
Diffstat (limited to 'src')
101 files changed, 356 insertions, 243 deletions
diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp index da05890a8..9d90646f5 100644 --- a/src/kvilib/core/kvi_qstring.cpp +++ b/src/kvilib/core/kvi_qstring.cpp @@ -488,7 +488,7 @@ namespace KviQString const QChar * fmt = nullTerminatedArray(szFmt); if(!fmt) { - s = QString::null; + s = QString(); return; } diff --git a/src/kvilib/ext/kvi_config.cpp b/src/kvilib/ext/kvi_config.cpp index 92e00411b..8f2533779 100644 --- a/src/kvilib/ext/kvi_config.cpp +++ b/src/kvilib/ext/kvi_config.cpp @@ -328,7 +328,7 @@ bool KviConfig::load() // we in fact need this (mercy :D) // otherwise the empty options will be treated as non-existing ones // and will get the defaults (which is bad) - QString * pVal = new QString(QString::null); + QString * pVal = new QString(QString()); p_group->replace(szKey,pVal); } } diff --git a/src/kvilib/ext/kvi_config.h b/src/kvilib/ext/kvi_config.h index 356231d22..a7fec3cc6 100644 --- a/src/kvilib/ext/kvi_config.h +++ b/src/kvilib/ext/kvi_config.h @@ -105,7 +105,7 @@ public: void writeEntry(const QString & szKey,const QString & szValue); void writeEntry(const QString & szKey,const char * szValue) { writeEntry(szKey,QString::fromUtf8(szValue)); }; - QString readEntry(const QString & szKey,const QString & szDefault = QString::null); + QString readEntry(const QString & szKey,const QString & szDefault = QString()); // HACK for KviOptions.. (FIXME) QString readKviStrEntry(const QString &szKey,const KviStr &szDefault) { return readEntry(szKey,szDefault.ptr()); }; @@ -127,7 +127,7 @@ public: void writeEntry(const QString & szKey,const QStringList &list); QList<int> readIntListEntry(const QString & ,const QList<int> &list); void writeEntry(const QString & szKey,const QList<int> &list); - QString readQStringEntry(const QString & szKey,const QString &szDefault = QString::null) + QString readQStringEntry(const QString & szKey,const QString &szDefault = QString()) { return readEntry(szKey,szDefault); }; //void writeEntry(const QString & szKey,const QString &szValue); //void writeEntry(const char *szKey,unsigned long lValue); diff --git a/src/kvilib/irc/kvi_ircmask.cpp b/src/kvilib/irc/kvi_ircmask.cpp index aefdd7826..8446c9303 100644 --- a/src/kvilib/irc/kvi_ircmask.cpp +++ b/src/kvilib/irc/kvi_ircmask.cpp @@ -650,7 +650,7 @@ QString KviIrcMask::getHostDomainMask() const { int len = m_szHost.length(); const QChar *p=KviQString::nullTerminatedArray(m_szHost); - if(!p)return QString::null; + if(!p)return QString(); const QChar *b = p; while(p->unicode() && p->unicode() != '.')p++; QString ret(p,len - (p - b)); diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/kvi_ircserverdb.cpp index 53a38ccde..edbbb790f 100644 --- a/src/kvilib/irc/kvi_ircserverdb.cpp +++ b/src/kvilib/irc/kvi_ircserverdb.cpp @@ -473,7 +473,7 @@ void KviServerDataBase::load(const QString & filename) pNewNet->m_szUserName = cfg.readQStringEntry("UserName"); pNewNet->m_szOnConnectCommand = cfg.readQStringEntry("OnConnectCommand"); pNewNet->m_szOnLoginCommand = cfg.readQStringEntry("OnLoginCommand"); - pNewNet->m_pNickServRuleSet = KviNickServRuleSet::load(&cfg,QString::null); + pNewNet->m_pNickServRuleSet = KviNickServRuleSet::load(&cfg,QString()); pNewNet->m_bAutoConnect = cfg.readBoolEntry("AutoConnect",false); pNewNet->m_szUserIdentityId = cfg.readQStringEntry("UserIdentityId"); if(pNewNet->m_bAutoConnect) @@ -549,7 +549,7 @@ void KviServerDataBase::save(const QString &filename) cfg.writeEntry("OnConnectCommand",pNetwork->m_szOnConnectCommand); if(!pNetwork->m_szOnLoginCommand.isEmpty()) cfg.writeEntry("OnLoginCommand",pNetwork->m_szOnLoginCommand); - if(pNetwork->m_pNickServRuleSet)pNetwork->m_pNickServRuleSet->save(&cfg,QString::null); + if(pNetwork->m_pNickServRuleSet)pNetwork->m_pNickServRuleSet->save(&cfg,QString()); if(pNetwork->autoJoinChannelList()) cfg.writeEntry("AutoJoinChannels",*(pNetwork->autoJoinChannelList())); if(pNetwork->m_szName == m_szCurrentNetwork)cfg.writeEntry("Current",true); diff --git a/src/kvilib/irc/kvi_nickserv.cpp b/src/kvilib/irc/kvi_nickserv.cpp index e42aad191..9968fe820 100644 --- a/src/kvilib/irc/kvi_nickserv.cpp +++ b/src/kvilib/irc/kvi_nickserv.cpp @@ -280,7 +280,7 @@ bool KviNickServRule::load(KviConfig * cfg,const QString &prefix) m_szNickServMask = cfg->readQStringEntry(tmp); if(m_szNickServMask.isEmpty())return false; KviQString::sprintf(tmp,"%QServerMask",&prefix); - m_szServerMask = cfg->readQStringEntry(tmp,QString::null); + m_szServerMask = cfg->readQStringEntry(tmp,QString()); KviQString::sprintf(tmp,"%QMessageRegexp",&prefix); m_szMessageRegexp = cfg->readQStringEntry(tmp); if(m_szMessageRegexp.isEmpty())return false; diff --git a/src/kvilib/net/kvi_http.h b/src/kvilib/net/kvi_http.h index 078b89579..0d65bbe4f 100644 --- a/src/kvilib/net/kvi_http.h +++ b/src/kvilib/net/kvi_http.h @@ -135,7 +135,7 @@ public: bool start(); // this is a shortcut for reset()+setUrl()+setProcessingType()+setFileName()+start() - bool get(const KviUrl &u,ProcessingType p = WholeFile,const QString &szFileName = QString::null); + bool get(const KviUrl &u,ProcessingType p = WholeFile,const QString &szFileName = QString()); const QString & lastError(){ return m_szLastError; }; @@ -170,7 +170,7 @@ protected: const QString &szPath, unsigned int uContentOffset, RequestMethod m, - const QString &szPostData = QString::null, + const QString &szPostData = QString(), bool bUseSSL = false); public: diff --git a/src/kvilib/tal/kvi_tal_filedialog_kde.h b/src/kvilib/tal/kvi_tal_filedialog_kde.h index 15ee406f6..9a4c211bf 100644 --- a/src/kvilib/tal/kvi_tal_filedialog_kde.h +++ b/src/kvilib/tal/kvi_tal_filedialog_kde.h @@ -51,7 +51,7 @@ public: * \param bModal Whether the dialog is modal * \return KviTalFileDialog */ - KviTalFileDialog(const QString & szDirName, const QString & szFilter = QString::null, QWidget * pParent = 0, const char * pcName = 0, bool bModal = false); + KviTalFileDialog(const QString & szDirName, const QString & szFilter = QString(), QWidget * pParent = 0, const char * pcName = 0, bool bModal = false); /** * \brief Destroys the filedialog object @@ -91,7 +91,7 @@ public: * \param pParent The parent object * \return QString */ - static QString getExistingDirectoryPath(const QString & szDir = QString::null, const QString & szCaption = QString::null, QWidget * pParent = 0) + static QString getExistingDirectoryPath(const QString & szDir = QString(), const QString & szCaption = QString(), QWidget * pParent = 0) { // QFileDialog allows making new directories...kfiledialog not :/ return KFileDialog::getExistingDirectory(KUrl(szDir),pParent,szCaption); diff --git a/src/kvilib/tal/kvi_tal_filedialog_qt.h b/src/kvilib/tal/kvi_tal_filedialog_qt.h index 3cb12e602..695ad2a21 100644 --- a/src/kvilib/tal/kvi_tal_filedialog_qt.h +++ b/src/kvilib/tal/kvi_tal_filedialog_qt.h @@ -52,7 +52,7 @@ public: * \param bModal Whether the dialog is modal * \return KviTalFileDialog */ - KviTalFileDialog(const QString & szDirName, const QString & szFilter = QString::null, QWidget * pParent = 0, const char * pcName = 0, bool bModal = false); + KviTalFileDialog(const QString & szDirName, const QString & szFilter = QString(), QWidget * pParent = 0, const char * pcName = 0, bool bModal = false); /** * \brief Destroys the filedialog object @@ -92,7 +92,7 @@ public: * \param pParent The parent object * \return QString */ - static QString getExistingDirectoryPath(const QString & szDir = QString::null, const QString & szCaption = QString::null, QWidget * pParent = 0){ return getExistingDirectory(pParent,szCaption,szDir); }; + static QString getExistingDirectoryPath(const QString & szDir = QString(), const QString & szCaption = QString(), QWidget * pParent = 0){ return getExistingDirectory(pParent,szCaption,szDir); }; }; #endif // _KVI_TAL_FILEDIALOG_QT_H_ diff --git a/src/kvilib/tal/kvi_tal_mainwindow.cpp b/src/kvilib/tal/kvi_tal_mainwindow.cpp index 715f42532..4dba49e72 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow.cpp +++ b/src/kvilib/tal/kvi_tal_mainwindow.cpp @@ -27,11 +27,11 @@ #ifdef COMPILE_KDE_SUPPORT - KviTalMainWindow::KviTalMainWindow(QWidget * par,const char * nam) - : KMainWindow(par) + KviTalMainWindow::KviTalMainWindow(QWidget * pParent, const char * pcName) + : KMainWindow(pParent) { //setWindowTitle(nam); - setObjectName(nam); + setObjectName(pcName); } bool KviTalMainWindow::usesBigPixmaps() @@ -39,21 +39,23 @@ return (iconSize().width() > 40); } - void KviTalMainWindow::setUsesBigPixmaps(bool b) + void KviTalMainWindow::setUsesBigPixmaps(bool bUse) { - if(b)setIconSize(QSize(48,48)); - else setIconSize(QSize(24,24)); + if(bUse) + setIconSize(QSize(48,48)); + else + setIconSize(QSize(24,24)); } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_mainwindow_kde.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES #else - KviTalMainWindow::KviTalMainWindow(QWidget * par,const char * nam) - : QMainWindow(par) + KviTalMainWindow::KviTalMainWindow(QWidget * pParent, const char * pcName) + : QMainWindow(pParent) { - setObjectName(nam); + setObjectName(pcName); } bool KviTalMainWindow::usesBigPixmaps() @@ -61,19 +63,20 @@ return (iconSize().width() > 40); } - void KviTalMainWindow::setUsesBigPixmaps(bool b) + void KviTalMainWindow::setUsesBigPixmaps(bool bUse) { - if(b)setIconSize(QSize(48,48)); - else setIconSize(QSize(24,24)); + if(bUse) + setIconSize(QSize(48,48)); + else + setIconSize(QSize(24,24)); } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_mainwindow_qt.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES #endif KviTalMainWindow::~KviTalMainWindow() { } - diff --git a/src/kvilib/tal/kvi_tal_mainwindow.h b/src/kvilib/tal/kvi_tal_mainwindow.h index 7230ce4fc..34f7671ef 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow.h +++ b/src/kvilib/tal/kvi_tal_mainwindow.h @@ -24,6 +24,12 @@ // //============================================================================= +/** +* \file kvi_tal_mainwindow.h +* \author Szymon Stefanek +* \brief Switcher between Qt and KDE classes +*/ + #include "kvi_settings.h" #ifdef COMPILE_KDE_SUPPORT diff --git a/src/kvilib/tal/kvi_tal_mainwindow_kde.h b/src/kvilib/tal/kvi_tal_mainwindow_kde.h index 3b3c1de4d..a4d0833fd 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow_kde.h +++ b/src/kvilib/tal/kvi_tal_mainwindow_kde.h @@ -24,20 +24,51 @@ // //============================================================================= +/** +* \file kvi_tal_mainwindow_kde.h +* \author Szymon Stefanek +* \brief KDE class for mainwindow +*/ + #include "kvi_settings.h" #include <kmainwindow.h> #include <kstatusbar.h> // statusBar() is overridden to return a KStatusBar +/** +* \class KviTalMainWindow +* \brief Toolkit Abstraction Layer: mainwindow class +*/ class KVILIB_API KviTalMainWindow : public KMainWindow { Q_OBJECT public: - KviTalMainWindow(QWidget * par,const char * nam); + /** + * \brief Constructs the mainwindow object + * \param pParent The parent object + * \param pcName The name of the object + * \return KviTalMainWindow + */ + KviTalMainWindow(QWidget * pParent, const char * pcName); + + /** + * \brief Destroys the mainwindow object + * \return KviTalMainWindow + */ ~KviTalMainWindow(); - public: +public: + /** + * \brief Returns true if the mainwindow uses big pixmaps + * \return bool + */ bool usesBigPixmaps(); - void setUsesBigPixmaps(bool b); + + /** + * \brief Sets the use of big pixmaps + * \param bUse Whether to use big pixmaps + * \return void + */ + void setUsesBigPixmaps(bool bUse); }; #endif // _KVI_TAL_MAINWINDOW_KDE_H_ diff --git a/src/kvilib/tal/kvi_tal_mainwindow_qt.h b/src/kvilib/tal/kvi_tal_mainwindow_qt.h index 3ffc84b4d..2933ab4d1 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow_qt.h +++ b/src/kvilib/tal/kvi_tal_mainwindow_qt.h @@ -24,19 +24,50 @@ // //============================================================================= +/** +* \file kvi_tal_mainwindow_qt.h +* \author Szymon Stefanek +* \brief Qt class for mainwindow +*/ + #include "kvi_settings.h" #include <QMainWindow> +/** +* \class KviTalMainWindow +* \brief Toolkit Abstraction Layer: mainwindow class +*/ class KVILIB_API KviTalMainWindow : public QMainWindow { Q_OBJECT public: - KviTalMainWindow(QWidget * par,const char * nam); + /** + * \brief Constructs the mainwindow object + * \param pParent The parent object + * \param pcName The name of the object + * \return KviTalMainWindow + */ + KviTalMainWindow(QWidget * pParent, const char * pcName); + + /** + * \brief Destroys the mainwindow object + * \return KviTalMainWindow + */ ~KviTalMainWindow(); public: + /** + * \brief Returns true if the mainwindow uses big pixmaps + * \return bool + */ bool usesBigPixmaps(); - void setUsesBigPixmaps(bool b); + + /** + * \brief Sets the use of big pixmaps + * \param bUse Whether to use big pixmaps + * \return void + */ + void setUsesBigPixmaps(bool bUse); }; #endif // _KVI_TAL_MAINWINDOW_QT_H_ diff --git a/src/kvilib/tal/kvi_tal_menubar.cpp b/src/kvilib/tal/kvi_tal_menubar.cpp index 5b535ed9b..2ce17b253 100644 --- a/src/kvilib/tal/kvi_tal_menubar.cpp +++ b/src/kvilib/tal/kvi_tal_menubar.cpp @@ -27,33 +27,29 @@ #ifdef COMPILE_KDE_SUPPORT - KviTalMenuBar::KviTalMenuBar(QWidget * par,const char * nam) - : KMenuBar(par) - { - setWindowTitle(nam); - } - - KviTalMenuBar::~KviTalMenuBar() + KviTalMenuBar::KviTalMenuBar(QWidget * pParent, const char * pcName) + : KMenuBar(pParent) { + setWindowTitle(pcName); } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_menubar_kde.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES #else - KviTalMenuBar::KviTalMenuBar(QWidget * par,const char * nam) - : QMenuBar(par) - { - } - - KviTalMenuBar::~KviTalMenuBar() + KviTalMenuBar::KviTalMenuBar(QWidget * pParent, const char * pcName) + : QMenuBar(pParent) { } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_menubar_qt.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES #endif + +KviTalMenuBar::~KviTalMenuBar() +{ +} diff --git a/src/kvilib/tal/kvi_tal_menubar.h b/src/kvilib/tal/kvi_tal_menubar.h index fc6e41d97..739f9102e 100644 --- a/src/kvilib/tal/kvi_tal_menubar.h +++ b/src/kvilib/tal/kvi_tal_menubar.h @@ -24,6 +24,12 @@ // //============================================================================= +/** +* \file kvi_tal_menubar.h +* \author Szymon Stefanek +* \brief Switcher between Qt and KDE classes +*/ + #include "kvi_settings.h" #ifdef COMPILE_KDE_SUPPORT diff --git a/src/kvilib/tal/kvi_tal_menubar_kde.h b/src/kvilib/tal/kvi_tal_menubar_kde.h index 9a57d48f0..62e03dcbc 100644 --- a/src/kvilib/tal/kvi_tal_menubar_kde.h +++ b/src/kvilib/tal/kvi_tal_menubar_kde.h @@ -24,15 +24,35 @@ // //============================================================================= +/** +* \file kvi_tal_menubar_kde.h +* \author Szymon Stefanek +* \brief KDE class for menubar +*/ + #include "kvi_settings.h" #include <kmenubar.h> +/** +* \class KviTalMenuBar +* \brief Toolkit Abstraction Layer: menubar class +*/ class KVILIB_API KviTalMenuBar : public KMenuBar { Q_OBJECT public: - KviTalMenuBar(QWidget * par,const char * nam); + /** + * \brief Constructs the menubar object + * \param pParent The parent object + * \param pcName The name of the menubar + * \return KviTalMenuBar + */ + KviTalMenuBar(QWidget * pParent, const char * pcName); + + /** + * \brief Destroys the menubar object + */ ~KviTalMenuBar(); }; diff --git a/src/kvilib/tal/kvi_tal_menubar_qt.h b/src/kvilib/tal/kvi_tal_menubar_qt.h index 30205762c..22fd2bc1a 100644 --- a/src/kvilib/tal/kvi_tal_menubar_qt.h +++ b/src/kvilib/tal/kvi_tal_menubar_qt.h @@ -24,15 +24,35 @@ // //============================================================================= +/** +* \file kvi_tal_menubar_kde.h +* \author Szymon Stefanek +* \brief Qt class for menubar +*/ + #include "kvi_settings.h" #include <QMenuBar> +/** +* \class KviTalMenuBar +* \brief Toolkit Abstraction Layer: menubar class +*/ class KVILIB_API KviTalMenuBar : public QMenuBar { Q_OBJECT public: - KviTalMenuBar(QWidget * par,const char * nam); + /** + * \brief Constructs the menubar object + * \param pParent The parent object + * \param pcName The name of the menubar + * \return KviTalMenuBar + */ + KviTalMenuBar(QWidget * pParent, const char * pcName); + + /** + * \brief Destroys the menubar object + */ ~KviTalMenuBar(); }; diff --git a/src/kvirc/kernel/kvi_action.h b/src/kvirc/kernel/kvi_action.h index b259ea85b..3aef52e7b 100644 --- a/src/kvirc/kernel/kvi_action.h +++ b/src/kvirc/kernel/kvi_action.h @@ -97,10 +97,10 @@ public: const QString &szVisibleName, // permanent visible name, visible at least in the action drawer const QString &szDescription, // what this action does ? KviActionCategory * pCategory = 0, // one of KviActionManager::category*() or 0 (default category) - const QString &szBigIcon = QString::null, + const QString &szBigIcon = QString(), int iSmallIconId = 0, unsigned int uFlags = 0, - const QString &szKeySequence = QString::null) + const QString &szKeySequence = QString()) : QObject(pParent), m_szName(szName), m_szVisibleName(szVisibleName), diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 0b307fc1d..ae179d445 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -173,7 +173,7 @@ KviApp::KviApp(int &argc,char ** argv) // Ok...everything begins here g_pApp = this; - m_szConfigFile = QString::null; + m_szConfigFile = QString(); m_bCreateConfig = false; m_bShowSplashScreen = true; m_bUpdateGuiPending = false; @@ -973,7 +973,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con if(windowExists(p->pConsole)) { p->pConsole->setAvatar(p->szNick,p->szUser,p->szHost, - szLocalFileName,KviQString::equalCIN("http://",szRemoteUrl,7) ? szRemoteUrl : QString::null); + szLocalFileName,KviQString::equalCIN("http://",szRemoteUrl,7) ? szRemoteUrl : QString()); } } else { if((!_OUTPUT_MUTE) && (!bQuiet)) diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index fa6822471..4d9005fb7 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -178,10 +178,10 @@ public: void optionResetUpdate(int flags); // kvi_app_fs.cpp : Filesystem thingies - void getGlobalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile = QString::null); - void getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile = QString::null,bool bCreateIfNeeded = true); + void getGlobalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile = QString()); + void getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile = QString(),bool bCreateIfNeeded = true); - void getTmpFileName(QString &szBuffer,const QString &szEndingFileName = QString::null); + void getTmpFileName(QString &szBuffer,const QString &szEndingFileName = QString()); void getChannelDumpLogFileName(QString &str); static QTextCodec * defaultTextCodec(); @@ -233,7 +233,7 @@ public: // kvi_app.cpp : DCC (and CTCP AVATAR & SOUND) related stuff void setAvatarOnFileReceived(KviConsole * pConsole,const QString &szRemoteUrl,const QString &szNick,const QString &szUser,const QString &szHost); KviPendingAvatarChange * findPendingAvatarChange(KviConsole * pConsole,const QString &szNick,const QString &szRemoteUrl); - void fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,const QString &szLocalFileName,const QString &szNick = QString::null,const QString &szError = QString::null,bool bQuiet = false); + void fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,const QString &szLocalFileName,const QString &szNick = QString(),const QString &szError = QString(),bool bQuiet = false); void setAvatarFromOptions(); diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index d3e3f4193..207167434 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -162,7 +162,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_socketspy.png", KVI_SMALLICON_SPY, KviAction::NeedsContext, - QString::null); + QString()); SCRIPT_ACTION( KVI_COREACTION_NETWORKLINKS, @@ -173,7 +173,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_networklinks.png", KVI_SMALLICON_LINKS, KviAction::NeedsContext, - QString::null); + QString()); SCRIPT_ACTION( KVI_COREACTION_CHANNELLIST, @@ -184,7 +184,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_channellist.png", KVI_SMALLICON_LIST, KviAction::NeedsContext, - QString::null); + QString()); SCRIPT_ACTION( KVI_COREACTION_GENERALOPTIONS, @@ -340,7 +340,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_mailinglist.png", KVI_SMALLICON_MESSAGE, 0, - QString::null); + QString()); SCRIPT_ACTION( KVI_COREACTION_KVIRCHOMEPAGE, @@ -351,7 +351,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_kvircwww.png", KVI_SMALLICON_KVIRC, 0, - QString::null); + QString()); SCRIPT_ACTION( KVI_COREACTION_KVIRCRUHOMEPAGE, @@ -362,7 +362,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_kvircwww.png", KVI_SMALLICON_KVIRC, 0, - QString::null); + QString()); SCRIPT_ACTION( KVI_COREACTION_SCREENSHOT, @@ -386,7 +386,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_cascadewindows.png", KVI_SMALLICON_CASCADEWINDOWS, 0, - QString::null); + QString()); SLOT_ACTION( KVI_COREACTION_TILEWINDOWS, @@ -398,7 +398,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_tilewindows.png", KVI_SMALLICON_TILEWINDOWS, 0, - QString::null); + QString()); SLOT_ACTION( KVI_COREACTION_MINIMIZEALLWINDOWS, @@ -410,7 +410,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_minimizeallwindows.png", KVI_SMALLICON_MINIMIZE, 0, - QString::null); + QString()); SLOT_ACTION( KVI_COREACTION_NEWIRCCONTEXT, @@ -434,7 +434,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_quit.png", KVI_SMALLICON_QUITAPP, 0, - QString::null); + QString()); } diff --git a/src/kvirc/kernel/kvi_coreactions.h b/src/kvirc/kernel/kvi_coreactions.h index d747badf5..262d0b9dd 100644 --- a/src/kvirc/kernel/kvi_coreactions.h +++ b/src/kvirc/kernel/kvi_coreactions.h @@ -71,7 +71,7 @@ public: const QString &szVisibleName, const QString &szDescription, KviActionCategory * pCategory = 0, - const QString &szBigIcon = QString::null, + const QString &szBigIcon = QString(), int iSmallIconId = 0, unsigned int uFlags = 0); ~KviSubmenuAction(); diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp index 71b2e3ed1..0c631ea1c 100644 --- a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp +++ b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp @@ -190,7 +190,7 @@ void KviCustomToolBarManager::load(const QString &szFileName) while(it.current()) { cfg.setGroup(it.currentKey()); - KviCustomToolBarDescriptor * d = new KviCustomToolBarDescriptor(it.currentKey(),QString::null); + KviCustomToolBarDescriptor * d = new KviCustomToolBarDescriptor(it.currentKey(),QString()); d->m_bVisibleAtStartup = (cfg.readIntEntry("Visible",0) > 0); if(!d->load(&cfg))delete d; else m_pDescriptors->replace(it.currentKey(),d); @@ -226,7 +226,7 @@ void KviCustomToolBarManager::loadScripttoolbarsCompat(const QString &szFileName for(unsigned int i=0;i<cnt;i++) { tmp.sprintf("%d",i); - KviCustomToolBarDescriptor * d = new KviCustomToolBarDescriptor(QString::null,QString::null); + KviCustomToolBarDescriptor * d = new KviCustomToolBarDescriptor(QString(),QString()); if(!d->loadScripttoolbarCompat(tmp.ptr(),&cfg))delete d; else m_pDescriptors->replace(d->id(),d); } diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp index 940eee66d..435e2d505 100644 --- a/src/kvirc/kernel/kvi_filetransfer.cpp +++ b/src/kvirc/kernel/kvi_filetransfer.cpp @@ -166,12 +166,12 @@ void KviFileTransfer::invokeTransferWindow(KviWindow * pWnd,bool bCreateMinimize QString KviFileTransfer::localFileName() { - return QString::null; + return QString(); } QString KviFileTransfer::retryCommand() { - return QString::null; + return QString(); } bool KviFileTransfer::terminated() @@ -181,7 +181,7 @@ bool KviFileTransfer::terminated() QString KviFileTransfer::tipText() { - return QString::null; + return QString(); } int KviFileTransfer::displayHeight(int iLineSpacing) diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp index 6ef536ee2..bd02bc661 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -761,7 +761,7 @@ QPixmap * KviIconManager::getBigIcon(const QString &szName) QImage tmp2 = tmpi.scaled(32,32,Qt::IgnoreAspectRatio,Qt::SmoothTransformation); QPixmap *pix=new QPixmap(); *pix = QPixmap::fromImage(tmp2); - KviCachedPixmap * cp = new KviCachedPixmap(pix,QString::null); + KviCachedPixmap * cp = new KviCachedPixmap(pix,QString()); addToCache(tmpName,cp); return cp->pixmap(); } @@ -769,7 +769,7 @@ QPixmap * KviIconManager::getBigIcon(const QString &szName) p = getPixmap("kvi_bigicon_unknown.png"); if(p)return p; - KviCachedPixmap * cp = new KviCachedPixmap(new QPixmap(32,32),QString::null); + KviCachedPixmap * cp = new KviCachedPixmap(new QPixmap(32,32),QString()); addToCache(szName,cp); return cp->pixmap(); } diff --git a/src/kvirc/kernel/kvi_ircconnectiontarget.h b/src/kvirc/kernel/kvi_ircconnectiontarget.h index 9cbc61bfb..8d57d5b6a 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontarget.h +++ b/src/kvirc/kernel/kvi_ircconnectiontarget.h @@ -41,7 +41,7 @@ public: KviIrcConnectionTarget(const KviNetwork * pNetwork, const KviServer * pServer, const KviProxy * pProxy = 0, - const QString &szBindAddress = QString::null); + const QString &szBindAddress = QString()); ~KviIrcConnectionTarget(); private: KviNetwork * m_pNetwork; // owned, never null diff --git a/src/kvirc/kernel/kvi_irccontext.h b/src/kvirc/kernel/kvi_irccontext.h index 782ee7897..6d2712017 100644 --- a/src/kvirc/kernel/kvi_irccontext.h +++ b/src/kvirc/kernel/kvi_irccontext.h @@ -155,7 +155,7 @@ public: void registerDataStreamMonitor(KviIrcDataStreamMonitor * m); void unregisterDataStreamMonitor(KviIrcDataStreamMonitor *m); - void terminateConnectionRequest(bool bForce,const QString &szQuitMessage = QString::null,bool bSimulateUnexpectedDisconnect = false); + void terminateConnectionRequest(bool bForce,const QString &szQuitMessage = QString(),bool bSimulateUnexpectedDisconnect = false); protected: // called by KviIrcContextToolBar: this will DIE in favor of connectOrDisconnect() diff --git a/src/kvirc/kernel/kvi_notifylist.h b/src/kvirc/kernel/kvi_notifylist.h index 30e0aa5a6..d774d7790 100644 --- a/src/kvirc/kernel/kvi_notifylist.h +++ b/src/kvirc/kernel/kvi_notifylist.h @@ -58,8 +58,8 @@ protected: virtual bool handleUserhost(KviIrcMessage * msg); virtual bool handleIsOn(KviIrcMessage * msg); virtual bool handleWatchReply(KviIrcMessage *msg); - void notifyOnLine(const QString &nick,const QString &user = QString::null,const QString &host = QString::null,const QString &szReason = QString::null,bool bJoin=true); - void notifyOffLine(const QString &nick,const QString &user = QString::null,const QString &host = QString::null,const QString &szReason = QString::null); + void notifyOnLine(const QString &nick,const QString &user = QString(),const QString &host = QString(),const QString &szReason = QString(),bool bJoin=true); + void notifyOffLine(const QString &nick,const QString &user = QString(),const QString &host = QString(),const QString &szReason = QString()); public: KviConsole * console(){ return m_pConsole; }; }; diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp index a099bc993..a2f5338e0 100644 --- a/src/kvirc/kernel/kvi_texticonmanager.cpp +++ b/src/kvirc/kernel/kvi_texticonmanager.cpp @@ -102,7 +102,7 @@ KviTextIcon::~KviTextIcon() void KviTextIcon::setId(int iId) { m_iId = iId; - m_szFileName=QString::null; + m_szFileName=QString(); } void KviTextIcon::setFilename(QString szFileName) diff --git a/src/kvirc/kvs/kvi_kvs_action.h b/src/kvirc/kvs/kvi_kvs_action.h index f0a65d600..c30e25508 100644 --- a/src/kvirc/kvs/kvi_kvs_action.h +++ b/src/kvirc/kvs/kvi_kvs_action.h @@ -43,10 +43,10 @@ public: const QString &szVisibleName, const QString &szDescription, KviActionCategory * pCategory = 0, - const QString &szBigIcon = QString::null, + const QString &szBigIcon = QString(), int iSmallIconId = 0, unsigned int uFlags = 0, - const QString &szKeySequence = QString::null); + const QString &szKeySequence = QString()); ~KviKvsAction(); public: const QString & scriptCode(); diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp index d8fb00d3b..670fc5b0f 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp @@ -152,7 +152,7 @@ namespace KviKvsCoreFunctions tmp2.bufferToBase64(tmp1.ptr(),tmp1.len()); KVSCF_pRetBuffer->setString(QString(tmp2.ptr())); } else { - KVSCF_pRetBuffer->setString(QString::null); + KVSCF_pRetBuffer->setString(QString()); } return true; } @@ -194,7 +194,7 @@ namespace KviKvsCoreFunctions tmp2.bufferToHex(tmp1.ptr(),tmp1.len()); KVSCF_pRetBuffer->setString(QString(tmp2.ptr())); } else { - KVSCF_pRetBuffer->setString(QString::null); + KVSCF_pRetBuffer->setString(QString()); } return true; } @@ -513,7 +513,7 @@ namespace KviKvsCoreFunctions if(ac != 0 && ac < 65536) KVSCF_pRetBuffer->setString(QString(QChar((unsigned short)ac))); else - KVSCF_pRetBuffer->setString(QString::null); + KVSCF_pRetBuffer->setString(QString()); return true; } diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp index 3ad1a6bd7..3b05ac515 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp @@ -1013,7 +1013,7 @@ namespace KviKvsCoreSimpleCommands pConsole->outputPrivmsg(pWnd,type, szNick,szUser,szHost,szText, iFlags, - bPrefix ? szPrefix : QString::null,bSuffix ? szSuffix : QString::null); + bPrefix ? szPrefix : QString(),bSuffix ? szSuffix : QString()); return true; } diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index 1e2fd8077..ecceccd2d 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -861,7 +861,7 @@ int KviKvsObject::emitSignal(const QString &sigName,KviKvsObjectFunctionCall * p pTarget->setSignalSender(m_hObject); pTarget->setSignalName(sigName); - if(!pTarget->callFunction(this,s->szSlot,QString::null,pOuterCall->context(),&retVal,pParams)) + if(!pTarget->callFunction(this,s->szSlot,QString(),pOuterCall->context(),&retVal,pParams)) { if(KviKvsKernel::instance()->objectController()->lookupObject(hTarget) && it.current()) { @@ -1563,7 +1563,7 @@ bool KviKvsObject::callFunction(KviKvsObject * pCaller,const QString &fncName,Kv if(!pRetVal)pRetVal = &rv; KviKvsRunTimeContext ctx(0,g_pApp->activeConsole(),KviKvsKernel::instance()->emptyParameterList(),pRetVal,0); if(!pParams)pParams = KviKvsKernel::instance()->emptyParameterList(); - return callFunction(pCaller,fncName,QString::null,&ctx,pRetVal,pParams); + return callFunction(pCaller,fncName,QString(),&ctx,pRetVal,pParams); } bool KviKvsObject::callFunction(KviKvsObject * pCaller,const QString &fncName,KviKvsVariantList * pParams) diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h index 236420415..3bc67af16 100644 --- a/src/kvirc/kvs/kvi_kvs_object.h +++ b/src/kvirc/kvs/kvi_kvs_object.h @@ -118,9 +118,9 @@ public: bool dieNow(); KviKvsObjectClass * getExactClass(){ return m_pClass; }; - KviKvsObjectClass * getClass(const QString & classOverride = QString::null); + KviKvsObjectClass * getClass(const QString & classOverride = QString()); bool inheritsClass(KviKvsObjectClass * pClass); - KviKvsObjectFunctionHandler * lookupFunctionHandler(const QString & funcName,const QString & classOverride = QString::null); + KviKvsObjectFunctionHandler * lookupFunctionHandler(const QString & funcName,const QString & classOverride = QString()); // Registers a private implementation of a function // The function may or may not be already registered in the class @@ -132,7 +132,7 @@ public: bool callFunction( KviKvsObject * pCaller, // calling object, can be zero (used for the "internal" access list verification) const QString & fncName, // name of the function to call - const QString & classOverride, // eventual class override for the functon call, may be QString::null + const QString & classOverride, // eventual class override for the functon call, may be QString() KviKvsRunTimeContext * pContext, // calling runtime context (you'll have problems with instantiating this... :P ) KviKvsVariant * pRetVal, // the return value KviKvsVariantList * pParams); // the parameters for the call diff --git a/src/kvirc/kvs/kvi_kvs_object_class.cpp b/src/kvirc/kvs/kvi_kvs_object_class.cpp index 3aeb73bda..8800b7d05 100644 --- a/src/kvirc/kvs/kvi_kvs_object_class.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_class.cpp @@ -139,7 +139,7 @@ KviKvsObject * KviKvsObjectClass::allocateInstance(KviKvsObject * pParent,const v = pParams->next(); } - if(!pObject->callFunction(pObject,"constructor",QString::null,pContext,&ret,©)) + if(!pObject->callFunction(pObject,"constructor",QString(),pContext,&ret,©)) { // ops...constructor failed (script error!) delete pObject; diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp b/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp index f3a17b980..c0f55f81b 100644 --- a/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp @@ -42,7 +42,7 @@ bool KviKvsObjectFunctionHandler::isScriptHandler() QString KviKvsObjectFunctionHandler::scriptHandlerCode() { - return QString::null; + return QString(); } diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp index ad82f1714..3f35d6d34 100644 --- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp +++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp @@ -45,7 +45,7 @@ namespace KviKvsParameterProcessor { case KVS_PT_STRING: case KVS_PT_NONEMPTYSTRING: - *((QString *)(pFmtArray->pContainer)) = QString::null; + *((QString *)(pFmtArray->pContainer)) = QString(); break; case KVS_PT_INT: *((kvs_int_t *)(pFmtArray->pContainer)) = 0; diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h b/src/kvirc/kvs/kvi_kvs_parameterprocessor.h index 6c407dd59..41344b37a 100644 --- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h +++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.h @@ -28,11 +28,11 @@ // Data type: QString -// Default: QString::null +// Default: QString() #define KVS_PT_STRING 0 // Data type: QString -// Default: QString::null +// Default: QString() #define KVS_PT_NONEMPTYSTRING 1 // Data type: kvs_int_t diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp index 6b312890c..5806b2e76 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp @@ -1695,7 +1695,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma QString szInstruction(pBegin,KVSP_curCharPointer - pBegin); KviCommandFormatter::bufferFromBlock(szInstruction); QString * pItemName = pParameters ? pParameters->first() : 0; - QString szItemName = pItemName ? *pItemName : QString::null; + QString szItemName = pItemName ? *pItemName : QString(); if(bPrologue) pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(pLabelBegin,szInstruction,szItemName)); else @@ -1728,7 +1728,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma QString * pIcon = pParameters->next(); if(KVSP_curCharUnicode == ';')KVSP_skipChar; QString * pItemName = pParameters->next(); - pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,pItemName ? *pItemName : QString::null)); + pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString(),pItemName ? *pItemName : QString())); delete pParameters; } else if(szLabelLow == "popup") { @@ -1757,7 +1757,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma pSubPopup->setCondition(szCondition); pSubPopup->setText(*pText); - pSubPopup->setItemName(pItemName ? *pItemName : QString::null); + pSubPopup->setItemName(pItemName ? *pItemName : QString()); if(pIcon)pSubPopup->setIcon(*pIcon); pPopup->addLabel(pSubPopup); delete pParameters; @@ -1801,12 +1801,12 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma { QString szInstruction(pBegin,KVSP_curCharPointer - pBegin); KviCommandFormatter::bufferFromBlock(szInstruction); - pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,szInstruction,pItemName ? *pItemName : QString::null)); + pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString(),szInstruction,pItemName ? *pItemName : QString())); } else { // zero length instruction, but still add the item QString szInstruction = ""; KviCommandFormatter::bufferFromBlock(szInstruction); - pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,szInstruction,pItemName ? *pItemName : QString::null)); + pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString(),szInstruction,pItemName ? *pItemName : QString())); } delete pParameters; } else if(szLabelLow == "extpopup") @@ -1834,7 +1834,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma QString * pIcon = pParameters->next(); QString * pItemName = pParameters->next(); if(KVSP_curCharUnicode == ';')KVSP_skipChar; - pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,*pName,pItemName ? *pItemName : QString::null)); + pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString(),*pName,pItemName ? *pItemName : QString())); delete pParameters; } else { ///////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp index a1abd573b..cac5fda72 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp +++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp @@ -919,7 +919,7 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg) // Might be old version! KviQString::sprintf(tmp,"%Q_Prologue",&(prefix)); QString pr = cfg->readQStringEntry(tmp,""); - if(!pr.isEmpty())addPrologue(QString::null,pr); + if(!pr.isEmpty())addPrologue(QString(),pr); } KviQString::sprintf(tmp,"%Q_EpilogueCount",&prefix); @@ -939,7 +939,7 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg) // Might be old version! KviQString::sprintf(tmp,"%Q_Epilogue",&prefix); QString ep = cfg->readQStringEntry(tmp,""); - if(!ep.isEmpty())addEpilogue(QString::null,ep); + if(!ep.isEmpty())addEpilogue(QString(),ep); } @@ -953,7 +953,7 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg) KviQString::sprintf(pre,"%Q_%d",&prefix,idx); KviQString::sprintf(tmp,"%Q_Id",&pre); - QString itemName = cfg->readQStringEntry(tmp,QString::null); + QString itemName = cfg->readQStringEntry(tmp,QString()); KviQString::sprintf(tmp,"%Q_Type",&pre); int type = cfg->readIntEntry(tmp,3); diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp index e664293d3..bc1093530 100644 --- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp @@ -139,7 +139,7 @@ bool KviKvsProcessAsyncOperation::start() void KviKvsProcessAsyncOperation::ping() { - if(trigger(EventPing,QString::null)) + if(trigger(EventPing,QString())) { triggerSelfDelete(); } diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp index a35eb6f0b..e55faaf37 100644 --- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp @@ -53,11 +53,11 @@ KviKvsScriptAddon::KviKvsScriptAddon(const KviKvsScriptAddon &a) m_szName = a.m_szName; m_szVersion = a.m_szVersion; m_szIconId = a.m_szIconId; - allocateScripts(a.m_pVisibleNameScript->code(),a.m_pDescriptionScript->code(),a.m_pUninstallCallback ? a.m_pUninstallCallback->code() : QString::null); + allocateScripts(a.m_pVisibleNameScript->code(),a.m_pDescriptionScript->code(),a.m_pUninstallCallback ? a.m_pUninstallCallback->code() : QString()); m_pConfigureCallback = 0; - setConfigureCallback(a.m_pConfigureCallback ? a.m_pConfigureCallback->code() : QString::null); + setConfigureCallback(a.m_pConfigureCallback ? a.m_pConfigureCallback->code() : QString()); m_pHelpCallback = 0; - setHelpCallback(a.m_pHelpCallback ? a.m_pHelpCallback->code() : QString::null); + setHelpCallback(a.m_pHelpCallback ? a.m_pHelpCallback->code() : QString()); } KviKvsScriptAddon::KviKvsScriptAddon() diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp index 7a8d86be4..aef858b7c 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp @@ -197,7 +197,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::execute(KviKvsRunTimeCon KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(const QChar * pLocation) -: KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,QString::null,QString::null,QString::null,QString::null) +: KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,QString(),QString(),QString(),QString()) { m_pLabels = new KviPointerList<KviKvsTreeNodeSpecialCommandDefpopupLabel>; m_pLabels->setAutoDelete(true); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp index 6bbb11251..733aa10f0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp @@ -57,5 +57,5 @@ bool KviKvsTreeNodeThisObjectFunctionCall::evaluateReadOnlyInObjectScope(KviKvsO if(!m_pParams->evaluate(c,&l))return false; pBuffer->setNothing(); c->setDefaultReportLocation(this); - return o->callFunction(c->thisObject(),m_szFunctionName,QString::null,c,pBuffer,&l); + return o->callFunction(c->thisObject(),m_szFunctionName,QString(),c,pBuffer,&l); } diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp index 13f1d03be..d88d1fb57 100644 --- a/src/kvirc/kvs/kvi_kvs_useraction.cpp +++ b/src/kvirc/kvs/kvi_kvs_useraction.cpp @@ -62,7 +62,7 @@ KviKvsUserAction::KviKvsUserAction(QObject * pParent, KviKvsUserAction::KviKvsUserAction(QObject * pParent) - : KviKvsAction(pParent,QString::null,QString::null,QString::null,QString::null) + : KviKvsAction(pParent,QString(),QString(),QString(),QString()) { // needs loading! m_pDescriptionScript = 0; diff --git a/src/kvirc/kvs/kvi_kvs_useraction.h b/src/kvirc/kvs/kvi_kvs_useraction.h index f23aa6e0c..f9f0499f9 100644 --- a/src/kvirc/kvs/kvi_kvs_useraction.h +++ b/src/kvirc/kvs/kvi_kvs_useraction.h @@ -44,7 +44,7 @@ public: const QString &szBigIcon, const QString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence = QString::null); + const QString &szKeySequence = QString()); KviKvsUserAction(QObject * pParent); ~KviKvsUserAction(); @@ -61,7 +61,7 @@ public: const QString &szBigIcon, const QString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence = QString::null); + const QString &szKeySequence = QString()); void suicide() { delete this; }; protected: QString m_szSmallIcon; diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/kvi_kvs_variant.cpp index 4ffcb6120..593cf9e31 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.cpp +++ b/src/kvirc/kvs/kvi_kvs_variant.cpp @@ -585,14 +585,14 @@ void KviKvsVariant::asString(QString &szBuffer) const { if(!m_pData) { - szBuffer = QString::null; + szBuffer = QString(); return; } switch(m_pData->m_eType) { case KviKvsVariantData::String: szBuffer = *(m_pData->m_u.pString); break; - case KviKvsVariantData::Array: szBuffer = QString::null; m_pData->m_u.pArray->appendAsString(szBuffer); break; - case KviKvsVariantData::Hash: szBuffer = QString::null; m_pData->m_u.pHash->appendAsString(szBuffer); break; + case KviKvsVariantData::Array: szBuffer = QString(); m_pData->m_u.pArray->appendAsString(szBuffer); break; + case KviKvsVariantData::Hash: szBuffer = QString(); m_pData->m_u.pHash->appendAsString(szBuffer); break; case KviKvsVariantData::Integer: szBuffer.setNum(m_pData->m_u.iInteger); break; case KviKvsVariantData::Real: szBuffer.setNum(*(m_pData->m_u.pReal)); break; case KviKvsVariantData::Boolean: szBuffer.setNum(m_pData->m_u.bBoolean ? 1 : 0); break; diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.cpp b/src/kvirc/kvs/kvi_kvs_variantlist.cpp index 576431657..2d2de6971 100644 --- a/src/kvirc/kvs/kvi_kvs_variantlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_variantlist.cpp @@ -172,7 +172,7 @@ void KviKvsVariantList::setAutoDelete(bool bAutoDelete) void KviKvsVariantList::allAsString(QString &szBuffer) { - szBuffer = QString::null; + szBuffer = QString(); bool bFirst = true; for(KviKvsVariant * v = first();v;v = next()) { diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp index 03fbc3fd6..244fe1543 100644 --- a/src/kvirc/sparser/kvi_sp_ctcp.cpp +++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp @@ -1144,7 +1144,7 @@ void KviServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg) szVersion = "KVIrc " KVI_VERSION; - if(KviBuildInfo::buildRevision()!=QString::null) + if(KviBuildInfo::buildRevision()!=QString()) { szVersion+= " svn-"; szVersion+=KviBuildInfo::buildRevision(); @@ -1606,7 +1606,7 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) KviQString::cutToLast(szRemoteFile,'\\'); } - avatar = g_pIconManager->getAvatar(QString::null,szRemoteFile); + avatar = g_pIconManager->getAvatar(QString(),szRemoteFile); if((avatar == 0) && e) { @@ -1687,7 +1687,7 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) if(bResetAvatar)e->setAvatar(avatar); msg->msg->console()->avatarChanged(avatar,msg->pSource->nick(),msg->pSource->user(),msg->pSource->host(), - msg->msg->haltOutput() ? QString::null : textLine); + msg->msg->haltOutput() ? QString() : textLine); } diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp index b9f77a9bf..b7959c816 100644 --- a/src/kvirc/sparser/kvi_sp_literal.cpp +++ b/src/kvirc/sparser/kvi_sp_literal.cpp @@ -225,7 +225,7 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) if(av) { it->globalData()->setAvatar(av); - console->avatarChanged(av,szNick,szUser,szHost,QString::null); + console->avatarChanged(av,szNick,szUser,szHost,QString()); } } @@ -367,7 +367,7 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg) } // always decode with the textEncoding of the channel - QString partMsg = msg->paramCount() > 1 ? chan->decodeText(msg->safeTrailing()) : QString::null; + QString partMsg = msg->paramCount() > 1 ? chan->decodeText(msg->safeTrailing()) : QString(); if(IS_ME(msg,szNick)) { diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp index 6ed457be0..d8a8d6757 100644 --- a/src/kvirc/sparser/kvi_sp_numeric.cpp +++ b/src/kvirc/sparser/kvi_sp_numeric.cpp @@ -445,8 +445,8 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg) KviIrcMask mask(msg->connection()->decodeText(begin)); // and make it join if(!mask.nick().isEmpty())chan->join(mask.nick(), - mask.hasUser() ? mask.user() : QString::null, - mask.hasHost() ? mask.host() : QString::null, + mask.hasUser() ? mask.user() : QString(), + mask.hasHost() ? mask.host() : QString(), iFlags); *aux = ' '; *aux = save; diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index bb8dc66bd..b0614d704 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -1117,7 +1117,7 @@ void KviChannel::ownMessage(const QString & szBuffer) if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr())) return; m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED, - QString::null,QString::null,QString::null,szBuffer,KviConsole::NoNotifications); + QString(),QString(),QString(),szBuffer,KviConsole::NoNotifications); break; case KviCryptEngine::Encoded: { @@ -1126,7 +1126,7 @@ void KviChannel::ownMessage(const QString & szBuffer) // ugly ,but we must redecode here QString szRedecoded = decodeText(encrypted.ptr()); m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, - QString::null,QString::null,QString::null,szRedecoded,KviConsole::NoNotifications); + QString(),QString(),QString(),szRedecoded,KviConsole::NoNotifications); } break; default: // also case KviCryptEngine::EncryptError @@ -1218,7 +1218,7 @@ void KviChannel::ownMessage(const QString & szBuffer) if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),szTmp.data())) { //feeedback the user - m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,szCurSubString,KviConsole::NoNotifications); + m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szCurSubString,KviConsole::NoNotifications); userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG); } else { // skipped a part in this multi message.. we don't want to continue @@ -1233,7 +1233,7 @@ void KviChannel::ownMessage(const QString & szBuffer) } else { if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d)) { - m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,szTmpBuffer,KviConsole::NoNotifications); + m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szTmpBuffer,KviConsole::NoNotifications); userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG); } } diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 09ef09dda..1c8fd7bf1 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -598,7 +598,7 @@ public: * \param iFlags The flags of the user * \return KviUserListEntry * */ - KviUserListEntry * join(const QString & szNick, const QString & szUser = QString::null, const QString & szHost = QString::null, int iFlags = 0){ return m_pUserListView->join(szNick,szUser,szHost,iFlags); }; + KviUserListEntry * join(const QString & szNick, const QString & szUser = QString(), const QString & szHost = QString(), int iFlags = 0){ return m_pUserListView->join(szNick,szUser,szHost,iFlags); }; /** * \brief Returns true if the avatar of a user is changed diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index 948ce3082..9928d8133 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -869,7 +869,7 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QStr if(u) { if(avatar)u->setProperty("avatar",avatar->identificationString()); - else u->setProperty("avatar",QString::null); + else u->setProperty("avatar",QString()); bRegisteredStuff = true; } } @@ -894,12 +894,12 @@ void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const if(!szAvatar.isEmpty()) { // got a cache hit... is it on disk ? - KviAvatar * avatar = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * avatar = g_pIconManager->getAvatar(QString(),szAvatar); if(avatar) { // cached image on disk e->setAvatar(avatar); - avatarChangedUpdateWindows(nick,QString::null); + avatarChangedUpdateWindows(nick,QString()); return; } else { // no cached image on disk.. will need to requery it anyway @@ -917,11 +917,11 @@ void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const if(u->getProperty("avatar",szAvatar)) { // the user has a default avatar... - KviAvatar * avatar = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * avatar = g_pIconManager->getAvatar(QString(),szAvatar); if(avatar) { e->setAvatar(avatar); - avatarChangedUpdateWindows(nick,QString::null); + avatarChangedUpdateWindows(nick,QString()); return; } } @@ -942,9 +942,9 @@ void KviConsole::resetAvatarForMatchingUsers(KviRegisteredUser * u) { if(u->matchesFixed(it.currentKey(),e->user(),e->host())) { - KviAvatar * a = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * a = g_pIconManager->getAvatar(QString(),szAvatar); e->setAvatar(a); - avatarChangedUpdateWindows(it.currentKey(),QString::null); + avatarChangedUpdateWindows(it.currentKey(),QString()); } } ++it; @@ -973,7 +973,7 @@ KviAvatar * KviConsole::setAvatar(const QString &nick,const QString &user,const if(avatar) { e->setAvatar(avatar); - avatarChanged(avatar,nick,user,host,QString::null); + avatarChanged(avatar,nick,user,host,QString()); return avatar; } else { if(_OUTPUT_PARANOIC) @@ -1011,7 +1011,7 @@ KviAvatar * KviConsole::currentAvatar() if(a) { e->setAvatar(a); - avatarChanged(a,connection()->userInfo()->nickName(),QString::null,QString::null,QString::null); + avatarChanged(a,connection()->userInfo()->nickName(),QString(),QString(),QString()); } } return a; @@ -1026,7 +1026,7 @@ void KviConsole::setAvatarFromOptions() if(a) { e->setAvatar(a); - avatarChanged(a,connection()->userInfo()->nickName(),QString::null,QString::null,QString::null); + avatarChanged(a,connection()->userInfo()->nickName(),QString(),QString(),QString()); } } diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h index fb8355f57..0ba2a638d 100644 --- a/src/kvirc/ui/kvi_console.h +++ b/src/kvirc/ui/kvi_console.h @@ -151,7 +151,7 @@ public: NoNotifications = 7 // this is 1|2|4 implies NoWindowFlashing and NoNotifier }; void outputPrivmsg(KviWindow *wnd,int type,const QString &nick, - const QString &user,const QString &host,const QString &msg,int iFlags = 0,const QString &prefix = QString::null,const QString &suffix = QString::null); + const QString &user,const QString &host,const QString &msg,int iFlags = 0,const QString &prefix = QString(),const QString &suffix = QString()); // this applies highlighting to the specified message // and triggers the OnHighlight event. // it returns KVI_OUT_HIGHLIGHT if highlighting was applied @@ -213,7 +213,7 @@ inline bool KviConsole::isNotConnected() inline QString KviConsole::currentNetworkName() { - return (connection() ? connection()->networkName() : QString::null); + return (connection() ? connection()->networkName() : QString()); } #endif //_KVI_CONSOLE_H_ diff --git a/src/kvirc/ui/kvi_filedialog.h b/src/kvirc/ui/kvi_filedialog.h index 0e69167c4..1110b7dbc 100644 --- a/src/kvirc/ui/kvi_filedialog.h +++ b/src/kvirc/ui/kvi_filedialog.h @@ -57,7 +57,7 @@ public: * \param bModal Whether to have a modal behaviour * \return KviFileDialog */ - KviFileDialog(const QString & szDirName, const QString & szFilter = QString::null, QWidget * pParent = 0, const char * name = 0, bool bModal = false); + KviFileDialog(const QString & szDirName, const QString & szFilter = QString(), QWidget * pParent = 0, const char * name = 0, bool bModal = false); /** * \brief Destroys the file dialog object @@ -74,7 +74,7 @@ public: * \param pParent The parent widget * \return bool */ - static bool askForOpenFileName(QString & szBuffer, const QString & szCaption, const QString & szInitial = QString::null, const QString & szFilter = QString::null, bool bShowHidden = false, bool bShowNative = true, QWidget * pParent = 0); + static bool askForOpenFileName(QString & szBuffer, const QString & szCaption, const QString & szInitial = QString(), const QString & szFilter = QString(), bool bShowHidden = false, bool bShowNative = true, QWidget * pParent = 0); /** * \param szBuffer The buffer where to store the data @@ -86,7 +86,7 @@ public: * \param pParent The parent widget * \return bool */ - static bool askForSaveFileName(QString & szBuffer, const QString & szCaption, const QString & szInitial = QString::null, const QString & szFilter = QString::null, bool bShowHidden = false, bool bConfirmOverwrite = false, bool bShowNative = true, QWidget * pParent = 0); + static bool askForSaveFileName(QString & szBuffer, const QString & szCaption, const QString & szInitial = QString(), const QString & szFilter = QString(), bool bShowHidden = false, bool bConfirmOverwrite = false, bool bShowNative = true, QWidget * pParent = 0); /** * \param szBuffer The buffer where to store the data @@ -98,7 +98,7 @@ public: * \param pParent The parent widget * \return bool */ - static bool askForDirectoryName(QString & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter = QString::null, bool bShowHidden = false, bool bShowNative = true, QWidget * pParent = 0); + static bool askForDirectoryName(QString & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter = QString(), bool bShowHidden = false, bool bShowNative = true, QWidget * pParent = 0); /** * \param szBuffer The buffer where to store the data @@ -110,7 +110,7 @@ public: * \param pParent The parent widget * \return bool */ - static bool askForOpenFileNames(QStringList & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter = QString::null, bool bShowHidden = false, bool bShowNative = true, QWidget * pParent = 0); + static bool askForOpenFileNames(QStringList & szBuffer, const QString & szCaption, const QString & szInitial, const QString & szFilter = QString(), bool bShowHidden = false, bool bShowNative = true, QWidget * pParent = 0); }; #endif //_KVI_FILEDIALOG_H_ diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index 92cc22652..703fb224e 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -318,13 +318,13 @@ void KviImageDialog::okClicked() void KviImageDialog::cancelClicked() { - m_szSelectedImage = QString::null; + m_szSelectedImage = QString(); reject(); } void KviImageDialog::closeEvent(QCloseEvent * e) { - m_szSelectedImage = QString::null; + m_szSelectedImage = QString(); QDialog::closeEvent(e); } diff --git a/src/kvirc/ui/kvi_imagedialog.h b/src/kvirc/ui/kvi_imagedialog.h index 36d5151ae..41d7d1bef 100644 --- a/src/kvirc/ui/kvi_imagedialog.h +++ b/src/kvirc/ui/kvi_imagedialog.h @@ -41,7 +41,7 @@ public: QString m_szImageId; QString m_szTipText; public: - KviImageDialogItem(KviTalListWidget * b,const QPixmap &thumb,const QString &szFile,const QString &image_id,const QString &szTipText = QString::null,bool bIsFolder = false) + KviImageDialogItem(KviTalListWidget * b,const QPixmap &thumb,const QString &szFile,const QString &image_id,const QString &szTipText = QString(),bool bIsFolder = false) : KviTalListWidgetPixmap(b,thumb,szFile) , m_bIsFolder(bIsFolder) , m_szImageId(image_id) , m_szTipText(szTipText) {}; ~KviImageDialogItem(){}; public: @@ -64,10 +64,10 @@ class KVIRC_API KviImageDialog : public QDialog Q_OBJECT public: KviImageDialog(QWidget * par, - const QString &szCaption = QString::null, + const QString &szCaption = QString(), int types = KID_TYPE_ALL, int initialType = 0, - const QString &szInitialDir = QString::null, + const QString &szInitialDir = QString(), int maxPreviewFileSize = 256000, bool modal=false); virtual ~KviImageDialog(); protected: @@ -92,7 +92,7 @@ protected: public: const QString & selectedImage(){ return m_szSelectedImage; }; protected: - void startJob(int type,const QString &szInitialPath = QString::null); + void startJob(int type,const QString &szInitialPath = QString()); void jobTerminated(); virtual void closeEvent(QCloseEvent *e); protected slots: diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index b7becec87..9b80ee354 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -211,7 +211,7 @@ void KviInput::toggleToolButtons() void KviInput::inputEditorEnterPressed() { QString szText = m_pInputEditor->text(); - KviUserInput::parse(szText,m_pWindow,QString::null,m_pCommandlineModeButton->isChecked()); + KviUserInput::parse(szText,m_pWindow,QString(),m_pCommandlineModeButton->isChecked()); m_pInputEditor->setText(""); } @@ -278,7 +278,7 @@ void KviInput::keyPressEvent(QKeyEvent *e) } } } - KviUserInput::parse(szText,m_pWindow,QString::null,m_pCommandlineModeButton->isChecked()); + KviUserInput::parse(szText,m_pWindow,QString(),m_pCommandlineModeButton->isChecked()); m_pMultiLineEditor->setText(""); } } diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h index 2b4d48feb..b48fa1f08 100644 --- a/src/kvirc/ui/kvi_ipeditor.h +++ b/src/kvirc/ui/kvi_ipeditor.h @@ -38,7 +38,7 @@ class KVIRC_API KviIpEditor : public QFrame Q_OBJECT public: enum AddressType { IPv4 , IPv6 }; - KviIpEditor(QWidget * parent,AddressType = IPv4,const QString &ipAddr = QString::null,const char *name = 0); + KviIpEditor(QWidget * parent,AddressType = IPv4,const QString &ipAddr = QString(),const char *name = 0); ~KviIpEditor(); private: QLabel * m_pLabel[7]; diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index d16fc84a5..b8581f98d 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -174,7 +174,7 @@ public: //============================================================================================== // Logging // Stops previous logging session too... - bool startLogging(const QString& fname = QString::null,bool bPrependCurBuffer = false); + bool startLogging(const QString& fname = QString(),bool bPrependCurBuffer = false); void stopLogging(); bool isLogging(){ return (m_pLogFile != 0); }; void getLogFileName(QString &buffer); diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index 3601f3270..220802f00 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -622,7 +622,7 @@ void KviQuery::ownMessage(const QString & szBuffer) return; m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED, - QString::null,QString::null,QString::null,szBuffer,KviConsole::NoNotifications); + QString(),QString(),QString(),szBuffer,KviConsole::NoNotifications); break; case KviCryptEngine::Encoded: { @@ -632,7 +632,7 @@ void KviQuery::ownMessage(const QString & szBuffer) // ugly ,but we must redecode here QString szRedecoded = decodeText(encrypted.ptr()); m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, - QString::null,QString::null,QString::null,szRedecoded,KviConsole::NoNotifications); + QString(),QString(),QString(),szRedecoded,KviConsole::NoNotifications); } break; default: // also case KviCryptEngine::EncryptError @@ -726,7 +726,7 @@ void KviQuery::ownMessage(const QString & szBuffer) if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),szTmp.data())) { //feeedback the user - m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,szCurSubString,KviConsole::NoNotifications); + m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szCurSubString,KviConsole::NoNotifications); userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG); } else { // skipped a part in this multi message.. we don't want to continue @@ -741,7 +741,7 @@ void KviQuery::ownMessage(const QString & szBuffer) } else { if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d)) { - m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,szTmpBuffer,KviConsole::NoNotifications); + m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szTmpBuffer,KviConsole::NoNotifications); userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG); } } diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h index 9735862a6..d91e44efc 100644 --- a/src/kvirc/ui/kvi_selectors.h +++ b/src/kvirc/ui/kvi_selectors.h @@ -180,7 +180,7 @@ class KVIRC_API KviFileSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT public: - KviFileSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled,unsigned int uFlags = 0,const QString &szFilter = QString::null); + KviFileSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled,unsigned int uFlags = 0,const QString &szFilter = QString()); ~KviFileSelector(){}; public: enum Flags { diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index aad80c474..902022fc6 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -116,7 +116,7 @@ KviStatusBarApplet::~KviStatusBarApplet() QString KviStatusBarApplet::tipText(const QPoint &) { - return QString::null; + return QString(); } void KviStatusBarApplet::paintEvent(QPaintEvent * e) diff --git a/src/kvirc/ui/kvi_statusbarapplet.h b/src/kvirc/ui/kvi_statusbarapplet.h index d65ea9f6e..ecf873c20 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.h +++ b/src/kvirc/ui/kvi_statusbarapplet.h @@ -65,7 +65,7 @@ public: KviStatusBarAppletDescriptor(const QString &szVisibleName, const QString &szInternalName, CreateAppletCallback pProc, - const QString &szPreloadModule = QString::null, + const QString &szPreloadModule = QString(), const QPixmap &pixIcon = QPixmap()); virtual ~KviStatusBarAppletDescriptor(); public: diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/kvi_topicw.h index d3176b491..64f113a95 100644 --- a/src/kvirc/ui/kvi_topicw.h +++ b/src/kvirc/ui/kvi_topicw.h @@ -53,7 +53,7 @@ public: class KVIRC_API KviTopicListBoxItem : public KviTalListWidgetText { public: - KviTopicListBoxItem(KviTalListWidget * pListBox = 0, const QString & text = QString::null); + KviTopicListBoxItem(KviTalListWidget * pListBox = 0, const QString & text = QString()); ~KviTopicListBoxItem(); public: virtual int width(const KviTalListWidget * pList) const; diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index c8590d881..19f186a7a 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -753,7 +753,7 @@ KviUserListEntry * KviUserListView::join(const QString & szNick, const QString & // add an entry to the global dict KviIrcUserEntry * pGlobalData = m_pIrcUserDataBase->insertUser(szNick,szUser,szHost); // calculate the flags and update the counters - pEntry = new KviUserListEntry(this,szNick,pGlobalData,iFlags,(szUser == QString::null)); + pEntry = new KviUserListEntry(this,szNick,pGlobalData,iFlags,(szUser == QString())); insertUserEntry(szNick,pEntry); } else { // if(!host.isEmpty()) - it can be UHNAMES with host or NAMEX(X) w/o it diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h index 5bda24bd0..f73a9b55c 100644 --- a/src/kvirc/ui/kvi_userlistview.h +++ b/src/kvirc/ui/kvi_userlistview.h @@ -238,7 +238,7 @@ public: * \param pName The name of the users list * \return KviUserListView */ - KviUserListView(QWidget * pParent, KviWindowToolPageButton * pButton, KviIrcUserDataBase * pDb, KviWindow * pWnd, int iDictSize = 5, const QString & szTextLabel = QString::null, const char * pName = "userslistview"); + KviUserListView(QWidget * pParent, KviWindowToolPageButton * pButton, KviIrcUserDataBase * pDb, KviWindow * pWnd, int iDictSize = 5, const QString & szTextLabel = QString(), const char * pName = "userslistview"); /** * \brief Destroys the user list view object @@ -711,7 +711,7 @@ public: * \param iFlags The flags of the user * \return KviUserListEntry * */ - KviUserListEntry * join(const QString & szNick, const QString & szUser = QString::null, const QString & szHost = QString::null, int iFlags = 0); + KviUserListEntry * join(const QString & szNick, const QString & szUser = QString(), const QString & szHost = QString(), int iFlags = 0); /** * \brief Returns true if the avatar of a user is changed diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index fe238105b..10dde0281 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -370,7 +370,7 @@ void KviSingleActionEditor::chooseSmallIcon() void KviSingleActionEditor::chooseBigIcon() { if(!m_pActionData)return; - KviImageDialog * d = new KviImageDialog(this,QString::null,KID_TYPE_ALL,KID_TYPE_FULL_PATH); + KviImageDialog * d = new KviImageDialog(this,QString(),KID_TYPE_ALL,KID_TYPE_FULL_PATH); int ret = d->exec(); QString s = d->selectedImage(); delete d; @@ -696,7 +696,7 @@ void KviActionEditor::exportActions() QString szFile; - if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,QString::null,true,true,true))return; + if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,QString(),true,true,true))return; QString szCode; @@ -778,14 +778,14 @@ void KviActionEditor::newAction() szDes.append("\")"); KviActionData * ad = new KviActionData(szName, - QString::null, + QString(), szVis, szDes, KviActionManager::categoryGeneric()->name(), - QString::null, - QString::null, + QString(), + QString(), 0, - QString::null, + QString(), 0); KviActionEditorTreeWidgetItem * lvi = new KviActionEditorTreeWidgetItem(m_pTreeWidget,ad); diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index 23de049a6..bc7d9d368 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -280,7 +280,7 @@ void KviScriptManagementDialog::installScript() { QString szFileName, szError; - if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs("Please select the addon installation file"),QString::null,KVI_FILTER_SCRIPTS,false,true))return; + if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs("Please select the addon installation file"),QString(),KVI_FILTER_SCRIPTS,false,true))return; szFileName.replace("\\","\\\\"); diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index 10cef8792..064a9a149 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -359,7 +359,7 @@ void KviAliasEditor::splitFullAliasOrNamespaceName(const QString &szFullName,QSt QString KviAliasEditor::buildFullItemName(KviAliasEditorTreeWidgetItem * it) { - if(!it) return QString::null; + if(!it) return QString(); QString szName = it->name(); KviAliasNamespaceTreeWidgetItem * nit = it->parentNamespaceItem(); while(nit) @@ -837,7 +837,7 @@ void KviAliasEditor::loadProperties(KviConfig *cfg) def.append(20); def.append(80); m_pSplitter->setSizes(cfg->readIntListEntry("Sizes",def)); - QString tmp = cfg->readEntry("LastAlias",QString::null); + QString tmp = cfg->readEntry("LastAlias",QString()); KviAliasEditorTreeWidgetItem * it = findAliasItem(tmp); if(!it)it = findNamespaceItem(tmp); @@ -1101,7 +1101,7 @@ QString KviAliasEditor::askForAliasName(const QString &szAction,const QString &s szInitialText, &bOk); g_pAliasEditorModule->unlock(); - if(!bOk)return QString::null; + if(!bOk)return QString(); if(szNewName.isEmpty()) { g_pAliasEditorModule->lock(); @@ -1169,7 +1169,7 @@ QString KviAliasEditor::askForNamespaceName(const QString &szAction,const QStrin szInitialText, &bOk); g_pAliasEditorModule->unlock(); - if(!bOk)return QString::null; + if(!bOk)return QString(); if(szNewName.isEmpty()) { g_pAliasEditorModule->lock(); diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp index dd68ab0b8..6fe1c89b7 100644 --- a/src/modules/avatar/libkviavatar.cpp +++ b/src/modules/avatar/libkviavatar.cpp @@ -201,7 +201,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c) if(szAvatar.isEmpty()) { - KviAsyncAvatarSelectionDialog * d = new KviAsyncAvatarSelectionDialog(g_pFrame,QString::null,c->window()->connection()); + KviAsyncAvatarSelectionDialog * d = new KviAsyncAvatarSelectionDialog(g_pFrame,QString(),c->window()->connection()); d->show(); return true; } @@ -215,7 +215,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c) return true; } - KviAvatar * av = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * av = g_pIconManager->getAvatar(QString(),szAvatar); if(av) { // Ok...got it... @@ -224,7 +224,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c) c->window()->connection()->userInfo()->nickName(), c->window()->connection()->userInfo()->userName(), c->window()->connection()->userInfo()->hostName(), - QString::null); + QString()); } else { bool bIsUrl = KviQString::equalCIN(szAvatar,"http://",7) && (szAvatar.length() > 7); @@ -298,7 +298,7 @@ static bool avatar_kvs_cmd_unset(KviKvsModuleCommandCall * c) c->window()->connection()->userInfo()->nickName(), c->window()->connection()->userInfo()->userName(), c->window()->connection()->userInfo()->hostName(), - QString::null); + QString()); return true; } diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index d99a8eedb..c7bd1c85c 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1184,7 +1184,7 @@ // KviVariantTableItem // KviVariantTableItem::KviVariantTableItem(QTable * t,const QVariant & property) - : QTableItem(t,QTableItem::WhenCurrent,QString::null) + : QTableItem(t,QTableItem::WhenCurrent,QString()) { m_property = property; } diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index e9fb642f0..e20c3e20b 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -848,8 +848,8 @@ void KviScriptEditorImplementation::saveToFile() QString szFileName; if(KviFileDialog::askForSaveFileName(szFileName, __tr2qs_ctx("Choose a Filename - KVIrc","editor"), - QString::null, - QString::null,false,true,true)) + QString(), + QString(),false,true,true)) { QString szBuffer = m_pEditor->toPlainText(); @@ -929,7 +929,7 @@ void KviScriptEditorImplementation::loadFromFile() QString szFileName; if(KviFileDialog::askForOpenFileName(szFileName, __tr2qs_ctx("Load Script File - KVIrc","editor"), - QString::null,KVI_FILTER_SCRIPT,false,true)) + QString(),KVI_FILTER_SCRIPT,false,true)) { QString szBuffer; if(KviFileUtils::loadFile(szFileName,szBuffer)) diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp index b3c0b9d94..39662582b 100644 --- a/src/modules/eventeditor/eventeditor.cpp +++ b/src/modules/eventeditor/eventeditor.cpp @@ -485,7 +485,7 @@ void KviEventEditor::exportAllEvents() QString szFile; - if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,QString::null,true,true))return; + if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,QString(),true,true))return; if(!KviFileUtils::writeFile(szFile,out)) { diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index 98986b260..ff5f0c2a4 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -437,7 +437,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess) m_eGeneralStatus = Success; displayUpdate(); if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICSUCCESS,__tr2qs_ctx("[HTTP %d]: Transfer completed","http"),id()); - g_pApp->fileDownloadTerminated(true,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString::null,QString::null,!m_bNotifyCompletion); + g_pApp->fileDownloadTerminated(true,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString(),QString(),!m_bNotifyCompletion); } else { m_szStatusString = __tr2qs_ctx("Transfer failed","http"); m_szStatusString += ": "; @@ -445,7 +445,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess) m_eGeneralStatus = Failure; displayUpdate(); if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICERROR,__tr2qs_ctx("[HTTP %d]: Transfer failed: %Q","http"),id(),&(m_pHttpRequest->lastError())); - g_pApp->fileDownloadTerminated(false,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString::null,m_pHttpRequest->lastError(),!m_bNotifyCompletion); + g_pApp->fileDownloadTerminated(false,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString(),m_pHttpRequest->lastError(),!m_bNotifyCompletion); } if(m_bAutoClean) diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp index ff25ae6f9..c62781eab 100644 --- a/src/modules/http/libkvihttp.cpp +++ b/src/modules/http/libkvihttp.cpp @@ -245,7 +245,7 @@ static bool http_kvs_cmd_get(KviKvsModuleCommandCall * c) KVSM_PARAMETER("filename",KVS_PT_STRING,KVS_PF_OPTIONAL,szFileName) KVSM_PARAMETERS_END(c) - return http_kvs_complete_get(c,szUrl,szFileName,QString::null); + return http_kvs_complete_get(c,szUrl,szFileName,QString()); } /* @doc: http.asyncGet diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index 95216b5c5..8fb58534b 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -364,7 +364,7 @@ void KviListWindow::importList() { QString szFile; - if(KviFileDialog::askForOpenFileName(szFile,__tr2qs("Choose filename"),QString::null,KVI_FILTER_CONFIG,false, + if(KviFileDialog::askForOpenFileName(szFile,__tr2qs("Choose filename"),QString(),KVI_FILTER_CONFIG,false, false,this)) { if(m_pConsole->isConnected()) diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp index bcf6d82c7..34aa275c1 100644 --- a/src/modules/logview/logviewwidget.cpp +++ b/src/modules/logview/logviewwidget.cpp @@ -43,13 +43,13 @@ KviLogListViewItem::KviLogListViewItem(KviTalTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData) : KviTalTreeWidgetItem(par), m_type(type), m_pFileData(fileData) { - setText(0,m_pFileData ? m_pFileData->name() : QString::null); + setText(0,m_pFileData ? m_pFileData->name() : QString()); }; KviLogListViewItem::KviLogListViewItem(KviTalTreeWidget * par, KviLogFile::KviLogTypes type, KviLogFile * fileData) : KviTalTreeWidgetItem(par), m_type(type), m_pFileData(fileData) { - setText(0,m_pFileData ? m_pFileData->name() : QString::null); + setText(0,m_pFileData ? m_pFileData->name() : QString()); }; KviLogListViewItemFolder::KviLogListViewItemFolder(KviTalTreeWidgetItem * par, const QString& label) diff --git a/src/modules/logview/logviewwidget.h b/src/modules/logview/logviewwidget.h index 03f28abaf..1f7b102a0 100644 --- a/src/modules/logview/logviewwidget.h +++ b/src/modules/logview/logviewwidget.h @@ -42,7 +42,7 @@ public: public: KviLogFile::KviLogTypes m_type; KviLogFile* m_pFileData; - virtual QString fileName() const { return QString::null; }; + virtual QString fileName() const { return QString(); }; }; class KviLogListViewItemFolder : public KviLogListViewItem diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp index b41e05d59..effa1f50d 100644 --- a/src/modules/mediaplayer/mp_interface.cpp +++ b/src/modules/mediaplayer/mp_interface.cpp @@ -88,19 +88,19 @@ QString KviMediaPlayerInterface::getLocalFile() ret.remove(0,7); return ret; } - return QString::null; + return QString(); } QString KviMediaPlayerInterface::amipEval(const QString &cmd) { - return QString::null; + return QString(); } #define SCAN_MP3_FILE \ QString f = getLocalFile(); \ - if(f.isEmpty())return QString::null; \ + if(f.isEmpty())return QString(); \ mp3info mp3; \ - if(!scan_mp3_file(f,&mp3))return QString::null; \ + if(!scan_mp3_file(f,&mp3))return QString(); \ QTextCodec *pCodec; \ pCodec=mediaplayer_get_codec(); @@ -270,6 +270,6 @@ QString KviMediaPlayerInterface::mediaType() else if(ret.endsWith(".mpeg",Qt::CaseInsensitive))ret = "MPEG Video"; else if(ret.endsWith(".mpg",Qt::CaseInsensitive))ret = "MPEG Video"; else if(ret.startsWith("http://",Qt::CaseInsensitive))ret = "HTTP Audio Stream"; - else ret = QString::null; + else ret = QString(); return ret; } diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/mp_xmmsinterface.cpp index f12d5365d..67e925e9f 100644 --- a/src/modules/mediaplayer/mp_xmmsinterface.cpp +++ b/src/modules/mediaplayer/mp_xmmsinterface.cpp @@ -306,20 +306,20 @@ bool KviXmmsInterface::playMrl(const QString &mrl) QString KviXmmsInterface::nowPlaying() { int (*sym)(int) = (int (*)(int))lookupSymbol("xmms_remote_get_playlist_pos"); - if(!sym)return QString::null; + if(!sym)return QString(); int pos = sym(0); char * (*sym2)(int,int) = (char * (*)(int,int))lookupSymbol("xmms_remote_get_playlist_title"); - if(!sym2)return QString::null; + if(!sym2)return QString(); return QString::fromLocal8Bit(sym2(0,pos)); } QString KviXmmsInterface::mrl() { int (*sym)(int) = (int (*)(int))lookupSymbol("xmms_remote_get_playlist_pos"); - if(!sym)return QString::null; + if(!sym)return QString(); int pos = sym(0); char * (*sym2)(int,int) = (char * (*)(int,int))lookupSymbol("xmms_remote_get_playlist_file"); - if(!sym2)return QString::null; + if(!sym2)return QString(); QString ret = QString::fromLocal8Bit(sym2(0,pos)); if(ret.length() > 1) if(ret[0] == '/')ret.prepend("file://"); diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 47f3b817e..a26623a22 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -1376,7 +1376,7 @@ void KviNotifierWindow::returnPressed() addMessage(tab->window(),tmp.ptr(),html,0); //m_pCurrentFocusedWindowTab on place of m_pCurrentMessage->window() m_pLineEdit->setText(""); - KviUserInput::parse(txt,tab->window(),QString::null,1); + KviUserInput::parse(txt,tab->window(),QString(),1); } void KviNotifierWindow::progressUpdate() diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp index 3d01f61e3..b478b0c92 100644 --- a/src/modules/objects/class_treewidgetitem.cpp +++ b/src/modules/objects/class_treewidgetitem.cpp @@ -207,12 +207,12 @@ KviKvsStandardTreeWidgetItem::~KviKvsStandardTreeWidgetItem() /* KviKvsCheckTreeWidgetItem::KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par) -:KviTalCheckListItem(par,QString::null,KviTalCheckListItem::CheckBox), m_pMasterObject(ob) +:KviTalCheckListItem(par,QString(),KviTalCheckListItem::CheckBox), m_pMasterObject(ob) { } KviKvsCheckTreeWidgetItem::KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par) -:KviTalCheckListItem(par,QString::null,KviTalCheckListItem::CheckBox), m_pMasterObject(ob) +:KviTalCheckListItem(par,QString(),KviTalCheckListItem::CheckBox), m_pMasterObject(ob) { } diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 401ab18c1..71fc90aa5 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -257,7 +257,7 @@ void KviAvatarSelectionDialog::chooseFileClicked() { QString tmp; if(KviFileDialog::askForOpenFileName(tmp,__tr2qs_ctx("Choose an Image File - KVIrc","options"), - QString::null,KVI_FILTER_IMAGE,false,true,this)) + QString(),KVI_FILTER_IMAGE,false,true,this)) { m_pLineEdit->setText(tmp); } @@ -534,7 +534,7 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar() { // this is an url // first check if we have it in the cache - KviAvatar * a = g_pIconManager->getAvatar(QString::null,szCurrent); + KviAvatar * a = g_pIconManager->getAvatar(QString(),szCurrent); if(!a) { // no cache... try downloading diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 0daef2a80..d08f6368c 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -263,7 +263,7 @@ void KviMessageListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionVie KviMessageColorListWidgetItem::KviMessageColorListWidgetItem(KviTalListWidget * b,int idx) -: KviTalListWidgetText(b,QString::null) +: KviTalListWidgetText(b,QString()) { m_iClrIdx = idx; diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index b5349f9ce..7f68e53b3 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -403,13 +403,13 @@ void KviNetworkDetailsWidget::fillData(KviNetwork * n) if(m_pAutoConnectCheck) n->setAutoConnect(m_pAutoConnectCheck->isChecked()); if(m_pEncodingEditor) - if(m_pEncodingEditor->currentIndex() <= 0)n->setEncoding(QString::null); + if(m_pEncodingEditor->currentIndex() <= 0)n->setEncoding(QString()); else { KviLocale::EncodingDescription * d = KviLocale::encodingDescription(m_pEncodingEditor->currentIndex() - 1); n->setEncoding(d->szName); } if(m_pTextEncodingEditor) - if(m_pTextEncodingEditor->currentIndex() <= 0)n->setTextEncoding(QString::null); + if(m_pTextEncodingEditor->currentIndex() <= 0)n->setTextEncoding(QString()); else { KviLocale::EncodingDescription * dd = KviLocale::encodingDescription(m_pTextEncodingEditor->currentIndex() - 1); n->setTextEncoding(dd->szName); diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index 96c1f7fd4..265a8da9c 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -36,7 +36,7 @@ KviTextIconTableItem::KviTextIconTableItem(QTableWidget * t,KviTextIcon * icon) -: QTableWidgetItem(QString::null,Qt::ItemIsEditable) +: QTableWidgetItem(QString(),Qt::ItemIsEditable) { if(icon) m_pIcon=icon; @@ -161,7 +161,7 @@ void KviTextIconsOptionsWidget::iconSelected(int id) void KviTextIconsOptionsWidget::chooseFromFile() { QString szFile; - KviFileDialog::askForOpenFileName(szFile,"Choose icon filename",QString::null,KVI_FILTER_IMAGE,"options"); + KviFileDialog::askForOpenFileName(szFile,"Choose icon filename",QString(),KVI_FILTER_IMAGE,"options"); if(!szFile.isEmpty()) { if(g_pIconManager->getPixmap(szFile)) diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index e3f79dd62..4e372998d 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -909,27 +909,27 @@ void KviSinglePopupEditor::populateMenu(KviKvsPopupMenu * pop,KviPopupTreeWidget case KviKvsPopupMenuItem::Item: if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::Item); else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::Item); - theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString::null); - theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString::null); - theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString::null); - theItem->setCode(item->kvsCode() ? item->kvsCode()->code() : QString::null); + theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString()); + theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString()); + theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString()); + theItem->setCode(item->kvsCode() ? item->kvsCode()->code() : QString()); theItem->setId(item->name()); break; case KviKvsPopupMenuItem::ExtMenu: if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::ExtMenu); else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::ExtMenu); - theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString::null); - theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString::null); - theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString::null); + theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString()); + theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString()); + theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString()); theItem->setCode(((KviKvsPopupMenuItemExtMenu *)item)->extName()); theItem->setId(item->name()); break; case KviKvsPopupMenuItem::Label: if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::Label); else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::Label); - theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString::null); - theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString::null); - theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString::null); + theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString()); + theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString()); + theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString()); theItem->setId(item->name()); break; case KviKvsPopupMenuItem::Separator: @@ -940,9 +940,9 @@ void KviSinglePopupEditor::populateMenu(KviKvsPopupMenu * pop,KviPopupTreeWidget case KviKvsPopupMenuItem::Menu: if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::Menu); else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::Menu); - theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString::null); - theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString::null); - theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString::null); + theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString()); + theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString()); + theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString()); theItem->setId(item->name()); populateMenu(((KviKvsPopupMenuItemMenu *)item)->menu(),theItem,0); break; diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index 581e53d05..c137204d1 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -393,7 +393,7 @@ void KviRegisteredUsersDialog::addGroupClicked() bool ok; QString text = QInputDialog::getText( this, "KVIrc", __tr("Group name:"), QLineEdit::Normal, - QString::null, &ok ); + QString(), &ok ); if ( ok && !text.isEmpty() ) { g_pLocalRegisteredUserDataBase->addGroup(text); fillList(); @@ -746,7 +746,7 @@ void KviRegisteredUsersDialog::exportClicked() QString avatar; if(u->getProperty("avatar",avatar)) { - KviAvatar * av = g_pIconManager->getAvatar(QString::null,avatar); + KviAvatar * av = g_pIconManager->getAvatar(QString(),avatar); if(av) { if(!av->pixmap()->isNull()) diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index cf8c464ef..e16e85dab 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -435,7 +435,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste m_pCustomColorCheck->setChecked(r->getBoolProperty("useCustomColor")); g->addWidget(m_pCustomColorCheck,5,0,1,2); - m_pCustomColorSelector = new KviColorSelector(p2,QString::null,m_pCustomColor,1); + m_pCustomColorSelector = new KviColorSelector(p2,QString(),m_pCustomColor,1); g->addWidget(m_pCustomColorSelector,5,2); QPushButton * pb = new QPushButton(__tr2qs("All Properties..."),p2); diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 9466f1bb5..cf817546c 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -745,7 +745,7 @@ void KviSetupWizard::chooseOldDataPath() "Do you want to use it anyway?") .arg( szBuffer ), __tr2qs("&Yes"), __tr2qs("&No"), - QString::null, 0, 1 ) == 0 + QString(), 0, 1 ) == 0 ) { m_pOldDataPathEdit->setText(szBuffer); } diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index e0db6290b..56f6c31bb 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -1890,7 +1890,7 @@ static bool str_kvs_fnc_split(KviKvsModuleFunctionCall * c) } } else { if(!bNoEmpty) - a->set(id,new KviKvsVariant(QString::null)); // empty string at the end + a->set(id,new KviKvsVariant(QString())); // empty string at the end } return true; diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index cb389dcb5..051017420 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -208,7 +208,7 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c) #else */ char * b = kvi_getenv(szVar.data()); - c->returnValue()->setString(b ? QString::fromLocal8Bit(b) : QString::null); + c->returnValue()->setString(b ? QString::fromLocal8Bit(b) : QString()); //#endif return true; } diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index 8d86e06fe..f59921031 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -318,7 +318,7 @@ void KviThemeManagementDialog::installFromFile() QString szFileName; QString szError; - if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs_ctx("Open Theme - KVIrc","theme"),QString::null,KVI_FILTER_THEME)) + if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs_ctx("Open Theme - KVIrc","theme"),QString(),KVI_FILTER_THEME)) return; if(!KviThemeFunctions::installThemePackage(szFileName,szError,this)) { diff --git a/src/modules/toolbareditor/toolbareditor.h b/src/modules/toolbareditor/toolbareditor.h index 06ad94397..e5c3be0e8 100644 --- a/src/modules/toolbareditor/toolbareditor.h +++ b/src/modules/toolbareditor/toolbareditor.h @@ -73,7 +73,7 @@ class KviCustomToolBarPropertiesDialog : public QDialog { Q_OBJECT public: - KviCustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId = QString::null,const QString &szLabel = QString::null,const QString &szIconId = QString::null); + KviCustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId = QString(),const QString &szLabel = QString(),const QString &szIconId = QString()); ~KviCustomToolBarPropertiesDialog(); protected: QString m_szId; diff --git a/src/modules/upnp/igdcontrolpoint.cpp b/src/modules/upnp/igdcontrolpoint.cpp index 529287d35..5ff50d228 100644 --- a/src/modules/upnp/igdcontrolpoint.cpp +++ b/src/modules/upnp/igdcontrolpoint.cpp @@ -87,7 +87,7 @@ QString IgdControlPoint::getExternalIpAddress() const { return m_pWanConnectionService->getExternalIpAddress(); } else { - return QString::null; + return QString(); } } diff --git a/src/modules/upnp/manager.cpp b/src/modules/upnp/manager.cpp index 64072c16c..2a81abfb0 100644 --- a/src/modules/upnp/manager.cpp +++ b/src/modules/upnp/manager.cpp @@ -114,7 +114,7 @@ Manager * Manager::instance() QString Manager::getExternalIpAddress() const { // Do not expose activeIgd_; - return (m_pActiveIgdControlPoint != 0 ? m_pActiveIgdControlPoint->getExternalIpAddress() : QString::null); + return (m_pActiveIgdControlPoint != 0 ? m_pActiveIgdControlPoint->getExternalIpAddress() : QString()); } diff --git a/src/modules/upnp/rootservice.cpp b/src/modules/upnp/rootservice.cpp index 87c684015..def377458 100644 --- a/src/modules/upnp/rootservice.cpp +++ b/src/modules/upnp/rootservice.cpp @@ -214,7 +214,7 @@ ServiceParameters RootService::getServiceById(const QString &serviceId) const } //calling function check this field to understand if the struct is null - params.controlUrl = QString::null; + params.controlUrl = QString(); return params; } @@ -254,7 +254,7 @@ ServiceParameters RootService::getServiceByType(const QString &serviceType) cons } //calling function check this field to understand if the struct is null - params.controlUrl = QString::null; + params.controlUrl = QString(); return params; } diff --git a/src/modules/upnp/xmlfunctions.cpp b/src/modules/upnp/xmlfunctions.cpp index b23c8235c..5d8f168cc 100644 --- a/src/modules/upnp/xmlfunctions.cpp +++ b/src/modules/upnp/xmlfunctions.cpp @@ -107,7 +107,7 @@ QString XmlFunctions::getNodeValue( const QDomNode &rootNode, const QString &pat if( rootNode.isNull() ) { qWarning() << "XmlFunctions::getNodeValue: Attempted to request '" << path << "' on null root node." << endl; - return QString::null; + return QString(); } diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index 88f54dfc3..a06da7170 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -480,7 +480,7 @@ void BanFrame::enableClicked() void BanFrame::addBan() { bool ok = false; - QString *pText = new QString(QInputDialog::getText(this, __tr2qs("URL Ban List"),__tr2qs("Add"),QLineEdit::Normal,QString::null,&ok)); + QString *pText = new QString(QInputDialog::getText(this, __tr2qs("URL Ban List"),__tr2qs("Add"),QLineEdit::Normal,QString(),&ok)); if (ok && !pText->isEmpty()) { g_pBanList->append(pText); m_pBanList->addItem(*pText); |