diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:52:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:52:08 -0600 |
| commit | 784a2227ffdcb03a1e37b1390a8b6e0985ddda9c (patch) | |
| tree | 2497bf931758f4bbbf3ec4c538c947b1df27692b /src/gui | |
| parent | 2b2b805df5f62a0bc900253dd3e774f2e2ad31e3 (diff) | |
| download | tellico-784a2227ffdcb03a1e37b1390a8b6e0985ddda9c.tar.gz tellico-784a2227ffdcb03a1e37b1390a8b6e0985ddda9c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/counteditem.cpp | 2 | ||||
| -rw-r--r-- | src/gui/datewidget.cpp | 4 | ||||
| -rw-r--r-- | src/gui/fieldwidget.cpp | 2 | ||||
| -rw-r--r-- | src/gui/imagewidget.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kwidgetlister.cpp | 2 | ||||
| -rw-r--r-- | src/gui/previewdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/stringmapdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/tablefieldwidget.cpp | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/counteditem.cpp b/src/gui/counteditem.cpp index 56f4575..c890dea 100644 --- a/src/gui/counteditem.cpp +++ b/src/gui/counteditem.cpp @@ -15,7 +15,7 @@ #include "../tellico_utils.h" #include "../tellico_debug.h" -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstringhandler.h> #include <tqpainter.h> diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp index 52e51fb..b6ad777 100644 --- a/src/gui/datewidget.cpp +++ b/src/gui/datewidget.cpp @@ -22,8 +22,8 @@ #include <kpushbutton.h> #include <kdatepicker.h> #include <kiconloader.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <kcalendarsystem.h> #include <tqvbox.h> diff --git a/src/gui/fieldwidget.cpp b/src/gui/fieldwidget.cpp index 4ac43df..41d3d82 100644 --- a/src/gui/fieldwidget.cpp +++ b/src/gui/fieldwidget.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <kurllabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqwhatsthis.h> diff --git a/src/gui/imagewidget.cpp b/src/gui/imagewidget.cpp index 090f3c8..c336bf7 100644 --- a/src/gui/imagewidget.cpp +++ b/src/gui/imagewidget.cpp @@ -19,10 +19,10 @@ #include "../tellico_utils.h" #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kbuttonbox.h> #include <kurldrag.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqwmatrix.h> #include <tqlayout.h> diff --git a/src/gui/kwidgetlister.cpp b/src/gui/kwidgetlister.cpp index 9611152..6e2eaa1 100644 --- a/src/gui/kwidgetlister.cpp +++ b/src/gui/kwidgetlister.cpp @@ -31,7 +31,7 @@ #include "kwidgetlister.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kpushbutton.h> #include <kiconloader.h> diff --git a/src/gui/previewdialog.cpp b/src/gui/previewdialog.cpp index ea5a8f2..673c465 100644 --- a/src/gui/previewdialog.cpp +++ b/src/gui/previewdialog.cpp @@ -16,7 +16,7 @@ #include "../entry.h" #include "../imagefactory.h" // for StyleOptions -#include <klocale.h> +#include <tdelocale.h> #include <ktempdir.h> #include <tdehtmlview.h> diff --git a/src/gui/stringmapdialog.cpp b/src/gui/stringmapdialog.cpp index ba9fb18..85030d4 100644 --- a/src/gui/stringmapdialog.cpp +++ b/src/gui/stringmapdialog.cpp @@ -14,7 +14,7 @@ #include "stringmapdialog.h" #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kbuttonbox.h> #include <kiconloader.h> diff --git a/src/gui/tablefieldwidget.cpp b/src/gui/tablefieldwidget.cpp index 9df2880..5d63970 100644 --- a/src/gui/tablefieldwidget.cpp +++ b/src/gui/tablefieldwidget.cpp @@ -16,7 +16,7 @@ #include "../tellico_utils.h" #include "../tellico_kernel.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kiconloader.h> #include <kinputdialog.h> |