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

7 files changed, 8 insertions, 8 deletions

diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp
index 67ff6bd..0c913a5 100644
--- a/ksquirrel/ksquirrel.cpp
+++ b/ksquirrel/ksquirrel.cpp
@@ -57,7 +57,7 @@
 #include <kanimwidget.h>
 #include <kglobalsettings.h>
 #include <kactioncollection.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 #include <kurlcompletion.h>
 #include <konq_pixmapprovider.h>
 #include <kio/job.h>
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
index 05adf9e..bf77ee1 100644
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
@@ -16,8 +16,8 @@
  ***************************************************************************/
 
 #include <kaction.h>
-#include <kparts/browserextension.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/genericfactory.h>
 #include <kfileitem.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.h b/ksquirrel/ksquirrelpart/ksquirrelpart.h
index 408955d..2ed903b 100644
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.h
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.h
@@ -18,7 +18,7 @@
 #ifndef KSQUIRRELPART_H
 #define KSQUIRRELPART_H
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class TDEAboutData;
 class KToggleAction;
diff --git a/ksquirrel/sidebar/sq_multibar.cpp b/ksquirrel/sidebar/sq_multibar.cpp
index 87a86c8..b932fa7 100644
--- a/ksquirrel/sidebar/sq_multibar.cpp
+++ b/ksquirrel/sidebar/sq_multibar.cpp
@@ -23,7 +23,7 @@
 #include <tqsignalmapper.h>
 #include <tqsplitter.h>
 
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 
diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp
index 3da90dd..5d905dc 100644
--- a/ksquirrel/sidebar/sq_previewwidget.cpp
+++ b/ksquirrel/sidebar/sq_previewwidget.cpp
@@ -70,7 +70,7 @@ SQ_PreviewWidget::SQ_PreviewWidget(TQWidget *parent, const char *name)
     popup->insertSeparator();
     popup->insertItem(i18n("Execute")+"\tEnter", TQT_TQOBJECT(this), TQT_SIGNAL(execute()));
 
-    multi_pix = SQ_IconLoader::instance()->loadIcon("kmultiple", KIcon::Desktop, KIcon::SizeSmall);
+    multi_pix = SQ_IconLoader::instance()->loadIcon("tdemultiple", KIcon::Desktop, KIcon::SizeSmall);
 
     setMinimumHeight(20);
     setFocusPolicy(TQ_WheelFocus);
diff --git a/ksquirrel/sq_dragprovider.cpp b/ksquirrel/sq_dragprovider.cpp
index 8e93652..84fa83d 100644
--- a/ksquirrel/sq_dragprovider.cpp
+++ b/ksquirrel/sq_dragprovider.cpp
@@ -122,7 +122,7 @@ void SQ_DragProvider::start()
     TQPixmap dragIcon;
 
     if(urls.count() > 1)
-        dragIcon = SQ_IconLoader::instance()->loadIcon("kmultiple", KIcon::Desktop, KIcon::SizeSmall);
+        dragIcon = SQ_IconLoader::instance()->loadIcon("tdemultiple", KIcon::Desktop, KIcon::SizeSmall);
     else
         dragIcon = first->pixmap(KIcon::SizeSmall);
 
diff --git a/ksquirrel/sq_selectdeselectgroup.ui.h b/ksquirrel/sq_selectdeselectgroup.ui.h
index 740f31b..6057ebe 100644
--- a/ksquirrel/sq_selectdeselectgroup.ui.h
+++ b/ksquirrel/sq_selectdeselectgroup.ui.h
@@ -13,7 +13,7 @@
 
 #ifdef SQ_HAVE_KREGEXP
 #include <kregexpeditorinterface.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <ktrader.h>
 #endif