From 6c1373684f10d07347aba3a5b790e8a9599a6276 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:05:45 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- amor/CMakeLists.txt | 2 +- amor/amoranim.h | 2 +- amor/amorconfig.cpp | 2 +- kmoon/kmoonapplet.cpp | 2 +- kmoon/kmoonwidget.cpp | 2 +- kodo/CMakeLists.txt | 2 +- kodo/kodometer.h | 2 +- kteatime/CMakeLists.txt | 2 +- kteatime/toplevel.cpp | 2 +- ktux/CMakeLists.txt | 2 +- ktux/spriteanim.h | 2 +- ktux/spritepm.h | 2 +- kweather/CMakeLists.txt | 4 ++-- kweather/kcmweather.cpp | 2 +- kweather/kweather.cpp | 2 +- kweather/reportview.cpp | 2 +- kweather/serviceconfigwidget.cpp | 2 +- kweather/weatherbar.cpp | 2 +- kweather/weatherlib.cpp | 2 +- kweather/weatherservice.cpp | 2 +- kworldwatch/CMakeLists.txt | 4 ++-- kworldwatch/flags.h | 2 +- kworldwatch/main.cpp | 2 +- kworldwatch/mapwidget.cpp | 2 +- kworldwatch/mapwidget.h | 2 +- kworldwatch/zoneclock.cpp | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/amor/CMakeLists.txt b/amor/CMakeLists.txt index e18fe3f..ad96cdc 100644 --- a/amor/CMakeLists.txt +++ b/amor/CMakeLists.txt @@ -31,7 +31,7 @@ tde_add_executable( amor AUTOMOC main.cpp amoranim.cpp amorpm.cpp amorbubble.cpp amorconfig.cpp amortips.cpp AmorIface.skel - LINK kio-shared Xext + LINK tdeio-shared Xext DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/amor/amoranim.h b/amor/amoranim.h index bb59d8a..45a8b7f 100644 --- a/amor/amoranim.h +++ b/amor/amoranim.h @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include //--------------------------------------------------------------------------- diff --git a/amor/amorconfig.cpp b/amor/amorconfig.cpp index 2285bc7..8e7f590 100644 --- a/amor/amorconfig.cpp +++ b/amor/amorconfig.cpp @@ -26,7 +26,7 @@ */ #include #include "amorconfig.h" -#include +#include //--------------------------------------------------------------------------- // diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp index 709f3c2..03da384 100644 --- a/kmoon/kmoonapplet.cpp +++ b/kmoon/kmoonapplet.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include "version.h" diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp index 91fb2b6..1d25c96 100644 --- a/kmoon/kmoonwidget.cpp +++ b/kmoon/kmoonwidget.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include "kmoondlg.h" #include "kmoonwidget.h" diff --git a/kodo/CMakeLists.txt b/kodo/CMakeLists.txt index 4caaf27..e2d329c 100644 --- a/kodo/CMakeLists.txt +++ b/kodo/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( tde_add_executable( kodo AUTOMOC SOURCES main.cpp kodometer.cpp kimagenumber.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kodo/kodometer.h b/kodo/kodometer.h index e127566..74bdf4e 100644 --- a/kodo/kodometer.h +++ b/kodo/kodometer.h @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kteatime/CMakeLists.txt b/kteatime/CMakeLists.txt index 6f5f353..a512391 100644 --- a/kteatime/CMakeLists.txt +++ b/kteatime/CMakeLists.txt @@ -27,7 +27,7 @@ link_directories( tde_add_executable( kteatime AUTOMOC SOURCES main.cpp toplevel.cpp tealist.cpp timeedit.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp index 33b0b78..0619994 100644 --- a/kteatime/toplevel.cpp +++ b/kteatime/toplevel.cpp @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include #include diff --git a/ktux/CMakeLists.txt b/ktux/CMakeLists.txt index cd18957..b52242d 100644 --- a/ktux/CMakeLists.txt +++ b/ktux/CMakeLists.txt @@ -29,7 +29,7 @@ link_directories( tde_add_executable( ktux AUTOMOC SOURCES spriteanim.cpp spritemisc.cpp spritepm.cpp sprite.cpp - LINK kio-shared tdescreensaver-shared + LINK tdeio-shared tdescreensaver-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ktux/spriteanim.h b/ktux/spriteanim.h index 8749a2a..583690a 100644 --- a/ktux/spriteanim.h +++ b/ktux/spriteanim.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include //--------------------------------------------------------------------------- diff --git a/ktux/spritepm.h b/ktux/spritepm.h index 97d27e8..351e313 100644 --- a/ktux/spritepm.h +++ b/ktux/spritepm.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include //--------------------------------------------------------------------------- diff --git a/kweather/CMakeLists.txt b/kweather/CMakeLists.txt index 4c93de2..bddf208 100644 --- a/kweather/CMakeLists.txt +++ b/kweather/CMakeLists.txt @@ -40,7 +40,7 @@ tde_add_executable( kweatherservice AUTOMOC weatherlib.cpp weatherservice.cpp weatherservice.skel stationdatabase.cpp sun.cpp weatherservice.stub - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -94,7 +94,7 @@ tde_add_kpart( weather_panelapplet AUTOMOC tde_add_kpart( kcm_weather AUTOMOC SOURCES kcmweather.cpp prefdialogdata.ui weatherservice.stub - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kweather/kcmweather.cpp b/kweather/kcmweather.cpp index 650dae8..2d15ca8 100644 --- a/kweather/kcmweather.cpp +++ b/kweather/kcmweather.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp index 584f6b3..18ab953 100644 --- a/kweather/kweather.cpp +++ b/kweather/kweather.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp index 4825489..29a3d5b 100644 --- a/kweather/reportview.cpp +++ b/kweather/reportview.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include +#include #include #include #include diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp index 537354c..a4fb2f7 100644 --- a/kweather/serviceconfigwidget.cpp +++ b/kweather/serviceconfigwidget.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp index e7f074e..5111748 100644 --- a/kweather/weatherbar.cpp +++ b/kweather/weatherbar.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp index a595cae..c0313ad 100644 --- a/kweather/weatherlib.cpp +++ b/kweather/weatherlib.cpp @@ -27,7 +27,7 @@ email : geiseri@msoe.edu #include #include #include -#include +#include #include #include #include diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp index 2c018b9..7fa3b0c 100644 --- a/kweather/weatherservice.cpp +++ b/kweather/weatherservice.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include 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 -#include +#include 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 -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 +#include 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 #include -#include +#include #include "flow.h" -- cgit v1.2.1