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

20 files changed, 71 insertions, 71 deletions

diff --git a/kregexpeditor/CMakeLists.txt b/kregexpeditor/CMakeLists.txt
index ee0eca5..1ebb963 100644
--- a/kregexpeditor/CMakeLists.txt
+++ b/kregexpeditor/CMakeLists.txt
@@ -77,7 +77,7 @@ tde_add_library( kregexpeditorcommon SHARED AUTOMOC
     emacsregexpconverter.cpp
     regexphighlighter.cpp util.cpp
   VERSION 1.0.0
-  LINK kio-shared kmultiformlistbox-static
+  LINK kio-shared tdemultiformlistbox-static
     kwidgetstreamer-static
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kregexpeditor/KMultiFormListBox/CMakeLists.txt b/kregexpeditor/KMultiFormListBox/CMakeLists.txt
index 31f4b3e..67bfa33 100644
--- a/kregexpeditor/KMultiFormListBox/CMakeLists.txt
+++ b/kregexpeditor/KMultiFormListBox/CMakeLists.txt
@@ -27,14 +27,14 @@ add_definitions(
 )
 
 
-##### kmultiformlistbox (static) ################
-
-tde_add_library( kmultiformlistbox STATIC_PIC AUTOMOC
-  SOURCES ccp.cpp kmultiformlistboxentry.cpp
-    kmultiformlistbox.cpp
-    kmultiformlistbox-multivisible.cpp
-    kmultiformlistboxfactory.cpp indexWindow.cpp
-    kmultiformlistbox-windowed.cpp
+##### tdemultiformlistbox (static) ################
+
+tde_add_library( tdemultiformlistbox STATIC_PIC AUTOMOC
+  SOURCES ccp.cpp tdemultiformlistboxentry.cpp
+    tdemultiformlistbox.cpp
+    tdemultiformlistbox-multivisible.cpp
+    tdemultiformlistboxfactory.cpp indexWindow.cpp
+    tdemultiformlistbox-windowed.cpp
     widgetwindow.cpp windowlistboxitem.cpp
 )
 
@@ -43,8 +43,8 @@ tde_add_library( kmultiformlistbox STATIC_PIC AUTOMOC
 
 install(
   FILES
-    kmultiformlistbox.h
-    kmultiformlistboxentry.h
-    kmultiformlistboxfactory.h
+    tdemultiformlistbox.h
+    tdemultiformlistboxentry.h
+    tdemultiformlistboxfactory.h
   DESTINATION ${INCLUDE_INSTALL_DIR}
 )
diff --git a/kregexpeditor/KMultiFormListBox/Makefile.am b/kregexpeditor/KMultiFormListBox/Makefile.am
index 5ee885f..3f2a395 100644
--- a/kregexpeditor/KMultiFormListBox/Makefile.am
+++ b/kregexpeditor/KMultiFormListBox/Makefile.am
@@ -1,15 +1,15 @@
 AM_CPPFLAGS = -DQT_NO_CAST_ASCII
-noinst_LTLIBRARIES  = libkmultiformlistbox.la
+noinst_LTLIBRARIES  = libtdemultiformlistbox.la
 
 INCLUDES= -I$(srcdir)/../KWidgetStreamer $(all_includes)
 
-include_HEADERS = kmultiformlistboxentry.h kmultiformlistbox.h \
-	kmultiformlistboxfactory.h 
-noinst_HEADERS = ccp.h indexWindow.h kmultiformlistbox-multivisible.h \
-	kmultiformlistbox-windowed.h widgetwindow.h windowlistboxitem.h
-libkmultiformlistbox_la_SOURCES = ccp.cpp kmultiformlistboxentry.cpp \
-	kmultiformlistbox.cpp kmultiformlistbox-multivisible.cpp \
-	kmultiformlistboxfactory.cpp indexWindow.cpp \
-	kmultiformlistbox-windowed.cpp widgetwindow.cpp windowlistboxitem.cpp
+include_HEADERS = tdemultiformlistboxentry.h tdemultiformlistbox.h \
+	tdemultiformlistboxfactory.h 
+noinst_HEADERS = ccp.h indexWindow.h tdemultiformlistbox-multivisible.h \
+	tdemultiformlistbox-windowed.h widgetwindow.h windowlistboxitem.h
+libtdemultiformlistbox_la_SOURCES = ccp.cpp tdemultiformlistboxentry.cpp \
+	tdemultiformlistbox.cpp tdemultiformlistbox-multivisible.cpp \
+	tdemultiformlistboxfactory.cpp indexWindow.cpp \
+	tdemultiformlistbox-windowed.cpp widgetwindow.cpp windowlistboxitem.cpp
 
 METASOURCES = AUTO
diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp
index be65d35..8197d2c 100644
--- a/kregexpeditor/KMultiFormListBox/ccp.cpp
+++ b/kregexpeditor/KMultiFormListBox/ccp.cpp
@@ -19,7 +19,7 @@
 // ccp = Cut-Copy-Paste
 //---------------------
 
-#include "kmultiformlistbox-multivisible.h"
+#include "tdemultiformlistbox-multivisible.h"
 #include "ccp.h"
 #include <tqobjectlist.h>
 #include <tqpopupmenu.h>
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
index 3dcab67..5c67526 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
@@ -21,10 +21,10 @@
   #include <tqmessagebox.h>
 #else
   #include <kmessagebox.h>
-  #include "kmultiformlistbox-multivisible.moc"
+  #include "tdemultiformlistbox-multivisible.moc"
 #endif
 
-#include "kmultiformlistbox-multivisible.h"
+#include "tdemultiformlistbox-multivisible.h"
 #include "indexWindow.h"
 #include "ccp.h"
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.h
index 04a3f75..5077496 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.h
@@ -22,11 +22,11 @@
 // To make an instance of the widget, you need to inherit the classes
 // `KMultiFormListBoxFactory' and `KMultiFormListBoxEntry'.
 // ------------------------------------------------------------------------
-#ifndef __kmultiformlistboxmultivisble
-#define __kmultiformlistboxmultivisble
+#ifndef __tdemultiformlistboxmultivisble
+#define __tdemultiformlistboxmultivisble
 
 // -------------------------------- includes ------------------------------
-#include "kmultiformlistbox.h"
+#include "tdemultiformlistbox.h"
 //-------------------------------------------------------------------------
 
 /**
@@ -132,5 +132,5 @@ private:
 };
 
 
-#endif /* kmultiformlistboxmultivisble */
+#endif /* tdemultiformlistboxmultivisble */
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-shower.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-shower.h
index 15f3af5..03cec37 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-shower.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-shower.h
@@ -15,8 +15,8 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#ifndef __kmultiformlistboxshower
-#define __kmultiformlistboxshower
+#ifndef __tdemultiformlistboxshower
+#define __tdemultiformlistboxshower
 
 // -------------------------------- includes ------------------------------
 //-------------------------------------------------------------------------
@@ -49,5 +49,5 @@ public:
 };
 
 
-#endif /* kmultiformlistboxshower */
+#endif /* tdemultiformlistboxshower */
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp
index 8d3ffe3..35627d6 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp
@@ -21,7 +21,7 @@
   #include <kmessagebox.h>
   #include <kpushbutton.h>
   #include <kstdguiitem.h>
-  #include "kmultiformlistbox-windowed.moc"
+  #include "tdemultiformlistbox-windowed.moc"
 #endif
 
 #include "widgetwindow.h"
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h
index f86f6a4..b2c0484 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h
@@ -15,8 +15,8 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#ifndef __kmultiformlistboxwindowed
-#define __kmultiformlistboxwindowed
+#ifndef __tdemultiformlistboxwindowed
+#define __tdemultiformlistboxwindowed
 
 #ifdef TQT_ONLY
   #include "compat.h"
@@ -25,8 +25,8 @@
   #include <klistbox.h>
 #endif
 
-#include "kmultiformlistboxfactory.h"
-#include "kmultiformlistbox.h"
+#include "tdemultiformlistboxfactory.h"
+#include "tdemultiformlistbox.h"
 class WindowListboxItem;
 
 
@@ -80,5 +80,5 @@ private slots:
 };
 
 
-#endif /* kmultiformlistboxwindowed */
+#endif /* tdemultiformlistboxwindowed */
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp
index 58b82da..33eda27 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 #ifndef TQT_ONLY
-  #include "kmultiformlistbox.moc"
+  #include "tdemultiformlistbox.moc"
 #endif
 
-#include "kmultiformlistbox-multivisible.h"
-#include "kmultiformlistbox-windowed.h"
+#include "tdemultiformlistbox-multivisible.h"
+#include "tdemultiformlistbox-windowed.h"
 
 KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiFormListBoxType tp, TQWidget *parent,
 																		  bool showUpDownButtons, bool showHelpButton, TQString addButtonText,
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h
index 89a6d0a..1151581 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h
@@ -15,12 +15,12 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#ifndef __kmultiformlistbox
-#define __kmultiformlistbox
+#ifndef __tdemultiformlistbox
+#define __tdemultiformlistbox
 
-#include "kmultiformlistboxfactory.h"
-#include "kmultiformlistbox-shower.h"
-#include "kmultiformlistboxentry.h"
+#include "tdemultiformlistboxfactory.h"
+#include "tdemultiformlistbox-shower.h"
+#include "tdemultiformlistboxentry.h"
 #include <tqptrlist.h>
 #include <tqlayout.h>
 #include <tqscrollview.h>
@@ -122,5 +122,5 @@ private:
 };
 
 
