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

31 files changed, 36 insertions, 36 deletions

diff --git a/ksirc/CMakeLists.txt b/ksirc/CMakeLists.txt
index 6c6a1bf8..15dbf624 100644
--- a/ksirc/CMakeLists.txt
+++ b/ksirc/CMakeLists.txt
@@ -68,5 +68,5 @@ tde_add_tdeinit_executable( ksirc AUTOMOC
     dccNewbase.ui dccNew.cpp
   LINK
     ksprefs-static ksprogress-static ksopenksirc-static ksticker-static
-    kio-shared
+    tdeio-shared
 )
diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp
index 46819832..b4260829 100644
--- a/ksirc/FilterRuleEditor.cpp
+++ b/ksirc/FilterRuleEditor.cpp
@@ -15,7 +15,7 @@
 #include <tqlineedit.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp
index 41e13323..f562b2af 100644
--- a/ksirc/KSOpenkSirc/open_ksirc.cpp
+++ b/ksirc/KSOpenkSirc/open_ksirc.cpp
@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kmdcodec.h>
 
diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index 2c868841..964a4acd 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -17,7 +17,7 @@
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <knuminput.h>
 
diff --git a/ksirc/KSPrefs/page_colors.cpp b/ksirc/KSPrefs/page_colors.cpp
index ae5c25fa..cf4f04d8 100644
--- a/ksirc/KSPrefs/page_colors.cpp
+++ b/ksirc/KSPrefs/page_colors.cpp
@@ -14,7 +14,7 @@
 #include <tqradiobutton.h>
 #include <tqlabel.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
diff --git a/ksirc/KSPrefs/page_irccolors.cpp b/ksirc/KSPrefs/page_irccolors.cpp
index 5ed96054..89de8231 100644
--- a/ksirc/KSPrefs/page_irccolors.cpp
+++ b/ksirc/KSPrefs/page_irccolors.cpp
@@ -11,7 +11,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolorbutton.h>
 
 PageIRCColors::PageIRCColors( TQWidget *parent, const char *name ) : PageIRCColorsBase( parent, name)
diff --git a/ksirc/KSPrefs/page_looknfeel.cpp b/ksirc/KSPrefs/page_looknfeel.cpp
index 29608e04..82244bb7 100644
--- a/ksirc/KSPrefs/page_looknfeel.cpp
+++ b/ksirc/KSPrefs/page_looknfeel.cpp
@@ -13,7 +13,7 @@
 
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include "page_looknfeel.h"
 
 PageLooknFeel::PageLooknFeel( TQWidget *parent, const char *name ) : PageLooknFeelBase( parent, name)
