diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:53:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:53:01 -0600 |
| commit | 7f7536ce977e7a4a00727244246fc71062a76721 (patch) | |
| tree | 7deaba7d507a5bb63df96afb8d82ac336db80221 /kipi-plugins/calendar | |
| parent | ca974a522c029a32b1f01571806e93edb56883e1 (diff) | |
| download | kipi-plugins-7f7536ce977e7a4a00727244246fc71062a76721.tar.gz kipi-plugins-7f7536ce977e7a4a00727244246fc71062a76721.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kipi-plugins/calendar')
| -rw-r--r-- | kipi-plugins/calendar/calevents.cpp | 2 | ||||
| -rw-r--r-- | kipi-plugins/calendar/calformatter.cpp | 4 | ||||
| -rw-r--r-- | kipi-plugins/calendar/calpainter.cpp | 4 | ||||
| -rw-r--r-- | kipi-plugins/calendar/calselect.cpp | 4 | ||||
| -rw-r--r-- | kipi-plugins/calendar/calsettings.cpp | 4 | ||||
| -rw-r--r-- | kipi-plugins/calendar/caltemplate.cpp | 2 | ||||
| -rw-r--r-- | kipi-plugins/calendar/calwidget.cpp | 4 | ||||
| -rw-r--r-- | kipi-plugins/calendar/calwizard.cpp | 4 | ||||
| -rw-r--r-- | kipi-plugins/calendar/monthwidget.cpp | 4 | ||||
| -rw-r--r-- | kipi-plugins/calendar/plugin_calendar.cpp | 2 |
10 files changed, 17 insertions, 17 deletions
diff --git a/kipi-plugins/calendar/calevents.cpp b/kipi-plugins/calendar/calevents.cpp index 4c493e5..ccdd39a 100644 --- a/kipi-plugins/calendar/calevents.cpp +++ b/kipi-plugins/calendar/calevents.cpp @@ -25,7 +25,7 @@ #include <kiconloader.h> #include <tdefiledialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "calevents.h" diff --git a/kipi-plugins/calendar/calformatter.cpp b/kipi-plugins/calendar/calformatter.cpp index 8acc8d8..62e8c7e 100644 --- a/kipi-plugins/calendar/calformatter.cpp +++ b/kipi-plugins/calendar/calformatter.cpp @@ -26,8 +26,8 @@ #include <tqmap.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcalendarsystem.h> #include <libkcal/calendarlocal.h> diff --git a/kipi-plugins/calendar/calpainter.cpp b/kipi-plugins/calendar/calpainter.cpp index 7e791a8..5db3307 100644 --- a/kipi-plugins/calendar/calpainter.cpp +++ b/kipi-plugins/calendar/calpainter.cpp @@ -33,8 +33,8 @@ // KDE includes. -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeversion.h> #include <kcalendarsystem.h> #include <kdebug.h> diff --git a/kipi-plugins/calendar/calselect.cpp b/kipi-plugins/calendar/calselect.cpp index 2277853..fbe2fd0 100644 --- a/kipi-plugins/calendar/calselect.cpp +++ b/kipi-plugins/calendar/calselect.cpp @@ -31,8 +31,8 @@ // KDE includes. -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcalendarsystem.h> #include <kstandarddirs.h> diff --git a/kipi-plugins/calendar/calsettings.cpp b/kipi-plugins/calendar/calsettings.cpp index ce9c657..c25191f 100644 --- a/kipi-plugins/calendar/calsettings.cpp +++ b/kipi-plugins/calendar/calsettings.cpp @@ -21,8 +21,8 @@ // KDE includes. -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcalendarsystem.h> // Local includes. diff --git a/kipi-plugins/calendar/caltemplate.cpp b/kipi-plugins/calendar/caltemplate.cpp index b6b2c90..6894ec5 100644 --- a/kipi-plugins/calendar/caltemplate.cpp +++ b/kipi-plugins/calendar/caltemplate.cpp @@ -41,7 +41,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> // Local includes. diff --git a/kipi-plugins/calendar/calwidget.cpp b/kipi-plugins/calendar/calwidget.cpp index f32e8e7..b5efe78 100644 --- a/kipi-plugins/calendar/calwidget.cpp +++ b/kipi-plugins/calendar/calwidget.cpp @@ -32,8 +32,8 @@ // KDE includes. -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcalendarsystem.h> // Local includes. diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp index d8fc6b2..c125180 100644 --- a/kipi-plugins/calendar/calwizard.cpp +++ b/kipi-plugins/calendar/calwizard.cpp @@ -37,8 +37,8 @@ // KDE includes. -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kprinter.h> #include <tdeapplication.h> #include <khelpmenu.h> diff --git a/kipi-plugins/calendar/monthwidget.cpp b/kipi-plugins/calendar/monthwidget.cpp index cfdeb78..31929bb 100644 --- a/kipi-plugins/calendar/monthwidget.cpp +++ b/kipi-plugins/calendar/monthwidget.cpp @@ -38,8 +38,8 @@ #include <kiconloader.h> #include <tdefiledialog.h> #include <kimageio.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/kipi-plugins/calendar/plugin_calendar.cpp b/kipi-plugins/calendar/plugin_calendar.cpp index ad34bc2..35f320b 100644 --- a/kipi-plugins/calendar/plugin_calendar.cpp +++ b/kipi-plugins/calendar/plugin_calendar.cpp @@ -26,7 +26,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kgenericfactory.h> #include <klibloader.h> |