Rename KInstance and KAboutData to avoid conflicts with KDE4

7 files changed, 12 insertions, 12 deletions

diff --git a/akregator/src/aboutdata.cpp b/akregator/src/aboutdata.cpp
index 5400acb9..21810183 100644
--- a/akregator/src/aboutdata.cpp
+++ b/akregator/src/aboutdata.cpp
@@ -29,7 +29,7 @@
 namespace Akregator {
 
 AboutData::AboutData()
-    : KAboutData("akregator", I18N_NOOP("Akregator"), AKREGATOR_VERSION, I18N_NOOP("A TDE Feed Aggregator"),
+    : TDEAboutData("akregator", I18N_NOOP("Akregator"), AKREGATOR_VERSION, I18N_NOOP("A TDE Feed Aggregator"),
                  License_GPL, I18N_NOOP("(C) 2004, 2005 Akregator developers"), 0,
                      "http://akregator.kde.org/")
 {
diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h
index cae660b5..4ccc3a2d 100644
--- a/akregator/src/aboutdata.h
+++ b/akregator/src/aboutdata.h
@@ -34,7 +34,7 @@ namespace Akregator {
 /**
 @author Teemu Rytilahti
 */
-class KDE_EXPORT AboutData : public KAboutData
+class KDE_EXPORT AboutData : public TDEAboutData
 {
 public:
     AboutData();
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index ffa7c905..9d9c574e 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -766,14 +766,14 @@ void Part::addFeed()
     m_view->slotFeedAdd();
 }
 
-KAboutData *Part::createAboutData()
+TDEAboutData *Part::createAboutData()
 {
     return new Akregator::AboutData;
 }
 
 void Part::showKNotifyOptions()
 {
-    KAboutData* about = new Akregator::AboutData;
+    TDEAboutData* about = new Akregator::AboutData;
     KNotifyDialog::configure(m_view, "akregator_knotify_config", about);
     delete about;
 }
@@ -934,7 +934,7 @@ bool Part::tryToLock(const TQString& backendName)
         appName = "akregator";
 
     TQString programName;
-    const KAboutData *about = kapp->aboutData();
+    const TDEAboutData *about = kapp->aboutData();
     if ( about )
         programName = about->programName();
     if ( programName.isEmpty() )
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index d74d4d42..276fb14c 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -37,7 +37,7 @@
 class TQDomDocument;
 class TQTimer;
 
-class KAboutData;
+class TDEAboutData;
 class KConfig;
 class KURL;
 
@@ -88,8 +88,8 @@ namespace Akregator
 	        /** Destructor. */
             virtual ~Part();
 
-            /** Create KAboutData for this KPart. */
-            static KAboutData *createAboutData();
+            /** Create TDEAboutData for this KPart. */
+            static TDEAboutData *createAboutData();
 
             /**
              Opens feedlist
diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp
index 721c1123..154facbc 100644
--- a/akregator/src/librss/testlibrss.cpp
+++ b/akregator/src/librss/testlibrss.cpp
@@ -58,7 +58,7 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
 
 int main( int argc, char **argv )
 {
-	KAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
+	TDEAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 	TDEApplication app;
diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp
index 6220e97c..0ab3a4e8 100644
--- a/akregator/src/notificationmanager.cpp
+++ b/akregator/src/notificationmanager.cpp
@@ -52,7 +52,7 @@ NotificationManager::~NotificationManager()
     m_self = 0;
 }
 
-void NotificationManager::setWidget(TQWidget* widget, KInstance* inst)
+void NotificationManager::setWidget(TQWidget* widget, TDEInstance* inst)
 {
     m_widget = widget;
     m_instance = inst != NULL ? inst : KGlobal::instance();
diff --git a/akregator/src/notificationmanager.h b/akregator/src/notificationmanager.h
index 0cc6db2e..1ff1d888 100644
--- a/akregator/src/notificationmanager.h
+++ b/akregator/src/notificationmanager.h
@@ -44,7 +44,7 @@ class NotificationManager : public TQObject
         ~NotificationManager();
 
         /** the widget used for notification, normally either the mainwindow or the tray icon */
-        void setWidget(TQWidget* widget, KInstance* inst=0);
+        void setWidget(TQWidget* widget, TDEInstance* inst=0);
         
     public slots:
 
@@ -74,7 +74,7 @@ class NotificationManager : public TQObject
         bool m_running;
         bool m_addedInLastInterval;
         TQWidget* m_widget;
-        KInstance* m_instance;
+        TDEInstance* m_instance;
 
         TQValueList<Article> m_articles;