Rename additional header files to avoid conflicts with KDE4

11 years ago · 51cb17939c
parent cbf5d0cef8
commit 51cb17939c
57 changed files with 78 additions and 78 deletions
--- a/conduits/abbrowserconduit/abbrowser-conduit.cc
+++ b/conduits/abbrowserconduit/abbrowser-conduit.cc
@ -38,8 +38,8 @@
 #include <tqfile.h>
 #include <tqregexp.h>

-#include <kabc/stdaddressbook.h>
-#include <kabc/resourcefile.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/resourcefile.h>
 #include <tdeio/netaccess.h>
 #include <ksavefile.h>

--- a/conduits/abbrowserconduit/abbrowser-conduit.h
+++ b/conduits/abbrowserconduit/abbrowser-conduit.h
@ -30,7 +30,7 @@
 */


-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>

 #include <pilotAddress.h>
 #include <plugin.h>
--- a/conduits/abbrowserconduit/abbrowserconduit.kcfg
+++ b/conduits/abbrowserconduit/abbrowserconduit.kcfg
@ -13,7 +13,7 @@
        <default>eAbookFile</default>
    </entry>
    <entry name="FileName" type="Path">
-        <default>$HOME/.trinity/share/apps/kabc/std.vcf</default>
+        <default>$HOME/.trinity/share/apps/tdeabc/std.vcf</default>
    </entry>
 		<entry name="ArchiveDeleted" type="Bool">
        <default>true</default>
--- a/conduits/abbrowserconduit/kabcRecord.cc
+++ b/conduits/abbrowserconduit/kabcRecord.cc
@ -35,8 +35,8 @@

 #include <tqregexp.h>

-#include <kglobal.h>
-#include <kabc/addressee.h>
+#include <tdeglobal.h>
+#include <tdeabc/addressee.h>

 #include "kabcRecord.h"

--- a/conduits/abbrowserconduit/kabcRecord.h
+++ b/conduits/abbrowserconduit/kabcRecord.h
@ -35,7 +35,7 @@

 #include <tqvaluevector.h>

-#include <kabc/phonenumber.h>
+#include <tdeabc/phonenumber.h>

 #include "pilotAddress.h"

--- a/conduits/docconduit/doc-conflictdialog.cc
+++ b/conduits/docconduit/doc-conflictdialog.cc
@ -32,7 +32,7 @@
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 #include <tqbuttongroup.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtimer.h>
 #include <tqtable.h>
 #include <tqcombobox.h>
--- a/conduits/docconduit/kpalmdoc_dlg.cc
+++ b/conduits/docconduit/kpalmdoc_dlg.cc
@ -38,12 +38,12 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeaboutapplication.h>
 #include <tdeapplication.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcharsets.h>

 #include <pilotLocalDatabase.h>
--- a/conduits/notepadconduit/notepad-factory.cc
+++ b/conduits/notepadconduit/notepad-factory.cc
@ -32,7 +32,7 @@
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlineedit.h>

 #include "pluginfactory.h"
--- a/conduits/popmail/popmail-conduit.cc
+++ b/conduits/popmail/popmail-conduit.cc
@ -65,12 +65,12 @@ unsigned long version_conduit_popmail = Pilot::PLUGIN_API;
 #include <tqtextcodec.h>

 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksock.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>

 #include "pilotRecord.h"
 #include "pilotSerialDatabase.h"
--- a/conduits/vcalconduit/vcal-conduitbase.cc
+++ b/conduits/vcalconduit/vcal-conduitbase.cc
@ -36,7 +36,7 @@
 #include <tqtimer.h>
 #include <tqfile.h>

-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>

 #include "libkcal/calendar.h"
--- a/kpilot/Makefile-standalone
+++ b/kpilot/Makefile-standalone
@ -133,7 +133,7 @@ kpilotDaemon.tar.gz :
 	-rmdir $(DAEMON_DISTDIR)

 conduitConfigDialog_base.cc : conduitConfigDialog_base.h conduitConfigDialog_base.ui
-	echo '#include <klocale.h>' > $@
+	echo '#include <tdelocale.h>' > $@
 	$(UIC) -tr i18n -i conduitConfigDialog_base.h conduitConfigDialog_base.ui | \
 		sed -e "s,i18n( \"\" ),QString::null,g" >> $@
 	echo '#include "conduitConfigDialog_base.moc"' >> $@
@ -142,7 +142,7 @@ conduitConfigDialog_base.h : conduitConfigDialog_base.ui
 	$(UIC) -o $@ $<

 kpilotConfigDialog_base.cc : kpilotConfigDialog_base.h kpilotConfigDialog_base.ui
-	echo '#include <klocale.h>' > $@
+	echo '#include <tdelocale.h>' > $@
 	$(UIC) -tr i18n -i kpilotConfigDialog_base.h kpilotConfigDialog_base.ui | \
 		sed -e "s,i18n( \"\" ),QString::null,g" >> $@
 	echo '#include "kpilotConfigDialog_base.moc"' >> $@
