Rename many classes to avoid conflicts with KDE

8 files changed, 16 insertions, 16 deletions

diff --git a/xparts/mozilla/Makefile.am b/xparts/mozilla/Makefile.am
index 743ce97e..58e8746f 100644
--- a/xparts/mozilla/Makefile.am
+++ b/xparts/mozilla/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(srcdir)/../src/kde -I$(srcdir)/../src/interfaces -I$(srcdir)/../src/gtk -I$(prefix)/include -I$(top_srcdir) $(MOZILLA_INCLUDES) $(all_includes)
+INCLUDES = -I$(srcdir)/../src/tde -I$(srcdir)/../src/interfaces -I$(srcdir)/../src/gtk -I$(prefix)/include -I$(top_srcdir) $(MOZILLA_INCLUDES) $(all_includes)
 
 AM_CFLAGS = $(GTK2_CFLAGS) $(GLIB2_CFLAGS)
 
@@ -6,7 +6,7 @@ lib_LTLIBRARIES = libkmozillapart.la
 
 libkmozillapart_la_SOURCES = kmozillapart.cpp
 libkmozillapart_la_LDFLAGS = -module $(all_libraries)
-libkmozillapart_la_LIBADD = ../src/kde/libkdexparts.la
+libkmozillapart_la_LIBADD = ../src/tde/libtdexparts.la
 
 servicedir = $(kde_servicesdir)
 service_DATA = kmozilla.desktop
@@ -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)/xtdeparts/kde/libkdexparts.la
+#kshell_LDADD = $(top_builddir)/xtdeparts/tde/libtdexparts.la
 #kshell_LDFLAGS = $(all_libraries)
 
 METASOURCES = AUTO
diff --git a/xparts/src/Makefile.am b/xparts/src/Makefile.am
index 243ba3b3..30982205 100644
--- a/xparts/src/Makefile.am
+++ b/xparts/src/Makefile.am
@@ -3,5 +3,5 @@ if include_GTK_support
 SUPPORTGTKDIR=gtk
 endif
 
-SUBDIRS = interfaces kde $(SUPPORTGTKDIR)
+SUBDIRS = interfaces tde $(SUPPORTGTKDIR)
 
diff --git a/xparts/src/kde/Makefile.am b/xparts/src/tde/Makefile.am
index 9b70542e..0a3d28ad 100644
--- a/xparts/src/kde/Makefile.am
+++ b/xparts/src/tde/Makefile.am
@@ -1,12 +1,12 @@
 
 INCLUDES = -I$(srcdir)/../interfaces $(all_includes)
 
-lib_LTLIBRARIES = libkdexparts.la
+lib_LTLIBRARIES = libtdexparts.la
 
-libkdexparts_la_SOURCES = xparthost_kpart.cpp xparthost.skel xpart.stub \
+libtdexparts_la_SOURCES = xparthost_kpart.cpp xparthost.skel xpart.stub \
 	kbrowsersignals.cpp xbrowsersignals.skel xbrowserextension.stub
-libkdexparts_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP
-libkdexparts_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0 
+libtdexparts_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP
+libtdexparts_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0
 
 xpart_DIR=$(srcdir)/../interfaces
 xparthost_DIR=$(srcdir)/../interfaces
diff --git a/xparts/src/kde/kbrowsersignals.cpp b/xparts/src/tde/kbrowsersignals.cpp
index 59a688e4..59a688e4 100644
--- a/xparts/src/kde/kbrowsersignals.cpp
+++ b/xparts/src/tde/kbrowsersignals.cpp
diff --git a/xparts/src/kde/kbrowsersignals.h b/xparts/src/tde/kbrowsersignals.h
index baee95aa..baee95aa 100644
--- a/xparts/src/kde/kbrowsersignals.h
+++ b/xparts/src/tde/kbrowsersignals.h
diff --git a/xparts/src/kde/xparthost_kpart.cpp b/xparts/src/tde/xparthost_kpart.cpp
index cfbe57d2..54bcb804 100644
--- a/xparts/src/kde/xparthost_kpart.cpp
+++ b/xparts/src/tde/xparthost_kpart.cpp
@@ -14,7 +14,7 @@
 
 #include <kdebug.h>
 
-XPartHost_KPart::XPartHost_KPart( TQWidget *parentWidget, const char *widgetName, 
+XPartHost_KPart::XPartHost_KPart( TQWidget *parentWidget, const char *widgetName,
 	                          TQObject *parent, const char *name )
     : KParts::ReadOnlyPart( parent, name ),
       XPartHost("parthost")
diff --git a/xparts/src/kde/xparthost_kpart.h b/xparts/src/tde/xparthost_kpart.h
index 829f7ca7..8cc54699 100644
--- a/xparts/src/kde/xparthost_kpart.h
+++ b/xparts/src/tde/xparthost_kpart.h
@@ -10,12 +10,12 @@ class KBrowserSignals;
 class QXEmbed;
 
 
-/** 
+/**
  * This class is the middle class between the host of the KPart (usually a
  * KParts::MainWindow) and the XPart. It transfer calls from the XPart to the
- * KPartHost host and from the KPartHost to the XPart. 
+ * KPartHost host and from the KPartHost to the XPart.
  *
- * Note : In the XPart white paper, this class is named KXPartHost 
+ * Note : In the XPart white paper, this class is named KXPartHost
  */
 class XPartHost_KPart : public KParts::ReadOnlyPart, public XPartHost
 {
diff --git a/xparts/xpart_notepad/Makefile.am b/xparts/xpart_notepad/Makefile.am
index cadb799e..4f6120ab 100644
--- a/xparts/xpart_notepad/Makefile.am
+++ b/xparts/xpart_notepad/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(srcdir)/../src/kde -I$(srcdir)/../src/interfaces -I$(prefix)/include -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(srcdir)/../src/tde -I$(srcdir)/../src/interfaces -I$(prefix)/include -I$(top_srcdir) $(all_includes)
 
 #AM_CFLAGS += $(GLIB_CFLAGS) $(GTK_CFLAGS)
 
@@ -8,19 +8,19 @@ xpart_DIR=$(srcdir)/../src/interfaces
 xparthost_DIR=$(srcdir)/../src/interfaces
 
 xp_notepad_SOURCES = xp_notepad.cpp xpart.skel xparthost.stub
-xp_notepad_LDADD = ../src/kde/libkdexparts.la
+xp_notepad_LDADD = ../src/tde/libtdexparts.la
 #xp_notepad_LDFLAGS = -L$(prefix)/lib -lxpcom $(all_libraries)
 xp_notepad_LDFLAGS = -L$(prefix)/lib $(all_libraries)
 
 shell_xparthost_SOURCES = shell_xparthost.cpp
-shell_xparthost_LDADD = $(top_builddir)/xparts/src/kde/libkdexparts.la
+shell_xparthost_LDADD = $(top_builddir)/xparts/src/tde/libtdexparts.la
 shell_xparthost_LDFLAGS = $(all_libraries)
 
 lib_LTLIBRARIES = libxp_notepadpart.la
 
 libxp_notepadpart_la_SOURCES = xp_notepad_factory.cpp
 libxp_notepadpart_la_LDFLAGS = -module $(all_libraries)
-libxp_notepadpart_la_LIBADD = ../src/kde/libkdexparts.la
+libxp_notepadpart_la_LIBADD = ../src/tde/libtdexparts.la
 
 servicedir = $(kde_servicesdir)
 service_DATA = xp_notepad.desktop