From d0de10e23a5ec604757cb03751d7a9a69215e194 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:22:52 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- amor/main.cpp | 4 ++-- fifteenapplet/fifteenapplet.cpp | 4 ++-- fifteenapplet/fifteenapplet.h | 4 ++-- kodo/main.cpp | 4 ++-- kteatime/main.cpp | 4 ++-- kweather/kcmweather.cpp | 4 ++-- kweather/kcmweatherservice.cpp | 4 ++-- kweather/kweather.cpp | 4 ++-- kweather/main.cpp | 4 ++-- kweather/reportmain.cpp | 4 ++-- kweather/weatherbar.cpp | 4 ++-- kweather/weatherbar.h | 2 +- kworldwatch/main.cpp | 4 ++-- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amor/main.cpp b/amor/main.cpp index 8a0ebe7..4fc7600 100644 --- a/amor/main.cpp +++ b/amor/main.cpp @@ -44,8 +44,8 @@ static const char description[] = I18N_NOOP("TDE creature for your desktop"); int main(int argc, char *argv[]) { - KAboutData aboutData( "amor", I18N_NOOP("amor"), - AMOR_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "amor", I18N_NOOP("amor"), + AMOR_VERSION, description, TDEAboutData::License_GPL, "(c) 1999, Martin R. Jones"); aboutData.addAuthor("Martin R. Jones",0, "mjones@kde.org"); aboutData.addAuthor("Gerardo Puga", I18N_NOOP("Current maintainer"), "gpuga@gioia.ing.unlp.edu.ar"); diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp index 490ed52..31dc572 100644 --- a/fifteenapplet/fifteenapplet.cpp +++ b/fifteenapplet/fifteenapplet.cpp @@ -75,12 +75,12 @@ int FifteenApplet::heightForWidth(int w) const void FifteenApplet::about() { if(!_aboutData) { - _aboutData = new KAboutData("kfifteenapplet", I18N_NOOP("KFifteenApplet"), "1.0", + _aboutData = new TDEAboutData("kfifteenapplet", I18N_NOOP("KFifteenApplet"), "1.0", I18N_NOOP("Fifteen pieces applet.\n\n" "The goal is to put the sliding pieces into numerical order.\n" "Select \"Randomize Pieces\" from the right mouse button menu\n" "to start a game."), - KAboutData::License_BSD, "(c) 2001, Matthias Elter"); + TDEAboutData::License_BSD, "(c) 2001, Matthias Elter"); _aboutData->addAuthor("Matthias Elter", 0, "elter@kde.org"); } diff --git a/fifteenapplet/fifteenapplet.h b/fifteenapplet/fifteenapplet.h index 6633fe0..1ef45c9 100644 --- a/fifteenapplet/fifteenapplet.h +++ b/fifteenapplet/fifteenapplet.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include class TQPopupMenu; -class KAboutData; +class TDEAboutData; class PiecesTable : public QtTableView { @@ -80,7 +80,7 @@ public: private: PiecesTable *_table; - KAboutData *_aboutData; + TDEAboutData *_aboutData; }; #endif diff --git a/kodo/main.cpp b/kodo/main.cpp index 92eb543..518cd9c 100644 --- a/kodo/main.cpp +++ b/kodo/main.cpp @@ -63,10 +63,10 @@ int main(int argc, char *argv[]) { /* Top level details */ - KAboutData *aboutData = new KAboutData("kodo", + TDEAboutData *aboutData = new TDEAboutData("kodo", I18N_NOOP("KOdometer"), "3.2", I18N_NOOP("KOdometer measures your desktop mileage"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 1998, Armen Nakashian", I18N_NOOP("A mouse odometer"), 0, "dev@gioelebarabucci.com"); diff --git a/kteatime/main.cpp b/kteatime/main.cpp index 1c374d2..71321d0 100644 --- a/kteatime/main.cpp +++ b/kteatime/main.cpp @@ -39,8 +39,8 @@ static const char version[] = "v1.1.0"; int main(int argc, char *argv[]) { - KAboutData aboutData( "kteatime", I18N_NOOP("KTeaTime"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kteatime", I18N_NOOP("KTeaTime"), + version, description, TDEAboutData::License_GPL, "(c) 1998-1999, Matthias Hoelzer-Kluepfel\n(c) 2002-2003, Martin Willers"); aboutData.addAuthor("Matthias Hoelzer-Kluepfel",0, "hoelzer@kde.org"); aboutData.addAuthor("Martin Willers", 0, "willers@xm-arts.de"); 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, "tokoe@kde.org" ); 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, "tokoe@kde.org" ); 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", "", "geiseri@kde.org", "http://www.kde.org/"); //aboutData.addAuthor("Nadeem Hasan", "", "nhasan@nadmm.com", "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"),"geiseri@kde.org"); aboutdata.addAuthor("Nadeem Hasan",I18N_NOOP("Developer"),"nhasan@kde.org"); 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"), "geiseri@kde.org"); 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 -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(); diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp index 03d2f2c..edcad2a 100644 --- a/kworldwatch/main.cpp +++ b/kworldwatch/main.cpp @@ -175,7 +175,7 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData about("kworldclock", I18N_NOOP("TDE World Clock"), "1.5"); + TDEAboutData about("kworldclock", I18N_NOOP("TDE World Clock"), "1.5"); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); KUniqueApplication::addCmdLineOptions(); @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("themes")) { - KInstance app(&about); + TDEInstance app(&about); listThemes(); return 0; } -- cgit v1.2.3