summaryrefslogtreecommitdiffstats
path: root/arts/tools
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:31 -0600
commitfcd5041fd6bf0cea48980d8a035468b2cdb5fff2 (patch)
treeaa0c8d74da1f6fbe13337d07bdf046ef3df80e35 /arts/tools
parentce8519b39b2aeaf3ef667afced239d5a4643ef72 (diff)
downloadtdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.tar.gz
tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'arts/tools')
-rw-r--r--arts/tools/artscontrolapplet.cpp4
-rw-r--r--arts/tools/main.cpp4
2 files changed, 4 insertions, 4 deletions
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" );