Byebye Q3H(V)Box

svn path=/trunk/playground/utils/dolphin/; revision=607111

diff --git a/src/bookmarkssettingspage.cpp b/src/bookmarkssettingspage.cpp
index 8ee77a52cfae5c81489a4bdc53cf29e914dc8f80..0f8ea95a9c73c5b26b6902fb393e6e013e8c5c93 100644 (file)
--- a/src/bookmarkssettingspage.cpp
+++ b/src/bookmarkssettingspage.cpp
@@ -25,7 +25,7 @@
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qlineedit.h>
-#include <q3vbox.h>
+
 //Added by qt3to4:
 #include <QPixmap>
 #include <Q3VBoxLayout>
@@ -37,6 +37,7 @@
 #include <k3listview.h>
 #include <klocale.h>
 #include <kpushbutton.h>
+#include <kvbox.h>
 
 #include "dolphinsettings.h"
 #include "editbookmarkdialog.h"
@@ -52,7 +53,7 @@ BookmarksSettingsPage::BookmarksSettingsPage(QWidget*parent) :
 
     const int spacing = KDialog::spacingHint();
 
-    Q3HBox* hBox = new Q3HBox(parent);
+    KHBox* hBox = new KHBox(parent);
     hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     hBox->setSpacing(spacing);
     hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);
@@ -72,7 +73,7 @@ BookmarksSettingsPage::BookmarksSettingsPage(QWidget*parent) :
     connect(m_listView, SIGNAL(doubleClicked(Q3ListViewItem*, const QPoint&, int)),
             this, SLOT(slotBookmarkDoubleClicked(Q3ListViewItem*, const QPoint&, int)));
 
-    Q3VBox* buttonBox = new Q3VBox(hBox);
+    KVBox* buttonBox = new KVBox(hBox);
     buttonBox->setSpacing(spacing);
 
     const QSizePolicy buttonSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index 486832a521d42fce95a35a3746942bc73f3b82cd..f59ac33021d3eab07a218c289ee08c5e89e622eb 100644 (file)
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -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());
 

diff --git a/src/detailsviewsettingspage.h b/src/detailsviewsettingspage.h
index 177d16f7b61b1e0512b931eedeedb29ee803aa5b..1eaba4242f5095db7ceded60bba002b0d42fce86 100644 (file)
--- a/src/detailsviewsettingspage.h
+++ b/src/detailsviewsettingspage.h
@@ -21,7 +21,8 @@
 #ifndef DETAILSVIEWSETTINGSPAGE_H
 #define DETAILSVIEWSETTINGSPAGE_H
 
-#include <q3vbox.h>
+#include <kvbox.h>
+
 class QCheckBox;
 class QFontComboBox;
 class QSpinBox;
@@ -34,7 +35,7 @@ class QRadioButton;
  *
  *  @author Peter Penz <peter.penz@gmx.at>
  */
