diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdeui/kcmodule.cpp | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kcmodule.cpp')
| -rw-r--r-- | tdeui/kcmodule.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tdeui/kcmodule.cpp b/tdeui/kcmodule.cpp index 7d82d2957..a047fe6b8 100644 --- a/tdeui/kcmodule.cpp +++ b/tdeui/kcmodule.cpp @@ -44,8 +44,8 @@ public: _unmanagedWidgetChangeState( false ) { } - KInstance *_instance; - KAboutData *_about; + TDEInstance *_instance; + TDEAboutData *_about; TQString _rootOnlyMsg; bool _useRootOnlyMsg; bool _hasOwnInstance; @@ -64,17 +64,17 @@ KCModule::KCModule(TQWidget *parent, const char *name, const TQStringList &) { init(); if (name && strlen(name)) { - d->_instance = new KInstance(name); + d->_instance = new TDEInstance(name); KGlobal::locale()->insertCatalogue(name); } else - d->_instance = new KInstance("kcmunnamed"); + d->_instance = new TDEInstance("kcmunnamed"); KGlobal::setActiveInstance(this->instance()); d->managers.setAutoDelete( true ); } -KCModule::KCModule(KInstance *instance, TQWidget *parent, const TQStringList & ) +KCModule::KCModule(TDEInstance *instance, TQWidget *parent, const TQStringList & ) : TQWidget(parent, instance ? instance->instanceName().data() : 0) { init(); @@ -156,12 +156,12 @@ void KCModule::unmanagedWidgetChangeState(bool changed) widgetChanged(); } -const KAboutData *KCModule::aboutData() const +const TDEAboutData *KCModule::aboutData() const { return d->_about; } -void KCModule::setAboutData( KAboutData* about ) +void KCModule::setAboutData( TDEAboutData* about ) { delete d->_about; d->_about = about; @@ -192,7 +192,7 @@ void KCModule::changed() emit changed(true); } -KInstance *KCModule::instance() const +TDEInstance *KCModule::instance() const { return d->_instance; } |