summaryrefslogtreecommitdiffstats
path: root/tdeui/kpixmapio.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
commit7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch)
treec76702a7f6310fbe9d437e347535422e836e94e9 /tdeui/kpixmapio.cpp
parenta2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff)
parent27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff)
downloadtdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz
tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeui/kpixmapio.cpp')
-rw-r--r--tdeui/kpixmapio.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp
index aafb7f3c2..02054aad3 100644
--- a/tdeui/kpixmapio.cpp
+++ b/tdeui/kpixmapio.cpp
@@ -18,8 +18,8 @@
#include <tqcolor.h>
#include <tqglobal.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <sys/types.h>
@@ -87,7 +87,7 @@ KPixmapIO::KPixmapIO()
#ifdef HAVE_MITSHM
setShmPolicy(ShmDontKeep);
- KConfig *config = KGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
if (!config->readBoolEntry("UseMitShm", true))
return;