KItemViews: Internal directory restructuration

- Move all private headers from the kitemviews-directory into
the 'private' subdirectory.

- Get rid of DolphinDirLister and just use a directory-lister
  internally in KFileItemModel.

- Minor interface-cleanups for signals

41 files changed, 267 insertions, 244 deletions

diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index 11760fed1..6464ec38a 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -23,9 +23,9 @@
 #include "kfileitemmodelrolesupdater.h"
 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"
-#include "kpixmapmodifier_p.h"
 #include <KLocale>
 #include <KStringHandler>
+#include "private/kpixmapmodifier.h"
 
 #include <KDebug>
 #include <KIcon>
diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 14ec1ec22..f3b4da892 100644
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -19,10 +19,8 @@
 
 #include "kfileitemlistwidget.h"
 
-#include "kfileitemclipboard_p.h"
 #include "kfileitemlistview.h"
 #include "kfileitemmodel.h"
-#include "kpixmapmodifier_p.h"
 
 #include <KIcon>
 #include <KIconEffect>
@@ -32,6 +30,9 @@
 #include <KStringHandler>
 #include <KDebug>
 
+#include "private/kfileitemclipboard.h"
+#include "private/kpixmapmodifier.h"
+
 #include <QFontMetricsF>
 #include <QGraphicsSceneResizeEvent>
 #include <QPainter>
@@ -193,12 +194,15 @@ QRectF KFileItemListWidget::textRect() const
 
 QRectF KFileItemListWidget::textFocusRect() const
 {
+    // In the compact- and details-layout a larger textRect() is returned to be aligned
+    // with the iconRect(). This is useful to have a larger selection/hover-area
+    // when having a quite large icon size but only one line of text. Still the
+    // focus rectangle should be shown as narrow as possible around the text.
+
     const_cast<KFileItemListWidget*>(this)->triggerCacheRefreshing();
-    if (m_layout == CompactLayout) {
-        // In the compact layout a larger textRect() is returned to be aligned
-        // with the iconRect(). This is useful to have a larger selection/hover-area
-        // when having a quite large icon size but only one line of text. Still the
-        // focus rectangle should be shown as narrow as possible around the text.
+
+    switch (m_layout) {
+    case CompactLayout: {
         QRectF rect = m_textRect;
         const TextInfo* topText    = m_textInfo.value(m_sortedVisibleRoles.first());
         const TextInfo* bottomText = m_textInfo.value(m_sortedVisibleRoles.last());
@@ -206,6 +210,19 @@ QRectF KFileItemListWidget::textFocusRect() const
         rect.setBottom(bottomText->pos.y() + bottomText->staticText.size().height());
         return rect;
     }
+
+    case DetailsLayout: {
+        QRectF rect = m_textRect;
+        const TextInfo* textInfo    = m_textInfo.value(m_sortedVisibleRoles.first());
+        rect.setTop(textInfo->pos.y());
+        rect.setBottom(textInfo->pos.y() + textInfo->staticText.size().height());
+        return rect;
+    }
+
+    default:
+        break;
+    }
+
     return m_textRect;
 }
 
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 685af8972..409b5cd52 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -19,26 +19,27 @@
 
 #include "kfileitemmodel.h"
 
-#include <KDirLister>
 #include <KDirModel>
-#include "kfileitemmodelsortalgorithm_p.h"
 #include <KGlobalSettings>
 #include <KLocale>
 #include <KStringHandler>
 #include <KDebug>
 
+#include "private/kfileitemmodelsortalgorithm.h"
+#include "private/kfileitemmodeldirlister.h"
+
 #include <QMimeData>
 #include <QTimer>
 
 // #define KFILEITEMMODEL_DEBUG
 
-KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :
+KFileItemModel::KFileItemModel(QObject* parent) :
     KItemModelBase("name", parent),
-    m_dirLister(dirLister),
+    m_dirLister(0),
     m_naturalSorting(KGlobalSettings::naturalSorting()),
     m_sortFoldersFirst(true),
     m_sortRole(NameRole),
-    m_sortProgressPercent(-1),
+    m_sortingProgressPercent(-1),
     m_roles(),
     m_caseSensitivity(Qt::CaseInsensitive),
     m_itemData(),
@@ -54,6 +55,22 @@ KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :
     m_expandedUrls(),
     m_urlsToExpand()
 {
+    m_dirLister = new KFileItemModelDirLister(this);
+    m_dirLister->setAutoUpdate(true);
+    m_dirLister->setDelayedMimeTypes(true);
+
+    connect(m_dirLister, SIGNAL(started(KUrl)), this, SIGNAL(dirLoadingStarted()));
+    connect(m_dirLister, SIGNAL(canceled()), this, SLOT(slotCanceled()));
+    connect(m_dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted()));
+    connect(m_dirLister, SIGNAL(newItems(KFileItemList)), this, SLOT(slotNewItems(KFileItemList)));
+    connect(m_dirLister, SIGNAL(itemsDeleted(KFileItemList)), this, SLOT(slotItemsDeleted(KFileItemList)));
+    connect(m_dirLister, SIGNAL(refreshItems(QList<QPair<KFileItem,KFileItem> >)), this, SLOT(slotRefreshItems(QList<QPair<KFileItem,KFileItem> >)));
+    connect(m_dirLister, SIGNAL(clear()), this, SLOT(slotClear()));
+    connect(m_dirLister, SIGNAL(clear(KUrl)), this, SLOT(slotClear(KUrl)));
+    connect(m_dirLister, SIGNAL(infoMessage(QString)), this, SIGNAL(infoMessage(QString)));
+    connect(m_dirLister, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString)));
+    connect(m_dirLister, SIGNAL(redirection(KUrl,KUrl)), this, SIGNAL(redirection(KUrl,KUrl)));
+
     // Apply default roles that should be determined
     resetRoles();
     m_requestRole[NameRole] = true;
