summaryrefslogtreecommitdiffstats
path: root/kmenuedit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
commitde7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch)
treedbb3152c372f8620f9290137d461f3d9f9eba1cb /kmenuedit
parent936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff)
downloadtdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz
tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kmenuedit')
-rw-r--r--kmenuedit/CMakeLists.txt2
-rw-r--r--kmenuedit/basictab.cpp2
-rw-r--r--kmenuedit/kmenuedit.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/kmenuedit/CMakeLists.txt b/kmenuedit/CMakeLists.txt
index 0cf7ec2d..e864464f 100644
--- a/kmenuedit/CMakeLists.txt
+++ b/kmenuedit/CMakeLists.txt
@@ -54,5 +54,5 @@ tde_add_library( kmenueditcommon STATIC_PIC AUTOMOC
SOURCES
basictab.cpp treeview.cpp kmenuedit.cpp
khotkeys.cpp menufile.cpp menuinfo.cpp
- LINK kio-shared
+ LINK tdeio-shared
)
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index 9687384d..bdee0e3b 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -36,7 +36,7 @@
#include <kicondialog.h>
#include <kdesktopfile.h>
#include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kcombobox.h>
#include <kkeydialog.h>
#include <kprocess.h>
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index 018b69f0..48af1312 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -22,7 +22,7 @@
#include <kaction.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kedittoolbar.h>
#include <kglobal.h>