Fix build if HAVE_NEPOMUK is not defined

[dolphin.git] / src / kitemviews / kitemlistcontainer.cpp

diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index 6e254026018a3d24048b078b99538923d5d16058..3bd8067a8f3c9b0be16e11f91ac1d4ce29b30155 100644 (file)
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -38,8 +38,6 @@
 
 #include <KDebug>
 
-#include "kitemlistviewaccessible.h"
-
 /**
  * Replaces the default viewport of KItemListContainer by a
  * non-scrollable viewport. The scrolling is done in an optimized
@@ -69,14 +67,6 @@ void KItemListContainerViewport::wheelEvent(QWheelEvent* event)
     event->ignore();
 }
 
-QAccessibleInterface* accessibleContainerFactory(const QString &key, QObject *object)
-{
-    Q_UNUSED(key)
-    if (KItemListView *view = qobject_cast<KItemListView*>(object))
-        return new KItemListViewAccessible(view);
-    return 0;
-}
-
 KItemListContainer::KItemListContainer(KItemListController* controller, QWidget* parent) :
     QAbstractScrollArea(parent),
     m_controller(controller),
@@ -103,8 +93,6 @@ KItemListContainer::KItemListContainer(KItemListController* controller, QWidget*
             this, SLOT(slotModelChanged(KItemModelBase*,KItemModelBase*)));
     connect(controller, SIGNAL(viewChanged(KItemListView*,KItemListView*)),
             this, SLOT(slotViewChanged(KItemListView*,KItemListView*)));
-
-    QAccessible::installFactory(accessibleContainerFactory);
 }
 
 KItemListContainer::~KItemListContainer()
@@ -113,8 +101,6 @@ KItemListContainer::~KItemListContainer()
     // the QGraphicsScene might get deleted before the view.
     delete m_controller;
     m_controller = 0;
-
-    QAccessible::removeFactory(accessibleContainerFactory);
 }
 
 KItemListController* KItemListContainer::controller() const
@@ -275,7 +261,9 @@ void KItemListContainer::updateScrollOffsetScrollBar()
         smoothScroller = m_verticalSmoothScroller;
         scrollOffsetScrollBar = verticalScrollBar();
         singleStep = view->itemSize().height();
-        pageStep = view->size().height();
+        // We cannot use view->size().height() because this height might
+        // include the header widget, which is not part of the scrolled area.
+        pageStep = view->verticalPageStep();
     } else {
         smoothScroller = m_horizontalSmoothScroller;
         scrollOffsetScrollBar = horizontalScrollBar();