diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
| commit | ed99a30644c19b0a3cf0d2147243532df4daa16b (patch) | |
| tree | 7f3f2850e59824fdf100a642367a82b1e7f0204f /tdecore/kglobalsettings.cpp | |
| parent | e5f2d46e9caf6942f365f1b454087dda71a340f7 (diff) | |
| download | tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kglobalsettings.cpp')
| -rw-r--r-- | tdecore/kglobalsettings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp index a103c4652..c0c6329c7 100644 --- a/tdecore/kglobalsettings.cpp +++ b/tdecore/kglobalsettings.cpp @@ -16,7 +16,7 @@ Boston, MA 02110-1301, USA. */ #include "config.h" -#include "kglobalsettings.h" +#include "tdeglobalsettings.h" #include <tqdir.h> #include <tqpixmap.h> @@ -40,12 +40,12 @@ static QRgb qt_colorref2qrgb(COLORREF col) #endif #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeshortcut.h> #include <kstandarddirs.h> #include <kcharsets.h> #include <tdeaccel.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfontinfo.h> #include <stdlib.h> #include <kprotocolinfo.h> |