Changed a bunch of QCombobox to KCombobox and other similar classes as

suggested by Krazy.
But I didn't see any improvement in the style or funcionality...

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

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index cecc5f14ee062ad72a040241498ea47777e25324..27774cd33f968460b2571bbaabece5c2f159ce73 100644 (file)
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.cpp
@@ -27,10 +27,10 @@
 
 #include <kdialog.h>
 #include <klocale.h>
+#include <kcombobox.h>
 
 #include <QButtonGroup>
 #include <QCheckBox>
-#include <QComboBox>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QLabel>
@@ -73,7 +73,7 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
     connect(m_fontRequester, SIGNAL(changed()), this, SIGNAL(changed()));
 
     QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup);
-    m_textWidthBox = new QComboBox(textGroup);
+    m_textWidthBox = new KComboBox(textGroup);
     m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Small"));
     m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Medium"));
     m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Large"));

diff --git a/src/columnviewsettingspage.h b/src/columnviewsettingspage.h
index a797a570514a731d29d7c910769022652157dbb2..5e16dc67bc47bfb4f4e83e051380212f4f06f2af 100644 (file)
--- a/src/columnviewsettingspage.h
+++ b/src/columnviewsettingspage.h
@@ -25,7 +25,7 @@
 class DolphinMainWindow;
 class DolphinFontRequester;
 class IconSizeGroupBox;
