Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	kmail/collectionpage/collectionmaintenancepage.cpp
	kmail/collectionpage/collectionmaintenancepage.h
	kmail/collectionpage/collectionquotapage.cpp
	kmail/collectionpage/collectionquotapage.h
	kmail/collectionpage/collectionquotawidget.cpp
	kmail/collectionpage/collectionquotawidget.h

CMakeLists.txt

@@ -84,7 +84,7 @@ if (KDEPIM_BUILD_DESKTOP)
      collectionpage/collectionmaintenancepage.cpp
      collectionpage/collectionviewpage.cpp
      collectionpage/collectionquotapage.cpp
-     collectionpage/collectionquotapage_p.cpp
+     collectionpage/collectionquotawidget.cpp
      collectionpage/collectionmailinglistpage.cpp
      collectionpage/collectionshortcutpage.cpp
   )

collectionpage/collectionmaintenancepage.cpp

@@ -93,14 +93,9 @@ void CollectionMaintenancePage::init(const Akonadi::Collection &col)
 
     mLastIndexed = new QLabel(i18n("Still not indexed."));
 
-    indexingLayout->addWidget(mLastIndexed);
-#if 0
-    QPushButton *forceReindex = new QPushButton(i18n("Force reindexing"));
-    indexingLayout->addWidget(forceReindex);
-    connect(forceReindex, &QPushButton::clicked, this, &CollectionMaintenancePage::slotReindexing);
-#endif
-    topLayout->addWidget(indexingGroup);
-    topLayout->addStretch(100);
+    indexingLayout->addWidget( mLastIndexed );
+    topLayout->addWidget( indexingGroup );
+    topLayout->addStretch( 100 );
 }
 
 void CollectionMaintenancePage::load(const Collection &col)
@@ -161,10 +156,3 @@ void CollectionMaintenancePage::updateCollectionStatistic(Akonadi::Collection::I
     }
 }
 
-void CollectionMaintenancePage::slotReindexing()
-{
-    QDBusInterface interfaceBalooIndexer(QLatin1String("org.freedesktop.Akonadi.Agent.akonadi_baloo_indexer"), QLatin1String("/"));
-    if (interfaceBalooIndexer.isValid()) {
-        interfaceBalooIndexer.asyncCall(QLatin1String("reindexCollection"), (qlonglong)mCurrentCollection.id());
-    }
-}

collectionpage/collectionmaintenancepage.h

@@ -42,7 +42,6 @@ protected:
 
 private Q_SLOTS:
     void updateCollectionStatistic(Akonadi::Collection::Id, const Akonadi::CollectionStatistics &);
-    void slotReindexing();
     void onIndexedItemsReceived(qint64 num);
 
 private:

collectionpage/collectionquotapage.cpp

@@ -31,7 +31,7 @@
  */
 
 #include "collectionquotapage.h"
-#include "collectionquotapage_p.h"
+#include "collectionquotawidget.h"
 #include <AkonadiCore/collectionquotaattribute.h>
 #include <AkonadiCore/collection.h>
 
@@ -61,7 +61,7 @@ bool CollectionQuotaPage::canHandle(const Akonadi::Collection &collection) const
 void CollectionQuotaPage::init()
 {
     QVBoxLayout *topLayout = new QVBoxLayout(this);
-    mQuotaWidget = new QuotaWidget(this);
+    mQuotaWidget = new CollectionQuotaWidget(this);
     topLayout->addWidget(mQuotaWidget);
 }
 

collectionpage/collectionquotapage.h

@@ -33,7 +33,7 @@
 #define COLLECTIONQUOTAPAGE_H
 #include <AkonadiWidgets/collectionpropertiespage.h>
 
-class QuotaWidget;
+class CollectionQuotaWidget;
 
 /**
  * "Quota" tab in the folder dialog
@@ -51,7 +51,7 @@ protected:
     void init();
 
 private:
-    QuotaWidget *mQuotaWidget;
+    CollectionQuotaWidget* mQuotaWidget;
 };
 
 AKONADI_COLLECTION_PROPERTIES_PAGE_FACTORY(CollectionQuotaPageFactory, CollectionQuotaPage)

collectionpage/collectionquotawidget.cpp

@@ -30,7 +30,7 @@
  *  your version.
  */
 
-#include "collectionquotapage_p.h"
+#include "collectionquotawidget.h"
 
 #include "kmkernel.h"
 
@@ -43,8 +43,8 @@
 #include <KFormat>
 #include <KConfigGroup>
 
-QuotaWidget::QuotaWidget(QWidget *parent)
-    : QWidget(parent)
+CollectionQuotaWidget::CollectionQuotaWidget( QWidget* parent )
+    :QWidget( parent )
 {
     QVBoxLayout *box = new QVBoxLayout(this);
     QWidget *stuff = new QWidget(this);
@@ -66,7 +66,7 @@ QuotaWidget::QuotaWidget(QWidget *parent)
     box->addStretch(2);
 }
 
-void QuotaWidget::setQuotaInfo(qint64 current, qint64 maxValue)
+void CollectionQuotaWidget::setQuotaInfo( qint64 current, qint64 maxValue )
 {
     mProgressBar->setMaximum(maxValue);
     mProgressBar->setValue(current);

collectionpage/collectionquotawidget.h

@@ -30,20 +30,19 @@
  */
 
 #ifndef COLLECTIONQUOTAPAGE_P_H
-#define COLLECTIONQUOTAPAGE_P_H
+#define COLLECTIONQUOTAWIDGET_H
 
 #include <QWidget>
 
 class QProgressBar;
 class QLabel;
 
-class QuotaWidget : public QWidget
-{
+class CollectionQuotaWidget : public QWidget {
 
     Q_OBJECT
 public:
-    explicit QuotaWidget(QWidget *parent);
-    ~QuotaWidget() { }
+    explicit CollectionQuotaWidget( QWidget* parent);
+    ~CollectionQuotaWidget() { }
 
     void setQuotaInfo(qint64 currentValue, qint64 maxValue);