Additional kde to tde renaming

116 files changed, 179 insertions, 179 deletions

diff --git a/kdeprint/management/CMakeLists.txt b/kdeprint/management/CMakeLists.txt
index c9fe6a5a9..0e12299e6 100644
--- a/kdeprint/management/CMakeLists.txt
+++ b/kdeprint/management/CMakeLists.txt
@@ -18,16 +18,16 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_BINARY_DIR}/kdecore
+  ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
-  ${CMAKE_SOURCE_DIR}/kdefx
-  ${CMAKE_SOURCE_DIR}/kdecore
-  ${CMAKE_SOURCE_DIR}/kdeui
+  ${CMAKE_SOURCE_DIR}/tdefx
+  ${CMAKE_SOURCE_DIR}/tdecore
+  ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/kio
   ${CMAKE_SOURCE_DIR}/kio/kio
   ${CMAKE_SOURCE_DIR}/kio/kfile
-  ${CMAKE_SOURCE_DIR}/kdeprint
+  ${CMAKE_SOURCE_DIR}/tdeprint
 )
 
 link_directories(
@@ -40,19 +40,19 @@ link_directories(
 install( FILES
     kmmainview.h kmjobviewer.h kmprinterpage.h
     kiconselectaction.h kmtimer.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint )
 
 
 ##### other data ################################
 
 install( FILES
     tileup.png tiledown.png side.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdeprint )
+  DESTINATION ${DATA_INSTALL_DIR}/tdeprint )
 
 
-#### kdeprint_management ########################
+#### tdeprint_management ########################
 
-set( target kdeprint_management )
+set( target tdeprint_management )
 
 set( ${target}_SRCS
   kmdbcreator.cpp kmdriverdb.cpp kmdriverdbwidget.cpp
@@ -77,7 +77,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 4.2.0
-  LINK kdeprint-shared
+  LINK tdeprint-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
@@ -87,12 +87,12 @@ tde_add_library( ${target} SHARED AUTOMOC
 set( target libtdeprint_management_module )
 
 set( ${target}_SRCS
-  kdeprint_management_module.cpp
+  tdeprint_management_module.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdeprint_management-shared
+  LINK tdeprint_management-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -105,7 +105,7 @@ set( ${target}_SRCS
   kaddprinterwizard.cpp
 )
 
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdeprint-shared
+  LINK tdeprint-shared
 )
diff --git a/kdeprint/management/Makefile.am b/kdeprint/management/Makefile.am
index 0cc693b68..34f8de935 100644
--- a/kdeprint/management/Makefile.am
+++ b/kdeprint/management/Makefile.am
@@ -1,10 +1,10 @@
 AM_CPPFLAGS = -D_KDEPRINT_COMPILE
 
-INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
+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)
 
 lib_LTLIBRARIES = libtdeprint_management.la
 kde_module_LTLIBRARIES = libtdeprint_management_module.la
-kdeinit_LTLIBRARIES = kaddprinterwizard.la
+tdeinit_LTLIBRARIES = kaddprinterwizard.la
 bin_PROGRAMS = 
 
 kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp
@@ -29,12 +29,12 @@ libtdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-und
 libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
 libtdeprint_management_la_METASOURCES = AUTO
 
-libtdeprint_management_module_la_SOURCES = kdeprint_management_module.cpp
+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)
 
-kdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
-kdeprintdir = $(includedir)/kdeprint
+tdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
+tdeprintdir = $(includedir)/tdeprint
 
 noinst_HEADERS = kmdbcreator.h kmdriverdb.h kmdriverdbwidget.h kmiconview.h \
 		 kminfopage.h kmmainview.h kmpages.h \
@@ -48,5 +48,5 @@ noinst_HEADERS = kmdbcreator.h kmdriverdb.h kmdriverdbwidget.h kmiconview.h \
 		 kmconfigfilter.h kmconfigfonts.h kmconfigjobs.h networkscanner.h
 
 dataicon_DATA = tileup.png tiledown.png side.png
-dataicondir = $(kde_datadir)/kdeprint
+dataicondir = $(kde_datadir)/tdeprint
 
diff --git a/kdeprint/management/cjanuswidget.cpp b/kdeprint/management/cjanuswidget.cpp
index 4163a87fe..af04ee170 100644
--- a/kdeprint/management/cjanuswidget.cpp
+++ b/kdeprint/management/cjanuswidget.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/cjanuswidget.h b/kdeprint/management/cjanuswidget.h
index 6deec3149..d33be1499 100644
--- a/kdeprint/management/cjanuswidget.h
+++ b/kdeprint/management/cjanuswidget.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/jobitem.cpp b/kdeprint/management/jobitem.cpp
index 171a91657..a9ce2fe85 100644
--- a/kdeprint/management/jobitem.cpp
+++ b/kdeprint/management/jobitem.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/jobitem.h b/kdeprint/management/jobitem.h
index 31c7923d8..580a1b84f 100644
--- a/kdeprint/management/jobitem.h
+++ b/kdeprint/management/jobitem.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kdeprint_management_module.cpp b/kdeprint/management/kdeprint_management_module.cpp
index 70c7b4cfd..8d4027f75 100644
--- a/kdeprint/management/kdeprint_management_module.cpp
+++ b/kdeprint/management/kdeprint_management_module.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *  Copyright (C) 2004  Dominique Devriese <devriese@kde.org>
  *
  *  This library is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ extern "C"
 {
 	KDEPRINT_EXPORT int add_printer_wizard(TQWidget *parent)
 	{
-                return kdeprint_management_add_printer_wizard( parent );
+                return tdeprint_management_add_printer_wizard( parent );
 	}
 
 	KDEPRINT_EXPORT bool config_dialog(TQWidget *parent)
diff --git a/kdeprint/management/kiconselectaction.cpp b/kdeprint/management/kiconselectaction.cpp
index c042213f7..8bf4d5a10 100644
--- a/kdeprint/management/kiconselectaction.cpp
+++ b/kdeprint/management/kiconselectaction.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kiconselectaction.h b/kdeprint/management/kiconselectaction.h
index dfd6ea17b..84bef60d2 100644
--- a/kdeprint/management/kiconselectaction.h
+++ b/kdeprint/management/kiconselectaction.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigcommand.cpp b/kdeprint/management/kmconfigcommand.cpp
index 65d4d34f4..32fb7db11 100644
--- a/kdeprint/management/kmconfigcommand.cpp
+++ b/kdeprint/management/kmconfigcommand.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigcommand.h b/kdeprint/management/kmconfigcommand.h
index 2ec662d95..203e6fd3a 100644
--- a/kdeprint/management/kmconfigcommand.h
+++ b/kdeprint/management/kmconfigcommand.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigdialog.cpp b/kdeprint/management/kmconfigdialog.cpp
index f2ddf7b57..3bd89a751 100644
--- a/kdeprint/management/kmconfigdialog.cpp
+++ b/kdeprint/management/kmconfigdialog.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigdialog.h b/kdeprint/management/kmconfigdialog.h
index ed60378c5..de04bc154 100644
--- a/kdeprint/management/kmconfigdialog.h
+++ b/kdeprint/management/kmconfigdialog.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigfilter.cpp b/kdeprint/management/kmconfigfilter.cpp
index 967a67908..29d5107e0 100644
--- a/kdeprint/management/kmconfigfilter.cpp
+++ b/kdeprint/management/kmconfigfilter.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigfilter.h b/kdeprint/management/kmconfigfilter.h
index b69f10c08..9571f0d54 100644
--- a/kdeprint/management/kmconfigfilter.h
+++ b/kdeprint/management/kmconfigfilter.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigfonts.cpp b/kdeprint/management/kmconfigfonts.cpp
index e5f47de3b..183d0b621 100644
--- a/kdeprint/management/kmconfigfonts.cpp
+++ b/kdeprint/management/kmconfigfonts.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigfonts.h b/kdeprint/management/kmconfigfonts.h
index 1d1483ed7..a93a26d75 100644
--- a/kdeprint/management/kmconfigfonts.h
+++ b/kdeprint/management/kmconfigfonts.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfiggeneral.cpp b/kdeprint/management/kmconfiggeneral.cpp
index 96e8668de..40d187c3c 100644
--- a/kdeprint/management/kmconfiggeneral.cpp
+++ b/kdeprint/management/kmconfiggeneral.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfiggeneral.h b/kdeprint/management/kmconfiggeneral.h
index 23739a152..8fc6fa5ab 100644
--- a/kdeprint/management/kmconfiggeneral.h
+++ b/kdeprint/management/kmconfiggeneral.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigjobs.cpp b/kdeprint/management/kmconfigjobs.cpp
index f70b1a33f..1088e1b3a 100644
--- a/kdeprint/management/kmconfigjobs.cpp
+++ b/kdeprint/management/kmconfigjobs.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigjobs.h b/kdeprint/management/kmconfigjobs.h
index 73d6274ba..34be5b1ef 100644
--- a/kdeprint/management/kmconfigjobs.h
+++ b/kdeprint/management/kmconfigjobs.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigpage.cpp b/kdeprint/management/kmconfigpage.cpp
index b31575d33..fb967e05d 100644
--- a/kdeprint/management/kmconfigpage.cpp
+++ b/kdeprint/management/kmconfigpage.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigpage.h b/kdeprint/management/kmconfigpage.h
index 596b8c5ec..d56fbde8b 100644
--- a/kdeprint/management/kmconfigpage.h
+++ b/kdeprint/management/kmconfigpage.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigpreview.cpp b/kdeprint/management/kmconfigpreview.cpp
index aa030019b..cd777ec7a 100644
--- a/kdeprint/management/kmconfigpreview.cpp
+++ b/kdeprint/management/kmconfigpreview.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmconfigpreview.h b/kdeprint/management/kmconfigpreview.h
index 359fcb227..a9c826c98 100644
--- a/kdeprint/management/kmconfigpreview.h
+++ b/kdeprint/management/kmconfigpreview.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdbcreator.cpp b/kdeprint/management/kmdbcreator.cpp
index 7bdefbe0e..1a89d0a8e 100644
--- a/kdeprint/management/kmdbcreator.cpp
+++ b/kdeprint/management/kmdbcreator.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdbcreator.h b/kdeprint/management/kmdbcreator.h
index 8b076e517..319d270c0 100644
--- a/kdeprint/management/kmdbcreator.h
+++ b/kdeprint/management/kmdbcreator.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdriverdb.cpp b/kdeprint/management/kmdriverdb.cpp
index 973be686e..6fbab45ec 100644
--- a/kdeprint/management/kmdriverdb.cpp
+++ b/kdeprint/management/kmdriverdb.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB()
 TQString KMDriverDB::dbFile()
 {
 	// this calls insure missing directories creation
-	TQString	filename = locateLocal("data",TQString::tqfromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
+	TQString	filename = locateLocal("data",TQString::tqfromLatin1("tdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
 	return filename;
 }
 
diff --git a/kdeprint/management/kmdriverdb.h b/kdeprint/management/kmdriverdb.h
index 3913d74ef..c5af6d53e 100644
--- a/kdeprint/management/kmdriverdb.h
+++ b/kdeprint/management/kmdriverdb.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdriverdbwidget.cpp b/kdeprint/management/kmdriverdbwidget.cpp
index e8a00c44d..e9c490206 100644
--- a/kdeprint/management/kmdriverdbwidget.cpp
+++ b/kdeprint/management/kmdriverdbwidget.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdriverdbwidget.h b/kdeprint/management/kmdriverdbwidget.h
index 27d8dcb6a..05b50536d 100644
--- a/kdeprint/management/kmdriverdbwidget.h
+++ b/kdeprint/management/kmdriverdbwidget.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdriverdialog.cpp b/kdeprint/management/kmdriverdialog.cpp
index 2e79a8c6f..ef37e333c 100644
--- a/kdeprint/management/kmdriverdialog.cpp
+++ b/kdeprint/management/kmdriverdialog.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmdriverdialog.h b/kdeprint/management/kmdriverdialog.h
index 8720213d7..8b7b01c45 100644
--- a/kdeprint/management/kmdriverdialog.h
+++ b/kdeprint/management/kmdriverdialog.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmiconview.cpp b/kdeprint/management/kmiconview.cpp
index 7afaf1537..1fa5a6da9 100644
--- a/kdeprint/management/kmiconview.cpp
+++ b/kdeprint/management/kmiconview.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmiconview.h b/kdeprint/management/kmiconview.h
index 1c3aeb542..1fd6fbbda 100644
--- a/kdeprint/management/kmiconview.h
+++ b/kdeprint/management/kmiconview.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kminfopage.cpp b/kdeprint/management/kminfopage.cpp
index c8c80117c..ad43f1ccb 100644
--- a/kdeprint/management/kminfopage.cpp
+++ b/kdeprint/management/kminfopage.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kminfopage.h b/kdeprint/management/kminfopage.h
index b0dd3a935..591fdbfe8 100644
--- a/kdeprint/management/kminfopage.h
+++ b/kdeprint/management/kminfopage.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kminstancepage.cpp b/kdeprint/management/kminstancepage.cpp
index a2d024546..25c037516 100644
--- a/kdeprint/management/kminstancepage.cpp
+++ b/kdeprint/management/kminstancepage.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kminstancepage.h b/kdeprint/management/kminstancepage.h
index 3b8931100..7a3075d73 100644
--- a/kdeprint/management/kminstancepage.h
+++ b/kdeprint/management/kminstancepage.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmjobviewer.cpp b/kdeprint/management/kmjobviewer.cpp
index 508595998..7f168faed 100644
--- a/kdeprint/management/kmjobviewer.cpp
+++ b/kdeprint/management/kmjobviewer.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -128,7 +128,7 @@ void KMJobViewer::setPrinter(const TQString& prname)
 {
 	// We need to trigger a refresh even if the printer
 	// has not changed, some jobs may have been canceled
-	// outside kdeprint. We can't return simply if
+	// outside tdeprint. We can't return simply if
 	// prname == m_prname.
 	if (m_prname != prname)
 	{
@@ -298,7 +298,7 @@ void KMJobViewer::initActions()
 	}
 
 	// Filter actions
-	KActionMenu	*fact = new KActionMenu(i18n("&Select Printer"), "kdeprint_printer", actionCollection(), "filter_modify");
+	KActionMenu	*fact = new KActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify");
 	fact->setDelayed(false);
 	connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int)));
 	connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
diff --git a/kdeprint/management/kmjobviewer.h b/kdeprint/management/kmjobviewer.h
index a8ac7d0af..650fe4b15 100644
--- a/kdeprint/management/kmjobviewer.h
+++ b/kdeprint/management/kmjobviewer.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmlistview.cpp b/kdeprint/management/kmlistview.cpp
index b9e4b738b..72d6872cb 100644
--- a/kdeprint/management/kmlistview.cpp
+++ b/kdeprint/management/kmlistview.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -123,7 +123,7 @@ KMListView::KMListView(TQWidget *parent, const char *name)
 	connect(this,TQT_SIGNAL(onViewport()),TQT_SLOT(slotOnViewport()));
 
 	m_root = new KMListViewItem(this,i18n("Print System"));
-	m_root->setPixmap(0,SmallIcon("kdeprint_printer"));
+	m_root->setPixmap(0,SmallIcon("tdeprint_printer"));
 	m_root->setOpen(true);
 	m_classes = new KMListViewItem(m_root,i18n("Classes"));
 	m_classes->setPixmap(0,SmallIcon("package"));
diff --git a/kdeprint/management/kmlistview.h b/kdeprint/management/kmlistview.h
index 9f5b24b46..20ddc5731 100644
--- a/kdeprint/management/kmlistview.h
+++ b/kdeprint/management/kmlistview.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmmainview.cpp b/kdeprint/management/kmmainview.cpp
index a1a63d61f..f5f905af3 100644
--- a/kdeprint/management/kmmainview.cpp
+++ b/kdeprint/management/kmmainview.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -60,7 +60,7 @@
 #undef m_manager
 #define	m_manager	KMFactory::self()->manager()
 
-int kdeprint_management_add_printer_wizard( TQWidget* parent )
+int tdeprint_management_add_printer_wizard( TQWidget* parent )
 {
 		KMWizard	dlg(parent);
 		int		flag(0);
@@ -181,24 +181,24 @@ void KMMainView::initActions()
 	vact->setCurrentItem(0);
 	connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int)));
 
-	KActionMenu	*stateAct = new KActionMenu(i18n("Start/Stop Printer"), "kdeprint_printstate", m_actions, "printer_state_change");
+	KActionMenu	*stateAct = new KActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change");
 	stateAct->setDelayed(false);
-	stateAct->insert(new KAction(i18n("&Start Printer"),"kdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
-	stateAct->insert(new KAction(i18n("Sto&p Printer"),"kdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
+	stateAct->insert(new KAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
+	stateAct->insert(new KAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
 
-	stateAct = new KActionMenu(i18n("Enable/Disable Job Spooling"), "kdeprint_queuestate", m_actions, "printer_spool_change");
+	stateAct = new KActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change");
 	stateAct->setDelayed(false);
-	stateAct->insert(new KAction(i18n("&Enable Job Spooling"),"kdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
-	stateAct->insert(new KAction(i18n("&Disable Job Spooling"),"kdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
+	stateAct->insert(new KAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
+	stateAct->insert(new KAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
 
 	new KAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove");
 	new KAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure");
-	new KAction(i18n("Add &Printer/Class..."),"kdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add");
-	new KAction(i18n("Add &Special (pseudo) Printer..."),"kdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
-	new KAction(i18n("Set as &Local Default"),"kdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
-	new KAction(i18n("Set as &User Default"),"kdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
-	new KAction(i18n("&Test Printer..."),"kdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test");
-	new KAction(i18n("Configure &Manager..."),"kdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
+	new KAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add");
+	new KAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
+	new KAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
+	new KAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
+	new KAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test");
+	new KAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
 	new KAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh");
 
 	KIconSelectAction	*dact = new KIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change");
@@ -208,9 +208,9 @@ void KMMainView::initActions()
 	dact->setCurrentItem(0);
 	connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int)));
 
-	new KAction(i18n("R&estart Server"),"kdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart");
-	new KAction(i18n("Configure &Server..."),"kdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure");
-	new KAction(i18n("Configure Server Access..."),"kdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerAccessConfigure()),m_actions,"server_access_configure");
+	new KAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart");
+	new KAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure");
+	new KAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerAccessConfigure()),m_actions,"server_access_configure");
 
 	KToggleAction	*tact = new KToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
 	tact->setCheckedState(i18n("Hide &Toolbar"));
@@ -218,8 +218,8 @@ void KMMainView::initActions()
 	tact = new KToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" );
 	tact->setCheckedState(i18n("Hide Me&nu Toolbar"));
 	connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) );
-	tact = new KToggleAction(i18n("Show Pr&inter Details"),"kdeprint_printer_infos", 0,m_actions,"view_printerinfos");
-	tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"kdeprint_printer_infos"));
+	tact = new KToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos");
+	tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"tdeprint_printer_infos"));
 	tact->setChecked(true);
 	connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool)));
 
@@ -233,7 +233,7 @@ void KMMainView::initActions()
 	KActionMenu	*mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool");
 	mact->setDelayed(false);
 	connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int)));
-	TQStringList	files = KGlobal::dirs()->findAllResources("data", "kdeprint/tools/*.desktop");
+	TQStringList	files = KGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop");
 	for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it)
 	{
 		KSimpleConfig	conf(*it);
@@ -301,7 +301,7 @@ void KMMainView::initActions()
 	m_actions->action("manager_configure")->plug( menu );
 	m_actions->action("view_refresh")->plug( menu );
 	//m_menubar->insertItem( i18n( "Manager" ), menu );
-	m_menubar->insertButton( "kdeprint_configmgr", 3, true, i18n( "Print Manager" ) );
+	m_menubar->insertButton( "tdeprint_configmgr", 3, true, i18n( "Print Manager" ) );
 	m_menubar->getButton( 3 )->setPopup( menu, true );
 	menu = new TQPopupMenu( this );
 	m_actions->action("view_printerinfos")->plug( menu );
@@ -586,7 +586,7 @@ void KMMainView::slotAdd()
 	KMTimer::self()->hold();
 
 	int	result(0);
-	if ((result=kdeprint_management_add_printer_wizard(this)) == -1)
+	if ((result=tdeprint_management_add_printer_wizard(this)) == -1)
 		showErrorMsg(i18n("Unable to create printer."));
 
 	KMTimer::self()->release((result == 1));
@@ -831,7 +831,7 @@ void KMMainView::slotToolSelected(int ID)
 	KMTimer::self()->hold();
 
 	TQString	libname = m_toollist[ID];
-	libname.prepend("kdeprint_tool_");
+	libname.prepend("tdeprint_tool_");
 	if (m_current && !m_current->device().isEmpty() && !libname.isEmpty())
 	{
 		KLibFactory	*factory = KLibLoader::self()->factory(libname.local8Bit());
@@ -906,12 +906,12 @@ void KMMainView::slotHelp()
 {
 	TQString s = TQT_TQOBJECT_CONST(sender())->name();
 	if ( s == "invoke_help" )
-		kapp->invokeHelp( TQString::null, "kdeprint" );
+		kapp->invokeHelp( TQString::null, "tdeprint" );
 	else if ( s == "invoke_web" )
 	{
 		TQStringList args;
 		args << "exec" << "http://printing.kde.org";
-		kapp->kdeinitExec( "kfmclient", args );
+		kapp->tdeinitExec( "kfmclient", args );
 	}
 	else
 		kdDebug( 500 ) << "Unknown help invokator: " << s << endl;
diff --git a/kdeprint/management/kmmainview.h b/kdeprint/management/kmmainview.h
index c924b3e90..0d05692d9 100644
--- a/kdeprint/management/kmmainview.h
+++ b/kdeprint/management/kmmainview.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
 #endif
 
 #include <tqwidget.h>
-#include <kdeprint/kpreloadobject.h>
+#include <tdeprint/kpreloadobject.h>
 #include <kmainwindow.h>
 
 class KMManager;
@@ -128,6 +128,6 @@ private:
 	KToolBar *m_menubar;
 };
 
-KDEPRINT_EXPORT int kdeprint_management_add_printer_wizard( TQWidget* parent );
+KDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent );
 
 #endif
diff --git a/kdeprint/management/kmpages.cpp b/kdeprint/management/kmpages.cpp
index be7f2f87a..4f0f1f4f7 100644
--- a/kdeprint/management/kmpages.cpp
+++ b/kdeprint/management/kmpages.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpages.h b/kdeprint/management/kmpages.h
index 75ad4641a..761c8d22d 100644
--- a/kdeprint/management/kmpages.h
+++ b/kdeprint/management/kmpages.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmprinterpage.h b/kdeprint/management/kmprinterpage.h
index cfce97ec7..25e5b1c12 100644
--- a/kdeprint/management/kmprinterpage.h
+++ b/kdeprint/management/kmprinterpage.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmprinterview.cpp b/kdeprint/management/kmprinterview.cpp
index 5eff6d946..19264a946 100644
--- a/kdeprint/management/kmprinterview.cpp
+++ b/kdeprint/management/kmprinterview.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmprinterview.h b/kdeprint/management/kmprinterview.h
index 0b3a17789..ba1bd38b1 100644
--- a/kdeprint/management/kmprinterview.h
+++ b/kdeprint/management/kmprinterview.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpropbackend.cpp b/kdeprint/management/kmpropbackend.cpp
index 7dfdc500d..98004d2ed 100644
--- a/kdeprint/management/kmpropbackend.cpp
+++ b/kdeprint/management/kmpropbackend.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpropbackend.h b/kdeprint/management/kmpropbackend.h
index adcabbdd2..01249d348 100644
--- a/kdeprint/management/kmpropbackend.h
+++ b/kdeprint/management/kmpropbackend.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpropcontainer.cpp b/kdeprint/management/kmpropcontainer.cpp
index 20ab492e7..9c7808199 100644
--- a/kdeprint/management/kmpropcontainer.cpp
+++ b/kdeprint/management/kmpropcontainer.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpropcontainer.h b/kdeprint/management/kmpropcontainer.h
index 411bb7134..d191dfeb6 100644
--- a/kdeprint/management/kmpropcontainer.h
+++ b/kdeprint/management/kmpropcontainer.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpropdriver.cpp b/kdeprint/management/kmpropdriver.cpp
index 086ccacca..55daf0ed5 100644
--- a/kdeprint/management/kmpropdriver.cpp
+++ b/kdeprint/management/kmpropdriver.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpropdriver.h b/kdeprint/management/kmpropdriver.h
index 6eb8873bf..247431762 100644
--- a/kdeprint/management/kmpropdriver.h
+++ b/kdeprint/management/kmpropdriver.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpropertypage.cpp b/kdeprint/management/kmpropertypage.cpp
index 74341ad9b..e0526ad5a 100644
--- a/kdeprint/management/kmpropertypage.cpp
+++ b/kdeprint/management/kmpropertypage.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpropertypage.h b/kdeprint/management/kmpropertypage.h
index 5698beff8..d13338750 100644
--- a/kdeprint/management/kmpropertypage.h
+++ b/kdeprint/management/kmpropertypage.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -22,7 +22,7 @@
 
 #include "cjanuswidget.h"
 #include "kmprinterpage.h"
-#include <kdeprint/kpreloadobject.h>
+#include <tdeprint/kpreloadobject.h>
 #include <kdelibs_export.h>
 #include <tqptrlist.h>
 
diff --git a/kdeprint/management/kmpropgeneral.cpp b/kdeprint/management/kmpropgeneral.cpp
index f32817fb6..c55603da9 100644
--- a/kdeprint/management/kmpropgeneral.cpp
+++ b/kdeprint/management/kmpropgeneral.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpropgeneral.h b/kdeprint/management/kmpropgeneral.h
index dd2c1cd43..c4e403b86 100644
--- a/kdeprint/management/kmpropgeneral.h
+++ b/kdeprint/management/kmpropgeneral.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpropmembers.cpp b/kdeprint/management/kmpropmembers.cpp
index adc3ebbbe..4efbcf547 100644
--- a/kdeprint/management/kmpropmembers.cpp
+++ b/kdeprint/management/kmpropmembers.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -35,7 +35,7 @@ KMPropMembers::KMPropMembers(TQWidget *parent, const char *name)
 	TQVBoxLayout	*main_ = new TQVBoxLayout(this, 10, 0);
 	main_->addWidget(m_members);
 
-	m_pixmap = "kdeprint_printer_class";
+	m_pixmap = "tdeprint_printer_class";
 	m_title = i18n("Members");
 	m_header = i18n("Class Members");
 }
