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/knotify | |
parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/knotify')
-rw-r--r-- | kcontrol/knotify/knotify.cpp | 4 | ||||
-rw-r--r-- | kcontrol/knotify/knotify.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index ea2479264..30914e96a 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -84,10 +84,10 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & connect( m_notifyWidget->m_playerButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPlayerSettings())); - KAboutData* ab = new KAboutData( + TDEAboutData* ab = new TDEAboutData( "kcmknotify", I18N_NOOP("KNotify"), "3.0", I18N_NOOP("System Notification Control Panel Module"), - KAboutData::License_GPL, "(c) 2002 Carsten Pfeiffer", 0, 0 ); + TDEAboutData::License_GPL, "(c) 2002 Carsten Pfeiffer", 0, 0 ); ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" ); ab->addCredit( "Charles Samuels", I18N_NOOP("Original implementation"), "charles@altair.dhs.org" ); diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h index 7f5cf8507..5af670bbe 100644 --- a/kcontrol/knotify/knotify.h +++ b/kcontrol/knotify/knotify.h @@ -32,7 +32,7 @@ class TQCheckBox; class TQLabel; class TQSlider; -class KAboutData; +class TDEAboutData; class KComboBox; class KURLRequester; class PlayerSettingsDialog; |