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 /konsolekalendar | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konsolekalendar')
| -rw-r--r-- | konsolekalendar/konsolekalendar.cpp | 2 | ||||
| -rw-r--r-- | konsolekalendar/konsolekalendaradd.cpp | 2 | ||||
| -rw-r--r-- | konsolekalendar/konsolekalendarchange.cpp | 2 | ||||
| -rw-r--r-- | konsolekalendar/konsolekalendardelete.cpp | 2 | ||||
| -rw-r--r-- | konsolekalendar/konsolekalendarexports.cpp | 2 | ||||
| -rw-r--r-- | konsolekalendar/konsolekalendarvariables.cpp | 4 | ||||
| -rw-r--r-- | konsolekalendar/main.cpp | 4 | ||||
| -rw-r--r-- | konsolekalendar/stdcalendar.cpp | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp index 3c7d2f003..535478cf8 100644 --- a/konsolekalendar/konsolekalendar.cpp +++ b/konsolekalendar/konsolekalendar.cpp @@ -40,7 +40,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <libkcal/calendarlocal.h> #include <libkcal/resourcecalendar.h> diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp index 36e23629c..d7b2774bc 100644 --- a/konsolekalendar/konsolekalendaradd.cpp +++ b/konsolekalendar/konsolekalendaradd.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <libkcal/calendarlocal.h> #include <libkcal/calendar.h> diff --git a/konsolekalendar/konsolekalendarchange.cpp b/konsolekalendar/konsolekalendarchange.cpp index 338ed1e54..7c9e3b5e7 100644 --- a/konsolekalendar/konsolekalendarchange.cpp +++ b/konsolekalendar/konsolekalendarchange.cpp @@ -34,7 +34,7 @@ #include <iostream> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "konsolekalendarchange.h" diff --git a/konsolekalendar/konsolekalendardelete.cpp b/konsolekalendar/konsolekalendardelete.cpp index 65b8d4254..4da761006 100644 --- a/konsolekalendar/konsolekalendardelete.cpp +++ b/konsolekalendar/konsolekalendardelete.cpp @@ -34,7 +34,7 @@ #include <iostream> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "konsolekalendardelete.h" diff --git a/konsolekalendar/konsolekalendarexports.cpp b/konsolekalendar/konsolekalendarexports.cpp index 9894ac96c..bf0748a3e 100644 --- a/konsolekalendar/konsolekalendarexports.cpp +++ b/konsolekalendar/konsolekalendarexports.cpp @@ -36,7 +36,7 @@ #include <tqdatetime.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <libkcal/calendarlocal.h> #include <libkcal/calendar.h> diff --git a/konsolekalendar/konsolekalendarvariables.cpp b/konsolekalendar/konsolekalendarvariables.cpp index e5541e00d..fddb77d90 100644 --- a/konsolekalendar/konsolekalendarvariables.cpp +++ b/konsolekalendar/konsolekalendarvariables.cpp @@ -30,9 +30,9 @@ * @author Tuukka Pasanen * @author Allen Winter */ -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index 0339634ce..d03d084a1 100644 --- a/konsolekalendar/main.cpp +++ b/konsolekalendar/main.cpp @@ -47,8 +47,8 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/konsolekalendar/stdcalendar.cpp b/konsolekalendar/stdcalendar.cpp index 3c735df73..0c871b811 100644 --- a/konsolekalendar/stdcalendar.cpp +++ b/konsolekalendar/stdcalendar.cpp @@ -28,7 +28,7 @@ #include <tdeconfig.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> using namespace KCal; |