diff options
| author |  Alexey Sokolov | 2016-05-01 16:16:09 +0100 |
|---|---|---|
| committer | Alexey Sokolov | 2016-05-01 16:16:09 +0100 |
| commit | fe375f69972cd912739c0d68fa4951d35de90e5e (patch) | |
| tree | 71bd2c2b59d6be62d7c18588a417e5aa39ab233c /src/modules/window | |
| parent | libkvidcc: fix $dcc.currentSpeed documentation add missing @short and fix rig... (diff) | |
| parent | Apply clang-tidy: modernize-loop-convert (diff) | |
| download | KVIrc-fe375f69972cd912739c0d68fa4951d35de90e5e.tar.gz KVIrc-fe375f69972cd912739c0d68fa4951d35de90e5e.tar.bz2 KVIrc-fe375f69972cd912739c0d68fa4951d35de90e5e.zip | |
Merge pull request #1962 from DarthGandalf/modernize
Apply several fixes of clang-tidy
Diffstat (limited to 'src/modules/window')
| -rw-r--r-- | src/modules/window/UserWindow.cpp | 4 | ||||
| -rw-r--r-- | src/modules/window/libkviwindow.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/window/UserWindow.cpp b/src/modules/window/UserWindow.cpp index ccb607f44..742b846f4 100644 --- a/src/modules/window/UserWindow.cpp +++ b/src/modules/window/UserWindow.cpp @@ -43,9 +43,9 @@ UserWindow::UserWindow(const char * pcName, QString & szIcon, KviConsoleWindow * m_pIrcView = new KviIrcView(this, this); if(iCreationFlags & HasInput) - m_pInput = new KviInput(this, 0); + m_pInput = new KviInput(this, nullptr); else - m_pInput = 0; + m_pInput = nullptr; if(context()) context()->registerContextWindow(this); diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index 092c7ba34..005d0dcaf 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -52,7 +52,7 @@ extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager; // KviApplication.cpp extern KVIRC_API KviPointerHashTable<QString, KviWindow> * g_pGlobalWindowDict; -KviPointerList<UserWindow> * g_pUserWindowList = 0; +KviPointerList<UserWindow> * g_pUserWindowList = nullptr; // $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type // $window.input.text $window.input.cursorpos $window.input.textlen @@ -1039,7 +1039,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c) if(szFlags.contains('i')) iFlags |= UserWindow::HasInput; - KviConsoleWindow * pConsole = 0; + KviConsoleWindow * pConsole = nullptr; if(c->parameterList()->count() >= 3) { pConsole = g_pApp->findConsole(uCtx); @@ -1325,7 +1325,7 @@ static bool window_kvs_cmd_savePropertiesAsDefault(KviKvsModuleCommandCall * c) #ifdef COMPILE_CRYPT_SUPPORT static bool initializeCryptEngine(KviCryptEngine * eng, KviCString & szEncryptKey, KviCString & szDecryptKey, QString & szError) { - char * encKey = 0; + char * encKey = nullptr; int encKeyLen = 0; char * tmpKey; @@ -1342,7 +1342,7 @@ static bool initializeCryptEngine(KviCryptEngine * eng, KviCString & szEncryptKe return false; } - char * decKey = 0; + char * decKey = nullptr; int decKeyLen = 0; decKeyLen = szDecryptKey.hexToBuffer(&tmpKey, false); @@ -1437,7 +1437,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c) if(szEngine.isEmpty()) { - pWnd->setCryptSessionInfo(0); + pWnd->setCryptSessionInfo(nullptr); } else { |