From cfb328d59024a251690b6e47c9f8d343fd8c241c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:38 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kalarm/alarmcalendar.cpp      |  6 +++---
 kalarm/alarmevent.cpp         |  2 +-
 kalarm/alarmlistview.cpp      |  4 ++--
 kalarm/alarmtext.cpp          |  2 +-
 kalarm/alarmtimewidget.cpp    |  4 ++--
 kalarm/birthdaydlg.cpp        | 10 +++++-----
 kalarm/daemon.cpp             |  2 +-
 kalarm/deferdlg.cpp           |  6 +++---
 kalarm/editdlg.cpp            |  8 ++++----
 kalarm/find.cpp               |  4 ++--
 kalarm/fontcolour.cpp         |  4 ++--
 kalarm/fontcolourbutton.cpp   |  2 +-
 kalarm/functions.cpp          |  6 +++---
 kalarm/kalarmapp.cpp          |  4 ++--
 kalarm/kalarmd/adcalendar.cpp |  2 +-
 kalarm/kalarmd/admain.cpp     |  4 ++--
 kalarm/kamail.cpp             |  8 ++++----
 kalarm/latecancel.cpp         |  2 +-
 kalarm/lib/colourcombo.cpp    |  2 +-
 kalarm/lib/dateedit.cpp       |  6 +++---
 kalarm/lib/datetime.cpp       |  4 ++--
 kalarm/lib/messagebox.h       |  2 +-
 kalarm/lib/shellprocess.cpp   |  2 +-
 kalarm/lib/timeedit.cpp       |  4 ++--
 kalarm/lib/timeperiod.cpp     |  2 +-
 kalarm/lib/timespinbox.cpp    |  2 +-
 kalarm/main.cpp               |  2 +-
 kalarm/mainwindow.cpp         |  8 ++++----
 kalarm/messagewin.cpp         |  6 +++---
 kalarm/prefdlg.cpp            |  6 +++---
 kalarm/preferences.cpp        |  6 +++---
 kalarm/recurrenceedit.cpp     |  6 +++---
 kalarm/reminder.cpp           |  4 ++--
 kalarm/repetition.cpp         |  2 +-
 kalarm/sounddlg.cpp           |  4 ++--
 kalarm/soundpicker.cpp        |  4 ++--
 kalarm/specialactions.cpp     |  2 +-
 kalarm/templatedlg.cpp        |  4 ++--
 kalarm/templatelistview.cpp   |  2 +-
 kalarm/templatepickdlg.cpp    |  2 +-
 kalarm/timeselector.cpp       |  2 +-
 kalarm/traywindow.cpp         |  4 ++--
 kalarm/undo.cpp               |  4 ++--
 43 files changed, 86 insertions(+), 86 deletions(-)

(limited to 'kalarm')

diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index c3c7b810..8d11854b 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -27,15 +27,15 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 #include <tdeio/netaccess.h>
 #include <tdefileitem.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdefiledialog.h>
 #include <dcopclient.h>
 #include <kdebug.h>
diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp
index 78e57ad1..00edf210 100644
--- a/kalarm/alarmevent.cpp
+++ b/kalarm/alarmevent.cpp
@@ -26,7 +26,7 @@
 #include <tqcolor.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "alarmtext.h"
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp
index 6f88d3e4..6d7e5f9e 100644
--- a/kalarm/alarmlistview.cpp
+++ b/kalarm/alarmlistview.cpp
@@ -26,8 +26,8 @@
 #include <tqheader.h>
 #include <tqregexp.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <libkcal/icaldrag.h>
diff --git a/kalarm/alarmtext.cpp b/kalarm/alarmtext.cpp
index c030c384..e1194ab0 100644
--- a/kalarm/alarmtext.cpp
+++ b/kalarm/alarmtext.cpp
@@ -20,7 +20,7 @@
 
 #include "kalarm.h"
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "alarmevent.h"
 #include "editdlg.h"
diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp
index 45abca7c..94abd0e3 100644
--- a/kalarm/alarmtimewidget.cpp
+++ b/kalarm/alarmtimewidget.cpp
@@ -27,8 +27,8 @@
 #include <tqwhatsthis.h>
 
 #include <kdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "checkbox.h"
 #include "dateedit.h"
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index 165e5aba..e50723ff 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -27,13 +27,13 @@
 #include <tqlineedit.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaccel.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <kdebug.h>
 
 #include "alarmcalendar.h"
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index 734636dd..c5769f94 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -26,7 +26,7 @@
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 
diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp
index 7ea2f216..c5fab880 100644
--- a/kalarm/deferdlg.cpp
+++ b/kalarm/deferdlg.cpp
@@ -22,9 +22,9 @@
 
 #include <tqlayout.h>
 
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <libkcal/event.h>
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index daf4406d..091a648a 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -37,21 +37,21 @@
 #include <tqdir.h>
 #include <tqstyle.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <tdefileitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurldrag.h>
 #include <kurlcompletion.h>
 #include <twin.h>
 #include <twinmodule.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addresseedialog.h>
 #include <kdebug.h>
 
 #include <libtdepim/maillistdrag.h>
diff --git a/kalarm/find.cpp b/kalarm/find.cpp
index f75d5f6f..9a469e57 100644
--- a/kalarm/find.cpp
+++ b/kalarm/find.cpp
@@ -29,8 +29,8 @@
 #include <kfind.h>
 #include <kseparator.h>
 #include <twin.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "alarmlistview.h"
diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp
index e4b92243..74feffb6 100644
--- a/kalarm/fontcolour.cpp
+++ b/kalarm/fontcolour.cpp
@@ -27,8 +27,8 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcolordialog.h>
 
 #include "kalarmapp.h"
diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp
index 6299049c..5321cdc9 100644
--- a/kalarm/fontcolourbutton.cpp
+++ b/kalarm/fontcolourbutton.cpp
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "fontcolour.h"
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index 9808f06e..f7dbc256 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -40,11 +40,11 @@
 
 #include <tdeconfig.h>
 #include <tdeaction.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <tdestdaccel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index b2ecb86f..7530b14a 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -30,13 +30,13 @@
 #include <tqfile.h>
 
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 #include <dcopclient.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdefileitem.h>
 #include <kstdguiitem.h>
 #include <ktrader.h>
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index e499f481..a2cc4836 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -23,7 +23,7 @@
 
 #include <tqfile.h>
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <kdebug.h>
diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp
index 314b6ad8..a5d9fd16 100644
--- a/kalarm/kalarmd/admain.cpp
+++ b/kalarm/kalarmd/admain.cpp
@@ -24,10 +24,10 @@
 
 #include <stdlib.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 #include "adapp.h"
 
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index ddcd38f3..b68f45ba 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -33,14 +33,14 @@
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdefileitem.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
-#include <kemailsettings.h>
+#include <tdetempfile.h>
+#include <tdeemailsettings.h>
 #include <kdebug.h>
 
 #include <libkpimidentities/identitymanager.h>
diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp
index fa317c39..ff684a77 100644
--- a/kalarm/latecancel.cpp
+++ b/kalarm/latecancel.cpp
@@ -23,7 +23,7 @@
 #include <tqwidgetstack.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "checkbox.h"
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index 4db9f37a..625933c7 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -23,7 +23,7 @@
 
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolordialog.h>
 
 #include "kalarm/preferences.h"
diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp
index 09712bed..29475f71 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -18,9 +18,9 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "dateedit.moc"
 
diff --git a/kalarm/lib/datetime.cpp b/kalarm/lib/datetime.cpp
index bc6e6439..b31d629a 100644
--- a/kalarm/lib/datetime.cpp
+++ b/kalarm/lib/datetime.cpp
@@ -19,8 +19,8 @@
  */
 #include "kalarm.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "datetime.h"
 
diff --git a/kalarm/lib/messagebox.h b/kalarm/lib/messagebox.h
index b0cae293..5baccca0 100644
--- a/kalarm/lib/messagebox.h
+++ b/kalarm/lib/messagebox.h
@@ -22,7 +22,7 @@
 #define MESSAGEBOX_H
 
 #include <kstdguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 /**
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp
index c3653e9b..c8ea891c 100644
--- a/kalarm/lib/shellprocess.cpp
+++ b/kalarm/lib/shellprocess.cpp
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "shellprocess.moc"
diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp
index 67a846d7..51760fc4 100644
--- a/kalarm/lib/timeedit.cpp
+++ b/kalarm/lib/timeedit.cpp
@@ -20,8 +20,8 @@
 
 #include "kalarm.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "combobox.h"
 #include "timespinbox.h"
diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp
index e372615a..7f370630 100644
--- a/kalarm/lib/timeperiod.cpp
+++ b/kalarm/lib/timeperiod.cpp
@@ -23,7 +23,7 @@
 #include <tqwidgetstack.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "combobox.h"
diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp
index b2121072..0ac932e6 100644
--- a/kalarm/lib/timespinbox.cpp
+++ b/kalarm/lib/timespinbox.cpp
@@ -22,7 +22,7 @@
 
 #include <tqvalidator.h>
 #include <tqlineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "timespinbox.moc"
 
diff --git a/kalarm/main.cpp b/kalarm/main.cpp
index b4c3f251..4b023588 100644
--- a/kalarm/main.cpp
+++ b/kalarm/main.cpp
@@ -24,7 +24,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kalarmapp.h"
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 3cacb47e..7487a8a2 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -24,7 +24,7 @@
 #include <tqdragobject.h>
 #include <tqheader.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdetoolbar.h>
 #include <tdepopupmenu.h>
 #include <tdeaccel.h>
@@ -32,10 +32,10 @@
 #include <tdeactionclasses.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurldrag.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index b437fffd..34814cbc 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -38,14 +38,14 @@
 #include <tdeaction.h>
 #include <kstdguiitem.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kdialog.h>
 #include <ktextbrowser.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <twin.h>
 #include <twinmodule.h>
 #include <kprocess.h>
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index 40b71675..2525139f 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -33,11 +33,11 @@
 #include <tqtooltip.h>
 #include <tqstyle.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kshell.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index c0d9ff6c..8bf67957 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -20,12 +20,12 @@
 
 #include "kalarm.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
 
 #include <libkpimidentities/identity.h>
 #include <libkpimidentities/identitymanager.h>
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index cfda8fc2..4a39022e 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -34,12 +34,12 @@
 #include <tqlineedit.h>
 #include <tqwhatsthis.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcalendarsystem.h>
 #include <kiconloader.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <libkcal/event.h>
diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp
index 60c60336..dd4b4151 100644
--- a/kalarm/reminder.cpp
+++ b/kalarm/reminder.cpp
@@ -23,8 +23,8 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kdebug.h>
 
diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp
index 45de81cb..4305cd65 100644
--- a/kalarm/repetition.cpp
+++ b/kalarm/repetition.cpp
@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "buttongroup.h"
 #include "radiobutton.h"
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index d93a3b68..a63c4df8 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -31,7 +31,7 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #ifdef WITHOUT_ARTS
@@ -43,7 +43,7 @@
 #include <arts/kplayobjectfactory.h>
 #include <arts/kplayobject.h>
 #endif
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <kdebug.h>
 
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index 1ae3a6a8..947e9fb9 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -28,8 +28,8 @@
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp
index 465fdf51..fd4b7a7d 100644
--- a/kalarm/specialactions.cpp
+++ b/kalarm/specialactions.cpp
@@ -27,7 +27,7 @@
 #include <klineedit.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "functions.h"
diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp
index c555ce6a..8ee2ca38 100644
--- a/kalarm/templatedlg.cpp
+++ b/kalarm/templatedlg.cpp
@@ -24,9 +24,9 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaccel.h>
 #include <kdebug.h>
 
diff --git a/kalarm/templatelistview.cpp b/kalarm/templatelistview.cpp
index ac2852a7..64d17489 100644
--- a/kalarm/templatelistview.cpp
+++ b/kalarm/templatelistview.cpp
@@ -20,7 +20,7 @@
 
 #include "kalarm.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "alarmcalendar.h"
diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp
index 3df2d8dd..b3bc4488 100644
--- a/kalarm/templatepickdlg.cpp
+++ b/kalarm/templatepickdlg.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "functions.h"
diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp
index 9ec5c981..de7ef828 100644
--- a/kalarm/timeselector.cpp
+++ b/kalarm/timeselector.cpp
@@ -25,7 +25,7 @@
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kdebug.h>
 
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 54a04308..7eb6d2a4 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -25,10 +25,10 @@
 #include <tqtooltip.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
 #include <kstdguiitem.h>
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index 5e9b98ee..d1d3602f 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -24,8 +24,8 @@
 #include <tqstringlist.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "alarmcalendar.h"
-- 
cgit v1.2.3