From 0ea54195f4400f13a5cc109feee4b3779fbd2f0f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:05:57 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kmilo/asus/CMakeLists.txt | 2 +- kmilo/asus/asus.cpp | 2 +- kmilo/delli8k/CMakeLists.txt | 2 +- kmilo/demo/CMakeLists.txt | 2 +- kmilo/generic/CMakeLists.txt | 2 +- kmilo/generic/generic_monitor.cpp | 2 +- kmilo/generic/generic_monitor.h | 2 +- kmilo/kmilo_kvaio/CMakeLists.txt | 2 +- kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop | 2 +- kmilo/kmilo_kvaio/kcmkvaio/main.cpp | 2 +- kmilo/kmilo_kvaio/kvaio.cpp | 2 +- kmilo/kmilod/CMakeLists.txt | 2 +- kmilo/kmilod/defaultskin.cpp | 2 +- kmilo/kmilod/kmilod.cpp | 2 +- kmilo/powerbook/CMakeLists.txt | 2 +- kmilo/powerbook2/CMakeLists.txt | 2 +- kmilo/thinkpad/CMakeLists.txt | 2 +- kmilo/thinkpad/kcmthinkpad/CMakeLists.txt | 2 +- kmilo/thinkpad/kcmthinkpad/main.cpp | 2 +- kmilo/thinkpad/kcmthinkpad/thinkpad.desktop | 2 +- kmilo/thinkpad/thinkpad.cpp | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) (limited to 'kmilo') diff --git a/kmilo/asus/CMakeLists.txt b/kmilo/asus/CMakeLists.txt index 377e9e5..3674de6 100644 --- a/kmilo/asus/CMakeLists.txt +++ b/kmilo/asus/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( kmilo_asus AUTOMOC SOURCES asus.cpp - LINK kio-shared kmilo-shared + LINK tdeio-shared kmilo-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/asus/asus.cpp b/kmilo/asus/asus.cpp index 1af8780..e70f3a6 100644 --- a/kmilo/asus/asus.cpp +++ b/kmilo/asus/asus.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include diff --git a/kmilo/delli8k/CMakeLists.txt b/kmilo/delli8k/CMakeLists.txt index 9d0ef93..18e83a2 100644 --- a/kmilo/delli8k/CMakeLists.txt +++ b/kmilo/delli8k/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( kmilo_delli8k AUTOMOC SOURCES delli8k.cpp - LINK kio-shared kmilo-shared + LINK tdeio-shared kmilo-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/demo/CMakeLists.txt b/kmilo/demo/CMakeLists.txt index fb2098f..270bbca 100644 --- a/kmilo/demo/CMakeLists.txt +++ b/kmilo/demo/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( tde_add_kpart( kmilo_demo AUTOMOC SOURCES demo.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/generic/CMakeLists.txt b/kmilo/generic/CMakeLists.txt index d89ab88..53e8783 100644 --- a/kmilo/generic/CMakeLists.txt +++ b/kmilo/generic/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( kmilo_generic AUTOMOC SOURCES generic_monitor.cpp - LINK kio-shared kmilo-shared + LINK tdeio-shared kmilo-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp index bbc5f84..b44ab7e 100644 --- a/kmilo/generic/generic_monitor.cpp +++ b/kmilo/generic/generic_monitor.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h index 18fd4eb..8649e03 100644 --- a/kmilo/generic/generic_monitor.h +++ b/kmilo/generic/generic_monitor.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "kmilod.h" #include "monitor.h" diff --git a/kmilo/kmilo_kvaio/CMakeLists.txt b/kmilo/kmilo_kvaio/CMakeLists.txt index 137bc6a..5fa718e 100644 --- a/kmilo/kmilo_kvaio/CMakeLists.txt +++ b/kmilo/kmilo_kvaio/CMakeLists.txt @@ -37,7 +37,7 @@ tde_add_library( kvaiodriverinterface STATIC_PIC AUTOMOC tde_add_kpart( kmilo_kvaio AUTOMOC SOURCES kmilo_kvaio.cpp kvaio.cpp - LINK kio-shared kmilo-shared + LINK tdeio-shared kmilo-shared kvaiodriverinterface-static DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop b/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop index 8c51255..750c780 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop +++ b/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=kcmshell kvaio +Exec=tdecmshell kvaio Icon=laptop DocPath=kcontrol/kvaio/index.html diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index ce01438..45af318 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index e8011e7..1129586 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -26,7 +26,7 @@ * Fn+F12 (suspend to disk) */ -#include +#include #include "kvaio.h" #include "kmilointerface.h" diff --git a/kmilo/kmilod/CMakeLists.txt b/kmilo/kmilod/CMakeLists.txt index f3913ab..078e911 100644 --- a/kmilo/kmilod/CMakeLists.txt +++ b/kmilo/kmilod/CMakeLists.txt @@ -37,7 +37,7 @@ tde_add_library( kmilo SHARED tde_add_kpart( kded_kmilod AUTOMOC SOURCES kmilod.cpp kmilod.skel defaultskin.cpp defaultwidget.ui kmilointerface.cpp - LINK kio-shared kmilo-shared tdeinit_kded-shared + LINK tdeio-shared kmilo-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp index b9595e2..a89617b 100644 --- a/kmilo/kmilod/defaultskin.cpp +++ b/kmilo/kmilod/defaultskin.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include "defaultskin.h" diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp index fa2f4a8..cfa121d 100644 --- a/kmilo/kmilod/kmilod.cpp +++ b/kmilo/kmilod/kmilod.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include "kmilointerface.h" diff --git a/kmilo/powerbook/CMakeLists.txt b/kmilo/powerbook/CMakeLists.txt index bb98b70..9a0e7de 100644 --- a/kmilo/powerbook/CMakeLists.txt +++ b/kmilo/powerbook/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( kmilo_powerbook AUTOMOC SOURCES pb_monitor.cpp - LINK kio-shared kmilo-shared ${PBB_LIBRARY} + LINK tdeio-shared kmilo-shared ${PBB_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/powerbook2/CMakeLists.txt b/kmilo/powerbook2/CMakeLists.txt index bb98b70..9a0e7de 100644 --- a/kmilo/powerbook2/CMakeLists.txt +++ b/kmilo/powerbook2/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( kmilo_powerbook AUTOMOC SOURCES pb_monitor.cpp - LINK kio-shared kmilo-shared ${PBB_LIBRARY} + LINK tdeio-shared kmilo-shared ${PBB_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/thinkpad/CMakeLists.txt b/kmilo/thinkpad/CMakeLists.txt index 7907fd8..1bee777 100644 --- a/kmilo/thinkpad/CMakeLists.txt +++ b/kmilo/thinkpad/CMakeLists.txt @@ -30,7 +30,7 @@ link_directories( tde_add_kpart( kmilo_thinkpad AUTOMOC SOURCES thinkpad.cpp - LINK kio-shared kmilo-shared + LINK tdeio-shared kmilo-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt b/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt index 0a79639..11f1409 100644 --- a/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt +++ b/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt @@ -29,7 +29,7 @@ add_definitions( tde_add_kpart( kcm_thinkpad AUTOMOC SOURCES kcmthinkpad_general.ui main.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index bb61c87..5b8d8d3 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop b/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop index 4b0b0d4..6b76314 100644 --- a/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop +++ b/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=kcmshell thinkpad +Exec=tdecmshell thinkpad Icon=laptop DocPath=kcontrol/thinkpad/index.html diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp index 2a57daa..16e22a9 100644 --- a/kmilo/thinkpad/thinkpad.cpp +++ b/kmilo/thinkpad/thinkpad.cpp @@ -30,7 +30,7 @@ */ #include -#include +#include #include #include #include "kmilointerface.h" -- cgit v1.2.3