summaryrefslogtreecommitdiffstats
path: root/kitchensync
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:50 -0600
commitb363d2579af0a11b77e698aed2e1021c2233b644 (patch)
treef4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /kitchensync
parent61bddfe3a7226b18c68a76124b727c736f431688 (diff)
downloadtdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz
tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kitchensync')
-rw-r--r--kitchensync/src/CMakeLists.txt2
-rw-r--r--kitchensync/src/Makefile.am2
-rw-r--r--kitchensync/src/aboutpage.cpp4
-rw-r--r--kitchensync/src/part.cpp2
-rw-r--r--kitchensync/src/part.h6
5 files changed, 8 insertions, 8 deletions
diff --git a/kitchensync/src/CMakeLists.txt b/kitchensync/src/CMakeLists.txt
index 29aae78c6..6820e250b 100644
--- a/kitchensync/src/CMakeLists.txt
+++ b/kitchensync/src/CMakeLists.txt
@@ -72,6 +72,6 @@ tde_add_library( kitchensync SHARED AUTOMOC
configguijescs.cpp configguievo2.cpp configguimoto.cpp
configguisynce.cpp configguisunbird.cpp
VERSION 0.0.0
- LINK qopensync-shared tdepim-shared khtml-shared
+ LINK qopensync-shared tdepim-shared tdehtml-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am
index 43568e7f5..779aec82e 100644
--- a/kitchensync/src/Makefile.am
+++ b/kitchensync/src/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \
bin_PROGRAMS = kitchensync
kitchensync_SOURCES = main.cpp mainwindow.cpp
-kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kitchensync_LDADD = libkitchensync.la
xdg_apps_DATA = kitchensync.desktop
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index fe252460e..50f4d1de6 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -24,8 +24,8 @@
#include <kaboutdata.h>
#include <kapplication.h>
#include <kdebug.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
#include <kiconloader.h>
#include <klocale.h>
#include <krun.h>
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index 1cf4d7a6c..0c015e107 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -27,7 +27,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <klocale.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
#include "mainwidget.h"
diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h
index 7a716de1e..b799cea51 100644
--- a/kitchensync/src/part.h
+++ b/kitchensync/src/part.h
@@ -21,9 +21,9 @@
#ifndef PART_H
#define PART_H
-#include <kparts/event.h>
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/event.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
class TDEAboutData;