From 5fc6f26e12b596addd235f87320c31761bd5a84d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:22:15 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 libtdepim/komposer/core/core.cpp        | 2 +-
 libtdepim/komposer/core/prefsmodule.cpp | 6 +++---
 libtdepim/komposer/core/prefsmodule.h   | 4 ++--
 libtdepim/komposer/core/tests/main.cpp  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libtdepim/komposer/core')

diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index f93e59cc9..945c22311 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -60,7 +60,7 @@ Core::Core( TQWidget *parent, const char *name )
   initWidgets();
   initCore();
   initConnections();
-  setInstance( new KInstance( "komposer" ) );
+  setInstance( new TDEInstance( "komposer" ) );
 
   createActions();
   setXMLFile( "komposerui.rc" );
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 5aed441a9..807869487 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -56,12 +56,12 @@ PrefsModule::PrefsModule( TQWidget *parent, const char *name )
   load();
 }
 
-const KAboutData*
+const TDEAboutData*
 PrefsModule::aboutData() const
 {
-  KAboutData *about = new KAboutData( I18N_NOOP( "komposerconfig" ),
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "komposerconfig" ),
                                       I18N_NOOP( "TDE Komposer" ),
-                                      0, 0, KAboutData::License_LGPL,
+                                      0, 0, TDEAboutData::License_LGPL,
                                       I18N_NOOP( "(c), 2003-2004 Zack Rusin" ) );
 
   about->addAuthor( "Zack Rusin", 0, "zack@kde.org" );;
diff --git a/libtdepim/komposer/core/prefsmodule.h b/libtdepim/komposer/core/prefsmodule.h
index 9e60098ee..a7733019c 100644
--- a/libtdepim/komposer/core/prefsmodule.h
+++ b/libtdepim/komposer/core/prefsmodule.h
@@ -27,7 +27,7 @@
 class TQGroupBox;
 class TQListViewItem;
 
-class KAboutData;
+class TDEAboutData;
 class KComboBox;
 
 namespace Komposer {
@@ -38,7 +38,7 @@ namespace Komposer {
   
   public:
     PrefsModule( TQWidget *parent=0, const char *name=0 );
-    virtual const KAboutData *aboutData() const;
+    virtual const TDEAboutData *aboutData() const;
   };
 
   class EditorSelection : public KPrefsWid
diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp
index 80bf8fc95..e132ac883 100644
--- a/libtdepim/komposer/core/tests/main.cpp
+++ b/libtdepim/komposer/core/tests/main.cpp
@@ -38,7 +38,7 @@ static const KCmdLineOptions options[] =
 };
 int main( int argc, char** argv )
 {
-    KAboutData aboutData( "tests","Test","0.1" );
+    TDEAboutData aboutData( "tests","Test","0.1" );
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-- 
cgit v1.2.1