diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:00:38 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:00:38 -0600 |
commit | 4bc3dcd8cbc23e1470e121e25a83d57c22e61b26 (patch) | |
tree | 7d379893635b06789888944241a976a4f2b440ab /kicker-applets/kbinaryclock | |
parent | 08a66075486dc740840cfb817bf0ca301c6f0385 (diff) | |
download | tdeaddons-4bc3dcd8cbc23e1470e121e25a83d57c22e61b26.tar.gz tdeaddons-4bc3dcd8cbc23e1470e121e25a83d57c22e61b26.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kicker-applets/kbinaryclock')
-rw-r--r-- | kicker-applets/kbinaryclock/kbinaryclock.cpp | 8 | ||||
-rw-r--r-- | kicker-applets/kbinaryclock/kbinaryclock.h | 2 | ||||
-rw-r--r-- | kicker-applets/kbinaryclock/prefs.kcfgc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index c19aff5..feddedb 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -20,8 +20,8 @@ #include "datepicker.h" #include <kapplication.h> -#include <kconfigdialog.h> -#include <kconfig.h> +#include <tdeconfigdialog.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <kglobalsettings.h> @@ -329,12 +329,12 @@ void KBinaryClock::openContextMenu() { proc << locate("exe", "tdesu"); proc << "--nonewdcop"; proc << TQString("%1 clock --lang %2") - .arg(locate("exe", "kcmshell")) + .arg(locate("exe", "tdecmshell")) .arg(TDEGlobal::locale()->language()); proc.start(TDEProcess::DontCare); break; case 104: - proc << locate("exe", "kcmshell"); + proc << locate("exe", "tdecmshell"); proc << "language"; proc.start(TDEProcess::DontCare); break; diff --git a/kicker-applets/kbinaryclock/kbinaryclock.h b/kicker-applets/kbinaryclock/kbinaryclock.h index e816056..73fd1b1 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.h +++ b/kicker-applets/kbinaryclock/kbinaryclock.h @@ -25,7 +25,7 @@ #include <kaboutdata.h> #include <tqdatetime.h> #include <tqtooltip.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include "settings.h" #include "prefs.h" diff --git a/kicker-applets/kbinaryclock/prefs.kcfgc b/kicker-applets/kbinaryclock/prefs.kcfgc index 7e91072..9a081dc 100644 --- a/kicker-applets/kbinaryclock/prefs.kcfgc +++ b/kicker-applets/kbinaryclock/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kbinaryclock.kcfg #IncludeFiles=defines.h ClassName=Prefs |