Ported to KBookmarkManager::closestBookmark - which even solves another TODO about...

[dolphin.git] / src / viewsettingspage.cpp

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 859f479a8a8daf16bcb8055e7c2d9cebb17067e6..5cf3c2b36705812110cfa3aaa8dc89478f5a1933 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
 #include "viewsettingspage.h"
@@ -23,7 +23,7 @@
 #include "iconsviewsettingspage.h"
 #include "detailsviewsettingspage.h"
 
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 #include <QTabWidget>
 #include <QLayout>
 #include <QLabel>
@@ -39,21 +39,23 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
     m_iconsPage(0),
     m_detailsPage(0)
 {
-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(this, 0, KDialog::spacingHint());
+    QVBoxLayout* topLayout = new QVBoxLayout(this);
+    topLayout->setMargin(0);
+    topLayout->setSpacing(KDialog::spacingHint());
 
     QTabWidget* tabWidget = new QTabWidget(this);
 
     // initialize 'General' tab
     m_generalPage = new GeneralViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_generalPage, SmallIcon("view_choose"), i18n("General"));
+    tabWidget->addTab(m_generalPage, SmallIcon("view-choose"), i18n("General"));
 
     // initialize 'Icons' tab
     m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_iconsPage, SmallIcon("view_icon"), i18n("Icons"));
+    tabWidget->addTab(m_iconsPage, SmallIcon("view-icon"), i18n("Icons"));
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);
-    tabWidget->addTab(m_detailsPage, SmallIcon("view_text"), i18n("Details"));
+    tabWidget->addTab(m_detailsPage, SmallIcon("fileview-text"), i18n("Details"));
 
     topLayout->addWidget(tabWidget, 0, 0 );
 }