diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index 12ab37e56..7ff02bca2 100644 --- a/kmmainwidget.cpp +++ b/kmmainwidget.cpp @@ -3494,7 +3494,7 @@ void KMMainWidget::setupActions() { mExpireConfigAction = new QAction(i18n("Expire..."), this); actionCollection()->addAction(QLatin1String("expire_settings"), mExpireConfigAction); - connect( mExpireConfigAction, SIGNAL(triggered(bool)), mManageShowCollectionProperties, SLOT(slotShowExpiryProperties()) ); + connect(mExpireConfigAction, SIGNAL(triggered(bool)), mManageShowCollectionProperties, SLOT(slotShowExpiryProperties())); } { diff --git a/manageshowcollectionproperties.cpp b/manageshowcollectionproperties.cpp index 28493faa1..707abece7 100644 --- a/manageshowcollectionproperties.cpp +++ b/manageshowcollectionproperties.cpp @@ -77,7 +77,7 @@ void ManageShowCollectionProperties::showCollectionProperties(const QString &pag return; } } - if ( Solid::Networking::status() == Solid::Networking::Unconnected ) { + if (Solid::Networking::status() == Solid::Networking::Unconnected) { KMessageBox::information( mMainWidget, i18n("Network is unconnected. Folder information cannot be updated.")); @@ -180,24 +180,23 @@ void ManageShowCollectionProperties::slotCollectionPropertiesFinished(KJob *job) const Akonadi::Collection collection = fetch->collections().first(); - const QStringList pages = QStringList() << QLatin1String( "MailCommon::CollectionGeneralPage" ) - << QLatin1String( "KMail::CollectionViewPage" ) - << QLatin1String( "Akonadi::CachePolicyPage" ) - << QLatin1String( "KMail::CollectionTemplatesPage" ) - << QLatin1String( "MailCommon::CollectionExpiryPage" ) - << QLatin1String( "PimCommon::CollectionAclPage" ) - << QLatin1String( "KMail::CollectionMailingListPage" ) - << QLatin1String( "KMail::CollectionQuotaPage" ) - << QLatin1String( "KMail::CollectionShortcutPage" ) - << QLatin1String( "KMail::CollectionMaintenancePage" ); - - QPointer dlg = new Akonadi::CollectionPropertiesDialog( collection, pages, mMainWidget ); - dlg->setWindowTitle( i18nc( "@title:window", "Properties of Folder %1", collection.name() ) ); - - - const QString pageToShow = fetch->property( "pageToShow" ).toString(); - if ( !pageToShow.isEmpty() ) { // show a specific page - dlg->setCurrentPage( pageToShow ); + const QStringList pages = QStringList() << QLatin1String("MailCommon::CollectionGeneralPage") + << QLatin1String("KMail::CollectionViewPage") + << QLatin1String("Akonadi::CachePolicyPage") + << QLatin1String("KMail::CollectionTemplatesPage") + << QLatin1String("MailCommon::CollectionExpiryPage") + << QLatin1String("PimCommon::CollectionAclPage") + << QLatin1String("KMail::CollectionMailingListPage") + << QLatin1String("KMail::CollectionQuotaPage") + << QLatin1String("KMail::CollectionShortcutPage") + << QLatin1String("KMail::CollectionMaintenancePage"); + + QPointer dlg = new Akonadi::CollectionPropertiesDialog(collection, pages, mMainWidget); + dlg->setWindowTitle(i18nc("@title:window", "Properties of Folder %1", collection.name())); + + const QString pageToShow = fetch->property("pageToShow").toString(); + if (!pageToShow.isEmpty()) { // show a specific page + dlg->setCurrentPage(pageToShow); } dlg->show(); mHashDialogBox.insert(collection.id(), dlg); diff --git a/manageshowcollectionproperties.h b/manageshowcollectionproperties.h index a2605a3da..b933cd709 100644 --- a/manageshowcollectionproperties.h +++ b/manageshowcollectionproperties.h @@ -24,7 +24,8 @@ #include -namespace Akonadi { +namespace Akonadi +{ class CollectionPropertiesDialog; }