From kde-commits Sat Feb 28 22:34:22 2009 From: Ben Cooksley Date: Sat, 28 Feb 2009 22:34:22 +0000 To: kde-commits Subject: playground/base/kcontrol4/src Message-Id: <1235860462.877640.31192.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=123586047001050 SVN commit 933437 by bcooksley: Restore the caption setting for when the configuration changed state changes M +2 -4 app/SettingsBase.cpp M +0 -1 classic/ClassicMode.cpp M +5 -6 core/ModuleView.cpp --- trunk/playground/base/kcontrol4/src/app/SettingsBase.cpp #933436:933437 @@ -212,11 +212,9 @@ void SettingsBase::toggleDirtyState(bool state) { - Q_UNUSED( state ); - // FIXME - /* KCModuleProxy * moduleProxy = activeView->activeModule(); + KCModuleInfo * moduleProxy = activeView->moduleView()->activeModule(); configureAction->setDisabled(state); - setCaption( moduleProxy->moduleInfo().moduleName(), state );*/ + setCaption( moduleProxy->moduleName(), state ); } void SettingsBase::initMenuList(MenuItem * parent) --- trunk/playground/base/kcontrol4/src/classic/ClassicMode.cpp #933436:933437 @@ -159,7 +159,6 @@ mStackedWidget->setCurrentWidget( classicCategory ); classicCategory->changeModule(activeModule); } else { - // We need to handle the module here MenuItem *menuItem = classicTree->model()->data( activeModule, Qt::UserRole ).value(); if ( menuItem ) { mModuleView->loadModule( &menuItem->item ); --- trunk/playground/base/kcontrol4/src/core/ModuleView.cpp #933436:933437 @@ -33,13 +33,12 @@ : mActiveModule( 0 ), mActiveProxy( 0 ) {} - KCModuleInfo *mActiveModule; - KCModuleProxy *mActiveProxy; + KCModuleInfo * mActiveModule; + KCModuleProxy * mActiveProxy; QMap mProxies; }; -ModuleView::ModuleView( QWidget *parent ) - : QStackedWidget( parent ), d( new Private() ) +ModuleView::ModuleView( QWidget *parent ) : QStackedWidget( parent ), d( new Private() ) { kDebug() << "load module"; } @@ -49,12 +48,12 @@ delete d; } -KCModuleInfo* ModuleView::activeModule() const +KCModuleInfo * ModuleView::activeModule() const { return d->mActiveModule; } -const KAboutData* ModuleView::aboutData() const +const KAboutData * ModuleView::aboutData() const { if ( d->mActiveProxy ) { return d->mActiveProxy->aboutData();