diff options
| author |  nmariusp | 2022-06-29 19:25:01 +0300 |
|---|---|---|
| committer |  GitHub | 2022-06-29 18:25:01 +0200 |
| commit | eb3fdd6b1d824f148fd6e582852dcba77fc9a271 (patch) | |
| tree | 2e720610cba97dab58d8ff9e1aa7fb60986a7c9b | |
| parent | Fix issue "CMake Warning (dev) at /home/n/kde/usr/share/ECM/modules/ECMFindMo... (diff) | |
| download | KVIrc-eb3fdd6b1d824f148fd6e582852dcba77fc9a271.tar.gz KVIrc-eb3fdd6b1d824f148fd6e582852dcba77fc9a271.tar.bz2 KVIrc-eb3fdd6b1d824f148fd6e582852dcba77fc9a271.zip | |
QString::null is deprecated (#2526)
| -rw-r--r-- | src/kvilib/irc/KviNickServRule.h | 4 | ||||
| -rw-r--r-- | src/kvilib/irc/KviNickServRuleSet.h | 2 | ||||
| -rw-r--r-- | src/modules/editor/ScriptEditorImplementation.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/kvilib/irc/KviNickServRule.h b/src/kvilib/irc/KviNickServRule.h index fccb97c16..911515d02 100644 --- a/src/kvilib/irc/KviNickServRule.h +++ b/src/kvilib/irc/KviNickServRule.h @@ -47,7 +47,7 @@ public: const QString & szNickServMask, const QString & szMessageRegexp, const QString & szIdentifyCommand, - const QString & szServerMask = QString::null) + const QString & szServerMask = QString()) : KviHeapObject(), m_szRegisteredNick(szRegisteredNick), m_szNickServMask(szNickServMask), @@ -72,7 +72,7 @@ public: const QString & szNickServMask, const QString & szMessageRegexp, const QString & szIdentifyCommand, - const QString & szServerMask = QString::null); + const QString & szServerMask = QString()); void save(KviConfigurationFile * cfg, const QString & prefix); // returns false if the loaded data has no sense diff --git a/src/kvilib/irc/KviNickServRuleSet.h b/src/kvilib/irc/KviNickServRuleSet.h index 9da65dba8..e40b1d040 100644 --- a/src/kvilib/irc/KviNickServRuleSet.h +++ b/src/kvilib/irc/KviNickServRuleSet.h @@ -53,7 +53,7 @@ public: void setEnabled(bool bEnabled) { m_bEnabled = bEnabled; }; bool isEmpty() { return m_pRules ? m_pRules->isEmpty() : true; }; void addRule(KviNickServRule * r); - KviNickServRule * matchRule(const QString & szNick, const KviIrcMask * nickServ, const QString & szMsg, const QString & szServer = QString::null); + KviNickServRule * matchRule(const QString & szNick, const KviIrcMask * nickServ, const QString & szMsg, const QString & szServer = QString()); void copyFrom(const KviNickServRuleSet & src); void load(const QString & szConfigFile); void save(const QString & szConfigFile); diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp index f21ef4fdb..92b66a378 100644 --- a/src/modules/editor/ScriptEditorImplementation.cpp +++ b/src/modules/editor/ScriptEditorImplementation.cpp @@ -864,8 +864,8 @@ void ScriptEditorImplementation::saveToFile() QString szFileName; if(KviFileDialog::askForSaveFileName(szFileName, __tr2qs_ctx("Choose a Filename - KVIrc", "editor"), - QString::null, - QString::null, false, true, true, this)) + QString(), + QString(), false, true, true, this)) { QString szBuffer = m_pEditor->toPlainText(); @@ -949,7 +949,7 @@ void ScriptEditorImplementation::loadFromFile() QString szFileName; if(KviFileDialog::askForOpenFileName(szFileName, __tr2qs_ctx("Select a File - KVIrc", "editor"), - QString::null, KVI_FILTER_SCRIPT, false, true, this)) + QString(), KVI_FILTER_SCRIPT, false, true, this)) { QString szBuffer; if(KviFileUtils::loadFile(szFileName, szBuffer)) |