From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:02:02 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kicker/menuext/kate/katesessionmenu.cpp | 2 +- kicker/menuext/konq-profiles/CMakeLists.txt | 2 +- kicker/menuext/konq-profiles/konqy_menu.cpp | 2 +- kicker/menuext/konsole/CMakeLists.txt | 2 +- kicker/menuext/konsole/konsole_mnu.cpp | 2 +- kicker/menuext/konsole/konsolebookmarkhandler.cpp | 4 ++-- kicker/menuext/konsole/konsolebookmarkhandler.h | 2 +- kicker/menuext/recentdocs/CMakeLists.txt | 2 +- kicker/menuext/system/systemmenu.h | 2 +- kicker/menuext/tdeprint/print_mnu.cpp | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kicker/menuext') diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index 032a2ab05..e4de35081 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -22,7 +22,7 @@ #include "katesessionmenu.moc" #include -#include +#include #include #include #include diff --git a/kicker/menuext/konq-profiles/CMakeLists.txt b/kicker/menuext/konq-profiles/CMakeLists.txt index 9154412c8..2847be4fe 100644 --- a/kicker/menuext/konq-profiles/CMakeLists.txt +++ b/kicker/menuext/konq-profiles/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES konquerormenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menu tde_add_kpart( kickermenu_konqueror AUTOMOC SOURCES konqy_menu.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp index a3c076741..4ed8c32e1 100644 --- a/kicker/menuext/konq-profiles/konqy_menu.cpp +++ b/kicker/menuext/konq-profiles/konqy_menu.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include diff --git a/kicker/menuext/konsole/CMakeLists.txt b/kicker/menuext/konsole/CMakeLists.txt index e16884acf..9c2f7224f 100644 --- a/kicker/menuext/konsole/CMakeLists.txt +++ b/kicker/menuext/konsole/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES konsolemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuex tde_add_kpart( kickermenu_konsole AUTOMOC SOURCES konsole_mnu.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index dbaa1e434..d2fb755bb 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp index e515e41f5..e12d6ebc1 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp +++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp @@ -1,4 +1,4 @@ -// Born as tdelibs/kio/kfile/kfilebookmarkhandler.cpp +// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.cpp #include #include @@ -29,7 +29,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool ) // import old bookmarks if ( !KStandardDirs::exists( file ) ) { - TQString oldFile = locate( "data", "kfile/bookmarks.html" ); + TQString oldFile = locate( "data", "tdefile/bookmarks.html" ); if ( !oldFile.isEmpty() ) importOldBookmarks( oldFile, file ); } diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h index cc0b1886b..733e52442 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.h +++ b/kicker/menuext/konsole/konsolebookmarkhandler.h @@ -1,4 +1,4 @@ -// Born as tdelibs/kio/kfile/kfilebookmarkhandler.h +// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.h #ifndef KONSOLEBOOKMARKHANDLER_H #define KONSOLEBOOKMARKHANDLER_H diff --git a/kicker/menuext/recentdocs/CMakeLists.txt b/kicker/menuext/recentdocs/CMakeLists.txt index ebefed9c6..4b3053efe 100644 --- a/kicker/menuext/recentdocs/CMakeLists.txt +++ b/kicker/menuext/recentdocs/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES recentdocs.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext tde_add_kpart( kickermenu_recentdocs AUTOMOC SOURCES recentdocsmenu.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kicker/menuext/system/systemmenu.h b/kicker/menuext/system/systemmenu.h index f25280989..1efbc3c57 100644 --- a/kicker/menuext/system/systemmenu.h +++ b/kicker/menuext/system/systemmenu.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include class SystemMenu : public KPanelMenu { diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp index fb10e0f34..e611b039e 100644 --- a/kicker/menuext/tdeprint/print_mnu.cpp +++ b/kicker/menuext/tdeprint/print_mnu.cpp @@ -112,7 +112,7 @@ void PrintMenu::slotExec(int ID) kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig")); break; case PRINT_MANAGER_ID: - KRun::runCommand("kcmshell tde-printers.desktop"); + KRun::runCommand("tdecmshell tde-printers.desktop"); break; case PRINT_BROWSER_ID: KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror"); -- cgit v1.2.3