Dolphin is now QT3_SUPPORT free

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 758c9510f0195dc5fac5dbabc75ca671cc77b03b..4583ca2974482caa047a1f550073bef50fd5bb2d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,8 +5,6 @@ add_subdirectory( tests )
 
 include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
 
-add_definitions (-DQT3_SUPPORT)
-
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index e53a4c61af2cd6a7715dfdd42e80be2494bb4c10..2904465dcb3ba706c74175f0faef53d92eb0d235 100644 (file)
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.cpp
@@ -61,7 +61,7 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
     m_columnWidthSlider->setMinimum(0);
     m_columnWidthSlider->setMaximum(5);
     m_columnWidthSlider->setPageStep(1);
-    m_columnWidthSlider->setTickmarks(QSlider::TicksBelow);
+    m_columnWidthSlider->setTickPosition(QSlider::TicksBelow);
     QLabel* largeLabel = new QLabel(i18nc("@item:inrange Column Width", "Large"), columnWidthBox);
 
     QHBoxLayout* columnWidthLayout = new QHBoxLayout(columnWidthBox);

diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index 810baabc83e5ae929b981191e7795f7bf64424d6..6e7443715d0d48c39c7d3461e7d96c08c5acffec 100644 (file)
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -36,11 +36,7 @@ FilterBar::FilterBar(QWidget* parent) :
 {
     const int gap = 3;
 
-    QVBoxLayout* vLayout = new QVBoxLayout(this);
-    vLayout->setMargin(0);
-    vLayout->addSpacing(gap);
-
-    QHBoxLayout* hLayout = new QHBoxLayout(vLayout);
+    QHBoxLayout* hLayout = new QHBoxLayout(this);
     hLayout->setMargin(0);
     hLayout->addSpacing(gap);
 

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index 41a2a25ca5d5fdc0ca8e415319e7f80cd3fb0195..75638348c43110ee7e8b94650eaf5773a504f6dc 100644 (file)
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -70,7 +70,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
     m_iconSizeSlider->setMaximum(5);
     m_iconSizeSlider->setPageStep(1);
     m_iconSizeSlider->setValue(sliderValue(settings->iconSize()));
-    m_iconSizeSlider->setTickmarks(QSlider::TicksBelow);
+    m_iconSizeSlider->setTickPosition(QSlider::TicksBelow);
     connect(m_iconSizeSlider, SIGNAL(valueChanged(int)),
             this, SLOT(updateIconSize(int)));
     new QLabel(i18nc("@item:inrange Icon Size", "Large"), iconSizeHBox);
@@ -78,7 +78,9 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
     m_iconSizeViewer = new PixmapViewer(iconSizeBox, PixmapViewer::SizeTransition);
     m_iconSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);
     m_iconSizeViewer->setFixedHeight(K3Icon::SizeEnormous);
-    m_iconSizeViewer->setEraseColor(iconBackgroundColor);
+    QPalette p = m_iconSizeViewer->palette();
+    p.setColor(m_iconSizeViewer->backgroundRole(), iconBackgroundColor);
+    m_iconSizeViewer->setPalette(p);
     updateIconSize(m_iconSizeSlider->value());
 
     QVBoxLayout* iconSizeLayout = new QVBoxLayout(iconSizeBox);
@@ -96,7 +98,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
     m_previewSizeSlider->setMaximum(5);
     m_previewSizeSlider->setPageStep(1);
     m_previewSizeSlider->setValue(sliderValue(settings->previewSize()));
-    m_previewSizeSlider->setTickmarks(QSlider::TicksBelow);
+    m_previewSizeSlider->setTickPosition(QSlider::TicksBelow);
     connect(m_previewSizeSlider, SIGNAL(valueChanged(int)),
             this, SLOT(updatePreviewSize(int)));
     new QLabel(i18nc("@item:inrange Preview Size", "Large"), previewSizeHBox);
@@ -104,7 +106,9 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
     m_previewSizeViewer = new PixmapViewer(previewSizeBox, PixmapViewer::SizeTransition);
     m_previewSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);
     m_previewSizeViewer->setFixedHeight(K3Icon::SizeEnormous);
-    m_previewSizeViewer->setEraseColor(iconBackgroundColor);
+    p = m_previewSizeViewer->palette();
+    p.setColor(m_previewSizeViewer->backgroundRole(), iconBackgroundColor);
+    m_previewSizeViewer->setPalette(p);
     updatePreviewSize(m_previewSizeSlider->value());
 
     QVBoxLayout* previewSizeLayout = new QVBoxLayout(previewSizeBox);

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 6154786272d2b2395b31ec14e9906c242642a7de..48e38d430cb8a98375769b2797e419f1cc50949b 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -72,7 +72,9 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     m_fontRequester = new KFontRequester(textGroup);
 
     QLabel* textlinesCountLabel = new QLabel(i18nc("@label:textbox", "Number of lines:"), textGroup);
-    m_textlinesCountBox = new QSpinBox(1, 5, 1, textGroup);
+    m_textlinesCountBox = new QSpinBox(textGroup);
+    m_textlinesCountBox->setMinimum(1);
+    m_textlinesCountBox->setMaximum(5);
 
     QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup);
     m_textWidthBox = new QComboBox(textGroup);

diff --git a/src/metadatawidget.cpp b/src/metadatawidget.cpp
index 0ecba4390d2502d285b34ead3ddc309ca92e9d3e..5c510f088f7b450dc9444e4e4078a1314ab58607 100644 (file)
--- a/src/metadatawidget.cpp
+++ b/src/metadatawidget.cpp
@@ -23,6 +23,7 @@
 
 #include <klocale.h>
 
+#include <QtCore/QEvent>
 #include <QtGui/QLabel>
 #include <QtGui/QGridLayout>
 #include <QtGui/QTextEdit>