Rename additional instances of KDE to TDE

72 files changed, 111 insertions, 111 deletions

diff --git a/tdeprint/CMakeLists.txt b/tdeprint/CMakeLists.txt
index bdbacc0bb..a7a97809f 100644
--- a/tdeprint/CMakeLists.txt
+++ b/tdeprint/CMakeLists.txt
@@ -121,4 +121,4 @@ tde_add_library( ${target} SHARED AUTOMOC
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
-set_target_properties( ${target}-shared PROPERTIES COMPILE_FLAGS -D_KDEPRINT_COMPILE )
+set_target_properties( ${target}-shared PROPERTIES COMPILE_FLAGS -D_TDEPRINT_COMPILE )
diff --git a/tdeprint/Makefile.am b/tdeprint/Makefile.am
index fecf25c64..b70e46e93 100644
--- a/tdeprint/Makefile.am
+++ b/tdeprint/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 if include_cups_SUBDIR
 CUPSSUBDIR=cups
@@ -11,7 +11,7 @@ INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/kded -I$(top_srcdir) $(all_inclu
 kde_module_LTLIBRARIES = kded_tdeprintd.la
 
 kded_tdeprintd_la_SOURCES = tdeprintd.skel tdeprintd.cpp kprintprocess.cpp
-kded_tdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libtdeinit_kded.la
+kded_tdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(top_builddir)/kded/libtdeinit_kded.la
 kded_tdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version
 #kded_tdeprintd_la_METASOURCES = AUTO
 
@@ -30,7 +30,7 @@ libtdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp
 			 fooparser.cpp fooscanner.cpp ppdparser.cpp ppdscanner.cpp ppdloader.cpp
 
 libtdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libtdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)
+libtdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
 libtdeprint_la_DEPENDENCIES =  $(LIB_KPARTS) 
 libtdeprint_la_METASOURCES = AUTO
 
diff --git a/tdeprint/cups/CMakeLists.txt b/tdeprint/cups/CMakeLists.txt
index 2166cc08f..62c48618c 100644
--- a/tdeprint/cups/CMakeLists.txt
+++ b/tdeprint/cups/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_subdirectory( cupsdconf2 )
 
 add_definitions(
-  -D_KDEPRINT_COMPILE
+  -D_TDEPRINT_COMPILE
 )
 
 include_directories(
diff --git a/tdeprint/cups/Makefile.am b/tdeprint/cups/Makefile.am
index 6f3d7edec..64e8b997d 100644
--- a/tdeprint/cups/Makefile.am
+++ b/tdeprint/cups/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 SUBDIRS = cupsdconf2
 
@@ -15,7 +15,7 @@ tdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcups
 				  kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
 				  kptagspage.cpp
 tdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_cups_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
+tdeprint_cups_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_TDEPRINT) $(LIB_TDECORE) $(LIB_TDEUI)
 tdeprint_cups_la_METASOURCES = AUTO
 
 noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
diff --git a/tdeprint/cups/cupsdconf2/Makefile.am b/tdeprint/cups/cupsdconf2/Makefile.am
index 434af6a3c..eb7e42159 100644
--- a/tdeprint/cups/cupsdconf2/Makefile.am
+++ b/tdeprint/cups/cupsdconf2/Makefile.am
@@ -15,7 +15,7 @@ cupsdconf_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment.
 			  qdirmultilineedit.cpp sizewidget.cpp main.cpp
 cupsdconf_la_METASOURCES = AUTO
 cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH)
-cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
 
 noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \
 		 cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h cupsdfilterpage.h \
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
index e6338eb8c..bc91f9ffe 100644
--- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
@@ -55,11 +55,11 @@ static TQString	pass_string;
 extern "C"
 {
 #include "cups-util.h"
-	KDEPRINT_EXPORT bool restartServer(TQString& msg)
+	TDEPRINT_EXPORT bool restartServer(TQString& msg)
 	{
 		return CupsdDialog::restartServer(msg);
 	}
-	KDEPRINT_EXPORT bool configureServer(TQWidget *parent, TQString& msg)
+	TDEPRINT_EXPORT bool configureServer(TQWidget *parent, TQString& msg)
 	{
 		dynamically_loaded = true;
 		bool result = CupsdDialog::configure(TQString::null, parent, &msg);
diff --git a/tdeprint/driver.h b/tdeprint/driver.h
index 7064e5335..423f8c85b 100644
--- a/tdeprint/driver.h
+++ b/tdeprint/driver.h
@@ -21,7 +21,7 @@
 #ifndef DRIVER_H
 #define DRIVER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -58,7 +58,7 @@ class DrPageSize;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrBase
+class TDEPRINT_EXPORT DrBase
 {
 public:
 	enum Type { Base = 0, Main, ChoiceGroup, Group, String, Integer, Float, List, Boolean };
@@ -103,7 +103,7 @@ protected:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrGroup : public DrBase
+class TDEPRINT_EXPORT DrGroup : public DrBase
 {
 public:
 	DrGroup();
@@ -150,7 +150,7 @@ protected:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrMain : public DrGroup
+class TDEPRINT_EXPORT DrMain : public DrGroup
 {
 public:
 	DrMain();
@@ -202,7 +202,7 @@ public:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrStringOption : public DrBase
+class TDEPRINT_EXPORT DrStringOption : public DrBase
 {
 public:
 	DrStringOption();
@@ -226,7 +226,7 @@ protected:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrIntegerOption : public DrBase
+class TDEPRINT_EXPORT DrIntegerOption : public DrBase
 {
 public:
 	DrIntegerOption();
@@ -251,7 +251,7 @@ protected:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrFloatOption : public DrBase
+class TDEPRINT_EXPORT DrFloatOption : public DrBase
 {
 public:
 	DrFloatOption();
@@ -276,7 +276,7 @@ protected:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrListOption : public DrBase
+class TDEPRINT_EXPORT DrListOption : public DrBase
 {
 public:
 	DrListOption();
@@ -308,7 +308,7 @@ protected:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrBooleanOption : public DrListOption
+class TDEPRINT_EXPORT DrBooleanOption : public DrListOption
 {
 	/* just an overloaded class, with different type */
 public:
diff --git a/tdeprint/driverview.h b/tdeprint/driverview.h
index 4ec06c5fa..e0ba373ca 100644
--- a/tdeprint/driverview.h
+++ b/tdeprint/driverview.h
@@ -30,13 +30,13 @@
 class DrOptionView;
 class DrMain;
 
-class KDEPRINT_EXPORT DrListView : public KListView
+class TDEPRINT_EXPORT DrListView : public KListView
 {
 public:
 	DrListView(TQWidget *parent = 0, const char *name = 0);
 };
 
-class KDEPRINT_EXPORT DriverView : public TQWidget
+class TDEPRINT_EXPORT DriverView : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/ext/CMakeLists.txt b/tdeprint/ext/CMakeLists.txt
index 9f4b2d629..83b1e3dab 100644
--- a/tdeprint/ext/CMakeLists.txt
+++ b/tdeprint/ext/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_definitions(
-  -D_KDEPRINT_COMPILE
+  -D_TDEPRINT_COMPILE
 )
 
 include_directories(
diff --git a/tdeprint/ext/Makefile.am b/tdeprint/ext/Makefile.am
index 66e547c9d..1cfccec43 100644
--- a/tdeprint/ext/Makefile.am
+++ b/tdeprint/ext/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint $(all_includes)
 
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = tdeprint_ext.la
 
 tdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp
 tdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_ext_la_LIBADD = $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
+tdeprint_ext_la_LIBADD = $(LIB_TDEPRINT) $(LIB_QT) $(LIB_TDECORE)
 tdeprint_ext_la_METASOURCES = AUTO
 
 noinst_HEADERS = kmextmanager.h kextprinterimpl.h kmextuimanager.h
diff --git a/tdeprint/foomatic2loader.h b/tdeprint/foomatic2loader.h
index 19cfc9d9d..dc2419f87 100644
--- a/tdeprint/foomatic2loader.h
+++ b/tdeprint/foomatic2loader.h
@@ -28,7 +28,7 @@
 class DrBase;
 class DrMain;
 
-class KDEPRINT_EXPORT Foomatic2Loader
+class TDEPRINT_EXPORT Foomatic2Loader
 {
 public:
 	Foomatic2Loader();
diff --git a/tdeprint/kmdbentry.h b/tdeprint/kmdbentry.h
index cccec92b6..e2ca1dfd0 100644
--- a/tdeprint/kmdbentry.h
+++ b/tdeprint/kmdbentry.h
@@ -25,7 +25,7 @@
 
 #include <kdelibs_export.h>
 
-struct KDEPRINT_EXPORT KMDBEntry
+struct TDEPRINT_EXPORT KMDBEntry
 {
 	// the file location of the driver
 	TQString	file;
diff --git a/tdeprint/kmfactory.h b/tdeprint/kmfactory.h
index 168385f6e..8bfc9961d 100644
--- a/tdeprint/kmfactory.h
+++ b/tdeprint/kmfactory.h
@@ -42,7 +42,7 @@ class KLibFactory;
 class KConfig;
 class KPReloadObject;
 
-class KDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject
+class TDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject
 {
 	Q_OBJECT
 	K_DCOP
diff --git a/tdeprint/kmjob.h b/tdeprint/kmjob.h
index d8fed5e8d..b4a31bf50 100644
--- a/tdeprint/kmjob.h
+++ b/tdeprint/kmjob.h
@@ -21,7 +21,7 @@
 #ifndef KMJOB_H
 #define KMJOB_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -37,7 +37,7 @@
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMJob : public KMObject
+class TDEPRINT_EXPORT KMJob : public KMObject
 {
 public:
 	enum JobAction {
diff --git a/tdeprint/kmjobmanager.h b/tdeprint/kmjobmanager.h
index 89cabaa7c..cfdf09bfc 100644
--- a/tdeprint/kmjobmanager.h
+++ b/tdeprint/kmjobmanager.h
@@ -20,7 +20,7 @@
 #ifndef KMJOBMANAGER_H
 #define KMJOBMANAGER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -43,7 +43,7 @@ class KAction;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMJobManager : public TQObject
+class TDEPRINT_EXPORT KMJobManager : public TQObject
 {
 	Q_OBJECT
 
diff --git a/tdeprint/kmmanager.h b/tdeprint/kmmanager.h
index df78adcd3..d5742bb39 100644
--- a/tdeprint/kmmanager.h
+++ b/tdeprint/kmmanager.h
@@ -20,7 +20,7 @@
 #ifndef KMMANAGER_H
 #define KMMANAGER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -45,7 +45,7 @@ class PrinterFilter;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMManager : public TQObject
+class TDEPRINT_EXPORT KMManager : public TQObject
 {
 	Q_OBJECT
 
diff --git a/tdeprint/kmobject.h b/tdeprint/kmobject.h
index 5b9358c49..40dd329f7 100644
--- a/tdeprint/kmobject.h
+++ b/tdeprint/kmobject.h
@@ -21,7 +21,7 @@
 #ifndef KMOBJECT_H
 #define KMOBJECT_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
diff --git a/tdeprint/kmprinter.h b/tdeprint/kmprinter.h
index c6c2995e9..ed77c4776 100644
--- a/tdeprint/kmprinter.h
+++ b/tdeprint/kmprinter.h
@@ -20,7 +20,7 @@
 #ifndef KMPRINTER_H
 #define KMPRINTER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -43,7 +43,7 @@ class TQWidget;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMPrinter : public KMObject
+class TDEPRINT_EXPORT KMPrinter : public KMObject
 {
 public:
 	enum PrinterType {
diff --git a/tdeprint/kmuimanager.h b/tdeprint/kmuimanager.h
index 248ad4ed7..e59c61e40 100644
--- a/tdeprint/kmuimanager.h
+++ b/tdeprint/kmuimanager.h
@@ -33,7 +33,7 @@ class KPrinterPropertyDialog;
 class KMConfigDialog;
 class TQListView;
 
-class KDEPRINT_EXPORT KMUiManager : public TQObject
+class TDEPRINT_EXPORT KMUiManager : public TQObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kmvirtualmanager.h b/tdeprint/kmvirtualmanager.h
index 1b7ab4867..db6ea9a51 100644
--- a/tdeprint/kmvirtualmanager.h
+++ b/tdeprint/kmvirtualmanager.h
@@ -32,7 +32,7 @@ class KMPrinter;
 class KMManager;
 class TQWidget;
 
-class KDEPRINT_EXPORT KMVirtualManager : public TQObject, public KPReloadObject
+class TDEPRINT_EXPORT KMVirtualManager : public TQObject, public KPReloadObject
 {
 public:
 	KMVirtualManager(KMManager *parent = 0, const char *name = 0);
diff --git a/tdeprint/kpcopiespage.h b/tdeprint/kpcopiespage.h
index 1e1532ce9..ddb2b4f2a 100644
--- a/tdeprint/kpcopiespage.h
+++ b/tdeprint/kpcopiespage.h
@@ -31,7 +31,7 @@ class TQSpinBox;
 class TQLabel;
 class KPrinter;
 
-class KDEPRINT_EXPORT KPCopiesPage : public KPrintDialogPage, public KPReloadObject
+class TDEPRINT_EXPORT KPCopiesPage : public KPrintDialogPage, public KPReloadObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kpdriverpage.h b/tdeprint/kpdriverpage.h
index 5c3936e49..fbf4cc19a 100644
--- a/tdeprint/kpdriverpage.h
+++ b/tdeprint/kpdriverpage.h
@@ -24,7 +24,7 @@
 
 class DriverView;
 
-class KDEPRINT_EXPORT KPDriverPage : public KPrintDialogPage
+class TDEPRINT_EXPORT KPDriverPage : public KPrintDialogPage
 {
 public:
 	KPDriverPage(KMPrinter *p, DrMain *d = 0, TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/kpgeneralpage.h b/tdeprint/kpgeneralpage.h
index 2a211ab04..dc8eef580 100644
--- a/tdeprint/kpgeneralpage.h
+++ b/tdeprint/kpgeneralpage.h
@@ -28,7 +28,7 @@ class TQButtonGroup;
 class TQGroupBox;
 class TQLabel;
 
-class KDEPRINT_EXPORT KPGeneralPage : public KPrintDialogPage
+class TDEPRINT_EXPORT KPGeneralPage : public KPrintDialogPage
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kpipeprocess.h b/tdeprint/kpipeprocess.h
index 0ead3da78..ca0b5ebb3 100644
--- a/tdeprint/kpipeprocess.h
+++ b/tdeprint/kpipeprocess.h
@@ -25,7 +25,7 @@
 
 #include <kdelibs_export.h>
 
-class KDEPRINT_EXPORT KPipeProcess : public TQFile
+class TDEPRINT_EXPORT KPipeProcess : public TQFile
 {
 public:
 	KPipeProcess(const TQString& cmd = TQString::null, int mode = IO_ReadOnly);
diff --git a/tdeprint/kpqtpage.h b/tdeprint/kpqtpage.h
index 0ab4361f4..8a57ce9e6 100644
--- a/tdeprint/kpqtpage.h
+++ b/tdeprint/kpqtpage.h
@@ -29,7 +29,7 @@ class TQComboBox;
 class TQLabel;
 class DrMain;
 
-class KDEPRINT_EXPORT KPQtPage : public KPrintDialogPage
+class TDEPRINT_EXPORT KPQtPage : public KPrintDialogPage
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kpreloadobject.h b/tdeprint/kpreloadobject.h
index 09bbe97d6..14b5e9314 100644
--- a/tdeprint/kpreloadobject.h
+++ b/tdeprint/kpreloadobject.h
@@ -22,7 +22,7 @@
 
 #include <kdelibs_export.h>
 
-class KDEPRINT_EXPORT KPReloadObject
+class TDEPRINT_EXPORT KPReloadObject
 {
 friend class KMFactory;
 public:
diff --git a/tdeprint/kprintaction.h b/tdeprint/kprintaction.h
index f6ba35d34..5c8688e8f 100644
--- a/tdeprint/kprintaction.h
+++ b/tdeprint/kprintaction.h
@@ -24,7 +24,7 @@
 
 class KPrinter;
 
-class KDEPRINT_EXPORT KPrintAction : public KActionMenu
+class TDEPRINT_EXPORT KPrintAction : public KActionMenu
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kprintdialog.h b/tdeprint/kprintdialog.h
index 77484ca58..c6329b304 100644
--- a/tdeprint/kprintdialog.h
+++ b/tdeprint/kprintdialog.h
@@ -20,7 +20,7 @@
 #ifndef KPRINTDIALOG_H
 #define KPRINTDIALOG_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -38,7 +38,7 @@ class KPrintDialogPage;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KPrintDialog : public KDialog, public KPReloadObject
+class TDEPRINT_EXPORT KPrintDialog : public KDialog, public KPReloadObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kprintdialogpage.h b/tdeprint/kprintdialogpage.h
index d9b44b6ea..aebf3acf7 100644
--- a/tdeprint/kprintdialogpage.h
+++ b/tdeprint/kprintdialogpage.h
@@ -87,7 +87,7 @@ class DrMain;
  * @short Base class for customized print dialog pages.
  * @see KPrinter
  */
-class KDEPRINT_EXPORT KPrintDialogPage : public TQWidget
+class TDEPRINT_EXPORT KPrintDialogPage : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kprinter.h b/tdeprint/kprinter.h
index 4910c23ef..7d7e7ea4d 100644
--- a/tdeprint/kprinter.h
+++ b/tdeprint/kprinter.h
@@ -79,13 +79,13 @@ class DrPageSize;
  * KPrintDialogPage and adding the page using addDialogPage().
  *
  * When compiling an application that uses KPrinter, you must link to -ltdeprint, which when
- * using the standard KDE build framework can be done by adding $(LIB_KDEPRINT) to _LDADD.
+ * using the standard KDE build framework can be done by adding $(LIB_TDEPRINT) to _LDADD.
  *
  * @short The central interface class to access the KDE print system.
  * @author Michael Goffioul
  * @see TQPrinter, KPrintDialogPage
  */
-class KDEPRINT_EXPORT KPrinter : public TQPaintDevice, public KPReloadObject
+class TDEPRINT_EXPORT KPrinter : public TQPaintDevice, public KPReloadObject
 {
 friend class KPrinterWrapper;
 friend class KPrinterImpl;
@@ -769,8 +769,8 @@ protected:
 
 // Utility functions
 
-KDEPRINT_EXPORT KPrinter::PageSize pageNameToPageSize(const TQString& name);
-KDEPRINT_EXPORT const char* pageSizeToPageName(KPrinter::PageSize s);
+TDEPRINT_EXPORT KPrinter::PageSize pageNameToPageSize(const TQString& name);
+TDEPRINT_EXPORT const char* pageSizeToPageName(KPrinter::PageSize s);
 /**
  * DO NOT USE, WILL BE REMOVED.
  * @obsolete
diff --git a/tdeprint/kprinterimpl.h b/tdeprint/kprinterimpl.h
index 618d9a429..e8cbecc04 100644
--- a/tdeprint/kprinterimpl.h
+++ b/tdeprint/kprinterimpl.h
@@ -31,7 +31,7 @@
 class KPrinter;
 class KMPrinter;
 
-class KDEPRINT_EXPORT KPrinterImpl : public TQObject
+class TDEPRINT_EXPORT KPrinterImpl : public TQObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kprinterpropertydialog.h b/tdeprint/kprinterpropertydialog.h
index 98a37d8bd..e76f38212 100644
--- a/tdeprint/kprinterpropertydialog.h
+++ b/tdeprint/kprinterpropertydialog.h
@@ -30,7 +30,7 @@ class KPrintDialogPage;
 class DrMain;
 class TQTabWidget;
 
-class KDEPRINT_EXPORT KPrinterPropertyDialog : public KDialogBase
+class TDEPRINT_EXPORT KPrinterPropertyDialog : public KDialogBase
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kxmlcommand.h b/tdeprint/kxmlcommand.h
index a0ba90c56..657194c2a 100644
--- a/tdeprint/kxmlcommand.h
+++ b/tdeprint/kxmlcommand.h
@@ -30,7 +30,7 @@ class DrMain;
 class DrGroup;
 class DrBase;
 
-class KDEPRINT_EXPORT KXmlCommand : public TQObject
+class TDEPRINT_EXPORT KXmlCommand : public TQObject
 {
 	friend class KXmlCommandManager;
 
@@ -86,7 +86,7 @@ private:
 	KXmlCommandPrivate	*d;
 };
 
-class KDEPRINT_EXPORT KXmlCommandManager : public TQObject
+class TDEPRINT_EXPORT KXmlCommandManager : public TQObject
 {
 public:
 	enum IO_CheckType	{ None = 0, Basic, Advanced };
diff --git a/tdeprint/lpdunix/CMakeLists.txt b/tdeprint/lpdunix/CMakeLists.txt
index 5b30cf46c..8bbe9bf27 100644
--- a/tdeprint/lpdunix/CMakeLists.txt
+++ b/tdeprint/lpdunix/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_definitions(
-  -D_KDEPRINT_COMPILE
+  -D_TDEPRINT_COMPILE
 )
 
 include_directories(
diff --git a/tdeprint/lpdunix/Makefile.am b/tdeprint/lpdunix/Makefile.am
index 019ead755..a93163db6 100644
--- a/tdeprint/lpdunix/Makefile.am
+++ b/tdeprint/lpdunix/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint $(all_includes)
 
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = tdeprint_lpdunix.la
 
 tdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp
 tdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_lpdunix_la_LIBADD =  $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT)
+tdeprint_lpdunix_la_LIBADD =  $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPRINT)
 tdeprint_lpdunix_la_METASOURCES = AUTO
 
 noinst_HEADERS = kmlpdunixmanager.h klpdunixprinterimpl.h kmlpdunixuimanager.h
diff --git a/tdeprint/lpr/CMakeLists.txt b/tdeprint/lpr/CMakeLists.txt
index c893411b1..7e7725ce6 100644
--- a/tdeprint/lpr/CMakeLists.txt
+++ b/tdeprint/lpr/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_definitions(
-  -D_KDEPRINT_COMPILE
+  -D_TDEPRINT_COMPILE
 )
 
 include_directories(
diff --git a/tdeprint/lpr/Makefile.am b/tdeprint/lpr/Makefile.am
index a9039888f..3793d982b 100644
--- a/tdeprint/lpr/Makefile.am
+++ b/tdeprint/lpr/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes)
 
@@ -14,7 +14,7 @@ tdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \
 			     editentrydialog.cpp
 tdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 tdeprint_lpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la \
-    $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE)
+    $(LIB_QT) $(LIB_TDEPRINT) $(LIB_TDEUI) $(LIB_TDECORE)
 tdeprint_lpr_la_METASOURCES = AUTO
 
 noinst_HEADERS = printcapreader.h \
diff --git a/tdeprint/lpr/lprhandler.h b/tdeprint/lpr/lprhandler.h
index e0e66e146..840c9bbd9 100644
--- a/tdeprint/lpr/lprhandler.h
+++ b/tdeprint/lpr/lprhandler.h
@@ -20,7 +20,7 @@
 #ifndef LPRHANDLER_H
 #define LPRHANDLER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
diff --git a/tdeprint/lpr/lprsettings.h b/tdeprint/lpr/lprsettings.h
index 01abbeeb3..7b0bf14e7 100644
--- a/tdeprint/lpr/lprsettings.h
+++ b/tdeprint/lpr/lprsettings.h
@@ -20,7 +20,7 @@
 #ifndef LPRSETTINGS_H
 #define LPRSETTINGS_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
diff --git a/tdeprint/lpr/printcapentry.h b/tdeprint/lpr/printcapentry.h
index f8ba99197..b2d3931a8 100644
--- a/tdeprint/lpr/printcapentry.h
+++ b/tdeprint/lpr/printcapentry.h
@@ -20,7 +20,7 @@
 #ifndef PRINTCAPENTRY_H
 #define PRINTCAPENTRY_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
diff --git a/tdeprint/management/CMakeLists.txt b/tdeprint/management/CMakeLists.txt
index 0e12299e6..ccaf2a70a 100644
--- a/tdeprint/management/CMakeLists.txt
+++ b/tdeprint/management/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_definitions(
-  -D_KDEPRINT_COMPILE
+  -D_TDEPRINT_COMPILE
 )
 
 include_directories(
diff --git a/tdeprint/management/Makefile.am b/tdeprint/management/Makefile.am
index 34f8de935..f0d1acd9f 100644
--- a/tdeprint/management/Makefile.am
+++ b/tdeprint/management/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
 
@@ -8,7 +8,7 @@ tdeinit_LTLIBRARIES = kaddprinterwizard.la
 bin_PROGRAMS = 
 
 kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp
-kaddprinterwizard_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_KDEUI)
+kaddprinterwizard_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_TDEUI)
 kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
 
 libtdeprint_management_la_SOURCES = \
@@ -26,12 +26,12 @@ libtdeprint_management_la_SOURCES = \
 	pluginaction.cpp kxmlcommanddlg.cpp kxmlcommandselector.cpp kmconfigcommand.cpp \
 	kmconfigfilter.cpp kmconfigfonts.cpp kmconfigjobs.cpp networkscanner.cpp
 libtdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
 libtdeprint_management_la_METASOURCES = AUTO
 
 libtdeprint_management_module_la_SOURCES = tdeprint_management_module.cpp
 libtdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
 
 tdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
 tdeprintdir = $(includedir)/tdeprint
diff --git a/tdeprint/management/kmconfigdialog.h b/tdeprint/management/kmconfigdialog.h
index de04bc154..6a47995cc 100644
--- a/tdeprint/management/kmconfigdialog.h
+++ b/tdeprint/management/kmconfigdialog.h
@@ -25,7 +25,7 @@
 
 #include "kmconfigpage.h"
 
-class KDEPRINT_EXPORT KMConfigDialog : public KDialogBase
+class TDEPRINT_EXPORT KMConfigDialog : public KDialogBase
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h
index d56fbde8b..ac0495ab8 100644
--- a/tdeprint/management/kmconfigpage.h
+++ b/tdeprint/management/kmconfigpage.h
@@ -26,7 +26,7 @@
 
 class KConfig;
 
-class KDEPRINT_EXPORT KMConfigPage : public TQWidget
+class TDEPRINT_EXPORT KMConfigPage : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h
index 650fe4b15..20f07976f 100644
--- a/tdeprint/management/kmjobviewer.h
+++ b/tdeprint/management/kmjobviewer.h
@@ -20,7 +20,7 @@
 #ifndef KMJOBVIEWER_H
 #define KMJOBVIEWER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -46,7 +46,7 @@ class TQCheckBox;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMJobViewer : public KMainWindow, public KMPrinterPage, public KPReloadObject
+class TDEPRINT_EXPORT KMJobViewer : public KMainWindow, public KMPrinterPage, public KPReloadObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h
index 0d05692d9..dea30d8ff 100644
--- a/tdeprint/management/kmmainview.h
+++ b/tdeprint/management/kmmainview.h
@@ -20,7 +20,7 @@
 #ifndef KMMAINVIEW_H
 #define KMMAINVIEW_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -50,7 +50,7 @@ class TQMenuBar;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject
+class TDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject
 {
 	Q_OBJECT
 public:
@@ -128,6 +128,6 @@ private:
 	KToolBar *m_menubar;
 };
 
-KDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent );
+TDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent );
 
 #endif
diff --git a/tdeprint/management/kmprinterpage.h b/tdeprint/management/kmprinterpage.h
index 25e5b1c12..44d12e356 100644
--- a/tdeprint/management/kmprinterpage.h
+++ b/tdeprint/management/kmprinterpage.h
@@ -20,7 +20,7 @@
 #ifndef KMPRINTERPAGE_H
 #define KMPRINTERPAGE_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
diff --git a/tdeprint/management/kmpropbackend.h b/tdeprint/management/kmpropbackend.h
index 01249d348..8f5768294 100644
--- a/tdeprint/management/kmpropbackend.h
+++ b/tdeprint/management/kmpropbackend.h
@@ -26,7 +26,7 @@
 
 class TQLabel;
 
-class KDEPRINT_EXPORT KMPropBackend : public KMPropWidget
+class TDEPRINT_EXPORT KMPropBackend : public KMPropWidget
 {
 public:
 	KMPropBackend(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/kmpropdriver.h b/tdeprint/management/kmpropdriver.h
index 247431762..ebc22cb5c 100644
--- a/tdeprint/management/kmpropdriver.h
+++ b/tdeprint/management/kmpropdriver.h
@@ -26,7 +26,7 @@
 
 class TQLabel;
 
-class KDEPRINT_EXPORT KMPropDriver : public KMPropWidget
+class TDEPRINT_EXPORT KMPropDriver : public KMPropWidget
 {
 public:
 	KMPropDriver(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/kmpropertypage.h b/tdeprint/management/kmpropertypage.h
index d13338750..3994e9a93 100644
--- a/tdeprint/management/kmpropertypage.h
+++ b/tdeprint/management/kmpropertypage.h
@@ -29,7 +29,7 @@
 class KMPropWidget;
 class KMPrinter;
 
-class KDEPRINT_EXPORT KMPropertyPage : public CJanusWidget, public KMPrinterPage, public KPReloadObject
+class TDEPRINT_EXPORT KMPropertyPage : public CJanusWidget, public KMPrinterPage, public KPReloadObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmpropmembers.h b/tdeprint/management/kmpropmembers.h
index 90330681e..9b8d789d2 100644
--- a/tdeprint/management/kmpropmembers.h
+++ b/tdeprint/management/kmpropmembers.h
@@ -24,7 +24,7 @@
 
 class TQTextView;
 
-class KDEPRINT_EXPORT KMPropMembers : public KMPropWidget
+class TDEPRINT_EXPORT KMPropMembers : public KMPropWidget
 {
 public:
 	KMPropMembers(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/kmpropwidget.h b/tdeprint/management/kmpropwidget.h
index 83148bc72..45773ba0f 100644
--- a/tdeprint/management/kmpropwidget.h
+++ b/tdeprint/management/kmpropwidget.h
@@ -27,7 +27,7 @@
 class KMPrinter;
 class KMWizard;
 
-class KDEPRINT_EXPORT KMPropWidget : public TQWidget
+class TDEPRINT_EXPORT KMPropWidget : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmtimer.h b/tdeprint/management/kmtimer.h
index eb40e7957..6c5cf4b9c 100644
--- a/tdeprint/management/kmtimer.h
+++ b/tdeprint/management/kmtimer.h
@@ -20,7 +20,7 @@
 #ifndef KMTIMER_H
 #define KMTIMER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -34,7 +34,7 @@
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMTimer : public TQTimer
+class TDEPRINT_EXPORT KMTimer : public TQTimer
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmwbackend.h b/tdeprint/management/kmwbackend.h
index 223123b4f..7b7b92708 100644
--- a/tdeprint/management/kmwbackend.h
+++ b/tdeprint/management/kmwbackend.h
@@ -27,7 +27,7 @@
 class TQButtonGroup;
 class TQVBoxLayout;
 
-class KDEPRINT_EXPORT KMWBackend : public KMWizardPage
+class TDEPRINT_EXPORT KMWBackend : public KMWizardPage
 {
 public:
 	KMWBackend(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/kmwinfobase.h b/tdeprint/management/kmwinfobase.h
index 9a2b6464e..ee9e09b22 100644
--- a/tdeprint/management/kmwinfobase.h
+++ b/tdeprint/management/kmwinfobase.h
@@ -26,7 +26,7 @@
 class TQLabel;
 class TQLineEdit;
 
-class KDEPRINT_EXPORT KMWInfoBase : public KMWizardPage
+class TDEPRINT_EXPORT KMWInfoBase : public KMWizardPage
 {
 public:
 	KMWInfoBase(int n = 1, TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/kmwizard.h b/tdeprint/management/kmwizard.h
index 5a2dcb6ea..f5331b87b 100644
--- a/tdeprint/management/kmwizard.h
+++ b/tdeprint/management/kmwizard.h
@@ -34,7 +34,7 @@ class KMPrinter;
 class KMWBackend;
 class SidePixmap;
 
-class KDEPRINT_EXPORT KMWizard : public TQDialog
+class TDEPRINT_EXPORT KMWizard : public TQDialog
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmwizardpage.h b/tdeprint/management/kmwizardpage.h
index 61fe938b7..207f065b7 100644
--- a/tdeprint/management/kmwizardpage.h
+++ b/tdeprint/management/kmwizardpage.h
@@ -26,7 +26,7 @@
 
 class KMPrinter;
 
-class KDEPRINT_EXPORT KMWizardPage : public TQWidget
+class TDEPRINT_EXPORT KMWizardPage : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kxmlcommandselector.h b/tdeprint/management/kxmlcommandselector.h
index 0efc299f9..dbd89f73b 100644
--- a/tdeprint/management/kxmlcommandselector.h
+++ b/tdeprint/management/kxmlcommandselector.h
@@ -32,7 +32,7 @@ class TQLabel;
 class TQPushButton;
 class KDialogBase;
 
-class KDEPRINT_EXPORT KXmlCommandSelector : public TQWidget
+class TDEPRINT_EXPORT KXmlCommandSelector : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/networkscanner.h b/tdeprint/management/networkscanner.h
index 3d56bb03e..80a017676 100644
--- a/tdeprint/management/networkscanner.h
+++ b/tdeprint/management/networkscanner.h
@@ -25,7 +25,7 @@
 #include <tqptrlist.h>
 
 
-class KDEPRINT_EXPORT NetworkScanner : public TQWidget
+class TDEPRINT_EXPORT NetworkScanner : public TQWidget
 {
 	Q_OBJECT
 
diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h
index fb355b597..0bb368ed2 100644
--- a/tdeprint/management/pluginaction.h
+++ b/tdeprint/management/pluginaction.h
@@ -22,7 +22,7 @@
 
 #include <kaction.h>
 
-class KDEPRINT_EXPORT PluginAction : public KAction
+class TDEPRINT_EXPORT PluginAction : public KAction
 {
 	Q_OBJECT
 
diff --git a/tdeprint/management/sidepixmap.h b/tdeprint/management/sidepixmap.h
index a9730883e..54f7a1f5e 100644
--- a/tdeprint/management/sidepixmap.h
+++ b/tdeprint/management/sidepixmap.h
@@ -25,7 +25,7 @@
 
 #include <kdelibs_export.h>
 
-class KDEPRINT_EXPORT SidePixmap : public TQFrame
+class TDEPRINT_EXPORT SidePixmap : public TQFrame
 {
 public:
 	SidePixmap(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/tdeprint_management_module.cpp b/tdeprint/management/tdeprint_management_module.cpp
index 8d4027f75..d15ef791f 100644
--- a/tdeprint/management/tdeprint_management_module.cpp
+++ b/tdeprint/management/tdeprint_management_module.cpp
@@ -32,18 +32,18 @@
 
 extern "C"
 {
-	KDEPRINT_EXPORT int add_printer_wizard(TQWidget *parent)
+	TDEPRINT_EXPORT int add_printer_wizard(TQWidget *parent)
 	{
                 return tdeprint_management_add_printer_wizard( parent );
 	}
 
-	KDEPRINT_EXPORT bool config_dialog(TQWidget *parent)
+	TDEPRINT_EXPORT bool config_dialog(TQWidget *parent)
 	{
 		KMConfigDialog	dlg(parent);
 		return dlg.exec();
 	}
 
-	KDEPRINT_EXPORT TQString select_command( TQWidget* parent )
+	TDEPRINT_EXPORT TQString select_command( TQWidget* parent )
 	{
 		KDialogBase dlg( parent, 0, true, i18n( "Select Command" ), KDialogBase::Ok|KDialogBase::Cancel );
 		KXmlCommandSelector *xmlSel = new KXmlCommandSelector( false, &dlg, "CommandSelector", &dlg );
diff --git a/tdeprint/marginwidget.h b/tdeprint/marginwidget.h
index bca3a2c00..6be534d4a 100644
--- a/tdeprint/marginwidget.h
+++ b/tdeprint/marginwidget.h
@@ -30,7 +30,7 @@ class MarginPreview;
 class TQCheckBox;
 class TQComboBox;
 
-class KDEPRINT_EXPORT MarginWidget : public TQWidget
+class TDEPRINT_EXPORT MarginWidget : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/messagewindow.h b/tdeprint/messagewindow.h
index 44e211808..a66855289 100644
--- a/tdeprint/messagewindow.h
+++ b/tdeprint/messagewindow.h
@@ -27,7 +27,7 @@
 
 class TQLabel;
 
-class KDEPRINT_EXPORT MessageWindow : public TQWidget
+class TDEPRINT_EXPORT MessageWindow : public TQWidget
 {
 	Q_OBJECT
 
diff --git a/tdeprint/plugincombobox.h b/tdeprint/plugincombobox.h
index 668407e14..fc217667b 100644
--- a/tdeprint/plugincombobox.h
+++ b/tdeprint/plugincombobox.h
@@ -28,7 +28,7 @@
 class TQComboBox;
 class TQLabel;
 
-class KDEPRINT_EXPORT PluginComboBox : public TQWidget, public KPReloadObject
+class TDEPRINT_EXPORT PluginComboBox : public TQWidget, public KPReloadObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/ppdloader.h b/tdeprint/ppdloader.h
index c4eb9fbb5..70b5d1feb 100644
--- a/tdeprint/ppdloader.h
+++ b/tdeprint/ppdloader.h
@@ -33,7 +33,7 @@ class DrBase;
 class DrMain;
 struct PS_private;
 
-class KDEPRINT_EXPORT PPDLoader
+class TDEPRINT_EXPORT PPDLoader
 {
 public:
 	PPDLoader();
diff --git a/tdeprint/rlpr/CMakeLists.txt b/tdeprint/rlpr/CMakeLists.txt
index f8468a0dc..65624f184 100644
--- a/tdeprint/rlpr/CMakeLists.txt
+++ b/tdeprint/rlpr/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_definitions(
-  -D_KDEPRINT_COMPILE
+  -D_TDEPRINT_COMPILE
 )
 
 include_directories(
diff --git a/tdeprint/rlpr/Makefile.am b/tdeprint/rlpr/Makefile.am
index 1946fed94..a62a7ca4d 100644
--- a/tdeprint/rlpr/Makefile.am
+++ b/tdeprint/rlpr/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes)
 
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = tdeprint_rlpr.la
 tdeprint_rlpr_la_SOURCES = kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp kmrlpruimanager.cpp \
 			      kmwrlpr.cpp kmproprlpr.cpp kmproxywidget.cpp kmconfigproxy.cpp
 tdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_rlpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
+tdeprint_rlpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_QT) $(LIB_TDEPRINT) $(LIB_TDECORE) $(LIB_TDEUI)
 tdeprint_rlpr_la_METASOURCES = AUTO
 
 noinst_HEADERS = kmrlprmanager.h krlprprinterimpl.h kmrlpruimanager.h kmwrlpr.h kmproprlpr.h \
diff --git a/tdeprint/tdeprintcheck.h b/tdeprint/tdeprintcheck.h
index ae1264a97..0bb28cc28 100644
--- a/tdeprint/tdeprintcheck.h
+++ b/tdeprint/tdeprintcheck.h
@@ -17,15 +17,15 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef KDEPRINTCHECK_H
-#define KDEPRINTCHECK_H
+#ifndef TDEPRINTCHECK_H
+#define TDEPRINTCHECK_H
 
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kconfig.h>
 #include <kurl.h>
 
-class KDEPRINT_EXPORT KdeprintChecker
+class TDEPRINT_EXPORT KdeprintChecker
 {
 public:
 	static bool check(KConfig *conf, const TQString& group = TQString::null);
diff --git a/tdeprint/tdeprintd.h b/tdeprint/tdeprintd.h
index 597ffbc5b..51cd09877 100644
--- a/tdeprint/tdeprintd.h
+++ b/tdeprint/tdeprintd.h
@@ -17,8 +17,8 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef KDEPRINTD_H
-#define KDEPRINTD_H
+#ifndef TDEPRINTD_H
+#define TDEPRINTD_H
 
 #include <kdedmodule.h>
 #include <tqptrlist.h>
diff --git a/tdeprint/tools/escputil/Makefile.am b/tdeprint/tools/escputil/Makefile.am
index ac7620ef1..143f4ca11 100644
--- a/tdeprint/tools/escputil/Makefile.am
+++ b/tdeprint/tools/escputil/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = tdeprint_tool_escputil.la
 tdeprint_tool_escputil_la_SOURCES = escpwidget.cpp
 tdeprint_tool_escputil_la_METASOURCES = AUTO
 tdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+tdeprint_tool_escputil_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
 
 noinst_HEADERS = escpwidget.h
 
diff --git a/tdeprint/util.h b/tdeprint/util.h
index db4ad1cd6..6b966d7c0 100644
--- a/tdeprint/util.h
+++ b/tdeprint/util.h
@@ -32,8 +32,8 @@ void urlToSmb(const KURL& url, TQString& work, TQString& server, TQString& print
 // as other SMB tools (smbspool) doesn't seem to support encoding. This
 // utilities allow to continue working KURL class (and encoding) within
 // KDEPrint, but without encoding outside KDEPrint (shoudl fix bug #38733)
-KDEPRINT_EXPORT TQString buildSmbURI( const TQString& work, const TQString& server, const TQString& printer, const TQString& user, const TQString& passwd );
-KDEPRINT_EXPORT bool splitSmbURI( const TQString& uri, TQString& work, TQString& server, TQString& printer, TQString& user, TQString& passwd );
+TDEPRINT_EXPORT TQString buildSmbURI( const TQString& work, const TQString& server, const TQString& printer, const TQString& user, const TQString& passwd );
+TDEPRINT_EXPORT bool splitSmbURI( const TQString& uri, TQString& work, TQString& server, TQString& printer, TQString& user, TQString& passwd );
 
 static const struct pagesizestruct
 {