diff --git a/kdeprint/management/kmpropmembers.h b/kdeprint/management/kmpropmembers.h
index a8e90e6cd..90330681e 100644
--- a/kdeprint/management/kmpropmembers.h
+++ b/kdeprint/management/kmpropmembers.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpropwidget.cpp b/kdeprint/management/kmpropwidget.cpp
index b112c390b..ae8b03cbf 100644
--- a/kdeprint/management/kmpropwidget.cpp
+++ b/kdeprint/management/kmpropwidget.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmpropwidget.h b/kdeprint/management/kmpropwidget.h
index a9c2b918f..83148bc72 100644
--- a/kdeprint/management/kmpropwidget.h
+++ b/kdeprint/management/kmpropwidget.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmspecialprinterdlg.cpp b/kdeprint/management/kmspecialprinterdlg.cpp
index 346e858f4..6569f3f83 100644
--- a/kdeprint/management/kmspecialprinterdlg.cpp
+++ b/kdeprint/management/kmspecialprinterdlg.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -19,7 +19,7 @@
 
 #include "kmspecialprinterdlg.h"
 #include "kmprinter.h"
-#include "kdeprintcheck.h"
+#include "tdeprintcheck.h"
 #include "kmfactory.h"
 #include "kmspecialmanager.h"
 #include "kxmlcommandselector.h"
