summaryrefslogtreecommitdiffstats
path: root/kalarm/mainwindow.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
commitcfb328d59024a251690b6e47c9f8d343fd8c241c (patch)
tree7c11070cd07e5e023a26ddcfa41832c208c63732 /kalarm/mainwindow.cpp
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kalarm/mainwindow.cpp')
-rw-r--r--kalarm/mainwindow.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 3cacb47ea..7487a8a2d 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -24,7 +24,7 @@
#include <tqdragobject.h>
#include <tqheader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tdetoolbar.h>
#include <tdepopupmenu.h>
#include <tdeaccel.h>
@@ -32,10 +32,10 @@
#include <tdeactionclasses.h>
#include <kstdaction.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurldrag.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <kkeydialog.h>
#include <kedittoolbar.h>