-class QComboBox;
+class KComboBox;
 
 /**
  * @brief Represents the page from the Dolphin Settings which allows
@@ -55,7 +55,7 @@ private:
 private:
     IconSizeGroupBox* m_iconSizeGroupBox;
     DolphinFontRequester* m_fontRequester;
-    QComboBox* m_textWidthBox;
+    KComboBox* m_textWidthBox;
 };
 
 #endif

diff --git a/src/dolphinfontrequester.cpp b/src/dolphinfontrequester.cpp
index e2cbad0d54a6eee9b5f20b2076712b9e8f2b5d61..2fc444029084abe8e7c7ef9552a3c5d7d7cd16f8 100644 (file)
--- a/src/dolphinfontrequester.cpp
+++ b/src/dolphinfontrequester.cpp
@@ -22,8 +22,8 @@
 #include <kfontdialog.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
+#include <kcombobox.h>
 
-#include <QComboBox>
 #include <QEvent>
 #include <QPushButton>
 
@@ -36,7 +36,7 @@ DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
 {
     setSpacing(KDialog::spacingHint());
 
-    m_modeCombo = new QComboBox(this);
+    m_modeCombo = new KComboBox(this);
     m_modeCombo->addItem(i18nc("@item:inlistbox Font", "System Font"));
     m_modeCombo->addItem(i18nc("@item:inlistbox Font", "Custom Font"));
     connect(m_modeCombo, SIGNAL(activated(int)),

diff --git a/src/dolphinfontrequester.h b/src/dolphinfontrequester.h
index 34d69ad6152f967d438fced44e3d5d31de2a7aa2..03a062b2e6d47195bfb38f9050697e149d5ae8c2 100644 (file)
--- a/src/dolphinfontrequester.h
+++ b/src/dolphinfontrequester.h
@@ -24,7 +24,7 @@
 
 #include <QFont>
 
-class QComboBox;
+class KComboBox;
 class QPushButton;
 
 /**
@@ -69,7 +69,7 @@ private slots:
     void changeMode(int index);
 
 private:
-    QComboBox* m_modeCombo;
+    KComboBox* m_modeCombo;
     QPushButton* m_chooseFontButton;
 
     Mode m_mode;

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 328bdb94b93da2835ce34050f2e8f3cec1c9a7ae..8273234eb4250d69cd319253505c81666059bc7d 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -30,9 +30,9 @@
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
+#include <kcombobox.h>
 
 #include <QCheckBox>
-#include <QComboBox>
 #include <QGroupBox>
 #include <QLabel>
 #include <QListView>
@@ -87,7 +87,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :
     connect(m_textlinesCountBox, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
 
     QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup);
-    m_textWidthBox = new QComboBox(textGroup);
+    m_textWidthBox = new KComboBox(textGroup);
     m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Small"));
     m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Medium"));
     m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Large"));
@@ -107,13 +107,13 @@ IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :
     gridGroup->setSizePolicy(sizePolicy);
 
     QLabel* arrangementLabel = new QLabel(i18nc("@label:listbox", "Arrangement:"), gridGroup);
-    m_arrangementBox = new QComboBox(gridGroup);
+    m_arrangementBox = new KComboBox(gridGroup);
     m_arrangementBox->addItem(i18nc("@item:inlistbox Arrangement", "Columns"));
     m_arrangementBox->addItem(i18nc("@item:inlistbox Arrangement", "Rows"));
     connect(m_arrangementBox, SIGNAL(activated(int)), this, SIGNAL(changed()));
 
     QLabel* gridSpacingLabel = new QLabel(i18nc("@label:listbox", "Grid spacing:"), gridGroup);
-    m_gridSpacingBox = new QComboBox(gridGroup);
+    m_gridSpacingBox = new KComboBox(gridGroup);
     m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "None"));
     m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Small"));
     m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Medium"));

diff --git a/src/iconsviewsettingspage.h b/src/iconsviewsettingspage.h
index a24cc95914cbea1471da1ba079ae50ae4cd45999..75db81e536b28558f2fb20c0d9508d7b013f4116 100644 (file)
--- a/src/iconsviewsettingspage.h
+++ b/src/iconsviewsettingspage.h
@@ -26,7 +26,7 @@
 class DolphinFontRequester;
 class IconSizeGroupBox;
 class QCheckBox;
-class QComboBox;
+class KComboBox;
 class QSpinBox;
 
 /**
@@ -77,12 +77,12 @@ private:
     };
 
     IconSizeGroupBox* m_iconSizeGroupBox;
-    QComboBox* m_textWidthBox;
+    KComboBox* m_textWidthBox;
     DolphinFontRequester* m_fontRequester;
     QSpinBox* m_textlinesCountBox;
 
-    QComboBox* m_arrangementBox;
-    QComboBox* m_gridSpacingBox;
+    KComboBox* m_arrangementBox;
+    KComboBox* m_gridSpacingBox;
 };
 
 #endif

diff --git a/src/kcmdolphin.cpp b/src/kcmdolphin.cpp
index 076144a8bae15b4e2694d327ac00773a0fed50da..f980fa502af4b6be3b45763b7e36532c4cb8ad56 100644 (file)
--- a/src/kcmdolphin.cpp
+++ b/src/kcmdolphin.cpp
@@ -24,6 +24,7 @@
 #include "generalviewsettingspage.h"
 #include "iconsviewsettingspage.h"
 
+#include <ktabwidget.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kpluginfactory.h>
@@ -52,7 +53,7 @@ DolphinConfigModule::DolphinConfigModule(QWidget* parent, const QVariantList& ar
     topLayout->setMargin(0);
     topLayout->setSpacing(KDialog::spacingHint());
 
-    QTabWidget* tabWidget = new QTabWidget(this);
+    KTabWidget* tabWidget = new KTabWidget(this);
 
     // initialize 'General' tab
     GeneralViewSettingsPage* generalPage = new GeneralViewSettingsPage(QDir::homePath(), tabWidget);

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index b71732e5648707bc4647572b865f30115fd09320..9302ba138f1e733fc689c4504cae89d09bdaec6c 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -41,11 +41,11 @@
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
+#include <kcombobox.h>
 
 #include <QAction>
 #include <QButtonGroup>
 #include <QCheckBox>
-#include <QComboBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
@@ -93,7 +93,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     QWidget* propsGrid = new QWidget();
 
     QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsGrid);
-    m_viewMode = new QComboBox(propsGrid);
+    m_viewMode = new KComboBox(propsGrid);
     m_viewMode->addItem(KIcon("view-list-icons"), i18nc("@item:inlistbox", "Icons"));
     m_viewMode->addItem(KIcon("view-list-details"), i18nc("@item:inlistbox", "Details"));
     m_viewMode->addItem(KIcon("view-file-columns"), i18nc("@item:inlistbox", "Column"));
@@ -101,11 +101,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsGrid);
     QWidget* sortingBox = new QWidget(propsGrid);
 
-    m_sortOrder = new QComboBox(sortingBox);
+    m_sortOrder = new KComboBox(sortingBox);
     m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Ascending"));
     m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Descending"));
 
-    m_sorting = new QComboBox(sortingBox);
+    m_sorting = new KComboBox(sortingBox);
     m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Name"));
     m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Size"));
     m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Date"));

diff --git a/src/viewpropertiesdialog.h b/src/viewpropertiesdialog.h
index 6d0be52fc3cafc0c7625621c908112a51fa3df0e..320f8f115129e5f500ba8aa4da8834436c4c885c 100644 (file)
--- a/src/viewpropertiesdialog.h
+++ b/src/viewpropertiesdialog.h
@@ -26,7 +26,7 @@
 #include <kdialog.h>
 
 class QCheckBox;
-class QComboBox;
+class KComboBox;
 class QPushButton;
 class QRadioButton;
 class ViewProperties;
@@ -68,9 +68,9 @@ private:
     DolphinView* m_dolphinView;
     ViewProperties* m_viewProps;
 
-    QComboBox* m_viewMode;
-    QComboBox* m_sortOrder;
-    QComboBox* m_sorting;
+    KComboBox* m_viewMode;
+    KComboBox* m_sortOrder;
+    KComboBox* m_sorting;
     QCheckBox* m_showPreview;
     QCheckBox* m_showInGroups;
     QCheckBox* m_showHiddenFiles;

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 32b893c90fe78b627661955c0ab7a8692ec4d16d..bef05f58f16b6df8c8b360cc9a1050a49a312adf 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -28,13 +28,14 @@
 #include "iconsviewsettingspage.h"
 
 #include <QtGui/QBoxLayout>
-#include <QtGui/QTabWidget>
 #include <QtGui/QLayout>
 #include <QtGui/QLabel>
 
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
+#include <ktabwidget.h>
+
 
 ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
                                    QWidget* parent) :
@@ -45,7 +46,7 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
     topLayout->setMargin(0);
     topLayout->setSpacing(KDialog::spacingHint());
 
-    QTabWidget* tabWidget = new QTabWidget(this);
+    KTabWidget* tabWidget = new KTabWidget(this);
 
     // initialize 'General' tab
     const KUrl& url = mainWindow->activeViewContainer()->url();