summaryrefslogtreecommitdiffstats
path: root/kmix/kmixapplet.cpp
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 /kmix/kmixapplet.cpp
parentce8519b39b2aeaf3ef667afced239d5a4643ef72 (diff)
downloadtdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.tar.gz
tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmix/kmixapplet.cpp')
-rw-r--r--kmix/kmixapplet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index d20afddc..be672b2c 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -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);