diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:45 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:45 -0600 |
| commit | 6c1373684f10d07347aba3a5b790e8a9599a6276 (patch) | |
| tree | 09d7ad85e550d6b2042a9459752e70bd3625ef16 /kworldwatch | |
| parent | 7db2fb5945b2e7dc5c4c429101f49d886825a3a1 (diff) | |
| download | tdetoys-6c1373684f10d07347aba3a5b790e8a9599a6276.tar.gz tdetoys-6c1373684f10d07347aba3a5b790e8a9599a6276.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kworldwatch')
| -rw-r--r-- | kworldwatch/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kworldwatch/flags.h | 2 | ||||
| -rw-r--r-- | kworldwatch/main.cpp | 2 | ||||
| -rw-r--r-- | kworldwatch/mapwidget.cpp | 2 | ||||
| -rw-r--r-- | kworldwatch/mapwidget.h | 2 | ||||
| -rw-r--r-- | kworldwatch/zoneclock.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/kworldwatch/CMakeLists.txt b/kworldwatch/CMakeLists.txt index f8d4700..72bc706 100644 --- a/kworldwatch/CMakeLists.txt +++ b/kworldwatch/CMakeLists.txt @@ -38,7 +38,7 @@ tde_add_library( ww STATIC_PIC AUTOMOC tde_add_executable( kworldclock AUTOMOC SOURCES main.cpp - LINK kio-shared ww-static + LINK tdeio-shared ww-static DESTINATION ${BIN_INSTALL_DIR} ) @@ -47,7 +47,7 @@ tde_add_executable( kworldclock AUTOMOC tde_add_kpart( ww_panelapplet AUTOMOC SOURCES applet.cpp - LINK kio-shared ww-static + LINK tdeio-shared ww-static DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kworldwatch/flags.h b/kworldwatch/flags.h index 4bd2012..ed5c8ac 100644 --- a/kworldwatch/flags.h +++ b/kworldwatch/flags.h @@ -38,7 +38,7 @@ #include <tqbitmap.h> -#include <kconfig.h> +#include <tdeconfig.h> class Flag diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp index 2381d9f..8beb6a1 100644 --- a/kworldwatch/main.cpp +++ b/kworldwatch/main.cpp @@ -36,7 +36,7 @@ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaboutdata.h> #include <kcmdlineargs.h> #include <klocale.h> diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp index ffa9a8e..de50bdc 100644 --- a/kworldwatch/mapwidget.cpp +++ b/kworldwatch/mapwidget.cpp @@ -38,7 +38,7 @@ #include <kapplication.h> #include <kcmdlineargs.h> #include <kcolordialog.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kglobalsettings.h> #include <klocale.h> diff --git a/kworldwatch/mapwidget.h b/kworldwatch/mapwidget.h index 52d0016..21126cb 100644 --- a/kworldwatch/mapwidget.h +++ b/kworldwatch/mapwidget.h @@ -43,7 +43,7 @@ class TQPopupMenu; -#include <kconfig.h> +#include <tdeconfig.h> class CityList; diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp index 7fec82d..541e8b4 100644 --- a/kworldwatch/zoneclock.cpp +++ b/kworldwatch/zoneclock.cpp @@ -45,7 +45,7 @@ #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "flow.h" |