Rename a number of libraries and executables to avoid conflicts with KDE4

18 files changed, 22 insertions, 22 deletions

diff --git a/xparts/doc/kparts.fig b/xparts/doc/tdeparts.fig
index afed114f..afed114f 100644
--- a/xparts/doc/kparts.fig
+++ b/xparts/doc/tdeparts.fig
diff --git a/xparts/doc/kparts.png b/xparts/doc/tdeparts.png
index b2d534b3..b2d534b3 100644
--- a/xparts/doc/kparts.png
+++ b/xparts/doc/tdeparts.png
diff --git a/xparts/doc/xparts.html b/xparts/doc/xparts.html
index ad51c5a1..627c85f7 100644
--- a/xparts/doc/xparts.html
+++ b/xparts/doc/xparts.html
@@ -26,7 +26,7 @@
     <p>In order to understand, what is extending about XParts, first a
     brief overview on how KParts work.
 
-      <img src="kparts.png">
+      <img src="tdeparts.png">
 
     <p>Imagine an application - for example the integrated file manager
       "Konqueror" -  wants to utilize a component that handles the
diff --git a/xparts/mozilla/Makefile.am b/xparts/mozilla/Makefile.am
index ad5ed675..743ce97e 100644
--- a/xparts/mozilla/Makefile.am
+++ b/xparts/mozilla/Makefile.am
@@ -18,7 +18,7 @@ kmozilla_LDADD = ../src/gtk/libgtkxparts.la $(GTK2_LIBS) $(GLIB2_LIBS)
 kmozilla_LDFLAGS = $(MOZILLA_LDFLAGS) $(GLIB2_LDFLAGS) $(GTK2_LIBS) -L/usr/lib/mozilla -Wl,--rpath=/usr/lib/mozilla -lxul -lxpcom -lmozjs $(all_libraries)
 
 #kshell_SOURCES = kshell.cpp
-#kshell_LDADD = $(top_builddir)/xkparts/kde/libkdexparts.la
+#kshell_LDADD = $(top_builddir)/xtdeparts/kde/libkdexparts.la
 #kshell_LDFLAGS = $(all_libraries)
 
 METASOURCES = AUTO
diff --git a/xparts/mozilla/kmozilla.rc b/xparts/mozilla/kmozilla.rc
index 9c80e6c3..e0441a85 100644
--- a/xparts/mozilla/kmozilla.rc
+++ b/xparts/mozilla/kmozilla.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="1">
+<kpartgui name="tdehtmlpart" version="1">
 <MenuBar>
  <Menu name="edit">
   <Action name="stop" />
diff --git a/xparts/mozilla/kmozillapart.cpp b/xparts/mozilla/kmozillapart.cpp
index f083d779..625de5ad 100644
--- a/xparts/mozilla/kmozillapart.cpp
+++ b/xparts/mozilla/kmozillapart.cpp
@@ -7,10 +7,10 @@
 #include <kaction.h>
 #include <kmainwindow.h>
 #include <kprocess.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 #include <kdebug.h>
 #include <kaboutdata.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 
 typedef KParts::GenericFactory<KMozillaPart> KMozillaPartFactory;
 K_EXPORT_COMPONENT_FACTORY( libkmozillapart, KMozillaPartFactory );
diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp
index 9e83f9a4..b6935b47 100644
--- a/xparts/mozilla/kshell.cpp
+++ b/xparts/mozilla/kshell.cpp
@@ -8,7 +8,7 @@
 #include <kaction.h>
 #include <kmainwindow.h>
 #include <kprocess.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 #include <kdebug.h>
 
 class ShellWindow : public KParts::MainWindow
