summaryrefslogtreecommitdiffstats
path: root/tdecore/kglobalsettings.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:04 -0600
commitd1e0cc99a202cef3306b90b8839a6726e89f201e (patch)
treea0d01a91644fd94aa6da5d8944e052b67461faad /tdecore/kglobalsettings.cpp
parent3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff)
downloadtdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz
tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kglobalsettings.cpp')
-rw-r--r--tdecore/kglobalsettings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp
index f9774a886..27ba7743e 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/kglobalsettings.cpp
@@ -41,10 +41,10 @@ static QRgb qt_colorref2qrgb(COLORREF col)
#include <kdebug.h>
#include <kglobal.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <kstandarddirs.h>
#include <kcharsets.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <klocale.h>
#include <tqfontinfo.h>
#include <stdlib.h>