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 | |
| 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')
| -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 | ||||
| -rw-r--r-- | kicker-applets/kolourpicker/kolourpicker.cpp | 2 | ||||
| -rw-r--r-- | kicker-applets/ktimemon/timemon.cc | 2 | ||||
| -rw-r--r-- | kicker-applets/math/mathapplet.cpp | 2 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/configfrontend.h | 2 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/mediacontrolconfig.cpp | 2 |
8 files changed, 11 insertions, 11 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 diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index 52f1f40..164e1ab 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -34,7 +34,7 @@ $Id$ #include <klocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaboutdata.h> #include <kaboutapplication.h> #include <kmessagebox.h> diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc index 3f32558..43c6fe8 100644 --- a/kicker-applets/ktimemon/timemon.cc +++ b/kicker-applets/ktimemon/timemon.cc @@ -17,7 +17,7 @@ #include <tqtimer.h> #include <tqtooltip.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> #include <khelpmenu.h> diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index 9efce39..7856142 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kapplication.h> #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <kurifilter.h> #include <kdialog.h> diff --git a/kicker-applets/mediacontrol/configfrontend.h b/kicker-applets/mediacontrol/configfrontend.h index 30d0166..bbae0bb 100644 --- a/kicker-applets/mediacontrol/configfrontend.h +++ b/kicker-applets/mediacontrol/configfrontend.h @@ -21,7 +21,7 @@ #ifndef CONFIGFRONTEND_H #define CONFIGFRONTEND_H -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> class ConfigFrontend : public TQObject diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index 14e92fa..76ab823 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -34,7 +34,7 @@ #include <kapplication.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kiconloader.h> #include <klistbox.h> |