[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] kdeui/dialogs: port away from KVBox to QVBoxLayout
From:       Dominik Haumann <dhaumann () kde ! org>
Date:       2012-07-10 21:22:29
Message-ID: 20120710212229.5926AA60C6 () git ! kde ! org
[Download RAW message or body]

Git commit 0ff7053688013dbdb66c3230c047ad1f2c5ff239 by Dominik Haumann.
Committed on 10/07/2012 at 22:59.
Pushed by dhaumann into branch 'frameworks'.

port away from KVBox to QVBoxLayout

M  +4    -4    kdeui/dialogs/kconfigdialog.cpp
M  +10   -6    kdeui/dialogs/kpixmapregionselectordialog.cpp

http://commits.kde.org/kdelibs/0ff7053688013dbdb66c3230c047ad1f2c5ff239

diff --git a/kdeui/dialogs/kconfigdialog.cpp b/kdeui/dialogs/kconfigdialog.cpp
index 5ded429..72ddb4e 100644
--- a/kdeui/dialogs/kconfigdialog.cpp
+++ b/kdeui/dialogs/kconfigdialog.cpp
@@ -28,7 +28,6 @@
 #include <kiconloader.h>
 #include <klocalizedstring.h>
 #include <kpagewidgetmodel.h>
-#include <kvbox.h>
 
 #include <QIcon>
 #include <QLayout>
@@ -158,10 +157,11 @@ KPageWidgetItem* \
KConfigDialog::KConfigDialogPrivate::addPageInternal(QWidget *p  const QString \
&pixmapName,  const QString &header)
 {
-  KVBox *frame = new KVBox(q);
-  frame->setSpacing(-1);
-  page->setParent(frame);
+  QWidget *frame = new QWidget(q);
+  QVBoxLayout *boxLayout = new QVBoxLayout(frame);
+  boxLayout->setMargin(0);
 
+  boxLayout->addWidget(page);
   KPageWidgetItem *item = new KPageWidgetItem( frame, itemName );
   item->setHeader( header );
   if ( !pixmapName.isEmpty() )
diff --git a/kdeui/dialogs/kpixmapregionselectordialog.cpp \
b/kdeui/dialogs/kpixmapregionselectordialog.cpp index 2880882..d3b7765 100644
--- a/kdeui/dialogs/kpixmapregionselectordialog.cpp
+++ b/kdeui/dialogs/kpixmapregionselectordialog.cpp
@@ -23,11 +23,11 @@
 #include <QDesktopWidget>
 #include <QImage>
 #include <QLabel>
+#include <QVBoxLayout>
 
 #include <klocalizedstring.h>
 #include <kdialog.h>
 #include <kpixmapregionselectorwidget.h>
-#include <kvbox.h>
 
 class KPixmapRegionSelectorDialog::Private
 {
@@ -64,13 +64,17 @@ KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog( QWidget \
*parent )  setCaption( i18n("Select Region of Image") );
   setButtons( Help|Ok|Cancel );
 
-  KVBox *vbox=new KVBox(this);
-  new QLabel(i18n("Please click and drag on the image to select the region of \
                interest:"), vbox);
-  d->pixmapSelectorWidget= new KPixmapRegionSelectorWidget(vbox);
+  QWidget *content = new QWidget(this);
+  QVBoxLayout * boxLayout = new QVBoxLayout(content);
+  boxLayout->setMargin(0);
 
-  vbox->setSpacing( -1 );
+  QLabel *label = new QLabel(i18n("Please click and drag on the image to select the \
region of interest:"), content); +  d->pixmapSelectorWidget = new \
KPixmapRegionSelectorWidget(content);  
-  setMainWidget(vbox);
+  boxLayout->addWidget(label);
+  boxLayout->addWidget(d->pixmapSelectorWidget);
+
+  setMainWidget(content);
 
   d->init();
 }


[prev in list] [next in list] [prev in thread] [next in thread]