Rename KInstance and KAboutData to avoid conflicts with KDE4

6 files changed, 13 insertions, 13 deletions

diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp
index 417929339..a0671e5bc 100644
--- a/tdeprint/kjobviewer/main.cpp
+++ b/tdeprint/kjobviewer/main.cpp
@@ -35,7 +35,7 @@ static KCmdLineOptions options[] = {
 
 extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
 {
-	KAboutData	aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),KAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org");
+	TDEAboutData	aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),TDEAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org");
 	aboutData.addAuthor("Michael Goffioul",0,"tdeprint@swing.be");
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/tdeprint/printmgr/kcmprintmgr.cpp b/tdeprint/printmgr/kcmprintmgr.cpp
index f24bf6c84..4dba35e70 100644
--- a/tdeprint/printmgr/kcmprintmgr.cpp
+++ b/tdeprint/printmgr/kcmprintmgr.cpp
@@ -47,9 +47,9 @@ KCMPrintMgr::KCMPrintMgr(TQWidget *parent, const char *name, const TQStringList
 	main_->addWidget(m_mainview);
 	main_->activate();
 	
-	KAboutData *about =
-	  new KAboutData(I18N_NOOP("kcmprintmgr"), I18N_NOOP("TDE Printing Management"),
-                  0, 0, KAboutData::License_GPL,
+	TDEAboutData *about =
+	  new TDEAboutData(I18N_NOOP("kcmprintmgr"), I18N_NOOP("TDE Printing Management"),
+                  0, 0, TDEAboutData::License_GPL,
                   I18N_NOOP("(c) 2000 - 2002 Michael Goffioul"));
 	about->addAuthor("Michael Goffioul", 0, "tdeprint@swing.be");
 	setAboutData(about);
diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp
index 74142c994..946092d15 100644
--- a/tdeprint/slave/kio_print.cpp
+++ b/tdeprint/slave/kio_print.cpp
@@ -135,7 +135,7 @@ TQString buildGroupTable(DrGroup *grp, bool showHeader = true)
 
 int kdemain(int argc, char **argv)
 {
-	KInstance  instance("kio_print");
+	TDEInstance  instance("kio_print");
 
 	PRINT_DEBUG << "starting ioslave" << endl;
 	if (argc != 4)
@@ -145,8 +145,8 @@ int kdemain(int argc, char **argv)
 	}
 
 	/* create fake KApplicatiom object, needed for job stuffs */
-	KAboutData about( "kio_print", "kio_print", "fake_version", 
-			"TDEPrint IO slave", KAboutData::License_GPL, "(c) 2003, Michael Goffioul" );
+	TDEAboutData about( "kio_print", "kio_print", "fake_version", 
+			"TDEPrint IO slave", TDEAboutData::License_GPL, "(c) 2003, Michael Goffioul" );
 	TDECmdLineArgs::init( &about );
 	TDEApplication app;
 
diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp
index 5d5d7b154..0ac1adcd2 100644
--- a/tdeprint/tdeprint_part/printpart.cpp
+++ b/tdeprint/tdeprint_part/printpart.cpp
@@ -54,9 +54,9 @@ PrintPart::~PrintPart()
 {
 }
 
-KAboutData *PrintPart::createAboutData()
+TDEAboutData *PrintPart::createAboutData()
 {
-	return new KAboutData(I18N_NOOP("tdeprint_part"), I18N_NOOP("A Konqueror Plugin for Print Management"), "0.1");
+	return new TDEAboutData(I18N_NOOP("tdeprint_part"), I18N_NOOP("A Konqueror Plugin for Print Management"), "0.1");
 }
 
 bool PrintPart::openFile()
diff --git a/tdeprint/tdeprint_part/printpart.h b/tdeprint/tdeprint_part/printpart.h
index df543b210..98881d0f9 100644
--- a/tdeprint/tdeprint_part/printpart.h
+++ b/tdeprint/tdeprint_part/printpart.h
@@ -25,7 +25,7 @@
 
 class PrintPartExtension;
 class KMMainView;
-class KAboutData;
+class TDEAboutData;
 
 class PrintPart : public KParts::ReadOnlyPart
 {
@@ -36,7 +36,7 @@ public:
 		  const TQStringList & );
 	virtual ~PrintPart();
 
-	static KAboutData *createAboutData();
+	static TDEAboutData *createAboutData();
 
 protected:
 	bool openFile();
diff --git a/tdeprint/tdeprintfax/main.cpp b/tdeprint/tdeprintfax/main.cpp
index 219321907..82a07e97d 100644
--- a/tdeprint/tdeprintfax/main.cpp
+++ b/tdeprint/tdeprintfax/main.cpp
@@ -47,8 +47,8 @@ static KCmdLineOptions options[] =
 int main(int argc, char *argv[])
 {
 
-  KAboutData aboutData( "tdeprintfax", I18N_NOOP("KdeprintFax"),
-    "1.0", description, KAboutData::License_GPL,
+  TDEAboutData aboutData( "tdeprintfax", I18N_NOOP("KdeprintFax"),
+    "1.0", description, TDEAboutData::License_GPL,
     "(c), 2001 Michael Goffioul", 0, "http://printing.kde.org");
   aboutData.addAuthor("Michael Goffioul",0, "tdeprint@swing.be");
   TDECmdLineArgs::init( argc, argv, &aboutData );