Rename KInstance and KAboutData to avoid conflicts with KDE4

7 files changed, 13 insertions, 13 deletions

diff --git a/kweather/kcmweather.cpp b/kweather/kcmweather.cpp
index 528b26b..952edb7 100644
--- a/kweather/kcmweather.cpp
+++ b/kweather/kcmweather.cpp
@@ -72,10 +72,10 @@ KCMWeather::KCMWeather( TQWidget *parent, const char *name )
   connect( mWidget->m_textColor, TQT_SIGNAL( changed(const TQColor &) ),
                                  TQT_SLOT( textColorChanged(const TQColor &) ) );
 
-  KAboutData *about = new KAboutData(
+  TDEAboutData *about = new TDEAboutData(
       I18N_NOOP( "kcmweather" ),
       I18N_NOOP( "KWeather Configure Dialog" ),
-      0, 0, KAboutData::License_GPL,
+      0, 0, TDEAboutData::License_GPL,
       I18N_NOOP( "(c), 2003 Tobias Koenig" ) );
 
   about->addAuthor( "Tobias Koenig", 0, "[email protected]" );
diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp
index 49bf792..3df3c0c 100644
--- a/kweather/kcmweatherservice.cpp
+++ b/kweather/kcmweatherservice.cpp
@@ -48,9 +48,9 @@ KCMWeatherService::KCMWeatherService( TQWidget *parent, const char *name )
   //connect(mWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
 
   layout->addWidget( mWidget );
-  KAboutData *about = new KAboutData( "kcmweatherservice",
+  TDEAboutData *about = new TDEAboutData( "kcmweatherservice",
                                       I18N_NOOP( "KWeather Configure Dialog" ),
-                                      0, 0, KAboutData::License_GPL,
+                                      0, 0, TDEAboutData::License_GPL,
                                       I18N_NOOP( "(c), 2003 Tobias Koenig" ) );
 
   about->addAuthor( "Tobias Koenig", 0, "[email protected]" );
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index c864d44..69fc844 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -126,8 +126,8 @@ void kweather::initDCOP()
 /** about box */
 void kweather::about(){
     kdDebug(12004) << "Telling about" << endl;
-    KAboutData aboutData("KWeather", "KWeather", "2.1.0",
-            I18N_NOOP("Weather applet for the Kicker"), KAboutData::License_GPL_V2);
+    TDEAboutData aboutData("KWeather", "KWeather", "2.1.0",
+            I18N_NOOP("Weather applet for the Kicker"), TDEAboutData::License_GPL_V2);
     aboutData.addAuthor("Ian Reinhart Geiser", "", "[email protected]",
             "http://www.kde.org/");
     //aboutData.addAuthor("Nadeem Hasan",  "", "[email protected]", "http://www.nadmm.com/");
diff --git a/kweather/main.cpp b/kweather/main.cpp
index 5b93485..390d0e8 100644
--- a/kweather/main.cpp
+++ b/kweather/main.cpp
@@ -9,9 +9,9 @@
 int main (int argc, char *argv[])
 {
 	KLocale::setMainCatalogue("tdelibs");
-	KAboutData aboutdata("KWeatherService", I18N_NOOP("TDE"),
+	TDEAboutData aboutdata("KWeatherService", I18N_NOOP("TDE"),
 				"0.8", I18N_NOOP("KWeather DCOP Service"),
-				KAboutData::License_GPL, "(C) 2002, Ian Reinhart Geiser");
+				TDEAboutData::License_GPL, "(C) 2002, Ian Reinhart Geiser");
 	aboutdata.addAuthor("Ian Reinhart Geiser",I18N_NOOP("Developer"),"[email protected]");
 	aboutdata.addAuthor("Nadeem Hasan",I18N_NOOP("Developer"),"[email protected]");
 
diff --git a/kweather/reportmain.cpp b/kweather/reportmain.cpp
index fbff590..45f08fd 100644
--- a/kweather/reportmain.cpp
+++ b/kweather/reportmain.cpp
@@ -17,9 +17,9 @@ static KCmdLineOptions options[] =
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
-    KAboutData aboutData("reportview", I18N_NOOP("Weather Report"),
+    TDEAboutData aboutData("reportview", I18N_NOOP("Weather Report"),
         "0.8", I18N_NOOP("Weather Report for KWeatherService"),
-        KAboutData::License_GPL, "(C) 2002-2003, Ian Reinhart Geiser");
+        TDEAboutData::License_GPL, "(C) 2002-2003, Ian Reinhart Geiser");
     aboutData.addAuthor("Ian Reinhart Geiser", I18N_NOOP("Developer"),
         "[email protected]");
     aboutData.addAuthor("Nadeem Hasan", I18N_NOOP("Developer"),
diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp
index 8fdf16a..e7f074e 100644
--- a/kweather/weatherbar.cpp
+++ b/kweather/weatherbar.cpp
@@ -36,7 +36,7 @@
 #include <dcopref.h>
 
 
-KonqSidebarWeather::KonqSidebarWeather(KInstance* inst, TQObject* parent,
+KonqSidebarWeather::KonqSidebarWeather(TDEInstance* inst, TQObject* parent,
                                          TQWidget* widgetParent,
                                          TQString& desktopName, const char* name)
 
@@ -149,7 +149,7 @@ void KonqSidebarWeather::update()
 
 extern "C"
 {
-    KDE_EXPORT void* create_weather_sidebar(KInstance* inst, TQObject* par, TQWidget*widp,
+    KDE_EXPORT void* create_weather_sidebar(TDEInstance* inst, TQObject* par, TQWidget*widp,
                                       TQString& desktopname, const char* name)
     {
         return new KonqSidebarWeather(inst, par, widp, desktopname, name);
diff --git a/kweather/weatherbar.h b/kweather/weatherbar.h
index ca49d14..a3c86f8 100644
--- a/kweather/weatherbar.h
+++ b/kweather/weatherbar.h
@@ -40,7 +40,7 @@ class KonqSidebarWeather: public KonqSidebarPlugin, virtual public DCOPObject
   
     K_DCOP
 public:
-    KonqSidebarWeather(KInstance* inst, TQObject* parent, TQWidget* widgetParent,
+    KonqSidebarWeather(TDEInstance* inst, TQObject* parent, TQWidget* widgetParent,
                         TQString& desktopName_, const char* name = 0);
 
     ~KonqSidebarWeather();