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 /kmix | |
| parent | ce8519b39b2aeaf3ef667afced239d5a4643ef72 (diff) | |
| download | tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.tar.gz tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmix')
| -rw-r--r-- | kmix/kmixapplet.cpp | 2 | ||||
| -rw-r--r-- | kmix/kmixapplet.h | 2 | ||||
| -rw-r--r-- | kmix/kmixctrl.cpp | 4 | ||||
| -rw-r--r-- | kmix/main.cpp | 4 |
4 files changed, 6 insertions, 6 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); diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h index 376b3290..5874a484 100644 --- a/kmix/kmixapplet.h +++ b/kmix/kmixapplet.h @@ -126,7 +126,7 @@ private: TQString _mixerId; TQString _mixerName; - KAboutData m_aboutData; + TDEAboutData m_aboutData; }; diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp index b602b5b3..60c27c48 100644 --- a/kmix/kmixctrl.cpp +++ b/kmix/kmixctrl.cpp @@ -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"); diff --git a/kmix/main.cpp b/kmix/main.cpp index b1a3cab6..e81fa21b 100644 --- a/kmix/main.cpp +++ b/kmix/main.cpp @@ -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"); |