@@ -61,16 +78,6 @@ KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :
     m_roles.insert("name");
     m_roles.insert("isDir");
 
-    Q_ASSERT(dirLister);
-
-    connect(dirLister, SIGNAL(canceled()), this, SLOT(slotCanceled()));
-    connect(dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted()));
-    connect(dirLister, SIGNAL(newItems(KFileItemList)), this, SLOT(slotNewItems(KFileItemList)));
-    connect(dirLister, SIGNAL(itemsDeleted(KFileItemList)), this, SLOT(slotItemsDeleted(KFileItemList)));
-    connect(dirLister, SIGNAL(refreshItems(QList<QPair<KFileItem,KFileItem> >)), this, SLOT(slotRefreshItems(QList<QPair<KFileItem,KFileItem> >)));
-    connect(dirLister, SIGNAL(clear()), this, SLOT(slotClear()));
-    connect(dirLister, SIGNAL(clear(KUrl)), this, SLOT(slotClear(KUrl)));
-
     // For slow KIO-slaves like used for searching it makes sense to show results periodically even
     // before the completed() or canceled() signal has been emitted.
     m_maximumUpdateIntervalTimer = new QTimer(this);
@@ -96,6 +103,21 @@ KFileItemModel::~KFileItemModel()
     m_itemData.clear();
 }
 
+void KFileItemModel::loadDir(const KUrl& url)
+{
+    m_dirLister->openUrl(url);
+}
+
+void KFileItemModel::refreshDir(const KUrl& url)
+{
+    m_dirLister->openUrl(url, KDirLister::Reload);
+}
+
+KUrl KFileItemModel::dir() const
+{
+    return m_dirLister->url();
+}
+
 int KFileItemModel::count() const
 {
     return m_itemData.count();
@@ -160,34 +182,26 @@ bool KFileItemModel::sortFoldersFirst() const
 
 void KFileItemModel::setShowHiddenFiles(bool show)
 {
-    KDirLister* dirLister = m_dirLister.data();
-    if (dirLister) {
-        dirLister->setShowingDotFiles(show);
-        dirLister->emitChanges();
-        if (show) {
-            slotCompleted();
-        }
+    m_dirLister->setShowingDotFiles(show);
+    m_dirLister->emitChanges();
+    if (show) {
+        slotCompleted();
     }
 }
 
 bool KFileItemModel::showHiddenFiles() const
 {
-    const KDirLister* dirLister = m_dirLister.data();
-    return dirLister ? dirLister->showingDotFiles() : false;
+    return m_dirLister->showingDotFiles();
 }
 
 void KFileItemModel::setShowFoldersOnly(bool enabled)
 {
-    KDirLister* dirLister = m_dirLister.data();
-    if (dirLister) {
-        dirLister->setDirOnlyMode(enabled);
-    }
+    m_dirLister->setDirOnlyMode(enabled);
 }
 
 bool KFileItemModel::showFoldersOnly() const
 {
-    KDirLister* dirLister = m_dirLister.data();
-    return dirLister ? dirLister->dirOnlyMode() : false;
+    return m_dirLister->dirOnlyMode();
 }
 
 QMimeData* KFileItemModel::createMimeData(const QSet<int>& indexes) const
@@ -324,11 +338,7 @@ int KFileItemModel::index(const KUrl& url) const
 
 KFileItem KFileItemModel::rootItem() const
 {
-    const KDirLister* dirLister = m_dirLister.data();
-    if (dirLister) {
-        return dirLister->rootItem();
-    }
-    return KFileItem();
+    return m_dirLister->rootItem();
 }
 
 void KFileItemModel::clear()
@@ -391,21 +401,14 @@ bool KFileItemModel::setExpanded(int index, bool expanded)
         return false;
     }
 
-    KDirLister* dirLister = m_dirLister.data();
     const KUrl url = m_itemData.at(index)->item.url();
     if (expanded) {
         m_expandedUrls.insert(url);
-
-        if (dirLister) {
-            dirLister->openUrl(url, KDirLister::Keep);
-            return true;
-        }
+        m_dirLister->openUrl(url, KDirLister::Keep);
     } else {
         m_expandedUrls.remove(url);
+        m_dirLister->stop(url);
 
-        if (dirLister) {
-            dirLister->stop(url);
-        }
 
         KFileItemList itemsToRemove;
         const int expandedParentsCount = data(index)["expandedParentsCount"].toInt();
@@ -415,10 +418,9 @@ bool KFileItemModel::setExpanded(int index, bool expanded)
             ++index;
         }
         removeItems(itemsToRemove);
-        return true;
     }
 
-    return false;
+    return true;
 }
 
 bool KFileItemModel::isExpanded(int index) const
@@ -460,18 +462,13 @@ void KFileItemModel::restoreExpandedUrls(const QSet<KUrl>& urls)
 
 void KFileItemModel::expandParentItems(const KUrl& url)
 {
-    const KDirLister* dirLister = m_dirLister.data();
-    if (!dirLister) {
-        return;
-    }
-
-    const int pos = dirLister->url().path().length();
+    const int pos = m_dirLister->url().path().length();
 
     // Assure that each sub-path of the URL that should be
     // expanded is added to m_urlsToExpand. KDirLister
     // does not care whether the parent-URL has already been
     // expanded.
-    KUrl urlToExpand = dirLister->url();
+    KUrl urlToExpand = m_dirLister->url();
     const QStringList subDirs = url.path().mid(pos).split(QDir::separator());
     for (int i = 0; i < subDirs.count() - 1; ++i) {
         urlToExpand.addPath(subDirs.at(i));
@@ -537,6 +534,11 @@ QString KFileItemModel::nameFilter() const
     return m_filter.pattern();
 }
 
+void KFileItemModel::cancelDirLoading()
+{
+    m_dirLister->stop();
+}
+
 QList<KFileItemModel::RoleInfo> KFileItemModel::rolesInformation()
 {
     static QList<RoleInfo> rolesInfo;
@@ -666,7 +668,7 @@ void KFileItemModel::slotCompleted()
         m_urlsToExpand.clear();
     }
 
-    emit loadingCompleted();
+    emit dirLoadingCompleted();
 }
 
 void KFileItemModel::slotCanceled()
