Rename KInstance and KAboutData to avoid conflicts with KDE4

8 files changed, 15 insertions, 15 deletions

diff --git a/kview/kviewcanvas/ChangeLog b/kview/kviewcanvas/ChangeLog
index 1edb3529..9ec3ee84 100644
--- a/kview/kviewcanvas/ChangeLog
+++ b/kview/kviewcanvas/ChangeLog
@@ -10,7 +10,7 @@
 
 	* kimagecanvas.cpp:
 		Fix checkBounds() to always keep the aspect ratio.
-		Create the factory with it's own KInstance.
+		Create the factory with it's own TDEInstance.
 	* kimagecanvas.{h,cpp}:
 		New method boundImageTo( QSize ). Fits the image into the
 		requested width and height.
diff --git a/kview/kviewcanvas/test/main.cpp b/kview/kviewcanvas/test/main.cpp
index bd78c8fb..4c6fa3f7 100644
--- a/kview/kviewcanvas/test/main.cpp
+++ b/kview/kviewcanvas/test/main.cpp
@@ -17,7 +17,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("kimageviewertest", I18N_NOOP("KImageViewerTest"), version, description, KAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "kretz@kde.org");
+    TDEAboutData about("kimageviewertest", I18N_NOOP("KImageViewerTest"), version, description, TDEAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "kretz@kde.org");
     about.addAuthor( "Matthias Kretz", 0, "kretz@kde.org" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index b9e8af7d..dbfa1c92 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -167,11 +167,11 @@ KViewViewer::~KViewViewer()
 	delete m_pBuffer;
 }
 
-KAboutData * KViewViewer::createAboutData()
+TDEAboutData * KViewViewer::createAboutData()
 {
-	KAboutData * aboutData  = new KAboutData( "kviewviewer", I18N_NOOP( "KView" ),
+	TDEAboutData * aboutData  = new TDEAboutData( "kviewviewer", I18N_NOOP( "KView" ),
 			KVIEW_VERSION, I18N_NOOP( "TDE Image Viewer Part" ),
-			KAboutData::License_GPL,
+			TDEAboutData::License_GPL,
 			I18N_NOOP("(c) 1997-2002, The KView Developers") );
 	aboutData->addAuthor( "Matthias Kretz", I18N_NOOP( "Maintainer" ), "kretz@kde.org" );
 	aboutData->addAuthor( "Sirtaj Singh Kang", I18N_NOOP( "started it all" ), "taj@kde.org" );
@@ -743,7 +743,7 @@ void KViewViewer::slotDel()
 class PopupGUIClient : public KXMLGUIClient
 {
 	public:
-		PopupGUIClient( KInstance *inst, const TQString &doc )
+		PopupGUIClient( TDEInstance *inst, const TQString &doc )
 		{
 			setInstance( inst );
 			setXML( doc );
diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h
index 1cc26f32..06fb17bc 100644
--- a/kview/kviewviewer/kviewviewer.h
+++ b/kview/kviewviewer/kviewviewer.h
@@ -35,7 +35,7 @@ class KAction;
 class KActionMenu;
 class KToggleAction;
 class KSelectAction;
-class KAboutData;
+class TDEAboutData;
 class TQBuffer;
 class TQSize;
 class KDirWatch;
@@ -54,7 +54,7 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf
 		virtual ~KViewViewer();
 
 		KImageViewer::Canvas * canvas() const { return m_pCanvas; }
-		static KAboutData * createAboutData();
+		static TDEAboutData * createAboutData();
 		virtual void setReadWrite( bool readwrite = true );
 		KParts::BrowserExtension * browserExtension() const { return m_pExtension; }
 
diff --git a/kview/kviewviewer/test/main.cpp b/kview/kviewviewer/test/main.cpp
index 499e75e5..5a562b08 100644
--- a/kview/kviewviewer/test/main.cpp
+++ b/kview/kviewviewer/test/main.cpp
@@ -17,7 +17,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("kviewviewertest", I18N_NOOP("KView Viewer Test"), version, description, KAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "kretz@kde.org");
+    TDEAboutData about("kviewviewertest", I18N_NOOP("KView Viewer Test"), version, description, TDEAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "kretz@kde.org");
     about.addAuthor( "Matthias Kretz", 0, "kretz@kde.org" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kview/main.cpp b/kview/main.cpp
index 4f8266d2..43b6d907 100644
--- a/kview/main.cpp
+++ b/kview/main.cpp
@@ -33,9 +33,9 @@ static KCmdLineOptions options[] =
 
 extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
 {
-	KAboutData about( "kview", I18N_NOOP( "KView" ),
+	TDEAboutData about( "kview", I18N_NOOP( "KView" ),
 			KVIEW_VERSION, description,
-			KAboutData::License_GPL,
+			TDEAboutData::License_GPL,
 			I18N_NOOP( "(c) 1997-2002, The KView Developers" ) );
 	about.addAuthor( "Matthias Kretz", I18N_NOOP( "Maintainer" ), "kretz@kde.org" );
 	about.addAuthor( "Sirtaj Singh Kang", I18N_NOOP( "started it all" ), "taj@kde.org" );
diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp
index 9fcb1603..a08f871a 100644
--- a/kview/photobook/photobook.cpp
+++ b/kview/photobook/photobook.cpp
@@ -262,12 +262,12 @@ bool PhotoBookPart::openURL(const KURL &url)
 }
 
 
-KAboutData* PhotoBookPart::createAboutData()
+TDEAboutData* PhotoBookPart::createAboutData()
 {
-	return new KAboutData(
+	return new TDEAboutData(
 			"photobook", I18N_NOOP("Photo Book"),
 			"1.0", I18N_NOOP("Easily browse a folder of photographs"),
-			KAboutData::License_GPL,
+			TDEAboutData::License_GPL,
 			I18N_NOOP("Copyright (c) 2004,2005 Charles Samuels <charles@kde.org>")
 		);
 }
diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h
index 1f9bd136..b7c8ee63 100644
--- a/kview/photobook/photobook.h
+++ b/kview/photobook/photobook.h
@@ -122,7 +122,7 @@ public:
 	~PhotoBookPart();
 
 	virtual bool openURL(const KURL &url);
-	static KAboutData* createAboutData();
+	static TDEAboutData* createAboutData();
 	virtual bool openFile();
 
 public slots: