summaryrefslogtreecommitdiffstats
path: root/kmenuedit
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 /kmenuedit
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kmenuedit')
-rw-r--r--kmenuedit/kmenuedit.cpp4
-rw-r--r--kmenuedit/kmenuedit.h2
-rw-r--r--kmenuedit/menuinfo.h2
-rw-r--r--kmenuedit/treeview.cpp2
-rw-r--r--kmenuedit/treeview.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index 80f5eabf..8e7073b6 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -20,7 +20,7 @@
#include <tqsplitter.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
@@ -30,7 +30,7 @@
#include <kmessagebox.h>
#include <kservice.h>
#include <kstdaction.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include "treeview.h"
#include "basictab.h"
diff --git a/kmenuedit/kmenuedit.h b/kmenuedit/kmenuedit.h
index fdd79bce..15e5c797 100644
--- a/kmenuedit/kmenuedit.h
+++ b/kmenuedit/kmenuedit.h
@@ -20,7 +20,7 @@
#ifndef __kmenuedit_h__
#define __kmenuedit_h__
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <treeview.h>
class BasicTab;
diff --git a/kmenuedit/menuinfo.h b/kmenuedit/menuinfo.h
index 616df68a..9497022d 100644
--- a/kmenuedit/menuinfo.h
+++ b/kmenuedit/menuinfo.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <kservice.h>
class MenuFile;
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index c58d7bf0..dc90bcda 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -41,7 +41,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <kdesktopfile.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kmessagebox.h>
#include <kapplication.h>
#include <kservice.h>
diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h
index 562a3330..3370f5bc 100644
--- a/kmenuedit/treeview.h
+++ b/kmenuedit/treeview.h
@@ -23,7 +23,7 @@
#define __treeview_h__
#include <tqstring.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kservice.h>
#include <kservicegroup.h>