Use a QLinkedList instead of Q3PtrList

[dolphin.git] / src / detailsviewsettingspage.cpp

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index d0025501ede6739c231eab8d7ae4992872c4b1e0..81b9300715f9e8f86a5b7b6f803449fa34acb7c3 100644 (file)
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -15,14 +15,14 @@
  *   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 "detailsviewsettingspage.h"
 #include <qcheckbox.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <kfontcombo.h>
+#include <qfontcombobox.h>
 #include <qspinbox.h>
 #include <qlabel.h>
 #include <q3grid.h>
@@ -32,12 +32,13 @@
 #include <qcombobox.h>
 #include <q3groupbox.h>
 #include <q3groupbox.h>
+#include <kvbox.h>
 #include "dolphinsettings.h"
 #include "detailsmodesettings.h"
 #include "dolphindetailsview.h"
 
 DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget *parent) :
-    Q3VBox(parent),
+    KVBox(parent),
     m_dateBox(0),
     m_permissionsBox(0),
     m_ownerBox(0),
@@ -61,7 +62,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget *parent) :
     columnsGroup->setSizePolicy(sizePolicy);
     columnsGroup->setMargin(margin);
 
-    Q3HBox* visibleColumnsLayout = new Q3HBox(columnsGroup);
+    KHBox* visibleColumnsLayout = new KHBox(columnsGroup);
     m_dateBox = new QCheckBox(i18n("Date"), visibleColumnsLayout);
     m_dateBox->setChecked(settings->showDate());
 
@@ -82,15 +83,15 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget *parent) :
     m_mediumIconSize = new QRadioButton(i18n("Medium"), iconSizeGroup);
     m_largeIconSize  = new QRadioButton(i18n("Large"), iconSizeGroup);
     switch (settings->iconSize()) {
-        case KIcon::SizeLarge:
+        case K3Icon::SizeLarge:
             m_largeIconSize->setChecked(true);
             break;
 
-        case KIcon::SizeMedium:
+        case K3Icon::SizeMedium:
             m_mediumIconSize->setChecked(true);
             break;
 
-        case KIcon::SizeSmall:
+        case K3Icon::SizeSmall:
         default:
             m_smallIconSize->setChecked(true);
     }
@@ -107,7 +108,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget *parent) :
     textGroup->setMargin(margin);
 
     new QLabel(i18n("Font family:"), textGroup);
-    m_fontFamilyBox = new KFontCombo(textGroup);
+    m_fontFamilyBox = new QFontComboBox(textGroup);
     m_fontFamilyBox->setCurrentFont(settings->fontFamily());
 
     new QLabel(i18n("Font size:"), textGroup);
@@ -135,16 +136,16 @@ void DetailsViewSettingsPage::applySettings()
     settings->setShowOwner(m_ownerBox->isChecked());
     settings->setShowGroup(m_groupBox->isChecked());
 
-    int iconSize = KIcon::SizeSmall;
+    int iconSize = K3Icon::SizeSmall;
     if (m_mediumIconSize->isChecked()) {
-        iconSize = KIcon::SizeMedium;
+        iconSize = K3Icon::SizeMedium;
     }
     else if (m_largeIconSize->isChecked()) {
-        iconSize = KIcon::SizeLarge;
+        iconSize = K3Icon::SizeLarge;
     }
     settings->setIconSize(iconSize);
 
-    settings->setFontFamily(m_fontFamilyBox->currentFont());
+    settings->setFontFamily(m_fontFamilyBox->currentFont().family());
     settings->setFontSize(m_fontSizeBox->value());
 }