summaryrefslogtreecommitdiffstats
path: root/tdeprint
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 /tdeprint
parent1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff)
downloadtdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz
tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdeprint')
-rw-r--r--tdeprint/tdeprint_part/CMakeLists.txt2
-rw-r--r--tdeprint/tdeprint_part/printpart.cpp2
-rw-r--r--tdeprint/tdeprint_part/printpart.h4
-rw-r--r--tdeprint/tdeprintfax/Makefile.am2
4 files changed, 5 insertions, 5 deletions
diff --git a/tdeprint/tdeprint_part/CMakeLists.txt b/tdeprint/tdeprint_part/CMakeLists.txt
index 586d134c6..c0f04a9fe 100644
--- a/tdeprint/tdeprint_part/CMakeLists.txt
+++ b/tdeprint/tdeprint_part/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES tdeprint_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
tde_add_kpart( libtdeprint_part AUTOMOC
SOURCES printpart.cpp
- LINK tdeprint_management-shared kparts-shared
+ LINK tdeprint_management-shared tdeparts-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp
index 0ac1adcd2..c725aa872 100644
--- a/tdeprint/tdeprint_part/printpart.cpp
+++ b/tdeprint/tdeprint_part/printpart.cpp
@@ -27,7 +27,7 @@
#include <kiconloader.h>
#include <kaboutdata.h>
#include <kdebug.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
#include <tqwidget.h>
typedef KParts::GenericFactory<PrintPart> PrintPartFactory;
diff --git a/tdeprint/tdeprint_part/printpart.h b/tdeprint/tdeprint_part/printpart.h
index 98881d0f9..40e8041ea 100644
--- a/tdeprint/tdeprint_part/printpart.h
+++ b/tdeprint/tdeprint_part/printpart.h
@@ -20,8 +20,8 @@
#ifndef PRINTPART_H
#define PRINTPART_H
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
class PrintPartExtension;
class KMMainView;
diff --git a/tdeprint/tdeprintfax/Makefile.am b/tdeprint/tdeprintfax/Makefile.am
index 643a805b0..5c0b21659 100644
--- a/tdeprint/tdeprintfax/Makefile.am
+++ b/tdeprint/tdeprintfax/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= $(all_includes)
bin_PROGRAMS = tdeprintfax
tdeprintfax_SOURCES = main.cpp tdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \
conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp
-tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
tdeprintfax_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) -lkabc
tdeprintfax_METASOURCES = AUTO