TDE
/
kaffeine
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KInstance and KAboutData to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent c04a5f1cff
commit b862daf2f3
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

6
kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
Unescape View File

@ -85,11 +85,11 @@ KLameEnc::KLameEnc( TQWidget*, const char*, TQObject* parent, const char* name,
setInstance(KParts::GenericFactory<KLameEnc>::instance()); setInstance(KParts::GenericFactory<KLameEnc>::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."), "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"); "(c) 2006, Christophe Thommeret.", 0, "http://kaffeine.sourceforge.net");
aboutData->addAuthor("Christophe Thommeret.",0, "hftom@free.fr"); aboutData->addAuthor("Christophe Thommeret.",0, "hftom@free.fr");

2
kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
Unescape View File

@ -65,7 +65,7 @@ public:
char* stop( int &len ); char* stop( int &len );
//**************************** //****************************
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
private: private:

6
kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
Unescape View File

@ -65,11 +65,11 @@ KOggEnc::KOggEnc( TQWidget*, const char*, TQObject* parent, const char* name, co
tmpBuf = new char[1]; 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."), "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"); "(c) 2006, Christophe Thommeret.", 0, "http://kaffeine.sourceforge.net");
aboutData->addAuthor("Christophe Thommeret.",0, "hftom@free.fr"); aboutData->addAuthor("Christophe Thommeret.",0, "hftom@free.fr");

2
kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
Unescape View File

@ -72,7 +72,7 @@ public:
char* stop( int &len ); char* stop( int &len );
//**************************** //****************************
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
private: private:

4
kaffeine/src/main.cpp
Unescape View File

@ -66,9 +66,9 @@ int KaffeineApp::newInstance()
int main(int argc, char *argv[]) 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."), 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"); "http://kaffeine.sourceforge.net");
aboutData.addAuthor("Christophe Thommeret", I18N_NOOP("Current maintainer"), "hftom@free.fr"); aboutData.addAuthor("Christophe Thommeret", I18N_NOOP("Current maintainer"), "hftom@free.fr");

6
kaffeine/src/player-parts/dummy-part/dummy_part.cpp
Unescape View File

@ -66,11 +66,11 @@ bool DummyPart::closeURL()
return true; 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...", "0.1", "Description...",
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(c) 2004, Jürgen Kofler.", 0, "http://kaffeine.sourceforge.net"); "(c) 2004, Jürgen Kofler.", 0, "http://kaffeine.sourceforge.net");
aboutData->addAuthor("Jürgen Kofler.",0, "kaffeine@gmx.net"); aboutData->addAuthor("Jürgen Kofler.",0, "kaffeine@gmx.net");

2
kaffeine/src/player-parts/dummy-part/dummy_part.h
Unescape View File

@ -48,7 +48,7 @@ public:
uint position() const; /* percent */ uint position() const; /* percent */
bool closeURL(); bool closeURL();
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
public slots: public slots:
/* /*

6
kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
Unescape View File

@ -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.", "0.1", "GStreamer based player part for Kaffeine.",
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(c) 2005, Jürgen Kofler.", 0, "http://kaffeine.sourceforge.net"); "(c) 2005, Jürgen Kofler.", 0, "http://kaffeine.sourceforge.net");
aboutData->addAuthor("Jürgen Kofler.",0, "kaffeine@gmx.net"); aboutData->addAuthor("Jürgen Kofler.",0, "kaffeine@gmx.net");

2
kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h
Unescape View File

@ -53,7 +53,7 @@ public:
bool hasVideo(); bool hasVideo();
bool closeURL(); bool closeURL();
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
public slots: public slots:
/* /*

6
kaffeine/src/player-parts/xine-part/xine_part.cpp
Unescape View File

@ -145,11 +145,11 @@ XinePart::~XinePart()
delete m_embeddedContext; 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."), 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"); "(c) 2003-2004, Jürgen Kofler.", 0, "http://kaffeine.sourceforge.net");
aboutData->addAuthor("Jürgen Kofler.",0, "kaffeine@gmx.net"); aboutData->addAuthor("Jürgen Kofler.",0, "kaffeine@gmx.net");

2
kaffeine/src/player-parts/xine-part/xine_part.h
Unescape View File

@ -79,7 +79,7 @@ public:
uint position() const; /* percent */ uint position() const; /* percent */
bool closeURL(); /* stops playback and shows kaffeine logo */ bool closeURL(); /* stops playback and shows kaffeine logo */
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
/* /*
* DCOP functions... * DCOP functions...

Write Preview
Loading…
Cancel
Save