-#endif /* kmultiformlistbox */
+#endif /* tdemultiformlistbox */
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.cpp
index 5631078..ee3e5c5 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.cpp
@@ -17,10 +17,10 @@
  **/
 
 #ifndef TQT_ONLY
-  #include "kmultiformlistboxentry.moc"
+  #include "tdemultiformlistboxentry.moc"
 #endif
 
-#include "kmultiformlistboxentry.h"
+#include "tdemultiformlistboxentry.h"
 //----------------------------------------------------------------------
 // This function is needed to signal which of the KMultiFormListBox entries
 // the Idx button was invoked from.
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.h
index b3750bb..957f3ab 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.h
@@ -15,8 +15,8 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#ifndef __kmultiformlistboxentry
-#define __kmultiformlistboxentry
+#ifndef __tdemultiformlistboxentry
+#define __tdemultiformlistboxentry
 
 #include <tqpoint.h>
 #include <tqwidget.h>
@@ -70,5 +70,5 @@ signals:
 
 };
 
-#endif /* kmultiformlistboxentry */
+#endif /* tdemultiformlistboxentry */
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxfactory.cpp
index 08a800a..d4414cf 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxfactory.cpp
@@ -15,7 +15,7 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#include "kmultiformlistboxfactory.h"
+#include "tdemultiformlistboxfactory.h"
 #include <tqframe.h>
 
 TQWidget *KMultiFormListBoxFactory::separator(TQWidget *parent) {
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxfactory.h
index dc0bcce..314c0e0 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxfactory.h
@@ -16,8 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  **/
 // -------------------------------- includes ------------------------------
-#ifndef __kmultiformlistboxfactory
-#define __kmultiformlistboxfactory
+#ifndef __tdemultiformlistboxfactory
+#define __tdemultiformlistboxfactory
 #include <tqobject.h>
 #include "kwidgetstreamer.h"
 class KMultiFormListBoxEntry;
@@ -66,5 +66,5 @@ public:
   virtual TQWidget *separator(TQWidget *parent);
 };
 
