aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/term/libkviterm.cpp
diff options
context:
space:
mode:
authorGravatar ctrlaltca2023-07-08 01:38:33 +0200
committerGravatar GitHub2023-07-08 01:38:33 +0200
commit28292170d8c02743cabfabba3a1623b8d71b9aa2 (patch)
tree03c7269f527a40a5b86863db7c111f2552afe46c /src/modules/term/libkviterm.cpp
parentMerge branch 'bugfix/script-editor-out-of-range-exception' (diff)
downloadKVIrc-28292170d8c02743cabfabba3a1623b8d71b9aa2.tar.gz
KVIrc-28292170d8c02743cabfabba3a1623b8d71b9aa2.tar.bz2
KVIrc-28292170d8c02743cabfabba3a1623b8d71b9aa2.zip
Port to (and require) Qt 5.15. Drop KDE4 support, fix KDE5 (#2541)
* Port to (and require) Qt 5.15. Drop KDE4 support, implement KDE5 support where needed. --------- Co-authored-by: Fabio Bas <fabio.bas@officineinformatiche.net>
Diffstat (limited to 'src/modules/term/libkviterm.cpp')
-rw-r--r--src/modules/term/libkviterm.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index 4c56d5f1d..b4bc32b8a 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -29,7 +29,7 @@
#include <QSplitter>
-#ifdef COMPILE_KDE4_SUPPORT
+#ifdef COMPILE_KDE_SUPPORT
#include "TermWidget.h"
#include "TermWindow.h"
@@ -66,7 +66,7 @@ KviModule * g_pTermModule = nullptr;
static bool term_kvs_cmd_open(KviKvsModuleCommandCall * c)
{
-#ifdef COMPILE_KDE4_SUPPORT
+#ifdef COMPILE_KDE_SUPPORT
c->module()->lock(); // multiple locks are allowed
if(
c->hasSwitch('m', "mdi") || // compat only
@@ -81,7 +81,7 @@ static bool term_kvs_cmd_open(KviKvsModuleCommandCall * c)
w->show();
}
#else
- c->warning("Terminal emulation service not supported (non-KDE4 compilation)");
+ c->warning("Terminal emulation service not supported (non-KDE compilation)");
#endif
return true;
}
@@ -96,9 +96,9 @@ static bool term_module_init(KviModule * m)
static bool term_module_cleanup(KviModule *)
{
-#ifdef COMPILE_KDE4_SUPPORT
+#ifdef COMPILE_KDE_SUPPORT
while(!g_pTermWidgetList.empty())
- delete *g_pSocketSpyWindowList.begin();
+ delete *g_pTermWidgetList.begin();
while(!g_pTermWindowList.empty())
(*g_pTermWindowList.begin())->close();