diff --git a/kdeprint/management/kmspecialprinterdlg.h b/kdeprint/management/kmspecialprinterdlg.h
index 1ff688cf6..bc7497a05 100644
--- a/kdeprint/management/kmspecialprinterdlg.h
+++ b/kdeprint/management/kmspecialprinterdlg.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmtimer.cpp b/kdeprint/management/kmtimer.cpp
index 099d358f6..1525dd875 100644
--- a/kdeprint/management/kmtimer.cpp
+++ b/kdeprint/management/kmtimer.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmtimer.h b/kdeprint/management/kmtimer.h
index 6dcf962a0..eb40e7957 100644
--- a/kdeprint/management/kmtimer.h
+++ b/kdeprint/management/kmtimer.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwbackend.cpp b/kdeprint/management/kmwbackend.cpp
index d05564115..e39b52f8d 100644
--- a/kdeprint/management/kmwbackend.cpp
+++ b/kdeprint/management/kmwbackend.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwbackend.h b/kdeprint/management/kmwbackend.h
index 98cf8e7ef..223123b4f 100644
--- a/kdeprint/management/kmwbackend.h
+++ b/kdeprint/management/kmwbackend.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwclass.cpp b/kdeprint/management/kmwclass.cpp
index 2e27db0c9..a87388a6f 100644
--- a/kdeprint/management/kmwclass.cpp
+++ b/kdeprint/management/kmwclass.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwclass.h b/kdeprint/management/kmwclass.h
index 1fadf45f4..c9b63befb 100644
--- a/kdeprint/management/kmwclass.h
+++ b/kdeprint/management/kmwclass.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwdriver.cpp b/kdeprint/management/kmwdriver.cpp
index d0a38e17d..58793c192 100644
--- a/kdeprint/management/kmwdriver.cpp
+++ b/kdeprint/management/kmwdriver.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwdriver.h b/kdeprint/management/kmwdriver.h
index cb49246b6..9eef02069 100644
--- a/kdeprint/management/kmwdriver.h
+++ b/kdeprint/management/kmwdriver.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwdriverselect.cpp b/kdeprint/management/kmwdriverselect.cpp
index 353fc0861..e3d253660 100644
--- a/kdeprint/management/kmwdriverselect.cpp
+++ b/kdeprint/management/kmwdriverselect.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwdriverselect.h b/kdeprint/management/kmwdriverselect.h
index 281989074..464a78239 100644
--- a/kdeprint/management/kmwdriverselect.h
+++ b/kdeprint/management/kmwdriverselect.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwdrivertest.cpp b/kdeprint/management/kmwdrivertest.cpp
index f1b9bc48b..545d3b94d 100644
--- a/kdeprint/management/kmwdrivertest.cpp
+++ b/kdeprint/management/kmwdrivertest.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -52,7 +52,7 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name)
 	TQLabel	*l2 = new TQLabel(i18n("<b>Model:</b>"), this);
 	TQLabel	*l3 = new TQLabel(i18n("<b>Description:</b>"), this);
 
