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/kicker | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kicker')
| -rw-r--r-- | kcontrol/kicker/lookandfeeltab_kcm.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/kicker/main.cpp | 10 | ||||
| -rw-r--r-- | kcontrol/kicker/main.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp index 39972bc73..16e52c8ec 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.cpp +++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp @@ -32,9 +32,9 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - KAboutData *about = - new KAboutData(I18N_NOOP("kcmkicker"), I18N_NOOP("TDE Panel Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmkicker"), I18N_NOOP("TDE Panel Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999 - 2001 Matthias Elter\n(c) 2002 Aaron J. Seigo")); about->addAuthor("Matthias Elter", 0, "elter@kde.org"); diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index daf9f283f..8bf4646df 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -351,13 +351,13 @@ TQString KickerConfig::quickHelp() const " manipulation of the panel's buttons and applets."); } -KAboutData *KickerConfig::aboutData() +TDEAboutData *KickerConfig::aboutData() { - // the KAboutDatas are deleted by the KCModules - KAboutData *about - = new KAboutData(I18N_NOOP("kcmkicker"), + // the TDEAboutDatas are deleted by the KCModules + TDEAboutData *about + = new TDEAboutData(I18N_NOOP("kcmkicker"), I18N_NOOP("TDE Panel Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2009 - 2010 Timothy Pearson\n" "(c) 1999 - 2001 Matthias Elter\n" "(c) 2002 - 2003 Aaron J. Seigo")); diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h index 97de653b5..bbc567273 100644 --- a/kcontrol/kicker/main.h +++ b/kcontrol/kicker/main.h @@ -24,7 +24,7 @@ #include "extensionInfo.h" class TQComboBox; -class KAboutData; +class TDEAboutData; class KDirWatch; class KickerConfig : public TQObject, public DCOPObject @@ -46,7 +46,7 @@ public: void restartKicker(); TQString quickHelp() const; - KAboutData *aboutData(); + TDEAboutData *aboutData(); int currentPanelIndex() const { return m_currentPanelIndex; } |