-#endif /* kmultiformlistbox */
+#endif /* tdemultiformlistbox */
 
diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.h b/kregexpeditor/KMultiFormListBox/widgetwindow.h
index eea6500..2312653 100644
--- a/kregexpeditor/KMultiFormListBox/widgetwindow.h
+++ b/kregexpeditor/KMultiFormListBox/widgetwindow.h
@@ -26,7 +26,7 @@
   #include <klistbox.h>
 #endif
 
-#include "kmultiformlistbox-windowed.h"
+#include "tdemultiformlistbox-windowed.h"
 
 /**
    @internal
diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
index 04ee2a6..721257c 100644
--- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
+++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
@@ -16,7 +16,7 @@
  *  Boston, MA 02110-1301, USA.
  **/
 #include "kwidgetstreamer.h"
-#include "kmultiformlistbox.h"
+#include "tdemultiformlistbox.h"
 #include <tqobjectlist.h>
 #include <tqvariant.h>
 
diff --git a/kregexpeditor/Makefile.am b/kregexpeditor/Makefile.am
index 916ef42..22460b6 100644
--- a/kregexpeditor/Makefile.am
+++ b/kregexpeditor/Makefile.am
@@ -28,7 +28,7 @@ libkregexpeditorcommon_la_SOURCES = \
   emacsregexpconverter.cpp regexphighlighter.cpp util.cpp
 
 libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
-libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libkmultiformlistbox.la \
+libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libtdemultiformlistbox.la \
 	KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 
 METASOURCES = AUTO
@@ -46,7 +46,7 @@ libkregexpeditorgui_la_LIBADD = libkregexpeditorcommon.la
 
 bin_PROGRAMS = kregexpeditor
 kregexpeditor_SOURCES = main.cpp
-kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kregexpeditor_LDADD =  libkregexpeditorcommon.la $(LIB_KIO)
 kregexpeditor_INCLUDES =  $(all_includes)
 
diff --git a/kregexpeditor/characterswidget.h b/kregexpeditor/characterswidget.h
index 8100f0a..1450d97 100644
--- a/kregexpeditor/characterswidget.h
+++ b/kregexpeditor/characterswidget.h
@@ -24,7 +24,7 @@
 #include <kdialogbase.h>
 #endif
 
-#include <kmultiformlistbox.h>
+#include <tdemultiformlistbox.h>
 #include "regexpwidget.h"
 #include <tqvgroupbox.h>
 
diff --git a/kregexpeditor/qt-only/qt-only.pro b/kregexpeditor/qt-only/qt-only.pro
index 9af8b97..536c98b 100644
--- a/kregexpeditor/qt-only/qt-only.pro
+++ b/kregexpeditor/qt-only/qt-only.pro
@@ -31,12 +31,12 @@ HEADERS += altnregexp.h \
            gen_qregexpparser.hh \
            indexWindow.h \
            infopage.h \
-           kmultiformlistbox-multivisible.h \
-           kmultiformlistbox-shower.h \
-           kmultiformlistbox-windowed.h \
-           kmultiformlistbox.h \
-           kmultiformlistboxentry.h \
-           kmultiformlistboxfactory.h \
+           tdemultiformlistbox-multivisible.h \
+           tdemultiformlistbox-shower.h \
+           tdemultiformlistbox-windowed.h \
+           tdemultiformlistbox.h \
+           tdemultiformlistboxentry.h \
+           tdemultiformlistboxfactory.h \
            kregexpeditorgui.h \
            kregexpeditorprivate.h \
            kwidgetstreamer.h \
@@ -96,11 +96,11 @@ SOURCES += altnregexp.cpp \
            gen_qregexplexer.cpp \
            indexWindow.cpp \
            infopage.cpp \
-           kmultiformlistbox-multivisible.cpp \
-           kmultiformlistbox-windowed.cpp \
-           kmultiformlistbox.cpp \
-           kmultiformlistboxentry.cpp \
-           kmultiformlistboxfactory.cpp \
+           tdemultiformlistbox-multivisible.cpp \
+           tdemultiformlistbox-windowed.cpp \
+           tdemultiformlistbox.cpp \
+           tdemultiformlistboxentry.cpp \
+           tdemultiformlistboxfactory.cpp \
            kregexpeditorgui.cpp \
            kregexpeditorprivate.cpp \
            kwidgetstreamer.cpp \