-	m_test = new KPushButton(KGuiItem(i18n("&Test"), "kdeprint_testprinter"), this);
+	m_test = new KPushButton(KGuiItem(i18n("&Test"), "tdeprint_testprinter"), this);
 	m_settings = new KPushButton(KGuiItem(i18n("&Settings"), "configure"), this);
 
 	TQLabel	*l0 = new TQLabel(this);
diff --git a/kdeprint/management/kmwdrivertest.h b/kdeprint/management/kmwdrivertest.h
index 2689e7c22..5c1aefaee 100644
--- a/kdeprint/management/kmwdrivertest.h
+++ b/kdeprint/management/kmwdrivertest.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwend.cpp b/kdeprint/management/kmwend.cpp
index 9da4096c6..54294fb13 100644
--- a/kdeprint/management/kmwend.cpp
+++ b/kdeprint/management/kmwend.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwend.h b/kdeprint/management/kmwend.h
index fa74a6553..626eedf96 100644
--- a/kdeprint/management/kmwend.h
+++ b/kdeprint/management/kmwend.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwfile.cpp b/kdeprint/management/kmwfile.cpp
index 190868d03..32da27c03 100644
--- a/kdeprint/management/kmwfile.cpp
+++ b/kdeprint/management/kmwfile.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwfile.h b/kdeprint/management/kmwfile.h
index 2e6997372..40e2e2171 100644
--- a/kdeprint/management/kmwfile.h
+++ b/kdeprint/management/kmwfile.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwinfobase.cpp b/kdeprint/management/kmwinfobase.cpp
index 835042c59..993576334 100644
--- a/kdeprint/management/kmwinfobase.cpp
+++ b/kdeprint/management/kmwinfobase.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwinfobase.h b/kdeprint/management/kmwinfobase.h
index c33058fe0..9a2b6464e 100644
--- a/kdeprint/management/kmwinfobase.h
+++ b/kdeprint/management/kmwinfobase.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwinfopage.cpp b/kdeprint/management/kmwinfopage.cpp
index abfa2993c..1e9652e93 100644
--- a/kdeprint/management/kmwinfopage.cpp
+++ b/kdeprint/management/kmwinfopage.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwinfopage.h b/kdeprint/management/kmwinfopage.h
index aefa675fe..346d29401 100644
--- a/kdeprint/management/kmwinfopage.h
+++ b/kdeprint/management/kmwinfopage.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwizard.cpp b/kdeprint/management/kmwizard.cpp
index fead7c4e3..5dc915572 100644
--- a/kdeprint/management/kmwizard.cpp
+++ b/kdeprint/management/kmwizard.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -244,7 +244,7 @@ void KMWizard::slotNext()
 
 void KMWizard::slotHelp()
 {
-	kapp->invokeHelp(TQString::null, "kdeprint");
+	kapp->invokeHelp(TQString::null, "tdeprint");
 }
 
 void KMWizard::enableWizard()