--- a/kpilot/addressWidget.cc
+++ b/kpilot/addressWidget.cc
@ -53,7 +53,7 @@
 #include <tqregexp.h>

 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>

--- a/kpilot/conduitConfigDialog.cc
+++ b/kpilot/conduitConfigDialog.cc
@ -47,8 +47,8 @@
 #include <kservicetype.h>
 #include <kuserprofile.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <klibloader.h>
 #include <kseparator.h>
--- a/kpilot/datebookWidget.cc
+++ b/kpilot/datebookWidget.cc
@ -37,7 +37,7 @@

 #include <tdelistview.h>
 #include <kdatepicker.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #include "datebookWidget.moc"

--- a/kpilot/dbAppInfoEditor.cc
+++ b/kpilot/dbAppInfoEditor.cc
@ -30,7 +30,7 @@
 #include <tqtextedit.h>
 #include <tqlabel.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #include "dbAppInfoEditor.h"

--- a/kpilot/dbFlagsEditor.cc
+++ b/kpilot/dbFlagsEditor.cc
@ -33,7 +33,7 @@
 #include <tqcheckbox.h>
 #include <kdatewidget.h>
 #include <ktimewidget.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #include "pilotRecord.h"
 #include "dbFlagsEditor.h"
--- a/kpilot/dbRecordEditor.cc
+++ b/kpilot/dbRecordEditor.cc
@ -36,7 +36,7 @@
 #include <tqpushbutton.h>
 #include <tqlayout.h>

-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #include "pilotRecord.h"
 #include "dbRecordEditor.h"
--- a/kpilot/dbSelectionDialog.cc
+++ b/kpilot/dbSelectionDialog.cc
@ -33,7 +33,7 @@
 #include <tqlistview.h>
 #include <tqpushbutton.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <klineedit.h>

--- a/kpilot/dbviewerWidget.cc
+++ b/kpilot/dbviewerWidget.cc
@ -46,7 +46,7 @@
 #include <ktextedit.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #include "listCat.h"
 #include "listItems.h"
--- a/kpilot/fileInstallWidget.cc
+++ b/kpilot/fileInstallWidget.cc
@ -49,7 +49,7 @@
 #include <kurldrag.h>
 #include <kiconloader.h>
 #include <kiconview.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>

 #include "kpilotConfig.h"
--- a/kpilot/fileInstaller.cc
+++ b/kpilot/fileInstaller.cc
@ -38,11 +38,11 @@
 #include <tqstrlist.h>
 #include <tqdir.h>

-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #include "fileInstaller.moc"

--- a/kpilot/hotSync.cc
+++ b/kpilot/hotSync.cc
@ -50,10 +50,10 @@
 #include <tqstringlist.h>
 #include <tqthread.h>

-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #include "pilotUser.h"
 #include "pilotRecord.h"
--- a/kpilot/internalEditorAction.cc
+++ b/kpilot/internalEditorAction.cc
@ -30,7 +30,7 @@
 #include <tqtimer.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
 #include <ktextedit.h>
 #include <kdialogbase.h>
--- a/kpilot/kpilot.cc
+++ b/kpilot/kpilot.cc
@ -39,12 +39,12 @@

 #include <kjanuswidget.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>
 #include <twin.h>
 #include <kcombobox.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
--- a/kpilot/kpilotConfig.cc
+++ b/kpilot/kpilotConfig.cc
@ -39,8 +39,8 @@
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <tdecmdlineargs.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>

 #include "kpilotSettings.h"
 #include "kpilotConfig.h"
--- a/kpilot/kpilotConfigDialog.cc
+++ b/kpilot/kpilotConfigDialog.cc
@ -44,10 +44,10 @@
 #include <tqspinbox.h>
 #include <tqfile.h>

-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcharsets.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>

--- a/kpilot/kpilotConfigWizard.cc
+++ b/kpilot/kpilotConfigWizard.cc
@ -33,9 +33,9 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>

-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfigskeleton.h>

 #include "kpilotConfig.h"
--- a/kpilot/kpilotProbeDialog.cc
+++ b/kpilot/kpilotProbeDialog.cc
@ -37,9 +37,9 @@
 #include <tqmap.h>
 #include <tqvaluelist.h>

-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfigskeleton.h>
 #include <tdeapplication.h>
 #include <kprogress.h>
--- a/kpilot/kroupware.cc
+++ b/kpilot/kroupware.cc
@ -33,7 +33,7 @@
 #include <tqfile.h>

 #include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>


 #include <tdeapplication.h>
--- a/kpilot/listCat.cc
+++ b/kpilot/listCat.cc
@ -31,7 +31,7 @@
 #include "options.h"

 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #include "listCat.moc"

--- a/kpilot/logWidget.cc
+++ b/kpilot/logWidget.cc
@ -42,11 +42,11 @@
 #include <tqtextstream.h>
 #include <tqpainter.h>

-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #include <pi-version.h>

--- a/kpilot/main-test.cc
+++ b/kpilot/main-test.cc
@ -41,7 +41,7 @@
 #include <tqtimer.h>

 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kservice.h>
