diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/knotify | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/knotify')
| -rw-r--r-- | kcontrol/knotify/knotify.cpp | 10 | ||||
| -rw-r--r-- | kcontrol/knotify/knotify.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index 63438cbf2..bc9c63cc5 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -48,7 +48,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_knotify, NotifyFactory("kcmnotify") ) using namespace KNotify; KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & ) - : KCModule(NotifyFactory::instance(), parent, name), + : TDECModule(NotifyFactory::instance(), parent, name), m_playerSettings( 0L ) { setButtons( Help | Default | Apply ); @@ -98,7 +98,7 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & KCMKNotify::~KCMKNotify() { - KConfig config( "knotifyrc", false, false ); + TDEConfig config( "knotifyrc", false, false ); config.setGroup( "Misc" ); ApplicationList allApps = m_notifyWidget->allApps(); ApplicationListIterator appIt( allApps ); @@ -173,7 +173,7 @@ void KCMKNotify::load( bool useDefaults ) allApps.sort(); m_notifyWidget->setEnabled( !allApps.isEmpty() ); - KConfig config( "knotifyrc", true, false ); + TDEConfig config( "knotifyrc", true, false ); config.setReadDefaults( useDefaults ); config.setGroup( "Misc" ); TQString select = config.readEntry( "LastConfiguredApp" ); @@ -239,7 +239,7 @@ PlayerSettingsDialog::PlayerSettingsDialog( TQWidget *parent, bool modal ) void PlayerSettingsDialog::load( bool useDefaults ) { - KConfig config( "knotifyrc", true, false ); + TDEConfig config( "knotifyrc", true, false ); config.setReadDefaults( useDefaults ); config.setGroup( "Misc" ); bool useExternal = config.readBoolEntry( "Use external player", false ); @@ -264,7 +264,7 @@ void PlayerSettingsDialog::load( bool useDefaults ) void PlayerSettingsDialog::save() { // see tdelibs/arts/knotify/knotify.cpp - KConfig config( "knotifyrc", false, false ); + TDEConfig config( "knotifyrc", false, false ); config.setGroup( "Misc" ); config.writePathEntry( "External player", m_ui->reqExternal->url() ); diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h index 5af670bbe..a37393f97 100644 --- a/kcontrol/knotify/knotify.h +++ b/kcontrol/knotify/knotify.h @@ -44,7 +44,7 @@ namespace KNotify class KNotifyWidget; } -class KCMKNotify : public KCModule +class KCMKNotify : public TDECModule { Q_OBJECT |