From 48087e1d5650499b6093a6816356d467c8461802 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:46 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kget/kget_plug_in/CMakeLists.txt | 8 ++++---- kget/kget_plug_in/Makefile.am | 12 ++++++------ kget/kget_plug_in/cr22-action-khtml_kget.png | Bin 978 -> 0 bytes kget/kget_plug_in/cr22-action-tdehtml_kget.png | Bin 0 -> 978 bytes kget/kget_plug_in/kget_plug_in.cpp | 6 +++--- kget/kget_plug_in/kget_plug_in.desktop | 4 ++-- kget/kget_plug_in/kget_plug_in.h | 2 +- kget/kget_plug_in/kget_plug_in.rc | 2 +- kget/kmainwidget.cpp | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 kget/kget_plug_in/cr22-action-khtml_kget.png create mode 100644 kget/kget_plug_in/cr22-action-tdehtml_kget.png (limited to 'kget') diff --git a/kget/kget_plug_in/CMakeLists.txt b/kget/kget_plug_in/CMakeLists.txt index 72643aa9..bc5911d8 100644 --- a/kget/kget_plug_in/CMakeLists.txt +++ b/kget/kget_plug_in/CMakeLists.txt @@ -26,13 +26,13 @@ tde_install_icons( ) install( FILES kget_plug_in.rc kget_plug_in.desktop - DESTINATION ${DATA_INSTALL_DIR}/khtml/kpartplugins ) + DESTINATION ${DATA_INSTALL_DIR}/tdehtml/kpartplugins ) -##### khtml_kget (module) ####################### +##### tdehtml_kget (module) ####################### -tde_add_kpart( khtml_kget AUTOMOC +tde_add_kpart( tdehtml_kget AUTOMOC SOURCES kget_plug_in.cpp kget_linkview.cpp links.cpp - LINK khtml-shared + LINK tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kget/kget_plug_in/Makefile.am b/kget/kget_plug_in/Makefile.am index 00919095..d067473d 100644 --- a/kget/kget_plug_in/Makefile.am +++ b/kget/kget_plug_in/Makefile.am @@ -1,13 +1,13 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = khtml_kget.la +kde_module_LTLIBRARIES = tdehtml_kget.la -khtml_kget_la_METASOURCES = AUTO -khtml_kget_la_SOURCES = kget_plug_in.cpp kget_linkview.cpp links.cpp -khtml_kget_la_LIBADD = $(LIB_KHTML) -khtml_kget_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +tdehtml_kget_la_METASOURCES = AUTO +tdehtml_kget_la_SOURCES = kget_plug_in.cpp kget_linkview.cpp links.cpp +tdehtml_kget_la_LIBADD = $(LIB_KHTML) +tdehtml_kget_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) KDE_ICON = AUTO part_DATA = kget_plug_in.rc kget_plug_in.desktop -partdir = $(kde_datadir)/khtml/kpartplugins +partdir = $(kde_datadir)/tdehtml/kpartplugins diff --git a/kget/kget_plug_in/cr22-action-khtml_kget.png b/kget/kget_plug_in/cr22-action-khtml_kget.png deleted file mode 100644 index 6b0f14f3..00000000 Binary files a/kget/kget_plug_in/cr22-action-khtml_kget.png and /dev/null differ diff --git a/kget/kget_plug_in/cr22-action-tdehtml_kget.png b/kget/kget_plug_in/cr22-action-tdehtml_kget.png new file mode 100644 index 00000000..6b0f14f3 Binary files /dev/null and b/kget/kget_plug_in/cr22-action-tdehtml_kget.png differ diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp index 3631873d..edb90655 100644 --- a/kget/kget_plug_in/kget_plug_in.cpp +++ b/kget/kget_plug_in/kget_plug_in.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -37,7 +37,7 @@ #include #include -#include +#include #include @@ -176,7 +176,7 @@ KPluginFactory::~KPluginFactory() extern "C" { - KDE_EXPORT void* init_khtml_kget() + KDE_EXPORT void* init_tdehtml_kget() { TDEGlobal::locale()->insertCatalogue("kget"); return new KPluginFactory; diff --git a/kget/kget_plug_in/kget_plug_in.desktop b/kget/kget_plug_in/kget_plug_in.desktop index e4ff8d0c..1d5c86ef 100644 --- a/kget/kget_plug_in/kget_plug_in.desktop +++ b/kget/kget_plug_in/kget_plug_in.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -X-TDE-Library=khtml_kget +X-TDE-Library=tdehtml_kget X-TDE-PluginInfo-Author=Patrick Charbonnier, Carsten Pfeiffer X-TDE-PluginInfo-Email=pch@valleeurope.net, pfeiffer@kde.org X-TDE-PluginInfo-Name=kget @@ -73,5 +73,5 @@ Comment[uz@cyrillic]=Ёзиб олиш бошқарувчиси Comment[zh_CN]=下载管理器 Comment[zh_HK]=下載管理員 Comment[zh_TW]=下載管理員 -Icon=khtml_kget +Icon=tdehtml_kget diff --git a/kget/kget_plug_in/kget_plug_in.h b/kget/kget_plug_in/kget_plug_in.h index b0366d5c..25dd4c65 100644 --- a/kget/kget_plug_in/kget_plug_in.h +++ b/kget/kget_plug_in/kget_plug_in.h @@ -17,7 +17,7 @@ #ifndef __plugin_kget_plug_in_h #define __plugin_kget_plug_in_h -#include +#include #include #include #include diff --git a/kget/kget_plug_in/kget_plug_in.rc b/kget/kget_plug_in/kget_plug_in.rc index f40ee8b7..abd00c08 100644 --- a/kget/kget_plug_in/kget_plug_in.rc +++ b/kget/kget_plug_in/kget_plug_in.rc @@ -1,5 +1,5 @@ - + &Tools diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp index 69a4a85e..1865e6f9 100644 --- a/kget/kmainwidget.cpp +++ b/kget/kmainwidget.cpp @@ -1134,7 +1134,7 @@ void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile) else // destURL was given, check whether the file exists already { // simply delete it, the calling process should have asked if you - // really want to delete (at least khtml does) + // really want to delete (at least tdehtml does) if(TDEIO::NetAccess::exists(destURL, false, this)) SafeDelete::deleteFile( destURL ); } -- cgit v1.2.1