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

svn path=/trunk/KDE/kdebase/apps/; revision=778095
This commit is contained in:
Peter Penz 2008-02-22 13:56:16 +00:00
parent 1abc518e7a
commit 7a2f5990ee
3 changed files with 1 additions and 32 deletions

View file

@ -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();

View file

@ -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);
}

View file

@ -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);