diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
| commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
| tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /kalarm/lib | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kalarm/lib')
| -rw-r--r-- | kalarm/lib/colourcombo.cpp | 2 | ||||
| -rw-r--r-- | kalarm/lib/dateedit.cpp | 6 | ||||
| -rw-r--r-- | kalarm/lib/datetime.cpp | 4 | ||||
| -rw-r--r-- | kalarm/lib/messagebox.h | 2 | ||||
| -rw-r--r-- | kalarm/lib/shellprocess.cpp | 2 | ||||
| -rw-r--r-- | kalarm/lib/timeedit.cpp | 4 | ||||
| -rw-r--r-- | kalarm/lib/timeperiod.cpp | 2 | ||||
| -rw-r--r-- | kalarm/lib/timespinbox.cpp | 2 |
8 files changed, 12 insertions, 12 deletions
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" |