Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / columnviewsettingspage.cpp

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index e53a4c61af2cd6a7715dfdd42e80be2494bb4c10..57d246fa25815816f379880ae90f9cc847875a3e 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->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);
     QLabel* largeLabel = new QLabel(i18nc("@item:inrange Column Width", "Large"), columnWidthBox);
 
     QHBoxLayout* columnWidthLayout = new QHBoxLayout(columnWidthBox);


@@ -114,11 +114,11 @@ void ColumnViewSettingsPage::applySettings()
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 

-    int iconSize = K3Icon::SizeSmall;
+    int iconSize = KIconLoader::SizeSmall;

     if (m_mediumIconSize->isChecked()) {
     if (m_mediumIconSize->isChecked()) {

-        iconSize = K3Icon::SizeMedium;
+        iconSize = KIconLoader::SizeMedium;

     } else if (m_largeIconSize->isChecked()) {
     } else if (m_largeIconSize->isChecked()) {

-        iconSize = K3Icon::SizeLarge;
+        iconSize = KIconLoader::SizeLarge;

     }
     settings->setIconSize(iconSize);
 
     }
     settings->setIconSize(iconSize);
 


@@ -144,15 +144,15 @@ void ColumnViewSettingsPage::loadSettings()
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 
     switch (settings->iconSize()) {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 
     switch (settings->iconSize()) {

-    case K3Icon::SizeLarge:
+    case KIconLoader::SizeLarge:

         m_largeIconSize->setChecked(true);
         break;
 
         m_largeIconSize->setChecked(true);
         break;
 

-    case K3Icon::SizeMedium:
+    case KIconLoader::SizeMedium:

         m_mediumIconSize->setChecked(true);
         break;
 
         m_mediumIconSize->setChecked(true);
         break;
 

-    case K3Icon::SizeSmall:
+    case KIconLoader::SizeSmall:

     default:
         m_smallIconSize->setChecked(true);
     }
     default:
         m_smallIconSize->setChecked(true);
     }