diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:59:38 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:59:38 -0600 |
commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /kalarm | |
parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kalarm')
43 files changed, 86 insertions, 86 deletions
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index c3c7b8106..8d11854bd 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 78e57ad1e..00edf2109 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 6f88d3e4a..6d7e5f9e2 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 c030c384f..e1194ab0d 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 45abca7c6..94abd0e3e 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 165e5aba7..e50723ff0 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 734636dd5..c5769f942 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 7ea2f2160..c5fab8808 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 daf4406d3..091a648a3 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 f75d5f6f3..9a469e57a 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 e4b922431..74feffb67 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 6299049c6..5321cdc93 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 9808f06ea..f7dbc256f 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 b2ecb86f5..7530b14ac 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 e499f4814..a2cc4836a 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 314b6ad86..a5d9fd160 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 ddcd38f35..b68f45ba5 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 fa317c395..ff684a774 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 4db9f37ad..625933c70 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 09712beda..29475f716 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 bc6e64394..b31d629ae 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 b0cae2939..5baccca0a 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 c3653e9b8..c8ea891c4 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 67a846d7a..51760fc49 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 e372615a7..7f3706303 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 b2121072f..0ac932e69 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 b4c3f251e..4b023588d 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 3cacb47ea..7487a8a2d 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 b437fffd7..34814cbc1 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 40b716756..2525139f7 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 c0d9ff6cc..8bf67957e 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 cfda8fc27..4a39022e4 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 60c603368..dd4b41510 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 45de81cbf..4305cd651 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 d93a3b680..a63c4df86 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 1ae3a6a81..947e9fb91 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 465fdf510..fd4b7a7d5 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 c555ce6a0..8ee2ca387 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 ac2852a7f..64d174891 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 3df2d8dd7..b3bc44886 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 9ec5c9813..de7ef828d 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 54a043080..7eb6d2a44 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 5e9b98ee2..d1d3602f2 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" |