diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:31 -0600 |
| commit | fcd5041fd6bf0cea48980d8a035468b2cdb5fff2 (patch) | |
| tree | aa0c8d74da1f6fbe13337d07bdf046ef3df80e35 /arts | |
| parent | ce8519b39b2aeaf3ef667afced239d5a4643ef72 (diff) | |
| download | tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.tar.gz tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'arts')
| -rw-r--r-- | arts/builder/main.cpp | 4 | ||||
| -rw-r--r-- | arts/gui/kde/dbtest.cpp | 4 | ||||
| -rw-r--r-- | arts/tools/artscontrolapplet.cpp | 4 | ||||
| -rw-r--r-- | arts/tools/main.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp index bdfe7727..c83a5091 100644 --- a/arts/builder/main.cpp +++ b/arts/builder/main.cpp @@ -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/", diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp index e792edd8..9e569567 100644 --- a/arts/gui/kde/dbtest.cpp +++ b/arts/gui/kde/dbtest.cpp @@ -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 ); diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index e4a7e16a..e086749a 100644 --- a/arts/tools/artscontrolapplet.cpp +++ b/arts/tools/artscontrolapplet.cpp @@ -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 ); diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp index 4d0fc782..0037be6e 100644 --- a/arts/tools/main.cpp +++ b/arts/tools/main.cpp @@ -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" ); |