summaryrefslogtreecommitdiffstats
path: root/konqueror/iconview/konq_iconview.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 /konqueror/iconview/konq_iconview.cc
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/iconview/konq_iconview.cc')
-rw-r--r--konqueror/iconview/konq_iconview.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index 1e495efe3..a7bb5a812 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -31,16 +31,16 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <kdirlister.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kinputdialog.h>
#include <konq_settings.h>
#include <kpropertiesdialog.h>
#include <kstdaction.h>
#include <tdeparts/factory.h>
#include <ktrader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kivdirectoryoverlay.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstaticdeleter.h>
#include <tqregexp.h>