From b862daf2f3d6d52357b945e76d5ed4563b6a529e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:51:55 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp | 6 +++--- kaffeine/src/input/disc/plugins/mp3lame/klameenc.h | 2 +- kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp | 6 +++--- kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h | 2 +- kaffeine/src/main.cpp | 4 ++-- kaffeine/src/player-parts/dummy-part/dummy_part.cpp | 6 +++--- kaffeine/src/player-parts/dummy-part/dummy_part.h | 2 +- kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp | 6 +++--- kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h | 2 +- kaffeine/src/player-parts/xine-part/xine_part.cpp | 6 +++--- kaffeine/src/player-parts/xine-part/xine_part.h | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp index fc7dda2..a411a2a 100644 --- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp +++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp @@ -85,11 +85,11 @@ KLameEnc::KLameEnc( TQWidget*, const char*, TQObject* parent, const char* name, setInstance(KParts::GenericFactory::instance()); } -KAboutData *KLameEnc::createAboutData() +TDEAboutData *KLameEnc::createAboutData() { - KAboutData* aboutData = new KAboutData( "kaffeinemp3lame", I18N_NOOP("KaffeineMp3Lame"), + TDEAboutData* aboutData = new TDEAboutData( "kaffeinemp3lame", I18N_NOOP("KaffeineMp3Lame"), "0.1", I18N_NOOP("A Lame mp3 encoder plugin for Kaffeine."), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2006, Christophe Thommeret.", 0, "http://kaffeine.sourceforge.net"); aboutData->addAuthor("Christophe Thommeret.",0, "hftom@free.fr"); diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h index 245c40c..e798d24 100644 --- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h +++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h @@ -65,7 +65,7 @@ public: char* stop( int &len ); //**************************** - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); private: diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp index d7abe9a..281a48f 100644 --- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp +++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp @@ -65,11 +65,11 @@ KOggEnc::KOggEnc( TQWidget*, const char*, TQObject* parent, const char* name, co tmpBuf = new char[1]; } -KAboutData *KOggEnc::createAboutData() +TDEAboutData *KOggEnc::createAboutData() { - KAboutData* aboutData = new KAboutData( "kaffeineoggvorbis", I18N_NOOP("KaffeineOggVorbis"), + TDEAboutData* aboutData = new TDEAboutData( "kaffeineoggvorbis", I18N_NOOP("KaffeineOggVorbis"), "0.1", I18N_NOOP("A Ogg Vorbis encoder plugin for Kaffeine."), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2006, Christophe Thommeret.", 0, "http://kaffeine.sourceforge.net"); aboutData->addAuthor("Christophe Thommeret.",0, "hftom@free.fr"); diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h index 46fb736..9817990 100644 --- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h +++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h @@ -72,7 +72,7 @@ public: char* stop( int &len ); //**************************** - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); private: diff --git a/kaffeine/src/main.cpp b/kaffeine/src/main.cpp index 33c3e62..46e503f 100644 --- a/kaffeine/src/main.cpp +++ b/kaffeine/src/main.cpp @@ -66,9 +66,9 @@ int KaffeineApp::newInstance() int main(int argc, char *argv[]) { - KAboutData aboutData("kaffeine", I18N_NOOP("Kaffeine Player"), KAFFEINE_VERSION, + TDEAboutData aboutData("kaffeine", I18N_NOOP("Kaffeine Player"), KAFFEINE_VERSION, I18N_NOOP("A media player for TDE. Can use multiple backends for playback, default (and recommended) is xine."), - KAboutData::License_GPL_V2, I18N_NOOP("Copyright (C) 2003-2007, The Kaffeine Authors"), 0, + TDEAboutData::License_GPL_V2, I18N_NOOP("Copyright (C) 2003-2007, The Kaffeine Authors"), 0, "http://kaffeine.sourceforge.net"); aboutData.addAuthor("Christophe Thommeret", I18N_NOOP("Current maintainer"), "hftom@free.fr"); diff --git a/kaffeine/src/player-parts/dummy-part/dummy_part.cpp b/kaffeine/src/player-parts/dummy-part/dummy_part.cpp index 51fa53a..d507a34 100644 --- a/kaffeine/src/player-parts/dummy-part/dummy_part.cpp +++ b/kaffeine/src/player-parts/dummy-part/dummy_part.cpp @@ -66,11 +66,11 @@ bool DummyPart::closeURL() return true; } -KAboutData *DummyPart::createAboutData() +TDEAboutData *DummyPart::createAboutData() { - KAboutData* aboutData = new KAboutData( "dummypart", I18N_NOOP("DummyPart"), + TDEAboutData* aboutData = new TDEAboutData( "dummypart", I18N_NOOP("DummyPart"), "0.1", "Description...", - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2004, Jürgen Kofler.", 0, "http://kaffeine.sourceforge.net"); aboutData->addAuthor("Jürgen Kofler.",0, "kaffeine@gmx.net"); diff --git a/kaffeine/src/player-parts/dummy-part/dummy_part.h b/kaffeine/src/player-parts/dummy-part/dummy_part.h index befb40b..9d87997 100644 --- a/kaffeine/src/player-parts/dummy-part/dummy_part.h +++ b/kaffeine/src/player-parts/dummy-part/dummy_part.h @@ -48,7 +48,7 @@ public: uint position() const; /* percent */ bool closeURL(); - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); public slots: /* diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp index fb6e7a3..4893a32 100644 --- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp +++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp @@ -146,11 +146,11 @@ bool GStreamerPart::closeURL() -KAboutData *GStreamerPart::createAboutData() +TDEAboutData *GStreamerPart::createAboutData() { - KAboutData* aboutData = new KAboutData( "gstreamerpart", I18N_NOOP("GStreamerPart"), + TDEAboutData* aboutData = new TDEAboutData( "gstreamerpart", I18N_NOOP("GStreamerPart"), "0.1", "GStreamer based player part for Kaffeine.", - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2005, Jürgen Kofler.", 0, "http://kaffeine.sourceforge.net"); aboutData->addAuthor("Jürgen Kofler.",0, "kaffeine@gmx.net"); diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h index f8acd14..d71e560 100644 --- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h +++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h @@ -53,7 +53,7 @@ public: bool hasVideo(); bool closeURL(); - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); public slots: /* diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp index 45a1f07..bb9ec59 100644 --- a/kaffeine/src/player-parts/xine-part/xine_part.cpp +++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp @@ -145,11 +145,11 @@ XinePart::~XinePart() delete m_embeddedContext; } -KAboutData *XinePart::createAboutData() +TDEAboutData *XinePart::createAboutData() { - KAboutData* aboutData = new KAboutData( "kaffeine", I18N_NOOP("XinePart"), + TDEAboutData* aboutData = new TDEAboutData( "kaffeine", I18N_NOOP("XinePart"), KAFFEINE_VERSION, I18N_NOOP("A xine based player part for Kaffeine."), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2003-2004, Jürgen Kofler.", 0, "http://kaffeine.sourceforge.net"); aboutData->addAuthor("Jürgen Kofler.",0, "kaffeine@gmx.net"); diff --git a/kaffeine/src/player-parts/xine-part/xine_part.h b/kaffeine/src/player-parts/xine-part/xine_part.h index 9013e17..fd2c056 100644 --- a/kaffeine/src/player-parts/xine-part/xine_part.h +++ b/kaffeine/src/player-parts/xine-part/xine_part.h @@ -79,7 +79,7 @@ public: uint position() const; /* percent */ bool closeURL(); /* stops playback and shows kaffeine logo */ - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); /* * DCOP functions...