KDE 4.1 requires Qt4.4 -> remove the #ifdefs...

svn path=/trunk/KDE/kdebase/apps/; revision=778095

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index bcb98e0adb1805687b93d6220f029836f69855d0..09dfccc82544e49791c094ff6c2cd73ee20e566c 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -73,14 +73,8 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
     setDropIndicatorShown(false);
     setSelectionRectVisible(true);
 
-// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
-//       check avoids a division by zero happening on versions before 4.3.1.
-//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
-//       ereslibre
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
     setVerticalScrollMode(QListView::ScrollPerPixel);
     setHorizontalScrollMode(QListView::ScrollPerPixel);
-#endif
 
     // apply the column mode settings to the widget
     const ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index e80b75119cd9dcb42bbb9460df9608b119381a04..11b9938499683105044cc000ae1b060174ddf715 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -129,14 +129,8 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
                        settings->italicFont());
     }
 
-// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
-//       check avoids a division by zero happening on versions before 4.3.1.
-//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
-//       ereslibre
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
     setVerticalScrollMode(QTreeView::ScrollPerPixel);
     setHorizontalScrollMode(QTreeView::ScrollPerPixel);
-#endif
 
     updateDecorationSize();
 
@@ -161,19 +155,12 @@ bool DolphinDetailsView::event(QEvent* event)
 
         hideColumn(DolphinModel::Rating);
         hideColumn(DolphinModel::Tags);
-    }
-// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
-//       check avoids a division by zero happening on versions before 4.3.1.
-//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
-//       ereslibre
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
-    else if (event->type() == QEvent::UpdateRequest) {
+    } else if (event->type() == QEvent::UpdateRequest) {
         // a wheel movement will scroll 4 items
         if (model()->rowCount() > 0) {
             verticalScrollBar()->setSingleStep((sizeHintForRow(0) / 3) * 4);
         }
     }
-#endif
 
     return QTreeView::event(event);
 }

diff --git a/src/sidebartreeview.cpp b/src/sidebartreeview.cpp
index d580cbf6de2c453f5775fa21edcbfb802f15902c..5ac3b0cbf166645b0f4be5df76b1842688c2768a 100644 (file)
--- a/src/sidebartreeview.cpp
+++ b/src/sidebartreeview.cpp
@@ -43,14 +43,8 @@ SidebarTreeView::SidebarTreeView(QWidget* parent) :
     setDropIndicatorShown(false);
     setAutoExpandDelay(300);
 
-// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
-//       check avoids a division by zero happening on versions before 4.3.1.
-//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
-//       ereslibre
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
     setVerticalScrollMode(QListView::ScrollPerPixel);
     setHorizontalScrollMode(QListView::ScrollPerPixel);
-#endif
 
     viewport()->setAttribute(Qt::WA_Hover);
 
@@ -81,16 +75,10 @@ bool SidebarTreeView::event(QEvent* event)
         header()->hide();
     }
     else if (event->type() == QEvent::UpdateRequest) {
-        // TODO: Remove this check when 4.3.2 is released and KDE requires it... this
-        //       check avoids a division by zero happening on versions before 4.3.1.
-        //       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
-        //       ereslibre
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
         // a wheel movement will scroll 1 item
         if (model()->rowCount() > 0) {
             verticalScrollBar()->setSingleStep(sizeHintForRow(0) / 3);
         }
-#endif
     }
     else if (event->type() == QEvent::MetaCall) {
         resizeColumnToContents(DolphinModel::Name);