diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /kcontrol/componentchooser | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/componentchooser')
| -rw-r--r-- | kcontrol/componentchooser/kcm_componentchooser.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/componentchooser/kcm_componentchooser.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp index 8bf1a026f..fd9401d59 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.cpp +++ b/kcontrol/componentchooser/kcm_componentchooser.cpp @@ -30,9 +30,9 @@ KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ): connect(m_chooser,TQT_SIGNAL(changed(bool)),this,TQT_SIGNAL(changed(bool))); setButtons( Help | Apply ); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmcomponentchooser"), I18N_NOOP("Component Chooser"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmcomponentchooser"), I18N_NOOP("Component Chooser"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c), 2002 Joseph Wenninger")); about->addAuthor("Joseph Wenninger", 0 , "jowenn@kde.org"); diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h index 72dab21ba..f2c68b3bd 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.h +++ b/kcontrol/componentchooser/kcm_componentchooser.h @@ -20,7 +20,7 @@ #include "componentchooser.h" -class KAboutData; +class TDEAboutData; class KCMComponentChooser : public KCModule { |