summaryrefslogtreecommitdiffstats
path: root/kicker/menuext
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:16:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:16:20 -0600
commitdc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (patch)
tree4ebcd3dac0133d8d3fa880bbf83692c305b7350d /kicker/menuext
parent1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff)
downloadtdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz
tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kicker/menuext')
-rw-r--r--kicker/menuext/prefmenu/prefmenu.cpp2
-rw-r--r--kicker/menuext/prefmenu/prefmenu.h2
-rw-r--r--kicker/menuext/tom/tom.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 827b0e40c..03e53682b 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kservice.h>
#include <kservicegroup.h>
#include <kstandarddirs.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
#include <kurl.h>
#include <kurldrag.h>
diff --git a/kicker/menuext/prefmenu/prefmenu.h b/kicker/menuext/prefmenu/prefmenu.h
index d673fceef..10befe6b2 100644
--- a/kicker/menuext/prefmenu/prefmenu.h
+++ b/kicker/menuext/prefmenu/prefmenu.h
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqmap.h>
#include <kpanelmenu.h>
-#include <ksycocaentry.h>
+#include <tdesycocaentry.h>
typedef TQMap<int, KSycocaEntry::Ptr> EntryMap;
typedef TQPtrList<TQPopupMenu> PopupMenuList;
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index 19ff376f4..100045339 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -49,7 +49,7 @@ using namespace std;
#include <kservicegroup.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
-#include <ksycocaentry.h>
+#include <tdesycocaentry.h>
#include "menuinfo.h"
#include "service_mnu.h"