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

21 files changed, 37 insertions, 37 deletions

diff --git a/kalarm/CMakeLists.txt b/kalarm/CMakeLists.txt
index b93cc671..cd7295a4 100644
--- a/kalarm/CMakeLists.txt
+++ b/kalarm/CMakeLists.txt
@@ -59,7 +59,7 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/Applications RE
 tde_add_executable( kalarm AUTOMOC
   SOURCES
     birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp
-    emailidcombo.cpp find.cpp pickfileradio.cpp
+    emailidcombo.cpp find.cpp pictdefileradio.cpp
     calendarcompat.cpp eventlistviewbase.cpp alarmlistview.cpp
     kamail.cpp timeselector.cpp fontcolourbutton.cpp
     alarmtimewidget.cpp fontcolour.cpp soundpicker.cpp
diff --git a/kalarm/Makefile.am b/kalarm/Makefile.am
index a8e0e8bd..defbcce7 100644
--- a/kalarm/Makefile.am
+++ b/kalarm/Makefile.am
@@ -20,7 +20,7 @@ kalarm_SOURCES = birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp \
 	eventlistviewbase.cpp alarmlistview.cpp kamail.cpp timeselector.cpp \
 	templatelistview.cpp templatepickdlg.cpp templatedlg.cpp \
 	templatemenuaction.cpp latecancel.cpp repetition.cpp alarmtext.cpp \
-	emailidcombo.cpp find.cpp pickfileradio.cpp calendarcompat.cpp
+	emailidcombo.cpp find.cpp pictdefileradio.cpp calendarcompat.cpp
 kalarm_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libtdenetwork/qgpgme
 if include_ARTS
 ARTSLIB = -lartskde
@@ -37,7 +37,7 @@ noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \
 	editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \
 	fontcolour.h fontcolourbutton.h functions.h kalarm.h kalarmapp.h \
 	kamail.h karecurrence.h latecancel.h mainwindow.h mainwindowbase.h \
-	messagewin.h pickfileradio.h prefdlg.h preferences.h recurrenceedit.h \
+	messagewin.h pictdefileradio.h prefdlg.h preferences.h recurrenceedit.h \
 	recurrenceeditprivate.h reminder.h repetition.h sounddlg.h \
 	soundpicker.h specialactions.h startdaytimer.h templatedlg.h \
 	templatelistview.h templatemenuaction.h templatepickdlg.h timeselector.h \
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 1e64b046..26d2eb70 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -31,12 +31,12 @@
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutdata.h>
-#include <kio/netaccess.h>
-#include <kfileitem.h>
+#include <tdeio/netaccess.h>
+#include <tdefileitem.h>
 #include <ktempfile.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index 0727507f..76b040da 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kaccel.h>
 #include <kabc/addressbook.h>
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index 707865f8..1c37f974 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -24,7 +24,7 @@
 #include <tqiconset.h>
 
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutdata.h>
 #include <kmessagebox.h>
 #include <dcopclient.h>
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index 62c445ad..daf4406d 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -39,11 +39,11 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kfileitem.h>
+#include <tdeio/netaccess.h>
+#include <tdefileitem.h>
 #include <kmessagebox.h>
 #include <kurldrag.h>
 #include <kurlcompletion.h>
@@ -71,7 +71,7 @@
 #include "latecancel.h"
 #include "lineedit.h"
 #include "mainwindow.h"
-#include "pickfileradio.h"
+#include "pictdefileradio.h"
 #include "preferences.h"
 #include "radiobutton.h"
 #include "recurrenceedit.h"
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index 4723c342..e637f22f 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -38,14 +38,14 @@
 #include <tqdir.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
 #include <kstdaccel.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kdcopservicestarter.h>
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 29f498fc..5fa0d495 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -32,12 +32,12 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutdata.h>
 #include <dcopclient.h>
 #include <kprocess.h>
 #include <ktempfile.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kstdguiitem.h>
 #include <ktrader.h>
 #include <kstaticdeleter.h>
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index db2e4e3d..e499f481 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -24,8 +24,8 @@
 #include <tqfile.h>
 
 #include <ktempfile.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kdebug.h>
 
 #include "adcalendar.moc"
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index 0253e320..3f728bdb 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <tqstringlist.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 75bb4d2d..4b2ff902 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -31,9 +31,9 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <libkcal/calendarlocal.h>
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index e0c50d3c..cc9c0248 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -37,8 +37,8 @@
 #include <kprocess.h>
 #include <klocale.h>
 #include <kaboutdata.h>
-#include <kfileitem.h>
-#include <kio/netaccess.h>
+#include <tdefileitem.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 #include <kemailsettings.h>
 #include <kdebug.h>
diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp
index 721ee5ea..4e78ef08 100644
--- a/kalarm/lib/messagebox.cpp
+++ b/kalarm/lib/messagebox.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "kalarm.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "messagebox.h"
 
 
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 765678c6..08706246 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -36,7 +36,7 @@
 #include <kurldrag.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kaboutdata.h>
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 0315b8f4..7c17edd0 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -39,7 +39,7 @@
 #include <kstdguiitem.h>
 #include <kaboutdata.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kdialog.h>
 #include <ktextbrowser.h>
@@ -49,7 +49,7 @@
 #include <twin.h>
 #include <twinmodule.h>
 #include <kprocess.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <kpushbutton.h>
 #ifdef WITHOUT_ARTS
diff --git a/kalarm/pickfileradio.cpp b/kalarm/pictdefileradio.cpp
index 15b56d94..80911c29 100644
--- a/kalarm/pickfileradio.cpp
+++ b/kalarm/pictdefileradio.cpp
@@ -1,5 +1,5 @@
 /*
- *  pickfileradio.cpp  -  radio button with an associated file picker
+ *  pictdefileradio.cpp  -  radio button with an associated file picker
  *  Program:  kalarm
  *  Copyright (C) 2005 by David Jarvie <software@astrojar.org.uk>
  *
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 
 #include "lineedit.h"
-#include "pickfileradio.moc"
+#include "pictdefileradio.moc"
 
 
 PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name)
diff --git a/kalarm/pickfileradio.h b/kalarm/pictdefileradio.h
index f30ca7f6..ad6e0c25 100644
--- a/kalarm/pickfileradio.h
+++ b/kalarm/pictdefileradio.h
@@ -1,5 +1,5 @@
 /*
- *  pickfileradio.h  -  radio button with an associated file picker
+ *  pictdefileradio.h  -  radio button with an associated file picker
  *  Program:  kalarm
  *  Copyright (C) 2005 by David Jarvie <software@astrojar.org.uk>
  *
@@ -21,7 +21,7 @@
 #ifndef PICKFILERADIO_H
 #define PICKFILERADIO_H
 
-/** @file pickfileradio.h - radio button with an associated file picker */
+/** @file pictdefileradio.h - radio button with an associated file picker */
 
 #include "radiobutton.h"
 
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index 24669fbe..2e057eaf 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -21,7 +21,7 @@
 #include "kalarm.h"
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
 #include <kglobalsettings.h>
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index 1f386f30..d93a3b68 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -44,7 +44,7 @@
 #include <arts/kplayobject.h>
 #endif
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
 
 #include "checkbox.h"
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index 00f31893..1ae3a6a8 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -30,7 +30,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #ifndef WITHOUT_ARTS
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 58e8232c..8bcad17e 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -33,7 +33,7 @@
 #include <kstdaction.h>
 #include <kstdguiitem.h>
 #include <kaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "alarmcalendar.h"