-class DetailsViewSettingsPage : public Q3VBox
+class DetailsViewSettingsPage : public KVBox
 {
     Q_OBJECT
 

diff --git a/src/dolphin.h b/src/dolphin.h
index 594a680b3b4399bf37a4c2e53c5c85e656bcd228..c1e481a5de50d24a70ed89816fbcfb295e6edb78 100644 (file)
--- a/src/dolphin.h
+++ b/src/dolphin.h
@@ -34,6 +34,7 @@
 //Added by qt3to4:
 #include <QCloseEvent>
 #include <ksortablelist.h>
+#include <kvbox.h>
 
 #include "dolphinview.h"
 #include "undomanager.h"
@@ -42,7 +43,7 @@ class KPrinter;
 class KUrl;
 class QLineEdit;
 class KFileIconView;
-class Q3HBox;
+class KHBox;
 class Q3IconViewItem;
 class QSplitter;
 class KAction;

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index a5fb66d64d3ec5fe0f6a993d916aac4ab521f6a4..7f5a73feab4a9932a8ad4543daf14e1b89e9784f 100644 (file)
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -23,13 +23,14 @@
 #include <qlabel.h>
 #include <qtimer.h>
 #include <kiconloader.h>
+#include <kvbox.h>
 
 #include "dolphinview.h"
 #include "statusbarmessagelabel.h"
 #include "statusbarspaceinfo.h"
 
 DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
-    Q3HBox(parent),
+    KHBox(parent),
     m_messageLabel(0),
     m_spaceInfo(0),
     m_progressBar(0),

diff --git a/src/dolphinstatusbar.h b/src/dolphinstatusbar.h
index ad7c0d85fdedc857c038c7470a21f7c129eda678..cc0cfdd05c934696810cc94dbcc38f73559e318c 100644 (file)
--- a/src/dolphinstatusbar.h
+++ b/src/dolphinstatusbar.h
@@ -21,9 +21,10 @@
 #ifndef DOLPHINSTATUSBAR_H
 #define DOLPHINSTATUSBAR_H
 
-#include <q3hbox.h>
+
 //Added by qt3to4:
 #include <QLabel>
+#include <khbox.h>
 class QProgressBar;
 class QLabel;
 class QTimer;
@@ -40,7 +41,7 @@ class KUrl;
  *
  * @author Peter Penz
  */
-class DolphinStatusBar : public Q3HBox {
+class DolphinStatusBar : public KHBox {
     Q_OBJECT
 
 public:

diff --git a/src/editbookmarkdialog.cpp b/src/editbookmarkdialog.cpp
index 0689c11dab69abd782d423019789e163f556203b..8e92446e616e0170963400b422bd9595e7fe0d8c 100644 (file)
--- a/src/editbookmarkdialog.cpp
+++ b/src/editbookmarkdialog.cpp
@@ -31,7 +31,8 @@
 #include <kurl.h>
 #include <kfiledialog.h>
 #include <kicondialog.h>
-#include <q3hbox.h>
+#include <kvbox.h>
+
 
 EditBookmarkDialog::~EditBookmarkDialog()
 {
@@ -96,7 +97,7 @@ EditBookmarkDialog::EditBookmarkDialog(const QString& title,
     // create location widgets
     new QLabel(i18n("Location:"), grid);
 
-    Q3HBox* locationBox = new Q3HBox(grid);
+    KHBox* locationBox = new KHBox(grid);
     locationBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     locationBox->setSpacing(spacingHint());
     m_location = new QLineEdit(url.prettyUrl(), locationBox);

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 14ef83bc3649b449d422f4ba9a1ef59598dba9dd..64f37161cd1fbf9a298083c3ff96b1fd6da1100a 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -26,7 +26,7 @@
 #include <kdialog.h>
 #include <qlabel.h>
 #include <qlineedit.h>
-#include <q3vbox.h>
+
 #include <q3grid.h>
 #include <q3groupbox.h>
 #include <klocale.h>
@@ -35,6 +35,7 @@
 #include <qpushbutton.h>
 #include <kfiledialog.h>
 #include <qradiobutton.h>
+#include <kvbox.h>
 
 #include "dolphinsettings.h"
 #include "dolphin.h"
@@ -55,7 +56,7 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
 
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
 
-    Q3VBox* vBox = new Q3VBox(parent);
+    KVBox* vBox = new KVBox(parent);
     vBox->setSizePolicy(sizePolicy);
     vBox->setSpacing(spacing);
     vBox->setMargin(margin);
@@ -66,7 +67,7 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
     homeGroup->setSizePolicy(sizePolicy);
     homeGroup->setMargin(margin);
 
-    Q3HBox* homeUrlBox = new Q3HBox(homeGroup);
+    KHBox* homeUrlBox = new KHBox(homeGroup);
     homeUrlBox->setSizePolicy(sizePolicy);
     homeUrlBox->setSpacing(spacing);
 
@@ -77,7 +78,7 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
     connect(selectHomeUrlButton, SIGNAL(clicked()),
             this, SLOT(selectHomeUrl()));
 
-    Q3HBox* buttonBox = new Q3HBox(homeGroup);
+    KHBox* buttonBox = new KHBox(homeGroup);
     buttonBox->setSizePolicy(sizePolicy);
     buttonBox->setSpacing(spacing);
     QPushButton* useCurrentButton = new QPushButton(i18n("Use current location"), buttonBox);

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 734650ac35a8e2c359c28b6ef3b1ccb24ceae07c..562953dcc5ffa32735ffd9e810b86bdb9c199fd8 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -30,6 +30,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <assert.h>
+#include <kvbox.h>
 
 #include "iconsmodesettings.h"
 #include "dolphinsettings.h"
@@ -40,7 +41,7 @@
 
 IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
                                              QWidget* parent) :
-    Q3VBox(parent),
+    KVBox(parent),
     m_mode(mode),
     m_iconSizeSlider(0),
     m_previewSizeSlider(0),
@@ -61,7 +62,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     assert(settings != 0);
 
-    Q3HBox* sizesLayout = new Q3HBox(this);
+    KHBox* sizesLayout = new KHBox(this);
     sizesLayout->setSpacing(spacing);
     sizesLayout->setSizePolicy(sizePolicy);
 
@@ -72,7 +73,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
 
     const QColor iconBackgroundColor(KGlobalSettings::baseColor());
 
-    Q3HBox* iconSizeVBox = new Q3HBox(iconSizeGroup);
+    KHBox* iconSizeVBox = new KHBox(iconSizeGroup);
     iconSizeVBox->setSpacing(spacing);
     new QLabel(i18n("Small"), iconSizeVBox);
     m_iconSizeSlider = new QSlider(0, 5, 1, 0,  Qt::Horizontal, iconSizeVBox);
@@ -94,7 +95,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
         previewSizeGroup->setSizePolicy(sizePolicy);
         previewSizeGroup->setMargin(margin);
 
-        Q3HBox* previewSizeVBox = new Q3HBox(previewSizeGroup);
+        KHBox* previewSizeVBox = new KHBox(previewSizeGroup);
         previewSizeVBox->setSpacing(spacing);
         new QLabel(i18n("Small"), previewSizeVBox);
         m_previewSizeSlider = new QSlider(0, 5, 1, 0,  Qt::Horizontal, previewSizeVBox);

diff --git a/src/iconsviewsettingspage.h b/src/iconsviewsettingspage.h
index 0ed22a6e1b162fa6cbf89ddff8ff8be5713db01e..bd539057abec11cf9b63b8046a4e734f04bb701c 100644 (file)
--- a/src/iconsviewsettingspage.h
+++ b/src/iconsviewsettingspage.h
@@ -21,8 +21,9 @@
 #ifndef ICONSVIEWSETTINGSPAGE_H
 #define ICONSVIEWSETTINGSPAGE_H
 
-#include <q3vbox.h>
+
 #include <dolphiniconsview.h>
+#include <kvbox.h>
 
 class QSlider;
 class QComboBox;
@@ -49,7 +50,7 @@ class PixmapViewer;
  * @see DolphinIconsViewSettings
  *  @author Peter Penz <peter.penz@gmx.at>
  */
-class IconsViewSettingsPage : public Q3VBox
+class IconsViewSettingsPage : public KVBox
 {
     Q_OBJECT
 

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index cf68e1ce75275a550ced09ff3bd1223bf49a0097..017fcb9f6bc4094c3951a94d02849ddf8d54fbbc 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -25,7 +25,7 @@
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qpushbutton.h>
-#include <q3vbox.h>
+
 #include <q3vgroupbox.h>
 #include <q3popupmenu.h>
 #include <qpainter.h>
@@ -45,6 +45,7 @@
 #include <kdialog.h>
 #include <kglobalsettings.h>
 #include <kfilemetainfo.h>
+#include <kvbox.h>
 
 #include "dolphin.h"
 #include "pixmapviewer.h"
@@ -94,7 +95,7 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
     sep2->setFixedHeight(1);
 
     // actions
-    m_actionBox = new Q3VBox(this);
+    m_actionBox = new KVBox(this);
     m_actionBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 
     // Add a dummy widget with no restriction regarding a vertical resizing.

diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h
index e5535738815e38fc3e423707b3593dc3ac7e24da..8f2efcc7389631854693bef5da4bf7c56c64c8d7 100644 (file)
--- a/src/infosidebarpage.h
+++ b/src/infosidebarpage.h
@@ -33,6 +33,7 @@
 #include <kurl.h>
 #include <kmimetype.h>
 #include <kdedesktopmimetype.h>
+#include <kvbox.h>
 
 namespace KIO {
     class Job;
@@ -44,7 +45,7 @@ class QString;
 class QPainter;
 class KFileItem;
 class QLabel;
-class Q3VBox;
+class KVBox;
 class Q3Grid;
 class PixmapViewer;
 
@@ -161,7 +162,7 @@ private:
     Q3Grid* m_infoGrid;
     Q3PtrList<QLabel> m_infoWidgets;       // TODO: use children() from QObject instead
 
-    Q3VBox* m_actionBox;
+    KVBox* m_actionBox;
     Q3PtrList<QWidget> m_actionWidgets;    // TODO: use children() from QObject instead
     Q3ValueVector<KDEDesktopMimeType::Service> m_actionsVector;
 };

diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp
index 0b6beebf7a2ea5f23d599753c4f614f1577c4efe..f81a202184383bcd4a43aca199ef61ac27f71913 100644 (file)
--- a/src/urlnavigator.cpp
+++ b/src/urlnavigator.cpp
@@ -48,6 +48,7 @@
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kbookmarkmanager.h>
+#include <kvbox.h>
 
 #include "bookmarkselector.h"
 #include "dolphin.h"
@@ -80,7 +81,7 @@ UrlNavigator::HistoryElem::~HistoryElem()
 
 UrlNavigator::UrlNavigator(const KUrl& url,
                            DolphinView* dolphinView) :
-    Q3HBox(dolphinView),
+    KHBox(dolphinView),
     m_historyIndex(0),
     m_dolphinView(dolphinView),
     m_protocols(0),
@@ -279,7 +280,7 @@ DolphinView* UrlNavigator::dolphinView() const
 
 void UrlNavigator::keyReleaseEvent(QKeyEvent* event)
 {
-    Q3HBox::keyReleaseEvent(event);
+    KHBox::keyReleaseEvent(event);
     if (isUrlEditable() && (event->key() == Qt::Key_Escape)) {
         setUrlEditable(false);
     }

diff --git a/src/urlnavigator.h b/src/urlnavigator.h
index c23ead297d27103eb7a7429427982fa9276d68f4..0b25e136dd07ff0273624845cb55f5ccd59eea23 100644 (file)
--- a/src/urlnavigator.h
+++ b/src/urlnavigator.h
@@ -21,7 +21,7 @@
 #ifndef UrlNAVIGATOR_H
 #define UrlNAVIGATOR_H
 
-#include <q3hbox.h>
+
 //Added by qt3to4:
 #include <QLabel>
 #include <Q3ValueList>
@@ -29,6 +29,7 @@
 #include <Q3PopupMenu>
 #include <kurl.h>
 #include <qstring.h>
+#include <kvbox.h>
 
 class QComboBox;
 class QLabel;
@@ -66,7 +67,7 @@ class ProtocolCombo;
 
 typedef Q3ValueList<KUrl> UrlStack;
 
-class UrlNavigator : public Q3HBox
+class UrlNavigator : public KHBox
 {
     Q_OBJECT