From f481bd5f8e8f4f9ccd1c9d5e67bf45c992328d41 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Thu, 13 Feb 2014 08:00:06 +0100 Subject: [PATCH] Comment code about nepomuk + indexing collection (not sure that baloo support it) --- collectionpage/collectionmaintenancepage.cpp | 29 ++++++++++++++------ collectionpage/collectionmaintenancepage.h | 4 +++ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/collectionpage/collectionmaintenancepage.cpp b/collectionpage/collectionmaintenancepage.cpp index 8d7a4274e..dc8ec467f 100644 --- a/collectionpage/collectionmaintenancepage.cpp +++ b/collectionpage/collectionmaintenancepage.cpp @@ -25,21 +25,25 @@ #include #include +#if 0 #include #include #include #include +#endif #include #include -#include #include -#include #include #include -#include #include +#include + +#include +#include +#include #include #include @@ -47,7 +51,10 @@ using namespace Akonadi; CollectionMaintenancePage::CollectionMaintenancePage(QWidget * parent) : - CollectionPropertiesPage( parent ), mIsNotAVirtualCollection( true ), mFolderSizeLabel(0), mCollectionCount(0) + CollectionPropertiesPage( parent ), + mIsNotAVirtualCollection( true ), + mFolderSizeLabel(0), + mCollectionCount(0) { setObjectName( QLatin1String( "KMail::CollectionMaintenancePage" ) ); setPageTitle( i18n("Maintenance") ); @@ -90,7 +97,7 @@ void CollectionMaintenancePage::init(const Akonadi::Collection & col) box->addRow( new QLabel( i18n("Unread messages:"), messagesGroup ), mCollectionUnread ); topLayout->addWidget( messagesGroup ); - +#if 0 QGroupBox *indexingGroup = new QGroupBox( i18n( "Indexing" ), this ); QVBoxLayout *indexingLayout = new QVBoxLayout( indexingGroup ); mIndexingEnabled = new QCheckBox( i18n( "Enable Full Text Indexing" ) ); @@ -111,7 +118,7 @@ void CollectionMaintenancePage::init(const Akonadi::Collection & col) } topLayout->addWidget( indexingGroup ); - +#endif topLayout->addStretch( 100 ); } @@ -120,6 +127,7 @@ void CollectionMaintenancePage::load(const Collection & col) init( col ); if ( col.isValid() ) { updateLabel( col.statistics().count(), col.statistics().unreadCount(), col.statistics().size() ); +#if 0 Akonadi::IndexPolicyAttribute *attr = col.attribute(); const bool indexingWasEnabled(!attr || attr->indexingEnabled()); mIndexingEnabled->setChecked( indexingWasEnabled ); @@ -136,6 +144,7 @@ void CollectionMaintenancePage::load(const Collection & col) } } } +#endif } } @@ -144,11 +153,11 @@ void CollectionMaintenancePage::updateLabel( qint64 nbMail, qint64 nbUnreadMail, mCollectionCount->setText( QString::number( qMax( 0LL, nbMail ) ) ); mCollectionUnread->setText( QString::number( qMax( 0LL, nbUnreadMail ) ) ); mFolderSizeLabel->setText( KGlobal::locale()->formatByteSize( qMax( 0LL, size ) ) ); - } -void CollectionMaintenancePage::save(Collection &collection ) +void CollectionMaintenancePage::save(Collection &/*collection*/ ) { +#if 0 if ( !collection.hasAttribute() && mIndexingEnabled->isChecked() ) return; Akonadi::IndexPolicyAttribute *attr = collection.attribute( Akonadi::Collection::AddIfMissing ); @@ -158,6 +167,7 @@ void CollectionMaintenancePage::save(Collection &collection ) attr->setIndexingEnabled( false ); Nepomuk2::removeResources( QList () << collection.url() ); } +#endif } void CollectionMaintenancePage::updateCollectionStatistic(Akonadi::Collection::Id id, const Akonadi::CollectionStatistics& statistic) @@ -167,6 +177,7 @@ void CollectionMaintenancePage::updateCollectionStatistic(Akonadi::Collection::I } } +#if 0 void CollectionMaintenancePage::slotReindexing() { //Be sure to remove collection resources before to reindex. @@ -176,4 +187,4 @@ void CollectionMaintenancePage::slotReindexing() interfaceNepomukFeeder.asyncCall(QLatin1String("forceReindexCollection"),(qlonglong)mCurrentCollection.id()); } } - +#endif diff --git a/collectionpage/collectionmaintenancepage.h b/collectionpage/collectionmaintenancepage.h index 2ef09b721..48780645b 100644 --- a/collectionpage/collectionmaintenancepage.h +++ b/collectionpage/collectionmaintenancepage.h @@ -41,7 +41,9 @@ protected: protected slots: void updateCollectionStatistic(Akonadi::Collection::Id, const Akonadi::CollectionStatistics& ); +#if 0 void slotReindexing(); +#endif private: void updateLabel( qint64 nbMail, qint64 nbUnreadMail, qint64 size ); @@ -52,8 +54,10 @@ private: QLabel *mFolderSizeLabel; QLabel *mCollectionCount; QLabel *mCollectionUnread; +#if 0 QCheckBox *mIndexingEnabled; QLabel *mLastIndexed; +#endif }; AKONADI_COLLECTION_PROPERTIES_PAGE_FACTORY( CollectionMaintenancePageFactory, CollectionMaintenancePage )