diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /lib/kopalette | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/kopalette')
| -rw-r--r-- | lib/kopalette/kopalette.cc | 6 | ||||
| -rw-r--r-- | lib/kopalette/kopalettemanager.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 2202a86f..cd392205 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -29,9 +29,9 @@ #include <tqlayout.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tdeaccelmanager.h> #include <tdeconfig.h> diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index 2bb6a039..26f30992 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -29,8 +29,8 @@ #include <tdeaction.h> #include <tdeactionclasses.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <KoView.h> #include <KoMainWindow.h> |