--- a/kpilot/memoWidget.cc
+++ b/kpilot/memoWidget.cc
@ -49,7 +49,7 @@
 #include <tqptrlist.h>

 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeversion.h>
 #include <ktextedit.h>
--- a/kpilot/todoWidget.cc
+++ b/kpilot/todoWidget.cc
@ -39,7 +39,7 @@
 #include <tqwhatsthis.h>
 #include <tqtextcodec.h>

-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #include "kpilotConfig.h"
 #include "todoEditor.h"
--- a/lib/idmapper.cc
+++ b/lib/idmapper.cc
@ -30,7 +30,7 @@
 #include <tqsqldatabase.h>
 #include <tqfile.h>

-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>

 class IDMapperPrivate
--- a/lib/kpilotdevicelink.cc
+++ b/lib/kpilotdevicelink.cc
@ -52,7 +52,7 @@
 #include <tqsocketnotifier.h>

 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
--- a/lib/kpilotlink.cc
+++ b/lib/kpilotlink.cc
@ -53,7 +53,7 @@
 #include <tqthread.h>

 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
--- a/lib/kpilotlocallink.cc
+++ b/lib/kpilotlocallink.cc
@ -53,7 +53,7 @@
 #include <tqthread.h>

 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
--- a/lib/options.h
+++ b/lib/options.h
@ -42,7 +42,7 @@

 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #if !(KDE_IS_VERSION(3,4,0))
 #error "This is KPilot for (really) KDE 3.5 and won't compile with KDE < 3.4.0"
--- a/lib/pilot.cc
+++ b/lib/pilot.cc
@ -34,7 +34,7 @@
 #include <tqtextcodec.h>
 #include <tqmutex.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>

 #include "pilot.h"
 #include "pilotDatabase.h"
--- a/lib/pilotDatabase.cc
+++ b/lib/pilotDatabase.cc
@ -36,7 +36,7 @@

 #include <tqstringlist.h>

-#include <kglobal.h>
+#include <tdeglobal.h>

 #include "pilotDatabase.h"
 #include "pilotRecord.h"
--- a/lib/pilotDateEntry.cc
+++ b/lib/pilotDateEntry.cc
@ -35,7 +35,7 @@
 #include <tqnamespace.h>
 #include <tqregexp.h>

-#include <kglobal.h>
+#include <tdeglobal.h>

 #include "pilotDateEntry.h"

--- a/lib/pilotLocalDatabase.cc
+++ b/lib/pilotLocalDatabase.cc
@ -45,7 +45,7 @@
 #include <tqvaluevector.h>

 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ksavefile.h>

--- a/lib/pilotRecord.cc
+++ b/lib/pilotRecord.cc
@ -38,7 +38,7 @@

 #include <tqregexp.h>

-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>

 #include "pilot.h"
--- a/lib/pilotSerialDatabase.cc
+++ b/lib/pilotSerialDatabase.cc
@ -36,9 +36,9 @@

 #include <tqfile.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>

 #include "pilotRecord.h"
 #include "pilotSerialDatabase.h"
--- a/lib/pilotTodoEntry.cc
+++ b/lib/pilotTodoEntry.cc
@ -34,7 +34,7 @@
 #include <tqdatetime.h>
 #include <tqnamespace.h>

-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>


--- a/lib/plugin.cc
+++ b/lib/plugin.cc
@ -51,11 +51,11 @@
 #include <tdeaboutapplication.h>
 #include <kactivelabel.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <kservicetype.h>
 #include <kstandarddirs.h>
--- a/lib/recordConduit.h
+++ b/lib/recordConduit.h
@ -28,7 +28,7 @@
 */

 #include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #include "plugin.h"
 #include "pilot.h"
--- a/lib/syncAction.cc
+++ b/lib/syncAction.cc
@ -47,10 +47,10 @@
 #include <tqstyle.h>

 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #include "syncAction.moc"
 #include "kpilotlibSettings.h"
--- a/tests/exportdatebook.cc
+++ b/tests/exportdatebook.cc
@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfigskeleton.h>

--- a/tests/importaddresses.cc
+++ b/tests/importaddresses.cc
@ -31,11 +31,11 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>

-#include <kabc/addressbook.h>
-#include <kabc/resourcefile.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/resourcefile.h>

 #include "pilot.h"
 #include "pilotLocalDatabase.h"
--- a/tests/importdatebook.cc
+++ b/tests/importdatebook.cc
@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>

 #include <libkcal/calendar.h>
--- a/tests/mergecalendars.cc
+++ b/tests/mergecalendars.cc
@ -28,7 +28,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfigskeleton.h>

--- a/tests/testaddress.cc
+++ b/tests/testaddress.cc
@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>

 #include "pilot.h"
--- a/tests/testcategories.cc
+++ b/tests/testcategories.cc
@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>

 #include "pilotLocalDatabase.h"
--- a/tests/testdatabase.cc
+++ b/tests/testdatabase.cc
@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>

 #include "pilotLocalDatabase.h"
--- a/tests/testdatebook.cc
+++ b/tests/testdatebook.cc
@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>

 #include "pilot.h"