diff --git a/ksirc/KSPrefs/page_servchan.cpp b/ksirc/KSPrefs/page_servchan.cpp
index 24e36938..6be5ef5b 100644
--- a/ksirc/KSPrefs/page_servchan.cpp
+++ b/ksirc/KSPrefs/page_servchan.cpp
@@ -13,7 +13,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 PageServChan::PageServChan( TQWidget *parent, const char *name ) : PageServChanBase( parent, name)
 {
diff --git a/ksirc/KSPrefs/page_startup.cpp b/ksirc/KSPrefs/page_startup.cpp
index e2ddfdc1..691b8cc2 100644
--- a/ksirc/KSPrefs/page_startup.cpp
+++ b/ksirc/KSPrefs/page_startup.cpp
@@ -12,7 +12,7 @@
 #include <tqlistbox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <keditlistbox.h>
 
 #include <kdebug.h>
diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp
index 5187489a..f2d77e39 100644
--- a/ksirc/KSTicker/ksticker.cpp
+++ b/ksirc/KSTicker/ksticker.cpp
@@ -17,7 +17,7 @@
 #include "../ksopts.h"
 #include "../nickColourMaker.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <twin.h>
 #include <kdebug.h>
 
diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp
index ad8c3864..6c4bd80e 100644
--- a/ksirc/KSTicker/ksttest.cpp
+++ b/ksirc/KSTicker/ksttest.cpp
@@ -1,5 +1,5 @@
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqapplication.h>
 #include <tqsocketnotifier.h>
 #include <tqregexp.h>
diff --git a/ksirc/NewWindowDialog.cpp b/ksirc/NewWindowDialog.cpp
index ce8309cc..9ec1136a 100644
--- a/ksirc/NewWindowDialog.cpp
+++ b/ksirc/NewWindowDialog.cpp
@@ -1,5 +1,5 @@
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <tqhbox.h>
diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp
index 5d345cc2..9174d4a7 100644
--- a/ksirc/dccNew.cpp
+++ b/ksirc/dccNew.cpp
@@ -17,7 +17,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kcombobox.h>
diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp
index 0545b189..db0615a4 100644
--- a/ksirc/iocontroller.cpp
+++ b/ksirc/iocontroller.cpp
@@ -84,7 +84,7 @@
 #include <tdeversion.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 int KSircIOController::counter = 0;
 
diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp
index cd6018bb..ba9dbcda 100644
--- a/ksirc/ksirc.cpp
+++ b/ksirc/ksirc.cpp
@@ -21,7 +21,7 @@
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 //#include "cdate.h"
diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp
index 47e36c52..2aefe7d1 100644
--- a/ksirc/ksircprocess.cpp
+++ b/ksirc/ksircprocess.cpp
@@ -107,7 +107,7 @@
 
 #include <tqtimer.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/ksirc/ksopts.cpp b/ksirc/ksopts.cpp
index 4b3517a4..d9035f19 100644
--- a/ksirc/ksopts.cpp
+++ b/ksirc/ksopts.cpp
@@ -1,6 +1,6 @@
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #if KDE_IS_VERSION(3,1,92)
 #include <kuser.h>
diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp
index 81177b13..3d895513 100644
--- a/ksirc/ksview.cpp
+++ b/ksirc/ksview.cpp
@@ -32,8 +32,8 @@
 #include <kpopupmenu.h>
 #include <kstringhandler.h>
 #include <knotifyclient.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
 #include <kurldrag.h>
 
 #include "ksopts.h"
diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp
index 510b40e8..c6047674 100644
--- a/ksirc/mditoplevel.cpp
+++ b/ksirc/mditoplevel.cpp
@@ -5,7 +5,7 @@
 
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kpopupmenu.h>
 #include <klocale.h>
diff --git a/ksirc/puke/Makefile.am b/ksirc/puke/Makefile.am
index de25d641..4fbf90d2 100644
--- a/ksirc/puke/Makefile.am
+++ b/ksirc/puke/Makefile.am
@@ -12,7 +12,7 @@ libpuke_la_SOURCES = pwidget.cpp pobject.cpp \
 	pprogress.cpp ptablevw.cpp plistbox.cpp \
 	plabel.cpp pmenudta.cpp	ppopmenu.cpp \
 	palistbox.cpp ptabdialog.cpp \
-	pkfiledialog.cpp pobjfinder.cpp
+	ptdefiledialog.cpp pobjfinder.cpp
 
 $(srcdir)/HOWTO-PUKE.txt: HOWTO-PUKE.pod
 	pod2text $(srcdir)/HOWTO-PUKE.pod > HOWTO-PUKE.txt
@@ -34,7 +34,7 @@ perl_DATA = commands-handler.pl commands-perl.pl convert_commands.pl \
 	puke.pl small.pl test.pl tester.pl \
 	dcc_progress.pm dcc_status.pm load_all.pm \
 	palistbox.pm pbase.pm pboxlayout.pm pbutton.pm pframe.pm \
-	pkfiledialog.pm plabel.pm plined.pm plistbox.pm pmenudta.pm \
+	ptdefiledialog.pm plabel.pm plined.pm plistbox.pm pmenudta.pm \
 	ppopmenu.pm pprogress.pm ppushbt.pm ptabdialog.pm ptablevw.pm \
 	pwidget.pm pobjfinder.pm
 
diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp
index a7c95091..7d5e85e3 100644
--- a/ksirc/puke/controller.cpp
+++ b/ksirc/puke/controller.cpp
@@ -30,7 +30,7 @@ using namespace std; // iostream.h include cstring which puts strlen into
 #include "palistbox.h"
 #include "pbutton.h"
 #include "pframe.h"
-#include "pkfiledialog.h"
+#include "ptdefiledialog.h"
 #include "plabel.h"
 #include "ptqlayout.h"
 #include "plined.h"
diff --git a/ksirc/puke/dcc_status.pm b/ksirc/puke/dcc_status.pm
index 65bc1b07..149219d2 100644
--- a/ksirc/puke/dcc_status.pm
+++ b/ksirc/puke/dcc_status.pm
@@ -11,7 +11,7 @@
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
 &docommand("/load plined.pm");
-&docommand("/load pkfiledialog.pm");
+&docommand("/load ptdefiledialog.pm");
 &docommand("/load ppopmenu.pm");
 
 &docommand("/load dcc_progress.pm");
diff --git a/ksirc/puke/load_all.pm b/ksirc/puke/load_all.pm
index 26594c0f..b54a7dc7 100644
--- a/ksirc/puke/load_all.pm
+++ b/ksirc/puke/load_all.pm
@@ -10,5 +10,5 @@
 &docommand("/load plistbox.pm");
 &docommand("/load ppopmenu.pm");
 &docommand("/load ptabdialog.pm");
-&docommand("/load pkfiledialog.pm");
+&docommand("/load ptdefiledialog.pm");
 &docommand("/load pobjfinder.pm");  
diff --git a/ksirc/puke/pkfiledialog-cmd.h b/ksirc/puke/ptdefiledialog-cmd.h
index 6aebd59e..6aebd59e 100644
--- a/ksirc/puke/pkfiledialog-cmd.h
+++ b/ksirc/puke/ptdefiledialog-cmd.h
diff --git a/ksirc/puke/pkfiledialog.cpp b/ksirc/puke/ptdefiledialog.cpp
index 53d37aa7..d60b47d5 100644
--- a/ksirc/puke/pkfiledialog.cpp
+++ b/ksirc/puke/ptdefiledialog.cpp
@@ -3,8 +3,8 @@
 
 #include <kdebug.h>
 
-#include "pkfiledialog.h"
-#include "pkfiledialog-cmd.h"
+#include "ptdefiledialog.h"
+#include "ptdefiledialog-cmd.h"
 
 PObject *
 PKFileDialog::createWidget(CreateArgs &ca)
@@ -120,4 +120,4 @@ KFileDialog *PKFileDialog::widget()
   return kfbd;
 }
 
