${CMAKE_SOURCE_DIR}/libkonq doesn't exist now

[dolphin.git] / src / dolphincolumnview.cpp

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 4f893e9975c829dfb264632a21aa568cb4296e8c..d7fc15fc81dd4914a670146a4f7b4822f4c15a15 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -389,7 +389,6 @@ DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* control
     QAbstractItemView(parent),
     m_controller(controller),
     m_restoreActiveColumnFocus(false),
-    m_dirListerCompleted(false),
     m_index(-1),
     m_contentX(0),
     m_columns(),
@@ -477,10 +476,8 @@ void DolphinColumnView::setModel(QAbstractItemModel* model)
             this, SLOT(triggerReloadColumns(const QModelIndex&)));
 
     KDirLister* dirLister = m_dolphinModel->dirLister();
-    connect(dirLister, SIGNAL(started(const KUrl&)),
-            this, SLOT(slotDirListerStarted(const KUrl&)));
     connect(dirLister, SIGNAL(completed()),
-            this, SLOT(slotDirListerCompleted()));
+            this, SLOT(triggerExpandToActiveUrl()));
 
     activeColumn()->setModel(model);
     QAbstractItemView::setModel(model);
@@ -497,8 +494,8 @@ void DolphinColumnView::invertSelection()
 
     KDirLister* dirLister = m_dolphinModel->dirLister();
     const KFileItemList list = dirLister->itemsForDir(column->url());
-    foreach (KFileItem* item, list) {
-        const QModelIndex index = m_dolphinModel->indexForUrl(item->url());
+    foreach (const KFileItem item, list) {
+        const QModelIndex index = m_dolphinModel->indexForUrl(item.url());
         selModel->select(m_proxyModel->mapFromSource(index), QItemSelectionModel::Toggle);
     }
 }
@@ -734,10 +731,9 @@ void DolphinColumnView::zoomIn()
 {
     if (isZoomInPossible()) {
         ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-        // TODO: get rid of K3Icon sizes
         switch (settings->iconSize()) {
-        case K3Icon::SizeSmall:  settings->setIconSize(K3Icon::SizeMedium); break;
-        case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeLarge); break;
+        case KIconLoader::SizeSmall:  settings->setIconSize(KIconLoader::SizeMedium); break;
+        case KIconLoader::SizeMedium: settings->setIconSize(KIconLoader::SizeLarge); break;
         default: Q_ASSERT(false); break;
         }
         updateDecorationSize();
@@ -748,10 +744,9 @@ void DolphinColumnView::zoomOut()
 {
     if (isZoomOutPossible()) {
         ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-        // TODO: get rid of K3Icon sizes
         switch (settings->iconSize()) {
-        case K3Icon::SizeLarge:  settings->setIconSize(K3Icon::SizeMedium); break;
-        case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeSmall); break;
+        case KIconLoader::SizeLarge:  settings->setIconSize(KIconLoader::SizeMedium); break;
+        case KIconLoader::SizeMedium: settings->setIconSize(KIconLoader::SizeSmall); break;
         default: Q_ASSERT(false); break;
         }
         updateDecorationSize();
@@ -788,8 +783,7 @@ void DolphinColumnView::expandToActiveUrl()
     Q_ASSERT(lastIndex >= 0);
     const KUrl& activeUrl = m_columns[lastIndex]->url();
     const KUrl rootUrl = m_dolphinModel->dirLister()->url();
-    const bool expand = m_dirListerCompleted
-                        && rootUrl.isParentOf(activeUrl)
+    const bool expand = rootUrl.isParentOf(activeUrl)
                         && !rootUrl.equals(activeUrl, KUrl::CompareWithoutTrailingSlash);
     if (expand) {
         m_dolphinModel->expandToUrl(activeUrl);
@@ -827,28 +821,21 @@ void DolphinColumnView::updateColumns()
     }
 }
 
-void DolphinColumnView::slotDirListerStarted(const KUrl& url)
+void DolphinColumnView::triggerExpandToActiveUrl()
 {
-    Q_UNUSED(url);
-    m_dirListerCompleted = false;
-}
-
-void DolphinColumnView::slotDirListerCompleted()
-{
-    m_dirListerCompleted = true;
     QMetaObject::invokeMethod(this, "expandToActiveUrl", Qt::QueuedConnection);
 }
 
 bool DolphinColumnView::isZoomInPossible() const
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-    return settings->iconSize() < K3Icon::SizeLarge;
+    return settings->iconSize() < KIconLoader::SizeLarge;
 }
 
 bool DolphinColumnView::isZoomOutPossible() const
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-    return settings->iconSize() > K3Icon::SizeSmall;
+    return settings->iconSize() > KIconLoader::SizeSmall;
 }
 
 void DolphinColumnView::setActiveColumnIndex(int index)