@@ -1222,8 +1224,8 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item)
     }
 
     if (m_requestRole[ExpandedParentsCountRole]) {
-        if (m_expandedParentsCountRoot == UninitializedExpandedParentsCountRoot && m_dirLister.data()) {
-            const KUrl rootUrl = m_dirLister.data()->url();
+        if (m_expandedParentsCountRoot == UninitializedExpandedParentsCountRoot) {
+            const KUrl rootUrl = m_dirLister->url();
             const QString protocol = rootUrl.protocol();
             const bool forceExpandedParentsCountRoot = (protocol == QLatin1String("trash") ||
                                                         protocol == QLatin1String("nepomuk") ||
@@ -1501,8 +1503,7 @@ QString KFileItemModel::subPath(const KFileItem& item,
 
 bool KFileItemModel::useMaximumUpdateInterval() const
 {
-    const KDirLister* dirLister = m_dirLister.data();
-    return dirLister && !dirLister->url().isLocalFile();
+    return !m_dirLister->url().isLocalFile();
 }
 
 QList<QPair<int, QVariant> > KFileItemModel::nameRoleGroups() const
@@ -1847,20 +1848,20 @@ void KFileItemModel::emitSortProgress(int resolvedCount)
 
     const int itemCount = count();
     if (resolvedCount >= itemCount) {
-        m_sortProgressPercent = -1;
+        m_sortingProgressPercent = -1;
         if (m_resortAllItemsTimer->isActive()) {
             m_resortAllItemsTimer->stop();
             resortAllItems();
         }
 
-        emit sortProgress(100);
+        emit dirSortingProgress(100);
     } else if (itemCount > 0) {
         resolvedCount = qBound(0, resolvedCount, itemCount);
 
         const int progress = resolvedCount * 100 / itemCount;
-        if (m_sortProgressPercent != progress) {
-            m_sortProgressPercent = progress;
-            emit sortProgress(progress);
+        if (m_sortingProgressPercent != progress) {
+            m_sortingProgressPercent = progress;
+            emit dirSortingProgress(progress);
         }
     }
 }
diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h
index eaf35fecd..05834cd31 100644
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -23,12 +23,12 @@
 #include <libdolphin_export.h>
 #include <KFileItemList>
 #include <KUrl>
-#include <kitemviews/kfileitemmodelfilter_p.h>
 #include <kitemviews/kitemmodelbase.h>
+#include <kitemviews/private/kfileitemmodelfilter.h>
 
 #include <QHash>
 
-class KDirLister;
+class KFileItemModelDirLister;
 class QTimer;
 
 /**
@@ -42,24 +42,37 @@ class QTimer;
  *
  * Also the recursive expansion of sub-directories is supported by
  * KFileItemModel::setExpanded().
- *
- * TODO: In the longterm instead of passing a KDirLister just an URL should
- * be passed and a KDirLister used internally. This solves the following issues:
- * - The user of the API does not need to decide whether he listens to KDirLister
- *   or KFileItemModel.
- * - It resolves minor conceptual differences between KDirLister and KFileItemModel.
- *   E.g. there is no way for KFileItemModel to check whether a completed() signal
- *   will be emitted after newItems() will be send by KDirLister or not (in the case
- *   of setShowingDotFiles() no completed() signal will get emitted).
  */
 class LIBDOLPHINPRIVATE_EXPORT KFileItemModel : public KItemModelBase
 {
     Q_OBJECT
 
 public:
-    explicit KFileItemModel(KDirLister* dirLister, QObject* parent = 0);
+    explicit KFileItemModel(QObject* parent = 0);
     virtual ~KFileItemModel();
 
+    /**
+     * Loads the directory specified by \a url. The signals
+     * dirLoadingStarted(), dirLoadingProgress() and dirLoadingCompleted()
+     * indicate the current state of the loading process. The items
+     * of the directory are added after the loading has been completed.
+     */
+    void loadDir(const KUrl& url);
+
+    /**
+     * Throws away all currently loaded items and refreshes the directory
+     * by reloading all items again.
+     */
+    void refreshDir(const KUrl& url);
+
+    /**
+     * @return Parent directory of the items that are shown. In case
+     *         if a directory tree is shown, KFileItemModel::dir() returns
+     *         the root-parent of all items.
+     * @see rootItem()
+     */
+    KUrl dir() const;
+
     virtual int count() const;
     virtual QHash<QByteArray, QVariant> data(int index) const;
     virtual bool setData(int index, const QHash<QByteArray, QVariant>& values);
@@ -123,7 +136,8 @@ public:
     int index(const KUrl& url) const;
 
     /**
-     * @return Root item of all items.
+     * @return Root item of all items representing the item
+     *         for KFileItemModel::dir().
      */
     KFileItem rootItem() const;
 
@@ -158,6 +172,8 @@ public:
     void setNameFilter(const QString& nameFilter);
     QString nameFilter() const;
 
+    void cancelDirLoading();
+
     struct RoleInfo
     {   QByteArray role;
         QString translation;
@@ -176,20 +192,52 @@ public:
 
 signals:
     /**
+     * Is emitted if the loading of a directory has been started. It is
+     * assured that a signal dirLoadingCompleted() will be send after
+     * the loading has been finished. For tracking the loading progress
+     * the signal dirLoadingProgress() gets emitted in between.
+     */
+    void dirLoadingStarted();
+
+    /**
      * Is emitted after the loading of a directory has been completed or new
      * items have been inserted to an already loaded directory. Usually
      * one or more itemsInserted() signals are emitted before loadingCompleted()
      * (the only exception is loading an empty directory, where only a
      * loadingCompleted() signal gets emitted).
      */
-    void loadingCompleted();
+    void dirLoadingCompleted();
+
+    /**
+     * Informs about the progress in percent when loading a directory. It is assured
+     * that the signal dirLoadingStarted() has been emitted before.
+     */
+    void dirLoadingProgress(int percent);
 
     /**
      * Is emitted if the sort-role gets resolved asynchronously and provides
      * the progress-information of the sorting in percent. It is assured
      * that the last sortProgress-signal contains 100 as value.
      */
-    void sortProgress(int percent);
+    void dirSortingProgress(int percent);
+
+    /**
+     * Is emitted if an information message (e.g. "Connecting to host...")
+     * should be shown.
+     */
+    void infoMessage(const QString& message);
+
+    /**
+     * Is emitted if an error message (e.g. "Unknown location")
+     * should be shown.
+     */
+    void errorMessage(const QString& message);
+
+    /**
+     * Is emitted if a redirection from the current URL \a oldUrl
+     * to the new URL \a newUrl has been done.
+     */
+    void redirection(const KUrl& oldUrl, const KUrl& newUrl);
 
 protected:
     virtual void onGroupedSortingChanged(bool current);
@@ -357,13 +405,13 @@ private:
     static void determineMimeTypes(const KFileItemList& items, int timeout);
 
 private:
-    QWeakPointer<KDirLister> m_dirLister;
+    KFileItemModelDirLister* m_dirLister;
 
     bool m_naturalSorting;
     bool m_sortFoldersFirst;
 
     RoleType m_sortRole;
-    int m_sortProgressPercent; // Value of sortProgress() signal
+    int m_sortingProgressPercent; // Value of dirSortingProgress() signal
     QSet<QByteArray> m_roles;
     Qt::CaseSensitivity m_caseSensitivity;
 
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 632df676d..927407a69 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -20,7 +20,6 @@
 #include "kfileitemmodelrolesupdater.h"
 
 #include "kfileitemmodel.h"
-#include "kpixmapmodifier_p.h"
 
 #include <KConfig>
 #include <KConfigGroup>
@@ -28,14 +27,17 @@
 #include <KFileItem>
 #include <KGlobal>
 #include <KIO/PreviewJob>
+
+#include "private/kpixmapmodifier.h"
+
 #include <QPainter>
 #include <QPixmap>
 #include <QElapsedTimer>
 #include <QTimer>
 
 #ifdef HAVE_NEPOMUK
-    #include "knepomukrolesprovider_p.h"
-    #include "knepomukresourcewatcher_p.h"
+    #include "private/knepomukrolesprovider.h"
+    #include "private/knepomukresourcewatcher.h"
 #endif
 
 // Required includes for subItemsCount():
@@ -69,7 +71,7 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel* model, QO
     m_previewShown(false),
     m_enlargeSmallPreviews(true),
     m_clearPreviews(false),
-    m_sortProgress(-1),
+    m_sortingProgress(-1),
     m_model(model),
     m_iconSize(),
     m_firstVisibleIndex(0),
@@ -849,7 +851,7 @@ void KFileItemModelRolesUpdater::sortAndResolvePendingRoles()
 
 void KFileItemModelRolesUpdater::applySortProgressToModel()
 {
-    if (m_sortProgress < 0) {
+    if (m_sortingProgress < 0) {
         return;
     }
 
@@ -861,7 +863,7 @@ void KFileItemModelRolesUpdater::applySortProgressToModel()
     if (resolvedCount > 0) {
         m_model->emitSortProgress(resolvedCount);
         if (resolvedCount == m_model->count()) {
-            m_sortProgress = -1;
+            m_sortingProgress = -1;
         }
     }
 }
@@ -877,11 +879,11 @@ void KFileItemModelRolesUpdater::updateSortProgress()
                               ? hasUnknownMimeTypes()
                               : m_resolvableRoles.contains(sortRole);
 
-    if (m_sortProgress >= 0) {
+    if (m_sortingProgress >= 0) {
         // Mark the current sorting as finished
         m_model->emitSortProgress(m_model->count());
     }
-    m_sortProgress = showProgress ? 0 : -1;
+    m_sortingProgress = showProgress ? 0 : -1;
 }
 
 bool KFileItemModelRolesUpdater::hasUnknownMimeTypes() const
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h
index ce8cf1c73..c520a23e8 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.h
+++ b/src/kitemviews/kfileitemmodelrolesupdater.h
@@ -240,7 +240,7 @@ private:
     // during the roles-updater has been paused by setPaused().
     bool m_clearPreviews;
 
-    int m_sortProgress;
+    int m_sortingProgress;
 
     KFileItemModel* m_model;
     QSize m_iconSize;
diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index b480b4494..5a485b62c 100644
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -23,10 +23,11 @@
 #include "kitemlistcontainer.h"
 
 #include "kitemlistcontroller.h"
-#include "kitemlistsmoothscroller_p.h"
 #include "kitemlistview.h"
 #include "kitemmodelbase.h"
 
+#include "private/kitemlistsmoothscroller.h"
+
 #include <QApplication>
 #include <QGraphicsScene>
 #include <QGraphicsView>
diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index ad08223a4..c0f565b4d 100644
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -23,10 +23,14 @@
 
 #include "kitemlistcontroller.h"
 
+#include <KGlobalSettings>
+#include <KDebug>
+
 #include "kitemlistview.h"
-#include "kitemlistrubberband_p.h"
 #include "kitemlistselectionmanager.h"
-#include "kitemlistkeyboardsearchmanager_p.h"
+
+#include "private/kitemlistrubberband.h"
+#include "private/kitemlistkeyboardsearchmanager.h"
 
 #include <QApplication>
 #include <QDrag>
@@ -37,9 +41,6 @@
 #include <QMimeData>
 #include <QTimer>
 
-#include <KGlobalSettings>
-#include <KDebug>
-
 KItemListController::KItemListController(QObject* parent) :
     QObject(parent),
     m_singleClickActivation(KGlobalSettings::singleClick()),
diff --git a/src/kitemviews/kitemlistheader.cpp b/src/kitemviews/kitemlistheader.cpp
index be7a09c8f..e89ece0a1 100644
--- a/src/kitemviews/kitemlistheader.cpp
+++ b/src/kitemviews/kitemlistheader.cpp
@@ -18,9 +18,10 @@
  ***************************************************************************/
 
 #include "kitemlistheader.h"
-#include "kitemlistheaderwidget_p.h"
 #include "kitemlistview.h"
 
+#include "private/kitemlistheaderwidget.h"
+
 KItemListHeader::~KItemListHeader()
 {
 }
diff --git a/src/kitemviews/kitemlistkeyboardsearchmanager_p.h b/src/kitemviews/kitemlistkeyboardsearchmanager_p.h
deleted file mode 100644
index d6a6686db..000000000
--- a/src/kitemviews/kitemlistkeyboardsearchmanager_p.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2011 by Tirtha Chatterjee <[email protected]> *
- *                                                                         *
- *   Based on the Itemviews NG project from Trolltech Labs:                *
- *   http://qt.gitorious.org/qt-labs/itemviews-ng                          *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
-
-#ifndef KITEMLISTKEYBOARDMANAGER_H
-#define KITEMLISTKEYBOARDMANAGER_H
-
-#include <libdolphin_export.h>
-
-#include <QObject>
-#include <QString>
-#include <QElapsedTimer>
-
-/**
- * @brief Controls the keyboard searching ability for a KItemListController.
- *
- * @see KItemListController
- * @see KItemModelBase
- */
-class LIBDOLPHINPRIVATE_EXPORT KItemListKeyboardSearchManager : public QObject
-{
-    Q_OBJECT
-
-public:
-
-    KItemListKeyboardSearchManager(QObject* parent = 0);
-    virtual ~KItemListKeyboardSearchManager();
-
-    /**
-     * Add \a keys to the text buffer used for searching.
-     */
-    void addKeys(const QString& keys);
-
-    /**
-     * Sets the delay after which the search is cancelled to \a milliseconds.
-     * If the time interval between two calls of addKeys(const QString&) is
-     * larger than this, the second call will start a new search, rather than
-     * combining the keys received from both calls to a single search string.
-     */
-    void setTimeout(qint64 milliseconds);
-    qint64 timeout() const;
-
-signals:
-    /**
-     * Is emitted if the current item should be changed corresponding
-     * to \a text.
-     * @param searchFromNextItem If true start searching from item next to the
-     *                           current item. Otherwise, search from the
-     *                           current item.
-     */
-    // TODO: Think about getting rid of the bool parameter
-    // (see http://doc.qt.nokia.com/qq/qq13-apis.html#thebooleanparametertrap)
-    void changeCurrentItem(const QString& string, bool searchFromNextItem);
-
-private:
-    QString m_searchedString;
-    QElapsedTimer m_keyboardInputTime;
-    qint64 m_timeout;
-};
-
-#endif
-
-
diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 1e68c2bd2..732ed24e4 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -24,14 +24,15 @@
 
 #include "kitemlistcontroller.h"
 #include "kitemlistheader.h"
-#include "kitemlistheaderwidget_p.h"
-#include "kitemlistrubberband_p.h"
 #include "kitemlistselectionmanager.h"
-#include "kitemlistsizehintresolver_p.h"
-#include "kitemlistviewlayouter_p.h"
-#include "kitemlistviewanimation_p.h"
 #include "kitemlistwidget.h"
 
+#include "private/kitemlistheaderwidget.h"
+#include "private/kitemlistrubberband.h"
+#include "private/kitemlistsizehintresolver.h"
+#include "private/kitemlistviewlayouter.h"
+#include "private/kitemlistviewanimation.h"
+
 #include <KDebug>
 
 #include <QCursor>
diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index d65ece8e2..a3c11a6bf 100644
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -27,9 +27,9 @@
 
 #include <kitemviews/kitemlistgroupheader.h>
 #include <kitemviews/kitemliststyleoption.h>
-#include <kitemviews/kitemlistviewanimation_p.h>
 #include <kitemviews/kitemlistwidget.h>
 #include <kitemviews/kitemmodelbase.h>
+#include <kitemviews/private/kitemlistviewanimation.h>
 #include <QGraphicsWidget>
 #include <QSet>
 
diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index b703fbfe2..74b96ca1f 100644
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -22,10 +22,11 @@
 
 #include "kitemlistwidget.h"
 
-#include "kitemlistselectiontoggle_p.h"
 #include "kitemlistview.h"
 #include "kitemmodelbase.h"
 
+#include "private/kitemlistselectiontoggle.h"
+
 #include <KDebug>
 
 #include <KGlobalSettings>
diff --git a/src/kitemviews/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp
index fb63f9530..6d6085641 100644
--- a/src/kitemviews/kfileitemclipboard.cpp
+++ b/src/kitemviews/private/kfileitemclipboard.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kfileitemclipboard_p.h"
+#include "kfileitemclipboard.h"
 
 #include <KGlobal>
 #include <QApplication>
@@ -73,4 +73,4 @@ KFileItemClipboard::KFileItemClipboard() :
             this, SLOT(updateCutItems()));
 }
 
-#include "kfileitemclipboard_p.moc"
+#include "kfileitemclipboard.moc"
diff --git a/src/kitemviews/kfileitemclipboard_p.h b/src/kitemviews/private/kfileitemclipboard.h
index 86eb8e9fc..86eb8e9fc 100644
--- a/src/kitemviews/kfileitemclipboard_p.h
+++ b/src/kitemviews/private/kfileitemclipboard.h
diff --git a/src/kitemviews/private/kfileitemmodeldirlister.cpp b/src/kitemviews/private/kfileitemmodeldirlister.cpp
new file mode 100644
index 000000000..be0f9f77b
--- /dev/null
+++ b/src/kitemviews/private/kfileitemmodeldirlister.cpp
@@ -0,0 +1,44 @@
+/***************************************************************************
+ *   Copyright (C) 2006-2012 by Peter Penz <[email protected]>        *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
+ ***************************************************************************/
+
+#include "kfileitemmodeldirlister.h"
+#include <KLocale>
+#include <KIO/JobClasses>
+
+KFileItemModelDirLister::KFileItemModelDirLister(QObject* parent) :
+    KDirLister(parent)
+{
+    setAutoErrorHandlingEnabled(false, 0);
+}
+
+KFileItemModelDirLister::~KFileItemModelDirLister()
+{
+}
+
+void KFileItemModelDirLister::handleError(KIO::Job* job)
+{
+    const QString errorString = job->errorString();
+    if (errorString.isEmpty()) {
+        emit errorMessage(i18nc("@info:status", "Unknown error."));
+    } else {
+        emit errorMessage(errorString);
+    }
+}
+
+#include "kfileitemmodeldirlister.moc"
diff --git a/src/kitemviews/kitemlistrubberband_p.h b/src/kitemviews/private/kfileitemmodeldirlister.h
index aea58af46..1d58347f4 100644
--- a/src/kitemviews/kitemlistrubberband_p.h
+++ b/src/kitemviews/private/kfileitemmodeldirlister.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011 by Peter Penz <[email protected]>             *
+ *   Copyright (C) 2006-2012 by Peter Penz <[email protected]>        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -17,44 +17,31 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#ifndef KITEMLISTRUBBERBAND_H
-#define KITEMLISTRUBBERBAND_H
+#ifndef KFILEITEMMODELDIRLISTER_H
+#define KFILEITEMMODELDIRLISTER_H
 
 #include <libdolphin_export.h>
-#include <QObject>
-#include <QPointF>
+#include <KDirLister>
 
 /**
- * @brief Manages the rubberband when selecting items.
+ * @brief Extends the class KDirLister by emitting a signal when an
+ *        error occurred instead of showing an error dialog.
+ *        KDirLister::autoErrorHandlingEnabled() is set to false.
  */
-class LIBDOLPHINPRIVATE_EXPORT KItemListRubberBand : public QObject
+class LIBDOLPHINPRIVATE_EXPORT KFileItemModelDirLister : public KDirLister
 {
     Q_OBJECT
 
 public:
-    explicit KItemListRubberBand(QObject* parent = 0);
-    virtual ~KItemListRubberBand();
-
-    void setStartPosition(const QPointF& pos);
-    QPointF startPosition() const;
-
-    void setEndPosition(const QPointF& pos);
-    QPointF endPosition() const;
-
-    void setActive(bool active);
-    bool isActive() const;
+    KFileItemModelDirLister(QObject* parent = 0);
+    virtual ~KFileItemModelDirLister();
 
 signals:
-    void activationChanged(bool active);
-    void startPositionChanged(const QPointF& current, const QPointF& previous);
-    void endPositionChanged(const QPointF& current, const QPointF& previous);
+    /** Is emitted whenever an error has occurred. */
+    void errorMessage(const QString& msg);
 
-private:
-    bool m_active;
-    QPointF m_startPos;
-    QPointF m_endPos;
+protected:
+    virtual void handleError(KIO::Job* job);
 };
 
 #endif
-
-
diff --git a/src/kitemviews/kfileitemmodelfilter.cpp b/src/kitemviews/private/kfileitemmodelfilter.cpp
index f3f47ba56..816d35634 100644
--- a/src/kitemviews/kfileitemmodelfilter.cpp
+++ b/src/kitemviews/private/kfileitemmodelfilter.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kfileitemmodelfilter_p.h"
+#include "kfileitemmodelfilter.h"
 
 #include <KFileItem>
 #include <QRegExp>
diff --git a/src/kitemviews/kfileitemmodelfilter_p.h b/src/kitemviews/private/kfileitemmodelfilter.h
index 9bdf1fd95..9bdf1fd95 100644
--- a/src/kitemviews/kfileitemmodelfilter_p.h
+++ b/src/kitemviews/private/kfileitemmodelfilter.h
diff --git a/src/kitemviews/kfileitemmodelsortalgorithm.cpp b/src/kitemviews/private/kfileitemmodelsortalgorithm.cpp
index 4c2f29dee..e0aac13de 100644
--- a/src/kitemviews/kfileitemmodelsortalgorithm.cpp
+++ b/src/kitemviews/private/kfileitemmodelsortalgorithm.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kfileitemmodelsortalgorithm_p.h"
+#include "kfileitemmodelsortalgorithm.h"
 
 void KFileItemModelSortAlgorithm::sort(KFileItemModel* model,
                                        QList<KFileItemModel::ItemData*>::iterator begin,
diff --git a/src/kitemviews/kfileitemmodelsortalgorithm_p.h b/src/kitemviews/private/kfileitemmodelsortalgorithm.h
index 3a596dff5..3a596dff5 100644
--- a/src/kitemviews/kfileitemmodelsortalgorithm_p.h
+++ b/src/kitemviews/private/kfileitemmodelsortalgorithm.h
diff --git a/src/kitemviews/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp
index 2105b674c..576516f25 100644
--- a/src/kitemviews/kitemlistheaderwidget.cpp
+++ b/src/kitemviews/private/kitemlistheaderwidget.cpp
@@ -17,11 +17,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kitemlistheaderwidget_p.h"
+#include "kitemlistheaderwidget.h"
 
 #include <KAction>
 #include <KMenu>
-#include "kitemmodelbase.h"
+#include <kitemviews/kitemmodelbase.h>
 
 #include <QApplication>
 #include <QGraphicsSceneHoverEvent>
@@ -532,4 +532,4 @@ qreal KItemListHeaderWidget::roleXPosition(const QByteArray& role) const
     return -1;
 }
 
-#include "kitemlistheaderwidget_p.moc"
+#include "kitemlistheaderwidget.moc"
diff --git a/src/kitemviews/kitemlistheaderwidget_p.h b/src/kitemviews/private/kitemlistheaderwidget.h
index f8bba977b..f8bba977b 100644
--- a/src/kitemviews/kitemlistheaderwidget_p.h
+++ b/src/kitemviews/private/kitemlistheaderwidget.h
diff --git a/src/kitemviews/kitemlistkeyboardsearchmanager.cpp b/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp
index f4dc1a547..2f4e93b1d 100644
--- a/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
+++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp
@@ -20,7 +20,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kitemlistkeyboardsearchmanager_p.h"
+#include "kitemlistkeyboardsearchmanager.h"
 
 #include <QApplication>
 #include <QElapsedTimer>
diff --git a/src/kitemviews/kitemlistrubberband.cpp b/src/kitemviews/private/kitemlistrubberband.cpp
index c1f276cdf..ae023d2aa 100644
--- a/src/kitemviews/kitemlistrubberband.cpp
+++ b/src/kitemviews/private/kitemlistrubberband.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kitemlistrubberband_p.h"
+#include "kitemlistrubberband.h"
 
 KItemListRubberBand::KItemListRubberBand(QObject* parent) :
     QObject(parent),
@@ -72,4 +72,4 @@ bool KItemListRubberBand::isActive() const
     return m_active;
 }
 
-#include "kitemlistrubberband_p.moc"
+#include "kitemlistrubberband.moc"
diff --git a/src/kitemviews/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp
index 014f65b40..66da6a727 100644
--- a/src/kitemviews/kitemlistselectiontoggle.cpp
+++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kitemlistselectiontoggle_p.h"
+#include "kitemlistselectiontoggle.h"
 
 #include <KIconEffect>
 #include <KIconLoader>
@@ -103,4 +103,4 @@ void KItemListSelectionToggle::updatePixmap()
     }
 }
 
-#include "kitemlistselectiontoggle_p.moc"
+#include "kitemlistselectiontoggle.moc"
diff --git a/src/kitemviews/kitemlistselectiontoggle_p.h b/src/kitemviews/private/kitemlistselectiontoggle.h
index a8050d811..a8050d811 100644
--- a/src/kitemviews/kitemlistselectiontoggle_p.h
+++ b/src/kitemviews/private/kitemlistselectiontoggle.h
diff --git a/src/kitemviews/kitemlistsizehintresolver.cpp b/src/kitemviews/private/kitemlistsizehintresolver.cpp
index 0520fac04..c76ff0f55 100644
--- a/src/kitemviews/kitemlistsizehintresolver.cpp
+++ b/src/kitemviews/private/kitemlistsizehintresolver.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kitemlistsizehintresolver_p.h"
+#include "kitemlistsizehintresolver.h"
 
 #include <kitemviews/kitemlistview.h>
 #include <KDebug>
diff --git a/src/kitemviews/kitemlistsizehintresolver_p.h b/src/kitemviews/private/kitemlistsizehintresolver.h
index 1345e0321..1345e0321 100644
--- a/src/kitemviews/kitemlistsizehintresolver_p.h
+++ b/src/kitemviews/private/kitemlistsizehintresolver.h
diff --git a/src/kitemviews/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp
index 80f7f2883..6987e1ce1 100644
--- a/src/kitemviews/kitemlistsmoothscroller.cpp
+++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kitemlistsmoothscroller_p.h"
+#include "kitemlistsmoothscroller.h"
 
 #include <KGlobalSettings>
 #include <QEvent>
@@ -204,4 +204,4 @@ void KItemListSmoothScroller::handleWheelEvent(QWheelEvent* event)
     event->accept();
 }
 
-#include "kitemlistsmoothscroller_p.moc"
+#include "kitemlistsmoothscroller.moc"
diff --git a/src/kitemviews/kitemlistsmoothscroller_p.h b/src/kitemviews/private/kitemlistsmoothscroller.h
index 252c966c7..252c966c7 100644
--- a/src/kitemviews/kitemlistsmoothscroller_p.h
+++ b/src/kitemviews/private/kitemlistsmoothscroller.h
diff --git a/src/kitemviews/kitemlistviewanimation.cpp b/src/kitemviews/private/kitemlistviewanimation.cpp
index 9184b7144..e347c5bb1 100644
--- a/src/kitemviews/kitemlistviewanimation.cpp
+++ b/src/kitemviews/private/kitemlistviewanimation.cpp
@@ -17,9 +17,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kitemlistviewanimation_p.h"
+#include "kitemlistviewanimation.h"
 
-#include "kitemlistview.h"
+#include <kitemviews/kitemlistview.h>
 
 #include <KDebug>
 #include <KGlobalSettings>
@@ -242,4 +242,4 @@ void KItemListViewAnimation::slotFinished()
     Q_ASSERT(false);
 }
 
-#include "kitemlistviewanimation_p.moc"
+#include "kitemlistviewanimation.moc"
diff --git a/src/kitemviews/kitemlistviewanimation_p.h b/src/kitemviews/private/kitemlistviewanimation.h
index a3aceb0f5..a3aceb0f5 100644
--- a/src/kitemviews/kitemlistviewanimation_p.h
+++ b/src/kitemviews/private/kitemlistviewanimation.h
diff --git a/src/kitemviews/kitemlistviewlayouter.cpp b/src/kitemviews/private/kitemlistviewlayouter.cpp
index 405837d23..c15b44e13 100644
--- a/src/kitemviews/kitemlistviewlayouter.cpp
+++ b/src/kitemviews/private/kitemlistviewlayouter.cpp
@@ -17,10 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kitemlistviewlayouter_p.h"
+#include "kitemlistviewlayouter.h"
 
-#include "kitemmodelbase.h"
-#include "kitemlistsizehintresolver_p.h"
+#include <kitemviews/kitemmodelbase.h>
+#include "kitemlistsizehintresolver.h"
 
 #include <KDebug>
 
@@ -627,4 +627,4 @@ qreal KItemListViewLayouter::minimumGroupHeaderWidth() const
     return 100;
 }
 
