summaryrefslogtreecommitdiffstats
path: root/kget/kget_plug_in
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:46 -0600
commit48087e1d5650499b6093a6816356d467c8461802 (patch)
tree00c39f978492596620df1374e8a91af507d8bac3 /kget/kget_plug_in
parentccfaeb9b831a41e93e777b041cdf33a7d40a0e0b (diff)
downloadtdenetwork-48087e1d5650499b6093a6816356d467c8461802.tar.gz
tdenetwork-48087e1d5650499b6093a6816356d467c8461802.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kget/kget_plug_in')
-rw-r--r--kget/kget_plug_in/CMakeLists.txt8
-rw-r--r--kget/kget_plug_in/Makefile.am12
-rw-r--r--kget/kget_plug_in/cr22-action-tdehtml_kget.png (renamed from kget/kget_plug_in/cr22-action-khtml_kget.png)bin978 -> 978 bytes
-rw-r--r--kget/kget_plug_in/kget_plug_in.cpp6
-rw-r--r--kget/kget_plug_in/kget_plug_in.desktop4
-rw-r--r--kget/kget_plug_in/kget_plug_in.h2
-rw-r--r--kget/kget_plug_in/kget_plug_in.rc2
7 files changed, 17 insertions, 17 deletions
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-tdehtml_kget.png
index 6b0f14f3..6b0f14f3 100644
--- a/kget/kget_plug_in/cr22-action-khtml_kget.png
+++ b/kget/kget_plug_in/cr22-action-tdehtml_kget.png
Binary files 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 <dcopref.h>
#include <kdatastream.h>
#include <kdebug.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
#include <kiconloader.h>
#include <kglobal.h>
#include <kaction.h>
@@ -37,7 +37,7 @@
#include <dom/html_misc.h>
#include <dom/dom_element.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
#include <set>
@@ -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 <kparts/plugin.h>
+#include <tdeparts/plugin.h>
#include <klibloader.h>
#include <dcopclient.h>
#include <kurl.h>
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 @@
<!DOCTYPE kpartgui>
-<kpartgui library="khtml_kget" name="khtml_kget" version="3" >
+<kpartgui library="tdehtml_kget" name="tdehtml_kget" version="3" >
<MenuBar>
<Menu name="tools"><Text>&amp;Tools</Text>
<Action name="kget_menu"/>