summaryrefslogtreecommitdiffstats
path: root/libkonq/konq_settings.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
commit77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch)
treea1cce95474892add7cb970b8e9fbdb16e12bc2d7 /libkonq/konq_settings.cc
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libkonq/konq_settings.cc')
-rw-r--r--libkonq/konq_settings.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc
index aef17475b..41460e8ae 100644
--- a/libkonq/konq_settings.cc
+++ b/libkonq/konq_settings.cc
@@ -19,8 +19,8 @@
#include "konq_settings.h"
#include "konq_defaults.h"
-#include "kglobalsettings.h"
-#include <kglobal.h>
+#include "tdeglobalsettings.h"
+#include <tdeglobal.h>
#include <kservicetype.h>
#include <kdesktopfile.h>
#include <kdebug.h>