summaryrefslogtreecommitdiffstats
path: root/kpager/kpager.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
commita5430e4b98efd05937bd3bfe78c56eb826f145fa (patch)
tree1af88f74a9d800399de58491b215fb303cbfb1f3 /kpager/kpager.cpp
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kpager/kpager.cpp')
-rw-r--r--kpager/kpager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index d689b7140..dac64ab5a 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -44,7 +44,7 @@
#include <kapplication.h>
#include <kglobalsettings.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <kglobal.h>
#include <tdeconfig.h>
@@ -55,7 +55,7 @@
#include <netwm.h>
#include "desktop.h"
#include <tqpopupmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kiconloader.h>
#include <assert.h>