diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/display | |
| 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/display')
| -rw-r--r-- | kcontrol/display/display.cpp | 12 | ||||
| -rw-r--r-- | kcontrol/display/display.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp index 189d4723b..f9a27ca92 100644 --- a/kcontrol/display/display.cpp +++ b/kcontrol/display/display.cpp @@ -31,7 +31,7 @@ typedef KGenericFactory<KCMDisplay, TQWidget> DisplayFactory; K_EXPORT_COMPONENT_FACTORY ( kcm_display, DisplayFactory( "display" ) ) KCMDisplay::KCMDisplay( TQWidget *parent, const char *name, const TQStringList& ) - : KCModule( parent, name ) + : TDECModule( parent, name ) , m_changed(false) { m_tabs = new TQTabWidget( this ); @@ -56,7 +56,7 @@ void KCMDisplay::addTab( const TQString &name, const TQString &label ) TQWidget *page = new TQWidget( m_tabs, name.latin1() ); TQVBoxLayout *top = new TQVBoxLayout( page, KDialog::marginHint() ); - KCModule *kcm = KCModuleLoader::loadModule( name, page ); + TDECModule *kcm = TDECModuleLoader::loadModule( name, page ); if ( kcm ) { @@ -72,20 +72,20 @@ void KCMDisplay::addTab( const TQString &name, const TQString &label ) void KCMDisplay::load() { - for (TQMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) + for (TQMap<TDECModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) it.key()->load(); } void KCMDisplay::save() { - for (TQMap<KCModule*, bool>::Iterator it = m_modules.begin(); it != m_modules.end(); ++it) + for (TQMap<TDECModule*, bool>::Iterator it = m_modules.begin(); it != m_modules.end(); ++it) if (it.data()) it.key()->save(); } void KCMDisplay::moduleChanged( bool isChanged ) { - TQMap<KCModule*, bool>::Iterator currentModule = m_modules.find(static_cast<KCModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()))))); + TQMap<TDECModule*, bool>::Iterator currentModule = m_modules.find(static_cast<TDECModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()))))); Q_ASSERT(currentModule != m_modules.end()); if (currentModule.data() == isChanged) return; @@ -94,7 +94,7 @@ void KCMDisplay::moduleChanged( bool isChanged ) bool c = false; - for (TQMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) { + for (TQMap<TDECModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) { if (it.data()) { c = true; break; diff --git a/kcontrol/display/display.h b/kcontrol/display/display.h index 5696717ff..bb5d44e6f 100644 --- a/kcontrol/display/display.h +++ b/kcontrol/display/display.h @@ -24,7 +24,7 @@ class TQTabWidget; -class KCMDisplay : public KCModule +class KCMDisplay : public TDECModule { Q_OBJECT @@ -40,7 +40,7 @@ class KCMDisplay : public KCModule void addTab( const TQString &name, const TQString &label ); TQTabWidget *m_tabs; - TQMap<KCModule*, bool> m_modules; + TQMap<TDECModule*, bool> m_modules; bool m_changed; }; |