Rename KInstance and KAboutData to avoid conflicts with KDE4

3 files changed, 6 insertions, 6 deletions

diff --git a/kfaxview/faxmultipage.cpp b/kfaxview/faxmultipage.cpp
index 44c1e273..d052b51b 100644
--- a/kfaxview/faxmultipage.cpp
+++ b/kfaxview/faxmultipage.cpp
@@ -55,12 +55,12 @@ FaxMultiPage::~FaxMultiPage()
 }
 
 
-KAboutData* FaxMultiPage::createAboutData()
+TDEAboutData* FaxMultiPage::createAboutData()
 {
   /* You obviously want to change this to match your setup */
-  KAboutData* about = new KAboutData("kfaxview", I18N_NOOP("KFaxView"), "0.1",
+  TDEAboutData* about = new TDEAboutData("kfaxview", I18N_NOOP("KFaxView"), "0.1",
 				     I18N_NOOP("KViewshell Fax Plugin."),
-				     KAboutData::License_GPL,
+				     TDEAboutData::License_GPL,
 				     "Stefan Kebekus",
 				     I18N_NOOP("This program previews fax (g3) files."));
 
diff --git a/kfaxview/faxmultipage.h b/kfaxview/faxmultipage.h
index 6d506cff..a6e471e8 100644
--- a/kfaxview/faxmultipage.h
+++ b/kfaxview/faxmultipage.h
@@ -111,7 +111,7 @@ public:
   This member returns a structure that contains information about the
   authors of the implementation
   */
-  static KAboutData* createAboutData();
+  static TDEAboutData* createAboutData();
   
  private:
   /** This member holds the renderer which is used by the demo implementation */
diff --git a/kfaxview/main.cpp b/kfaxview/main.cpp
index 93fd1807..7f4fbeee 100644
--- a/kfaxview/main.cpp
+++ b/kfaxview/main.cpp
@@ -50,8 +50,8 @@ static const char description[] = I18N_NOOP("A previewer for Fax files.");
 
 int main(int argc, char** argv)
 {
-  KAboutData about ("kfaxview", I18N_NOOP("KFaxView"), "3.5",
-                    description, KAboutData::License_GPL,
+  TDEAboutData about ("kfaxview", I18N_NOOP("KFaxView"), "3.5",
+                    description, TDEAboutData::License_GPL,
                     "Stephan Kebekus, Helge Deller",
                     I18N_NOOP("Fax-G3 plugin for the KViewShell document viewer framework."));