TDE
/
tdemultimedia
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia
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 ce8519b39b
commit fcd5041fd6
21 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File

4
arts/builder/main.cpp
Unescape View File

@ -915,11 +915,11 @@ int artsbuilder_main(int argc, char **argv)
int main(int argc, char **argv)
#endif
{
KAboutData aboutData("artsbuilder",
TDEAboutData aboutData("artsbuilder",
I18N_NOOP("artsbuilder"),
ARTS_VERSION,
I18N_NOOP("aRts synthesizer designer"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(C) 1998-2001, Stefan Westerfeld",
I18N_NOOP("The analog real-time synthesizer graphical design tool."),
"http://www.arts-project.org/",

4
arts/gui/kde/dbtest.cpp
Unescape View File

@ -26,8 +26,8 @@ kdDebug() << k_funcinfo << endl;
int main( int argc, char* argv[] ) {
KAboutData aboutData( "dbtest", I18N_NOOP( "dBTest" ),
"0.1", "", KAboutData::License_GPL,
TDEAboutData aboutData( "dbtest", I18N_NOOP( "dBTest" ),
"0.1", "", TDEAboutData::License_GPL,
"(c) 2002, Arnold Krille" );
aboutData.addAuthor( "Arnold Krille", I18N_NOOP( "Creator" ), "arnold@arnoldarts.de");
TDECmdLineArgs::init( argc, argv, &aboutData );

4
arts/tools/artscontrolapplet.cpp
Unescape View File

@ -74,9 +74,9 @@ kdDebug()<<k_funcinfo<<endl;
#include <kaboutapplication.h>
void ArtsControlApplet::about() {
KAboutData about( "artscontrolapplet", I18N_NOOP( "aRts Control Applet" ), "0.5",
TDEAboutData about( "artscontrolapplet", I18N_NOOP( "aRts Control Applet" ), "0.5",
I18N_NOOP( "A kickerapplet to control aRts." ),
KAboutData::License_GPL, I18N_NOOP( "(c) 2003 by Arnold Krille" ) );
TDEAboutData::License_GPL, I18N_NOOP( "(c) 2003 by Arnold Krille" ) );
about.addAuthor( "Arnold Krille", I18N_NOOP( "Author of the Applet" ), "arnold@arnoldarts.de" );
about.addCredit( "Stefan Westerfeld", I18N_NOOP( "Thanks for creating aRts!" ) );
KAboutApplication a( &about, this );

4
arts/tools/main.cpp
Unescape View File

@ -189,9 +189,9 @@ kdDebug() << k_funcinfo << endl;
}
int main(int argc, char **argv) {
KAboutData aboutData( "artscontrol", I18N_NOOP("aRts control"),
TDEAboutData aboutData( "artscontrol", I18N_NOOP("aRts control"),
ARTS_VERSION, I18N_NOOP("Control tool for the aRts server"),
KAboutData::License_GPL, I18N_NOOP("(c) 2000 Stefan Westerfeld\n(c) 2003 Arnold Krille") );
TDEAboutData::License_GPL, I18N_NOOP("(c) 2000 Stefan Westerfeld\n(c) 2003 Arnold Krille") );
aboutData.addAuthor( "Stefan Westerfeld", I18N_NOOP( "Author and aRts maintainer" ), "stefan@space.twc.de" );
aboutData.addAuthor( "Arnold Krille", I18N_NOOP( "Some improvements" ), "arnold@arnoldarts.de" );

4
juk/main.cpp
Unescape View File

@ -49,8 +49,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
KAboutData aboutData("juk", I18N_NOOP("JuK"),
"2.3.5", description, KAboutData::License_GPL,
TDEAboutData aboutData("juk", I18N_NOOP("JuK"),
"2.3.5", description, TDEAboutData::License_GPL,
"© 2002 - 2007, Scott Wheeler", 0,
"http://developer.kde.org/~wheeler/juk.html");

2
juk/tagguessertest.cpp
Unescape View File

@ -64,7 +64,7 @@ void check( const TQString &filename, const TQString &title,
int main( int argc, char **argv )
{
KAboutData aboutData("tagguessertest", "tagguessertest", "0.1");
TDEAboutData aboutData("tagguessertest", "tagguessertest", "0.1");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDEApplication app;
check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats [Live].mp3",

14
kaboodle/kaboodle_factory.cpp
Unescape View File

@ -27,8 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
K_EXPORT_COMPONENT_FACTORY( libkaboodlepart, Kaboodle::KaboodleFactory)
KInstance *Kaboodle::KaboodleFactory::s_instance = 0;
KAboutData *Kaboodle::KaboodleFactory::s_aboutData = 0;
TDEInstance *Kaboodle::KaboodleFactory::s_instance = 0;
TDEAboutData *Kaboodle::KaboodleFactory::s_aboutData = 0;
Kaboodle::KaboodleFactory::KaboodleFactory() : KParts::Factory()
{
@ -54,21 +54,21 @@ KParts::Part *Kaboodle::KaboodleFactory::createPartObject(TQWidget *widgetParent
}
}
KInstance *Kaboodle::KaboodleFactory::instance()
TDEInstance *Kaboodle::KaboodleFactory::instance()
{
if(!s_instance)
s_instance = new KInstance(aboutData());
s_instance = new TDEInstance(aboutData());
return s_instance;
}
const KAboutData *Kaboodle::KaboodleFactory::aboutData()
const TDEAboutData *Kaboodle::KaboodleFactory::aboutData()
{
if(!s_aboutData)
{
s_aboutData = new KAboutData("kaboodle", I18N_NOOP("Kaboodle"), "1.7",
s_aboutData = new TDEAboutData("kaboodle", I18N_NOOP("Kaboodle"), "1.7",
I18N_NOOP("The Lean TDE Media Player"),
KAboutData::License_BSD,
TDEAboutData::License_BSD,
"(c) 2001-2003 Kaboodle developers", 0,
"http://www.freekde.org/neil/kaboodle/");
s_aboutData->addCredit("Carsten Pfeiffer", I18N_NOOP("Maintainer"), "pfeiffer@kde.org");

8
kaboodle/kaboodle_factory.h
Unescape View File

@ -43,12 +43,12 @@ public:
virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
static const KAboutData *aboutData();
static KInstance *instance();
static const TDEAboutData *aboutData();
static TDEInstance *instance();
private:
static KInstance *s_instance;
static KAboutData *s_aboutData;
static TDEInstance *s_instance;
static TDEAboutData *s_aboutData;
};
}

4
kaudiocreator/main.cpp
Unescape View File

@ -31,8 +31,8 @@ static const KCmdLineOptions options[] = {
int main(int argc, char *argv[]){
KAboutData aboutData("kaudiocreator", I18N_NOOP("KAudioCreator"), "1.13",
I18N_NOOP("CD ripper and audio encoder frontend"), KAboutData::License_LGPL, "(c) 2003-2005, Benjamin Meyer",
TDEAboutData aboutData("kaudiocreator", I18N_NOOP("KAudioCreator"), "1.13",
I18N_NOOP("CD ripper and audio encoder frontend"), TDEAboutData::License_LGPL, "(c) 2003-2005, Benjamin Meyer",
0, "http://www.icefox.net/");
aboutData.addAuthor("Benjamin Meyer", I18N_NOOP("Original author"), "ben+kaudiocreator@meyerhome.net", "http://www.icefox.net/");

6
kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
Unescape View File

@ -82,9 +82,9 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
connect( kcfg_replaceOutput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) );
connect( example, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) );
KAboutData *about =
new KAboutData(I18N_NOOP("kcmaudiocd"), I18N_NOOP("TDE Audio CD IO Slave"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmaudiocd"), I18N_NOOP("TDE Audio CD IO Slave"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2000 - 2005 Audio CD developers"));
about->addAuthor("Benjamin C. Meyer", I18N_NOOP("Current Maintainer"), "ben@meyerhome.net");

2
kmid/history.txt
Unescape View File

@ -552,7 +552,7 @@ Sunday 5-3-2000
Sunday 2-4-2000
- Now Libkmid links with tdecore and qt in order to use a KConfig object to
read the default settings as saved by the user with the midi kcontrol module.
- It creates a "dummy" KInstance in case of the application being a non-KDE
- It creates a "dummy" TDEInstance in case of the application being a non-KDE
application.
- Fixed compilation of KMid, as 1) someone renamed klinedit.h to klineedit.h
and 2) now we have to include qiconset.h when creating an action with pictures

12
kmid/kmid_part.cpp
Unescape View File

@ -19,7 +19,7 @@ K_EXPORT_COMPONENT_FACTORY( libkmidpart, KMidFactory )
* We need one static instance of the factory for our C 'main'
* function
*/
KInstance *KMidFactory::s_instance = 0L;
TDEInstance *KMidFactory::s_instance = 0L;
KMidFactory::KMidFactory()
{
@ -45,10 +45,10 @@ KParts::Part *KMidFactory::createPartObject(TQWidget *parentWidget, const char *
return obj;
}
KAboutData *KMidFactory::aboutData()
TDEAboutData *KMidFactory::aboutData()
{
KAboutData *aboutdata = new KAboutData("kmid", "KMid", "2.0",
I18N_NOOP("MIDI/Karaoke file player"), KAboutData::License_GPL,
TDEAboutData *aboutdata = new TDEAboutData("kmid", "KMid", "2.0",
I18N_NOOP("MIDI/Karaoke file player"), TDEAboutData::License_GPL,
I18N_NOOP("(c) 1997,98,99,2000, Antonio Larrosa Jimenez"),"",
"http://perso.wanadoo.es/antlarr/kmid.html");
aboutdata->addAuthor("Antonio Larrosa Jimenez",
@ -57,10 +57,10 @@ KAboutData *KMidFactory::aboutData()
return aboutdata;
}
KInstance *KMidFactory::instance()
TDEInstance *KMidFactory::instance()
{
if ( !s_instance )
s_instance = new KInstance( aboutData() );
s_instance = new TDEInstance( aboutData() );
return s_instance;
}

10
kmid/kmid_part.h
Unescape View File

@ -4,8 +4,8 @@
#include <kparts/browserextension.h>
#include <kparts/factory.h>
#include <tdelibs_export.h>
class KAboutData;
class KInstance;
class TDEAboutData;
class TDEInstance;
class KMidBrowserExtension;
class kmidClient;
@ -22,11 +22,11 @@ class KDE_EXPORT KMidFactory : public KParts::Factory
const char* classname = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList());
static KInstance *instance();
static TDEInstance *instance();
static KAboutData *aboutData();
static TDEAboutData *aboutData();
private:
static KInstance *s_instance;
static TDEInstance *s_instance;
};
class KMidPart: public KParts::ReadOnlyPart

2
kmix/kmixapplet.cpp
Unescape View File

@ -155,7 +155,7 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t,
: KPanelApplet( configFile, t, KPanelApplet::Preferences | KPanelApplet::ReportBug | KPanelApplet::About, parent, name ),
m_mixerWidget(0), m_errorLabel(0), m_pref(0),
m_aboutData( "kmix", I18N_NOOP("KMix Panel Applet"),
APP_VERSION, "Mini Sound Mixer Applet", KAboutData::License_GPL,
APP_VERSION, "Mini Sound Mixer Applet", TDEAboutData::License_GPL,
I18N_NOOP( "(c) 1996-2000 Christian Esken\n(c) 2000-2003 Christian Esken, Stefan Schimanski") )
{
setBackgroundOrigin(AncestorOrigin);

2
kmix/kmixapplet.h
Unescape View File

@ -126,7 +126,7 @@ private:
TQString _mixerId;
TQString _mixerName;
KAboutData m_aboutData;
TDEAboutData m_aboutData;
};

4
kmix/kmixctrl.cpp
Unescape View File

@ -49,8 +49,8 @@ static KCmdLineOptions options[] =
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KLocale::setMainCatalogue("kmix");
KAboutData aboutData( "kmixctrl", I18N_NOOP("KMixCtrl"),
APP_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kmixctrl", I18N_NOOP("KMixCtrl"),
APP_VERSION, description, TDEAboutData::License_GPL,
"(c) 2000 by Stefan Schimanski");
aboutData.addAuthor("Stefan Schimanski", 0, "1Stein@gmx.de");

4
kmix/main.cpp
Unescape View File

@ -39,8 +39,8 @@ static KCmdLineOptions options[] =
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KAboutData aboutData( "kmix", I18N_NOOP("KMix"),
APP_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kmix", I18N_NOOP("KMix"),
APP_VERSION, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1996-2000 Christian Esken\n(c) 2000-2003 Christian Esken, Stefan Schimanski\n(c) 2002-2005 Christian Esken, Helio Chissini de Castro"));
aboutData.addAuthor("Christian Esken", "Current maintainer", "esken@kde.org");

4
krec/main.cpp
Unescape View File

@ -44,8 +44,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
{
//cout<<endl<<"Starting kRec..."<<endl;
KAboutData aboutData( "krec", I18N_NOOP("KRec"),
"0.5.1", description, KAboutData::License_GPL,
TDEAboutData aboutData( "krec", I18N_NOOP("KRec"),
"0.5.1", description, TDEAboutData::License_GPL,
"(c) 2002, 2003 Arnold Krille" );
aboutData.addAuthor("Arnold Krille", I18N_NOOP( "Creator \nLook at the website www.arnoldarts.de \nfor other good stuff." ), "arnold@arnoldarts.de");
aboutData.addCredit( "Matthias Kretz", I18N_NOOP( "Helped where he was asked" ), "kretz@kde.org" );

4
kscd/kscd.cpp
Unescape View File

@ -1605,9 +1605,9 @@ static const KCmdLineOptions options[] =
*/
int main( int argc, char *argv[] )
{
KAboutData aboutData("kscd", I18N_NOOP("KsCD"),
TDEAboutData aboutData("kscd", I18N_NOOP("KsCD"),
KSCDVERSION, description,
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(c) 2001, Dirk Försterling\n(c) 2003, Aaron J. Seigo");
aboutData.addAuthor("Aaron J. Seigo", I18N_NOOP("Current maintainer"), "aseigo@kde.org");
aboutData.addAuthor("Alexander Kern",I18N_NOOP("Workman library update, CDTEXT, CDDA"), "kernalex@kde.org");

4
kscd/kscdmagic/main.cpp
Unescape View File

@ -188,9 +188,9 @@ main(int argc, char **argv)
opterr = 0;
/*
KAboutData aboutData( "kscdmagic", I18N_NOOP("kscdmagic"),
TDEAboutData aboutData( "kscdmagic", I18N_NOOP("kscdmagic"),
KSCDMAGICVERSION, I18N_NOOP("sound visualisation"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(c) 2000, Dirk Försterling");
aboutData.addAuthor("Paul Harrison",0, "pfh@yoyo.cc.monash.edu.au");
aboutData.addAuthor("Dirk Försterling",0, "milliByte@gmx.net");

4
noatun/app/main.cpp
Unescape View File

@ -16,8 +16,8 @@ static KCmdLineOptions options[] =
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
KAboutData aboutData("noatun", I18N_NOOP("Noatun"),
version, description, KAboutData::License_BSD,
TDEAboutData aboutData("noatun", I18N_NOOP("Noatun"),
version, description, TDEAboutData::License_BSD,
I18N_NOOP("(c) 2000-2004, The Noatun Developers"),
0, "http://noatun.kde.org");
aboutData.addAuthor("Charles Samuels", I18N_NOOP("Noatun Developer"),

Write Preview
Loading…
Cancel
Save