diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-09-06 02:05:48 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-09-06 02:05:48 +0200 |
| commit | b655e20e220d306930f7616df7ad37e681139531 (patch) | |
| tree | 823254b954686202424de0765cc45836898e3a57 | |
| parent | 1a36f79cf4aedaad3ce55e1ed79bde71d19141b3 (diff) | |
| download | tdedocker-b655e20e220d306930f7616df7ad37e681139531.tar.gz tdedocker-b655e20e220d306930f7616df7ad37e681139531.zip | |
Initial TDE conversion
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/customtraylabel.cpp | 6 | ||||
| -rw-r--r-- | src/kdocker.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/qtraylabel.cpp | 4 | ||||
| -rw-r--r-- | src/traylabelmgr.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0096124..4cf714f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -36,7 +36,7 @@ tde_add_executable( kdocker AUTOMOC traylabelmgr.cpp util.cpp LINK - kdecore-shared kdeui-shared DCOP-shared + tdecore-shared tdeui-shared DCOP-shared ${XMU_LIBRARIES} ${XPM_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} diff --git a/src/customtraylabel.cpp b/src/customtraylabel.cpp index abf02c1..83b89ea 100644 --- a/src/customtraylabel.cpp +++ b/src/customtraylabel.cpp @@ -30,8 +30,8 @@ #include <stdlib.h> #include <kiconloader.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "trace.h" #include "customtraylabel.h" @@ -56,7 +56,7 @@ CustomTrayLabel::CustomTrayLabel(const TQStringList& argv, pid_t pid, */ void CustomTrayLabel::installMenu() { - TQPixmap kdocker_png(KGlobal::iconLoader()->loadIcon("kdocker", KIcon::NoGroup, KIcon::SizeSmall)); + TQPixmap kdocker_png(TDEGlobal::iconLoader()->loadIcon("kdocker", TDEIcon::NoGroup, TDEIcon::SizeSmall)); setIcon(kdocker_png); TrayLabelMgr *tlMgr = TrayLabelMgr::instance(); diff --git a/src/kdocker.cpp b/src/kdocker.cpp index deb6143..2df7eb6 100644 --- a/src/kdocker.cpp +++ b/src/kdocker.cpp @@ -27,7 +27,7 @@ #include <tqtimer.h> #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> #include "trace.h" #include "traylabelmgr.h" diff --git a/src/main.cpp b/src/main.cpp index 0fbc859..4dd0b6f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,7 +24,7 @@ #include <unistd.h> #include <signal.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdir.h> #include "kdocker.h" diff --git a/src/qtraylabel.cpp b/src/qtraylabel.cpp index 0d790c9..38a8381 100644 --- a/src/qtraylabel.cpp +++ b/src/qtraylabel.cpp @@ -33,7 +33,7 @@ #include "qtraylabel.h" #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <X11/cursorfont.h> #include <X11/xpm.h> @@ -621,7 +621,7 @@ void TQTrayLabel::handleIconChange(void) TQImage image; if (!window_icon) { - image = KGlobal::iconLoader()->loadIcon("question", KIcon::NoGroup, KIcon::SizeMedium); + image = TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::NoGroup, TDEIcon::SizeMedium); } else image = TQPixmap((const char **) window_icon).convertToImage(); if (window_icon) XpmFree(window_icon); diff --git a/src/traylabelmgr.cpp b/src/traylabelmgr.cpp index 61dfd7e..c24034d 100644 --- a/src/traylabelmgr.cpp +++ b/src/traylabelmgr.cpp @@ -29,7 +29,7 @@ #include <tqtextstream.h> #include <tqfiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "trace.h" #include "traylabelmgr.h" |