-#include "kitemlistviewlayouter_p.moc"
+#include "kitemlistviewlayouter.moc"
diff --git a/src/kitemviews/kitemlistviewlayouter_p.h b/src/kitemviews/private/kitemlistviewlayouter.h
index da5bd1d7d..da5bd1d7d 100644
--- a/src/kitemviews/kitemlistviewlayouter_p.h
+++ b/src/kitemviews/private/kitemlistviewlayouter.h
diff --git a/src/kitemviews/knepomukdatamanagement_export_p.h b/src/kitemviews/private/knepomukdatamanagement_export.h
index 929a737c9..929a737c9 100644
--- a/src/kitemviews/knepomukdatamanagement_export_p.h
+++ b/src/kitemviews/private/knepomukdatamanagement_export.h
diff --git a/src/kitemviews/knepomukresourcewatcher_p.h b/src/kitemviews/private/knepomukresourcewatcher.h
index 9b4b8b71d..3f6643fc8 100644
--- a/src/kitemviews/knepomukresourcewatcher_p.h
+++ b/src/kitemviews/private/knepomukresourcewatcher.h
@@ -29,7 +29,7 @@
 #include <QtDBus/QDBusVariant>
 #include <QtCore/QVariant>
 
-#include "knepomukdatamanagement_export_p.h"
+#include "knepomukdatamanagement_export.h"
 
 namespace Nepomuk {
 
diff --git a/src/kitemviews/knepomukrolesprovider.cpp b/src/kitemviews/private/knepomukrolesprovider.cpp
index 25fb16121..7af887cbf 100644
--- a/src/kitemviews/knepomukrolesprovider.cpp
+++ b/src/kitemviews/private/knepomukrolesprovider.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "knepomukrolesprovider_p.h"
+#include "knepomukrolesprovider.h"
 
 #include <KDebug>
 #include <KGlobal>
diff --git a/src/kitemviews/knepomukrolesprovider_p.h b/src/kitemviews/private/knepomukrolesprovider.h
index 46a78d4ee..46a78d4ee 100644
--- a/src/kitemviews/knepomukrolesprovider_p.h
+++ b/src/kitemviews/private/knepomukrolesprovider.h
diff --git a/src/kitemviews/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp
index 475f36a64..29aceb66b 100644
--- a/src/kitemviews/kpixmapmodifier.cpp
+++ b/src/kitemviews/private/kpixmapmodifier.cpp
@@ -32,7 +32,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "kpixmapmodifier_p.h"
+#include "kpixmapmodifier.h"
 
 #include <QImage>
 #include <QPainter>
diff --git a/src/kitemviews/kpixmapmodifier_p.h b/src/kitemviews/private/kpixmapmodifier.h
index 4f863c349..4f863c349 100644
--- a/src/kitemviews/kpixmapmodifier_p.h
+++ b/src/kitemviews/private/kpixmapmodifier.h