Additional kde to tde renaming

35 files changed, 64 insertions, 64 deletions

diff --git a/kdeprint/lpr/CMakeLists.txt b/kdeprint/lpr/CMakeLists.txt
index 56de888b9..c893411b1 100644
--- a/kdeprint/lpr/CMakeLists.txt
+++ b/kdeprint/lpr/CMakeLists.txt
@@ -18,13 +18,13 @@ 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}/kdecore
-  ${CMAKE_SOURCE_DIR}/kdeui
-  ${CMAKE_SOURCE_DIR}/kdeprint
-  ${CMAKE_SOURCE_DIR}/kdeprint/management
+  ${CMAKE_SOURCE_DIR}/tdecore
+  ${CMAKE_SOURCE_DIR}/tdeui
+  ${CMAKE_SOURCE_DIR}/tdeprint
+  ${CMAKE_SOURCE_DIR}/tdeprint/management
 )
 
 link_directories(
@@ -36,18 +36,18 @@ link_directories(
 
 install( FILES
     printcapentry.h lprhandler.h lprsettings.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kdeprint/lpr )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeprint/lpr )
 
 
 ##### other data ################################
 
-install( FILES lpr.print DESTINATION ${DATA_INSTALL_DIR}/kdeprint/plugins )
-install( FILES apsdriver1 apsdriver2 lprngtooldriver1 DESTINATION ${DATA_INSTALL_DIR}/kdeprint )
+install( FILES lpr.print DESTINATION ${DATA_INSTALL_DIR}/tdeprint/plugins )
+install( FILES apsdriver1 apsdriver2 lprngtooldriver1 DESTINATION ${DATA_INSTALL_DIR}/tdeprint )
 
 
-#### kdeprint_lpr ###############################
+#### tdeprint_lpr ###############################
 
-set( target kdeprint_lpr )
+set( target tdeprint_lpr )
 
 set( ${target}_SRCS
   printcapreader.cpp lprhandler.cpp matichandler.cpp
@@ -60,7 +60,7 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdeprint_management-shared
+  LINK tdeprint_management-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -75,6 +75,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK driverparse-static kdefakes-shared ${DL_LIBRARIES}
+  LINK driverparse-static tdefakes-shared ${DL_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdeprint/lpr/Makefile.am b/kdeprint/lpr/Makefile.am
index cb40661f9..a9039888f 100644
--- a/kdeprint/lpr/Makefile.am
+++ b/kdeprint/lpr/Makefile.am
@@ -1,10 +1,10 @@
 AM_CPPFLAGS = -D_KDEPRINT_COMPILE
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes)
 
-kde_module_LTLIBRARIES = kdeprint_lpr.la
+kde_module_LTLIBRARIES = tdeprint_lpr.la
 
-kdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \
+tdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \
 			     matichandler.cpp klprfactory.cpp kmlprmanager.cpp \
 			     kmlpruimanager.cpp lpchelper.cpp lpqhelper.cpp \
 			     kmlprjobmanager.cpp matichelper.cpp \
@@ -12,10 +12,10 @@ kdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \
 			     lprsettings.cpp kmconfiglpr.cpp apshandler.cpp \
 			     lprngtoolhandler.cpp \
 			     editentrydialog.cpp
-kdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_lpr_la_LIBADD = $(top_builddir)/kdeprint/management/libtdeprint_management.la \
+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)
-kdeprint_lpr_la_METASOURCES = AUTO
+tdeprint_lpr_la_METASOURCES = AUTO
 
 noinst_HEADERS = printcapreader.h \
 		 matichandler.h kmlprmanager.h \
@@ -25,16 +25,16 @@ noinst_HEADERS = printcapreader.h \
 		 lprngtoolhandler.h \
 		 editentrydialog.h
 
-kdeprintlpr_HEADERS = printcapentry.h lprhandler.h lprsettings.h
-kdeprintlprdir = $(includedir)/kdeprint/lpr
+tdeprintlpr_HEADERS = printcapentry.h lprhandler.h lprsettings.h
+tdeprintlprdir = $(includedir)/tdeprint/lpr
 
 bin_PROGRAMS = make_driver_db_lpr
 make_driver_db_lpr_SOURCES = make_driver_db_lpr.c
 make_driver_db_lpr_LDFLAGS = $(all_libraries) 
-make_driver_db_lpr_LDADD = $(top_builddir)/kdecore/libtdefakes.la ../libdriverparse.a $(LIBDL)
+make_driver_db_lpr_LDADD = $(top_builddir)/tdecore/libtdefakes.la ../libdriverparse.a $(LIBDL)
 
 entry_DATA = lpr.print
-entrydir = $(kde_datadir)/kdeprint/plugins
+entrydir = $(kde_datadir)/tdeprint/plugins
 
 miscdata_DATA = apsdriver1 apsdriver2 lprngtooldriver1
-miscdatadir = $(kde_datadir)/kdeprint
+miscdatadir = $(kde_datadir)/tdeprint
diff --git a/kdeprint/lpr/apshandler.cpp b/kdeprint/lpr/apshandler.cpp
index 641ff5e07..d4107d7c7 100644
--- a/kdeprint/lpr/apshandler.cpp
+++ b/kdeprint/lpr/apshandler.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
@@ -196,7 +196,7 @@ DrMain* ApsHandler::loadDbDriver(const TQString& s)
 
 DrMain* ApsHandler::loadApsDriver(bool config)
 {
-	DrMain	*driver = loadToolDriver(locate("data", (config ? "kdeprint/apsdriver1" : "kdeprint/apsdriver2")));
+	DrMain	*driver = loadToolDriver(locate("data", (config ? "tdeprint/apsdriver1" : "tdeprint/apsdriver2")));
 	if (driver)
 		driver->set("text", "APS Common Driver");
 	return driver;
diff --git a/kdeprint/lpr/apshandler.h b/kdeprint/lpr/apshandler.h
index 02ee79c92..db213d194 100644
--- a/kdeprint/lpr/apshandler.h
+++ b/kdeprint/lpr/apshandler.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/lpr/editentrydialog.cpp b/kdeprint/lpr/editentrydialog.cpp
index 9029a6736..6c4ecc30c 100644
--- a/kdeprint/lpr/editentrydialog.cpp
+++ b/kdeprint/lpr/editentrydialog.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/lpr/editentrydialog.h b/kdeprint/lpr/editentrydialog.h
index c51152627..f4359dd89 100644
--- a/kdeprint/lpr/editentrydialog.h
+++ b/kdeprint/lpr/editentrydialog.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/lpr/klprfactory.cpp b/kdeprint/lpr/klprfactory.cpp
index 86666981e..4764dfc6a 100644
--- a/kdeprint/lpr/klprfactory.cpp
+++ b/kdeprint/lpr/klprfactory.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
@@ -25,5 +25,5 @@
 #include <kgenericfactory.h>
 
 typedef K_TYPELIST_4( KMLprManager, KMLprUiManager, KMLprJobManager, KLprPrinterImpl ) Products;
-K_EXPORT_COMPONENT_FACTORY( kdeprint_lpr, KGenericFactory< Products > )
+K_EXPORT_COMPONENT_FACTORY( tdeprint_lpr, KGenericFactory< Products > )
 
diff --git a/kdeprint/lpr/klprprinterimpl.cpp b/kdeprint/lpr/klprprinterimpl.cpp
index 9f0956ff3..70356f23c 100644
--- a/kdeprint/lpr/klprprinterimpl.cpp
+++ b/kdeprint/lpr/klprprinterimpl.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/lpr/klprprinterimpl.h b/kdeprint/lpr/klprprinterimpl.h
index ca346ab8a..508173f1d 100644
--- a/kdeprint/lpr/klprprinterimpl.h
+++ b/kdeprint/lpr/klprprinterimpl.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/lpr/kmconfiglpr.cpp b/kdeprint/lpr/kmconfiglpr.cpp
index f9f51b46d..f43a8da2d 100644
--- a/kdeprint/lpr/kmconfiglpr.cpp
+++ b/kdeprint/lpr/kmconfiglpr.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/lpr/kmconfiglpr.h b/kdeprint/lpr/kmconfiglpr.h
index 1f88d9fb7..7f3d50857 100644
--- a/kdeprint/lpr/kmconfiglpr.h
+++ b/kdeprint/lpr/kmconfiglpr.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/lpr/kmlprjobmanager.cpp b/kdeprint/lpr/kmlprjobmanager.cpp
index 67e7a4001..851663664 100644
--- a/kdeprint/lpr/kmlprjobmanager.cpp
+++ b/kdeprint/lpr/kmlprjobmanager.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/lpr/kmlprjobmanager.h b/kdeprint/lpr/kmlprjobmanager.h
index 83d65a296..d9a8eae3f 100644
--- a/kdeprint/lpr/kmlprjobmanager.h
+++ b/kdeprint/lpr/kmlprjobmanager.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/lpr/kmlprmanager.cpp b/kdeprint/lpr/kmlprmanager.cpp
index 64e593590..cf4dbbb94 100644
--- a/kdeprint/lpr/kmlprmanager.cpp
+++ b/kdeprint/lpr/kmlprmanager.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 KMLprManager::initHandlers()
 	insertHandler(new LPRngToolHandler(this));
 
 	// now load external handlers
-	TQStringList	l = KGlobal::dirs()->findAllResources("data", "kdeprint/lpr/*.la");
+	TQStringList	l = KGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la");
 	for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
 	{
 		KLibrary	*library = KLibLoader::self()->library(TQFile::encodeName(*it));
@@ -455,7 +455,7 @@ TQString KMLprManager::printOptions(KPrinter *prt)
 
 void KMLprManager::createPluginActions(KActionCollection *coll)
 {
-	KAction	*act = new KAction(i18n("&Edit printcap Entry..."), "kdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
+	KAction	*act = new KAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
 	act->setGroup("plugin");
 }
 
diff --git a/kdeprint/lpr/kmlprmanager.h b/kdeprint/lpr/kmlprmanager.h
index d95fb7db5..34d38340f 100644
--- a/kdeprint/lpr/kmlprmanager.h
+++ b/kdeprint/lpr/kmlprmanager.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/lpr/kmlpruimanager.cpp b/kdeprint/lpr/kmlpruimanager.cpp
index ea48c9bf9..655309e0c 100644
--- a/kdeprint/lpr/kmlpruimanager.cpp
+++ b/kdeprint/lpr/kmlpruimanager.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/lpr/kmlpruimanager.h b/kdeprint/lpr/kmlpruimanager.h
index e7e015e2a..561f93500 100644
--- a/kdeprint/lpr/kmlpruimanager.h
+++ b/kdeprint/lpr/kmlpruimanager.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/lpr/lpchelper.cpp b/kdeprint/lpr/lpchelper.cpp
index 7cf0bfebf..c921a803c 100644
--- a/kdeprint/lpr/lpchelper.cpp
+++ b/kdeprint/lpr/lpchelper.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/lpr/lpchelper.h b/kdeprint/lpr/lpchelper.h
index 8f2590065..b1e20f089 100644
--- a/kdeprint/lpr/lpchelper.h
+++ b/kdeprint/lpr/lpchelper.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/lpr/lpqhelper.cpp b/kdeprint/lpr/lpqhelper.cpp
index 3bd1c514b..30348f591 100644
--- a/kdeprint/lpr/lpqhelper.cpp
+++ b/kdeprint/lpr/lpqhelper.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/lpr/lpqhelper.h b/kdeprint/lpr/lpqhelper.h
index 59965fb62..2c38566c5 100644
--- a/kdeprint/lpr/lpqhelper.h
+++ b/kdeprint/lpr/lpqhelper.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/lpr/lprhandler.cpp b/kdeprint/lpr/lprhandler.cpp
index d3fc4ee94..fcb838bb9 100644
--- a/kdeprint/lpr/lprhandler.cpp
+++ b/kdeprint/lpr/lprhandler.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/lpr/lprhandler.h b/kdeprint/lpr/lprhandler.h
index eaab2557f..e0e66e146 100644
--- a/kdeprint/lpr/lprhandler.h
+++ b/kdeprint/lpr/lprhandler.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/lpr/lprngtoolhandler.cpp b/kdeprint/lpr/lprngtoolhandler.cpp
index 2d94e9b18..1d76cf2f5 100644
--- a/kdeprint/lpr/lprngtoolhandler.cpp
+++ b/kdeprint/lpr/lprngtoolhandler.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
@@ -163,7 +163,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool
 		return NULL;
 	}
 
-	DrMain*	driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1"));
+	DrMain*	driver = loadToolDriver(locate("data", "tdeprint/lprngtooldriver1"));
 	if (driver)
 	{
 		TQString	model = prt->option("driverID");
@@ -183,7 +183,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool
 DrMain* LPRngToolHandler::loadDbDriver(const TQString& s)
 {
 	int	p = s.find('/');
-	DrMain*	driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1"));
+	DrMain*	driver = loadToolDriver(locate("data", "tdeprint/lprngtooldriver1"));
 	if (driver)
 		driver->set("driverID", s.mid(p+1));
 	return driver;
@@ -231,7 +231,7 @@ TQMap<TQString,TQString> LPRngToolHandler::parseZOptions(const TQString& optstr)
 		return opts;
 	
 	if (m_dict.count() == 0)
-		m_dict = loadChoiceDict(locate("data", "kdeprint/lprngtooldriver1"));
+		m_dict = loadChoiceDict(locate("data", "tdeprint/lprngtooldriver1"));
 
 	TQString	unknown;
 	for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
diff --git a/kdeprint/lpr/lprngtoolhandler.h b/kdeprint/lpr/lprngtoolhandler.h
index e8843dc64..49641ca3a 100644
--- a/kdeprint/lpr/lprngtoolhandler.h
+++ b/kdeprint/lpr/lprngtoolhandler.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/lpr/lprsettings.cpp b/kdeprint/lpr/lprsettings.cpp
index a1a632a0f..0c1cec2a9 100644
--- a/kdeprint/lpr/lprsettings.cpp
+++ b/kdeprint/lpr/lprsettings.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/lpr/lprsettings.h b/kdeprint/lpr/lprsettings.h
index 419ec46d1..01abbeeb3 100644
--- a/kdeprint/lpr/lprsettings.h
+++ b/kdeprint/lpr/lprsettings.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
@@ -25,7 +25,7 @@
 #endif
 
 #include <tqobject.h>
-#include <kdeprint/kpreloadobject.h>
+#include <tdeprint/kpreloadobject.h>
 
 /**
  * @internal
diff --git a/kdeprint/lpr/matichandler.cpp b/kdeprint/lpr/matichandler.cpp
index bd3307ad5..ef2f1584b 100644
--- a/kdeprint/lpr/matichandler.cpp
+++ b/kdeprint/lpr/matichandler.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/lpr/matichandler.h b/kdeprint/lpr/matichandler.h
index db376f264..e30eee39e 100644
--- a/kdeprint/lpr/matichandler.h
+++ b/kdeprint/lpr/matichandler.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/lpr/matichelper.cpp b/kdeprint/lpr/matichelper.cpp
index 1da5f6313..ec0041b7c 100644
--- a/kdeprint/lpr/matichelper.cpp
+++ b/kdeprint/lpr/matichelper.cpp
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 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/lpr/matichelper.h b/kdeprint/lpr/matichelper.h
index 622dd06aa..5a2b64fe3 100644
--- a/kdeprint/lpr/matichelper.h
+++ b/kdeprint/lpr/matichelper.h
@@ -1,6 +1,6 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be>
+ *  Copyright (c) 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/lpr/printcapentry.cpp b/kdeprint/lpr/printcapentry.cpp
index 3f3af643b..9c83537e4 100644
--- a/kdeprint/lpr/printcapentry.cpp
+++ b/kdeprint/lpr/printcapentry.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/lpr/printcapentry.h b/kdeprint/lpr/printcapentry.h
index a7f2cabcf..f8ba99197 100644
--- a/kdeprint/lpr/printcapentry.h
+++ b/kdeprint/lpr/printcapentry.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/lpr/printcapreader.cpp b/kdeprint/lpr/printcapreader.cpp
index 72a6e2903..00016c14f 100644
--- a/kdeprint/lpr/printcapreader.cpp
+++ b/kdeprint/lpr/printcapreader.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/lpr/printcapreader.h b/kdeprint/lpr/printcapreader.h
index 51aac90d1..2236e5068 100644
--- a/kdeprint/lpr/printcapreader.h
+++ b/kdeprint/lpr/printcapreader.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