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

8 files changed, 10 insertions, 10 deletions

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";