-#include "pkfiledialog.moc"
+#include "ptdefiledialog.moc"
diff --git a/ksirc/puke/pkfiledialog.h b/ksirc/puke/ptdefiledialog.h
index 403f8493..cdf940a8 100644
--- a/ksirc/puke/pkfiledialog.h
+++ b/ksirc/puke/ptdefiledialog.h
@@ -3,7 +3,7 @@
 
 class PKFileDialog;
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include "pmessage.h"
 #include "pwidget.h"
 #include "controller.h"
diff --git a/ksirc/puke/pkfiledialog.pm b/ksirc/puke/ptdefiledialog.pm
index 6da8c229..d91fedca 100644
--- a/ksirc/puke/pkfiledialog.pm
+++ b/ksirc/puke/ptdefiledialog.pm
@@ -2,7 +2,7 @@
 &::PukeSendMessage($PUKE_WIDGET_LOAD, 
 		   $::PUKE_CONTROLLER, 
 		   $PWIDGET_KFILEDIALOG,
-		   "pkfiledialog.so",
+		   "ptdefiledialog.so",
 		   sub { my %ARG = %{shift()};
 			 if($ARG{'iArg'} == 1){
 			   print "*E* PKFileDialog Load failed!\n";
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index 61495815..4eea7003 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -82,7 +82,7 @@
 #include <tqregexp.h>
 
 #include <kmenubar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfontdialog.h>
 #include <kiconloader.h>
 #include <twin.h>
diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp
index e1623a3c..92066916 100644
--- a/ksirc/topic.cpp
+++ b/ksirc/topic.cpp
@@ -21,8 +21,8 @@
 #include <krun.h>
 #include <kpopupmenu.h>
 #include <kstringhandler.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
 
 #include "ksopts.h"
 #include "ksparser.h"
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index de75ee5f..3d502a52 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -67,9 +67,9 @@
 #include <kpopupmenu.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <kaction.h>
diff --git a/ksirc/usercontrolmenu.cpp b/ksirc/usercontrolmenu.cpp
index 6fddff90..522a5ada 100644
--- a/ksirc/usercontrolmenu.cpp
+++ b/ksirc/usercontrolmenu.cpp
@@ -1,7 +1,7 @@
 #include "usercontrolmenu.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 TQPtrList<UserControlMenu> UserControlMenu::UserMenu;