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

20 files changed, 26 insertions, 26 deletions

diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt
index fa15179..c0ea58a 100644
--- a/ark/CMakeLists.txt
+++ b/ark/CMakeLists.txt
@@ -39,7 +39,7 @@ tde_add_library( ark_common STATIC_PIC
 
 tde_add_tdeinit_executable( ark AUTOMOC
   SOURCES main.cpp arkapp.cpp mainwindow.cpp
-  LINK ark_common-static khtml-shared
+  LINK ark_common-static tdehtml-shared
 )
 
 
@@ -49,12 +49,12 @@ tde_add_kpart( libarkpart AUTOMOC
   SOURCES ark_part.cpp arkfactory.cpp zip.cpp
     tar.cpp filelistview.cpp arch.cpp lha.cpp
     compressedfile.cpp zoo.cpp rar.cpp ar.cpp
-    arkutils.cpp archiveformatdlg.cpp
+    artdeutils.cpp archiveformatdlg.cpp
     arkwidget.cpp searchbar.cpp addition.ui
     extraction.ui general.ui arkviewer.cpp
     sevenzip.cpp extractiondialog.cpp ace.cpp
     tarlistingthread.cpp arj.cpp
-  LINK ark_common-static khtml-shared
+  LINK ark_common-static tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/ark/Makefile.am b/ark/Makefile.am
index 14f33f5..aa26f03 100644
--- a/ark/Makefile.am
+++ b/ark/Makefile.am
@@ -27,7 +27,7 @@ libarkpart_la_COMPILE_FIRST = settings.h
 libarkpart_la_SOURCES = ark_part.cpp arkfactory.cpp zip.cpp tar.cpp \
                         filelistview.cpp arch.cpp lha.cpp \
                         compressedfile.cpp zoo.cpp rar.cpp \
-                        ar.cpp arkutils.cpp archiveformatdlg.cpp \
+                        ar.cpp artdeutils.cpp archiveformatdlg.cpp \
                         arkwidget.cpp searchbar.cpp \
                         addition.ui extraction.ui general.ui \
                         arkviewer.cpp sevenzip.cpp extractiondialog.cpp \
diff --git a/ark/arch.cpp b/ark/arch.cpp
index 18a589a..cd3d186 100644
--- a/ark/arch.cpp
+++ b/ark/arch.cpp
@@ -47,7 +47,7 @@
 // ark includes
 #include "arch.h"
 #include "arkwidget.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "filelistview.h"
 
 // the archive types
diff --git a/ark/arj.cpp b/ark/arj.cpp
index 146df76..79574b1 100644
--- a/ark/arj.cpp
+++ b/ark/arj.cpp
@@ -42,7 +42,7 @@
 #include "arj.h"
 #include "arkwidget.h"
 #include "settings.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "filelistview.h"
 
 ArjArch::ArjArch( ArkWidget *_gui, const TQString & _fileName )
diff --git a/ark/ark_part.h b/ark/ark_part.h
index 6ec3202..1057395 100644
--- a/ark/ark_part.h
+++ b/ark/ark_part.h
@@ -23,10 +23,10 @@
 #ifndef ARK_PART_H
 #define ARK_PART_H
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/factory.h>
 #include <kaction.h>
 #include <kprogress.h>
 
diff --git a/ark/ark_part.rc b/ark/ark_part.rc
index 086765f..44605ca 100644
--- a/ark/ark_part.rc
+++ b/ark/ark_part.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_kparts" version="8">
+<kpartgui name="ark_tdeparts" version="8">
 <ActionProperties>
     <Action name="select_all" icon="ark_selectall"/>
     <Action name="deselect_all" icon="ark_deselectall"/>
diff --git a/ark/ark_part_readonly.rc b/ark/ark_part_readonly.rc
index 84f4f02..c325723 100644
--- a/ark/ark_part_readonly.rc
+++ b/ark/ark_part_readonly.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_kparts" version="7">
+<kpartgui name="ark_tdeparts" version="7">
 <ActionProperties>
     <Action name="select_all" icon="ark_selectall"/>
 </ActionProperties>
diff --git a/ark/arkfactory.h b/ark/arkfactory.h
index 51b4933..5207ac4 100644
--- a/ark/arkfactory.h
+++ b/ark/arkfactory.h
@@ -21,7 +21,7 @@
 
 #ifndef ARKFACTORY_H
 #define ARKFACTORY_H
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 
 class ArkFactory : public KParts::Factory
 {
diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index 13dbfbe..7a2dda9 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -22,7 +22,7 @@
 #include "arkviewer.h"
 
 #include <klocale.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kmimetype.h>
 #include <kdebug.h>
 #include <kurl.h>
diff --git a/ark/arkviewer.h b/ark/arkviewer.h
index 5fc3849..af04c80 100644
--- a/ark/arkviewer.h
+++ b/ark/arkviewer.h
@@ -23,7 +23,7 @@
  */
 
 #include <kdialogbase.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class ArkViewer : public KDialogBase
 {
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index 5931f8b..c49760d 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -75,7 +75,7 @@
 #include "extractiondialog.h"
 #include "arkwidget.h"
 #include "filelistview.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "archiveformatinfo.h"
 #include "compressedfile.h"
 #include "searchbar.h"
diff --git a/ark/arkutils.cpp b/ark/artdeutils.cpp
index 52049d0..dbf5395 100644
--- a/ark/arkutils.cpp
+++ b/ark/artdeutils.cpp
@@ -72,7 +72,7 @@
 // TQt includes
 #include <tqfile.h>
 
-#include "arkutils.h"
+#include "artdeutils.h"
 
 TQString ArkUtils::getTimeStamp(const TQString &_month,
                             const TQString &_day,
diff --git a/ark/arkutils.h b/ark/artdeutils.h
index baed64b..baed64b 100644
--- a/ark/arkutils.h
+++ b/ark/artdeutils.h
diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp
index 8057828..9974252 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -48,7 +48,7 @@
 #include <kurlpixmapprovider.h>
 #include <kdebug.h>
 
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "settings.h"
 
 ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
diff --git a/ark/lha.cpp b/ark/lha.cpp
index 045be09..f0074aa 100644
--- a/ark/lha.cpp
+++ b/ark/lha.cpp
@@ -49,7 +49,7 @@
 #include "settings.h"
 #include "arch.h"
 #include "lha.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "filelistview.h"
 
 LhaArch::LhaArch( ArkWidget *_gui, const TQString & _fileName )
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index 2c9a957..21ffb08 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -32,8 +32,8 @@
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
-#include <kparts/componentfactory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/browserextension.h>
 #include <kkeydialog.h>
 #include <kcombobox.h>
 #include <kio/netaccess.h>
diff --git a/ark/mainwindow.h b/ark/mainwindow.h
index d448e8c..c878942 100644
--- a/ark/mainwindow.h
+++ b/ark/mainwindow.h
@@ -31,8 +31,8 @@
 
 // KDE includes
 #include <kmainwindow.h>
-#include <kparts/mainwindow.h>
-#include <kparts/part.h>
+#include <tdeparts/mainwindow.h>
+#include <tdeparts/part.h>
 #include <kprogress.h>
 
 class ArkWidget;
diff --git a/ark/rar.cpp b/ark/rar.cpp
index 2b015f5..500b338 100644
--- a/ark/rar.cpp
+++ b/ark/rar.cpp
@@ -49,7 +49,7 @@
 #include "arch.h"
 #include "settings.h"
 #include "rar.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "filelistview.h"
 
 RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName )
diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp
index 3ddf02f..c683f67 100644
--- a/ark/sevenzip.cpp
+++ b/ark/sevenzip.cpp
@@ -39,7 +39,7 @@
 #include "sevenzip.h"
 #include "arkwidget.h"
 #include "settings.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "filelistview.h"
 
 SevenZipArch::SevenZipArch( ArkWidget *gui, const TQString &filename )
diff --git a/ark/zoo.cpp b/ark/zoo.cpp
index f94abdb..c9814b4 100644
--- a/ark/zoo.cpp
+++ b/ark/zoo.cpp
@@ -46,7 +46,7 @@
 #include "arkwidget.h"
 #include "arch.h"
 #include "zoo.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "filelistview.h"
 
 static TQString fixTime( const TQString &_strTime );