diff --git a/kdeprint/management/kmwizard.h b/kdeprint/management/kmwizard.h
index b23c7b1f3..5a2dcb6ea 100644
--- a/kdeprint/management/kmwizard.h
+++ b/kdeprint/management/kmwizard.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwizardpage.cpp b/kdeprint/management/kmwizardpage.cpp
index 936a30c87..10149d0f9 100644
--- a/kdeprint/management/kmwizardpage.cpp
+++ b/kdeprint/management/kmwizardpage.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwizardpage.h b/kdeprint/management/kmwizardpage.h
index 68f655b2a..61fe938b7 100644
--- a/kdeprint/management/kmwizardpage.h
+++ b/kdeprint/management/kmwizardpage.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwlocal.cpp b/kdeprint/management/kmwlocal.cpp
index 3bbaf0eaa..7b56b2deb 100644
--- a/kdeprint/management/kmwlocal.cpp
+++ b/kdeprint/management/kmwlocal.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -48,7 +48,7 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name)
 	m_ports->addColumn("");
 	m_ports->setSorting(-1);
 	TQListViewItem	*root = new TQListViewItem(m_ports, i18n("Local System"));
-	root->setPixmap(0, SmallIcon("kdeprint_computer"));
+	root->setPixmap(0, SmallIcon("tdeprint_computer"));
 	root->setOpen(true);
 	connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*)));
 	TQLabel	*l1 = new TQLabel(i18n("URI:"), this);
