12 files changed, 15 insertions, 15 deletions
diff --git a/tdeprint/kjobviewer/CMakeLists.txt b/tdeprint/kjobviewer/CMakeLists.txt
index 332fa7fc4..14ba1dfd4 100644
--- a/tdeprint/kjobviewer/CMakeLists.txt
+++ b/tdeprint/kjobviewer/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-add_definitions( -D_KDEPRINT_COMPILE )
+add_definitions( -D_TDEPRINT_COMPILE )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/tdeprint/kjobviewer/Makefile.am b/tdeprint/kjobviewer/Makefile.am
index 5362ad033..0af72ba5a 100644
--- a/tdeprint/kjobviewer/Makefile.am
+++ b/tdeprint/kjobviewer/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES = $(all_includes)
 
@@ -8,7 +8,7 @@ tdeinit_LTLIBRARIES = kjobviewer.la
 
 kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp
 kjobviewer_la_METASOURCES = AUTO
-kjobviewer_la_LIBADD = -ltdeprint_management $(LIB_KDEUI)
+kjobviewer_la_LIBADD = -ltdeprint_management $(LIB_TDEUI)
 kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
 
 noinst_HEADERS = kjobviewer.h
diff --git a/tdeprint/kprinter/CMakeLists.txt b/tdeprint/kprinter/CMakeLists.txt
index 0849ebe12..a5baa1285 100644
--- a/tdeprint/kprinter/CMakeLists.txt
+++ b/tdeprint/kprinter/CMakeLists.txt
@@ -13,7 +13,7 @@ include( CheckFunctionExists )
 check_function_exists( sigset HAVE_SIGACTION )
 check_function_exists( sigaction HAVE_SIGSET )
 
-add_definitions( -D_KDEPRINT_COMPILE )
+add_definitions( -D_TDEPRINT_COMPILE )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/tdeprint/kprinter/Makefile.am b/tdeprint/kprinter/Makefile.am
index 4cab98880..67d958033 100644
--- a/tdeprint/kprinter/Makefile.am
+++ b/tdeprint/kprinter/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES = $(all_includes)
 
diff --git a/tdeprint/printmgr/CMakeLists.txt b/tdeprint/printmgr/CMakeLists.txt
index af68abb3f..4498837b2 100644
--- a/tdeprint/printmgr/CMakeLists.txt
+++ b/tdeprint/printmgr/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-add_definitions( -D_KDEPRINT_COMPILE )
+add_definitions( -D_TDEPRINT_COMPILE )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/tdeprint/printmgr/Makefile.am b/tdeprint/printmgr/Makefile.am
index d0932829a..b982dcd79 100644
--- a/tdeprint/printmgr/Makefile.am
+++ b/tdeprint/printmgr/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES = $(all_includes)
 
diff --git a/tdeprint/slave/CMakeLists.txt b/tdeprint/slave/CMakeLists.txt
index db9162a1b..fd042657e 100644
--- a/tdeprint/slave/CMakeLists.txt
+++ b/tdeprint/slave/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-add_definitions( -D_KDEPRINT_COMPILE )
+add_definitions( -D_TDEPRINT_COMPILE )
 
 add_subdirectory( mimetypes )
 add_subdirectory( templates )
diff --git a/tdeprint/slave/Makefile.am b/tdeprint/slave/Makefile.am
index 5e5e04123..46dbe4250 100644
--- a/tdeprint/slave/Makefile.am
+++ b/tdeprint/slave/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 SUBDIRS = mimetypes templates
 
diff --git a/tdeprint/tdeprint_part/CMakeLists.txt b/tdeprint/tdeprint_part/CMakeLists.txt
index 6de7ddb91..586d134c6 100644
--- a/tdeprint/tdeprint_part/CMakeLists.txt
+++ b/tdeprint/tdeprint_part/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-add_definitions( -D_KDEPRINT_COMPILE )
+add_definitions( -D_TDEPRINT_COMPILE )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/tdeprint/tdeprint_part/Makefile.am b/tdeprint/tdeprint_part/Makefile.am
index e27404a0f..27422bd89 100644
--- a/tdeprint/tdeprint_part/Makefile.am
+++ b/tdeprint/tdeprint_part/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 kde_module_LTLIBRARIES = libtdeprint_part.la
 
diff --git a/tdeprint/tdeprintfax/Makefile.am b/tdeprint/tdeprintfax/Makefile.am
index cd0d39900..643a805b0 100644
--- a/tdeprint/tdeprintfax/Makefile.am
+++ b/tdeprint/tdeprintfax/Makefile.am
@@ -3,8 +3,8 @@ 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_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-tdeprintfax_LDADD   = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) -lkabc
+tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+tdeprintfax_LDADD   = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) -lkabc
 tdeprintfax_METASOURCES = AUTO
 
 xdg_apps_DATA = tdeprintfax.desktop
diff --git a/tdeprint/tdeprintfax/tdeprintfax.h b/tdeprint/tdeprintfax/tdeprintfax.h
index fc1a02f7f..4645434ad 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.h
+++ b/tdeprint/tdeprintfax/tdeprintfax.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef KDEPRINTFAX_H
-#define KDEPRINTFAX_H
+#ifndef TDEPRINTFAX_H
+#define TDEPRINTFAX_H
 
 #include <kmainwindow.h>
 #include <kurl.h>