@@ -62,7 +62,7 @@ private:
 
 int main( int argc, char **argv )
 {
-    TDEApplication app( argc, argv, "xkpartsshell" );
+    TDEApplication app( argc, argv, "xtdepartsshell" );
 
     app.dcopClient()->registerAs("kshell");
 
diff --git a/xparts/src/gtk/Makefile.am b/xparts/src/gtk/Makefile.am
index 60a7a194..839e43db 100644
--- a/xparts/src/gtk/Makefile.am
+++ b/xparts/src/gtk/Makefile.am
@@ -10,4 +10,4 @@ libgtkxparts_la_LIBADD = $(GTK2_LIBS) $(GLIB2_LIBS) $(top_builddir)/dcopc/libdco
 libgtkxparts_la_LDFLAGS = -L$(prefix)/lib $(all_libraries) -no-undefined
 
 gtkxpartsinclude_HEADERS = gtkpart.h gtkbrowserextension.h
-gtkxpartsincludedir = $(includedir)/xkparts
+gtkxpartsincludedir = $(includedir)/xtdeparts
diff --git a/xparts/src/interfaces/Makefile.am b/xparts/src/interfaces/Makefile.am
index 0d4b7f97..21b08ed6 100644
--- a/xparts/src/interfaces/Makefile.am
+++ b/xparts/src/interfaces/Makefile.am
@@ -1,3 +1,3 @@
 
-xkpartsinclude_HEADERS = xpart.h xparthost.h
-xkpartsincludedir = $(includedir)/xkparts
+xtdepartsinclude_HEADERS = xpart.h xparthost.h
+xtdepartsincludedir = $(includedir)/xtdeparts
diff --git a/xparts/src/interfaces/xpart.h b/xparts/src/interfaces/xpart.h
index 5c44cbbd..819e65d2 100644
--- a/xparts/src/interfaces/xpart.h
+++ b/xparts/src/interfaces/xpart.h
@@ -1,5 +1,5 @@
-#ifndef __xkparts_part_h__
-#define __xkparts_part_h__
+#ifndef __xtdeparts_part_h__
+#define __xtdeparts_part_h__
 
 #include <dcopobject.h>
 #include <dcopref.h>
diff --git a/xparts/src/interfaces/xparthost.h b/xparts/src/interfaces/xparthost.h
index 75c6f4e0..40958086 100644
--- a/xparts/src/interfaces/xparthost.h
+++ b/xparts/src/interfaces/xparthost.h
@@ -1,5 +1,5 @@
-#ifndef __xkparts_parthost_h__
-#define __xkparts_parthost_h__
+#ifndef __xtdeparts_parthost_h__
+#define __xtdeparts_parthost_h__
 
 #include <dcopobject.h>
 #include <dcopref.h>
diff --git a/xparts/src/interfaces/xpartmanager.h b/xparts/src/interfaces/xpartmanager.h
index 25a341f8..714b0984 100644
--- a/xparts/src/interfaces/xpartmanager.h
+++ b/xparts/src/interfaces/xpartmanager.h
@@ -1,5 +1,5 @@
-#ifndef __xkparts_partmanager_h__
-#define __xkparts_partmanager_h__
+#ifndef __xtdeparts_partmanager_h__
+#define __xtdeparts_partmanager_h__
 
 #include <dcopobject.h>
 #include <tqglobal.h>
diff --git a/xparts/src/kde/kbrowsersignals.h b/xparts/src/kde/kbrowsersignals.h
index 3bd29a7f..baee95aa 100644
--- a/xparts/src/kde/kbrowsersignals.h
+++ b/xparts/src/kde/kbrowsersignals.h
@@ -2,7 +2,7 @@
 #define __kbrowsersignals_h__
 
 #include <xbrowsersignals.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <dcopref.h>
 
 class XBrowserExtension_stub;
diff --git a/xparts/src/kde/xparthost_kpart.h b/xparts/src/kde/xparthost_kpart.h
index 527178d2..829f7ca7 100644
--- a/xparts/src/kde/xparthost_kpart.h
+++ b/xparts/src/kde/xparthost_kpart.h
@@ -3,7 +3,7 @@
 
 #include <xparthost.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class XPart_stub;
 class KBrowserSignals;
diff --git a/xparts/xpart_notepad/shell_xparthost.cpp b/xparts/xpart_notepad/shell_xparthost.cpp
index 8bb4ce65..8ea38f75 100644
--- a/xparts/xpart_notepad/shell_xparthost.cpp
+++ b/xparts/xpart_notepad/shell_xparthost.cpp
@@ -9,7 +9,7 @@
 #include <kaction.h>
 #include <kmainwindow.h>
 #include <kprocess.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 #include <kdebug.h>
 
 ShellWindow::ShellWindow()
diff --git a/xparts/xpart_notepad/shell_xparthost.h b/xparts/xpart_notepad/shell_xparthost.h
index 7a0bb1a8..590a6293 100644
--- a/xparts/xpart_notepad/shell_xparthost.h
+++ b/xparts/xpart_notepad/shell_xparthost.h
@@ -2,7 +2,7 @@
 #define shell_xparthost_h
 
 #include <kmainwindow.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 #include <kdebug.h>
 
 class TDEProcess;
diff --git a/xparts/xpart_notepad/xp_notepad_factory.cpp b/xparts/xpart_notepad/xp_notepad_factory.cpp
index 7d9b4d12..f815fd4d 100644
--- a/xparts/xpart_notepad/xp_notepad_factory.cpp
+++ b/xparts/xpart_notepad/xp_notepad_factory.cpp
@@ -25,7 +25,7 @@
 #include <kaction.h>
 #include <kmainwindow.h>
 #include <kprocess.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 #include <kdebug.h>
 #include "xp_notepad_factory.h"
 
diff --git a/xparts/xpart_notepad/xp_notepad_factory.h b/xparts/xpart_notepad/xp_notepad_factory.h
index cb3090c6..83c5274f 100644
--- a/xparts/xpart_notepad/xp_notepad_factory.h
+++ b/xparts/xpart_notepad/xp_notepad_factory.h
@@ -21,7 +21,7 @@
 #ifndef __xp_notepad_factory_h__
 #define __xp_notepad_factory_h__
 
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 #include <tqptrlist.h>
 #include <kurl.h>
 #include "xparthost_kpart.h"