@@ -197,7 +197,7 @@ void KMWLocal::initialize()
 		{
 			TQListViewItem	*pItem = new TQListViewItem(last[index], printer);
 			last[index]->setOpen(true);
-			pItem->setPixmap(0, SmallIcon("kdeprint_printer"));
+			pItem->setPixmap(0, SmallIcon("tdeprint_printer"));
 		}
 	}
 	m_initialized = true;
diff --git a/kdeprint/management/kmwlocal.h b/kdeprint/management/kmwlocal.h
index 154984493..681d94e51 100644
--- a/kdeprint/management/kmwlocal.h
+++ b/kdeprint/management/kmwlocal.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwlpd.cpp b/kdeprint/management/kmwlpd.cpp
index b83c9cb82..cce4c7b5a 100644
--- a/kdeprint/management/kmwlpd.cpp
+++ b/kdeprint/management/kmwlpd.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwlpd.h b/kdeprint/management/kmwlpd.h
index 16cd70592..674cdff44 100644
--- a/kdeprint/management/kmwlpd.h
+++ b/kdeprint/management/kmwlpd.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwname.cpp b/kdeprint/management/kmwname.cpp
index d46b104a7..fe567f7bb 100644
--- a/kdeprint/management/kmwname.cpp
+++ b/kdeprint/management/kmwname.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwname.h b/kdeprint/management/kmwname.h
index e3b74f224..f933d59ed 100644
--- a/kdeprint/management/kmwname.h
+++ b/kdeprint/management/kmwname.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwpassword.cpp b/kdeprint/management/kmwpassword.cpp
index c8fb39c65..40dc105d5 100644
--- a/kdeprint/management/kmwpassword.cpp
+++ b/kdeprint/management/kmwpassword.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwpassword.h b/kdeprint/management/kmwpassword.h
index 493b36dd0..a7dfb062a 100644
--- a/kdeprint/management/kmwpassword.h
+++ b/kdeprint/management/kmwpassword.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwsmb.cpp b/kdeprint/management/kmwsmb.cpp
index 4c649d8a9..e76240cf8 100644
--- a/kdeprint/management/kmwsmb.cpp
+++ b/kdeprint/management/kmwsmb.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwsmb.h b/kdeprint/management/kmwsmb.h
index da89b5d1f..695379a79 100644
--- a/kdeprint/management/kmwsmb.h
+++ b/kdeprint/management/kmwsmb.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwsocket.cpp b/kdeprint/management/kmwsocket.cpp
index 5f2bf9742..98aad76a5 100644
--- a/kdeprint/management/kmwsocket.cpp
+++ b/kdeprint/management/kmwsocket.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -137,7 +137,7 @@ void KMWSocket::slotScanFinished()
 		else
 			name = it.current()->Name;
 		TQListViewItem	*item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port));
