diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /kexi/3rdparty | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kexi/3rdparty')
| -rw-r--r-- | kexi/3rdparty/kolibs/KoPageLayoutSize.cpp | 4 | ||||
| -rw-r--r-- | kexi/3rdparty/kolibs/koGlobal.cc | 6 | ||||
| -rw-r--r-- | kexi/3rdparty/kolibs/koPageLayout.cpp | 4 | ||||
| -rw-r--r-- | kexi/3rdparty/kolibs/koPageLayoutDia.cc | 4 | ||||
| -rw-r--r-- | kexi/3rdparty/kolibs/koUnit.cc | 4 | ||||
| -rw-r--r-- | kexi/3rdparty/kolibs/koUnitWidgets.cc | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp index 26960701..90adff17 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp @@ -22,9 +22,9 @@ #include <KoUnit.h> #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc index 24aa75ed..a375327f 100644 --- a/kexi/3rdparty/kolibs/koGlobal.cc +++ b/kexi/3rdparty/kolibs/koGlobal.cc @@ -23,9 +23,9 @@ #include <kdebug.h> #include <tqfont.h> #include <tqfontinfo.h> -#include <kglobalsettings.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp index b4640a30..6aa0ea66 100644 --- a/kexi/3rdparty/kolibs/koPageLayout.cpp +++ b/kexi/3rdparty/kolibs/koPageLayout.cpp @@ -20,10 +20,10 @@ */ #include "KoPageLayout.h" #include <KoUnit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #ifndef SIMPLE_KOLIBS # include <kodom.h> # include <koxmlns.h> diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc index 99d5e01d..2f0db91a 100644 --- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc +++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc @@ -29,9 +29,9 @@ #include <KoUnit.h> #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc index 38c8b111..a2eb289a 100644 --- a/kexi/3rdparty/kolibs/koUnit.cc +++ b/kexi/3rdparty/kolibs/koUnit.cc @@ -24,8 +24,8 @@ # include <KoXmlWriter.h> #endif -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tqregexp.h> diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc index 3f6fb09e..097dfc25 100644 --- a/kexi/3rdparty/kolibs/koUnitWidgets.cc +++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc @@ -20,8 +20,8 @@ #include "koUnitWidgets.moc" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqpushbutton.h> #include <tqlayout.h> |