-		item->setPixmap(0,SmallIcon("kdeprint_printer"));
+		item->setPixmap(0,SmallIcon("tdeprint_printer"));
 	}
 }
 
diff --git a/kdeprint/management/kmwsocket.h b/kdeprint/management/kmwsocket.h
index 07344e529..687b52fd4 100644
--- a/kdeprint/management/kmwsocket.h
+++ b/kdeprint/management/kmwsocket.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kmwsocketutil.cpp b/kdeprint/management/kmwsocketutil.cpp
index a8a89e3ad..e6d06bae2 100644
--- a/kdeprint/management/kmwsocketutil.cpp
+++ b/kdeprint/management/kmwsocketutil.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *
  *  This library is free software; you can redistribute it and/or
diff --git a/kdeprint/management/kmwsocketutil.h b/kdeprint/management/kmwsocketutil.h
index a7b9faee2..dfb9f490e 100644
--- a/kdeprint/management/kmwsocketutil.h
+++ b/kdeprint/management/kmwsocketutil.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp
index 135ebbe4c..3b42b71d7 100644
--- a/kdeprint/management/kxmlcommanddlg.cpp
+++ b/kdeprint/management/kxmlcommanddlg.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kxmlcommanddlg.h b/kdeprint/management/kxmlcommanddlg.h
index 7ccbc9e0e..88e590325 100644
--- a/kdeprint/management/kxmlcommanddlg.h
+++ b/kdeprint/management/kxmlcommanddlg.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/kxmlcommandselector.cpp b/kdeprint/management/kxmlcommandselector.cpp
index f46222fba..dfefe0a8b 100644
--- a/kdeprint/management/kxmlcommandselector.cpp
+++ b/kdeprint/management/kxmlcommandselector.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -20,7 +20,7 @@
 #include "kxmlcommandselector.h"
 #include "kxmlcommand.h"
 #include "kxmlcommanddlg.h"
-#include "kdeprintcheck.h"
+#include "tdeprintcheck.h"
 
 #include <tqcombobox.h>
 #include <kpushbutton.h>
diff --git a/kdeprint/management/kxmlcommandselector.h b/kdeprint/management/kxmlcommandselector.h
index 7466b9ea5..0efc299f9 100644
--- a/kdeprint/management/kxmlcommandselector.h
+++ b/kdeprint/management/kxmlcommandselector.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/networkscanner.cpp b/kdeprint/management/networkscanner.cpp
index 73466cdbb..a52e66018 100644
--- a/kdeprint/management/networkscanner.cpp
+++ b/kdeprint/management/networkscanner.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/networkscanner.h b/kdeprint/management/networkscanner.h
index 97c69a2cc..3d56bb03e 100644
--- a/kdeprint/management/networkscanner.h
+++ b/kdeprint/management/networkscanner.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/pluginaction.cpp b/kdeprint/management/pluginaction.cpp
index d876601e7..0aa3c10a3 100644
--- a/kdeprint/management/pluginaction.cpp
+++ b/kdeprint/management/pluginaction.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/pluginaction.h b/kdeprint/management/pluginaction.h
index c39f5f700..fb355b597 100644
--- a/kdeprint/management/pluginaction.h
+++ b/kdeprint/management/pluginaction.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/sidepixmap.cpp b/kdeprint/management/sidepixmap.cpp
index 696d7b025..8824dd5fc 100644
--- a/kdeprint/management/sidepixmap.cpp
+++ b/kdeprint/management/sidepixmap.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -28,9 +28,9 @@ SidePixmap::SidePixmap(TQWidget *parent, const char *name)
 	setLineWidth(1);
 	setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
 
-	m_side.load(locate("data", "kdeprint/side.png"));
-	m_tileup.load(locate("data", "kdeprint/tileup.png"));
-	m_tiledown.load(locate("data", "kdeprint/tiledown.png"));
+	m_side.load(locate("data", "tdeprint/side.png"));
+	m_tileup.load(locate("data", "tdeprint/tileup.png"));
+	m_tiledown.load(locate("data", "tdeprint/tiledown.png"));
 
 	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum));
 }
diff --git a/kdeprint/management/sidepixmap.h b/kdeprint/management/sidepixmap.h
index 330b63e2d..a9730883e 100644
--- a/kdeprint/management/sidepixmap.h
+++ b/kdeprint/management/sidepixmap.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
diff --git a/kdeprint/management/smbview.cpp b/kdeprint/management/smbview.cpp
index 8692b00bd..fde3a3451 100644
--- a/kdeprint/management/smbview.cpp
+++ b/kdeprint/management/smbview.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -240,7 +240,7 @@ void SmbView::processServers()
 			continue;
 		TQListViewItem	*item = new TQListViewItem(m_current,words[0]);
 		item->setExpandable(true);
-		item->setPixmap(0,SmallIcon("kdeprint_computer"));
+		item->setPixmap(0,SmallIcon("tdeprint_computer"));
 	}
 }
 
@@ -273,7 +273,7 @@ void SmbView::processShares()
 			//	comm += (words[i]+" ");
 			//TQListViewItem	*item = new TQListViewItem(m_current,words[0],comm);
 			TQListViewItem	*item = new TQListViewItem(m_current,sharen,comm);
-			item->setPixmap(0,SmallIcon("kdeprint_printer"));
+			item->setPixmap(0,SmallIcon("tdeprint_printer"));
 		}
 	}
 }
diff --git a/kdeprint/management/smbview.h b/kdeprint/management/smbview.h
index 57dc297f7..aea1d920d 100644
--- a/kdeprint/management/smbview.h
+++ b/kdeprint/management/smbview.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public