Somehow reviewboard is complaining on me
The file 'kde3support/kdeui/k3listviewsearchline.cpp' (rb884bdb) could not be
found in the repository
What?
So I'm sending the patch here for review, sorry if this is suboptimal.
Cheers,
Albert
commit b7b6ebc2daf5899287d18e3c92fb243c950023c4
Author: Albert Astals Cid <tsdg...@terra.es>
Date: Fri Jul 13 00:47:06 2012 +0200
Cleanup KVBox
diff --git a/kde3support/kdeui/k3listviewsearchline.cpp b/kde3support/kdeui/k3listviewsearchline.cpp
index b884bdb..029d4c8 100644
--- a/kde3support/kdeui/k3listviewsearchline.cpp
+++ b/kde3support/kdeui/k3listviewsearchline.cpp
@@ -468,8 +468,6 @@ void K3ListViewSearchLine::checkItemParentsNotVisible(K3ListView *listView)
}
}
-#include <kvbox.h>
-
/** Check whether \p item, its siblings and their descendents should be shown. Show or hide the items as necessary.
*
* \p item The list view item to start showing / hiding items at. Typically, this is the first child of another item, or the
diff --git a/kde3support/tests/k3listviewtest.cpp b/kde3support/tests/k3listviewtest.cpp
index cc69c3a..376ff38 100644
--- a/kde3support/tests/k3listviewtest.cpp
+++ b/kde3support/tests/k3listviewtest.cpp
@@ -3,7 +3,6 @@
#include <kconfig.h>
#include <kdialog.h>
#include <kglobal.h>
-#include <kvbox.h>
#include "k3listview.h"
diff --git a/kfile/kfileplaceeditdialog.cpp b/kfile/kfileplaceeditdialog.cpp
index 156f457..a5384ca 100644
--- a/kfile/kfileplaceeditdialog.cpp
+++ b/kfile/kfileplaceeditdialog.cpp
@@ -46,7 +46,6 @@
#include <QStyle>
#include <unistd.h>
-#include <kvbox.h>
#include <kconfiggroup.h>
diff --git a/kio/kfile/kfilesharedialog.cpp b/kio/kfile/kfilesharedialog.cpp
index 71f6a7c..4db2dcc 100644
--- a/kio/kfile/kfilesharedialog.cpp
+++ b/kio/kfile/kfilesharedialog.cpp
@@ -19,7 +19,6 @@
#include "kfilesharedialog.h"
#include "kfsprocess.h"
-#include <kvbox.h>
#include <QLabel>
#include <QtCore/QDir>
#include <QRadioButton>
@@ -36,7 +35,7 @@
class KFileSharePropsPlugin::Private
{
public:
- KVBox *m_vBox;
+ QFrame *m_vBox;
KfsProcess *m_configProc;
bool m_bAllShared;
bool m_bAllUnshared;
@@ -49,7 +48,11 @@ public:
KFileSharePropsPlugin::KFileSharePropsPlugin( KPropertiesDialog *_props )
: KPropertiesDialogPlugin( _props ),d(new Private)
{
- d->m_vBox = new KVBox();
+ d->m_vBox = new QFrame();
+ QVBoxLayout* layout = new QVBoxLayout( d->m_vBox );
+ layout->setSpacing( 0 );
+ layout->setMargin( 0 );
+
_props->addPage( d->m_vBox, i18n("&Share") );
d->m_configProc = 0;
@@ -95,6 +98,7 @@ void KFileSharePropsPlugin::init()
d->m_rbShare = 0L;
d->m_rbUnShare = 0L;
d->m_widget = new QWidget( d->m_vBox );
+ d->m_vBox->layout()->addWidget( d->m_widget );
QVBoxLayout * vbox = new QVBoxLayout( d->m_widget );
switch ( KFileShare::authorization() ) {
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index ecbdae8..c7f1fb5 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -117,7 +117,6 @@ extern "C" {
#include <kmetaprops.h>
#include <kpreviewprops.h>
#include <krun.h>
-#include <kvbox.h>
#include <kacl.h>
#include <kconfiggroup.h>
#include <kshell.h>
@@ -957,8 +956,11 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
l = new QLabel(i18n("Type:"), d->m_frame );
grid->addWidget(l, curRow, 0, Qt::AlignRight | Qt::AlignTop);
- KVBox *box = new KVBox(d->m_frame);
- box->setSpacing(2); // without that spacing the button literally “sticks” to the label ;)
+ QFrame *box = new QFrame(d->m_frame);
+ QVBoxLayout* boxLayout = new QVBoxLayout(box);
+ boxLayout->setSpacing(2); // without that spacing the button literally “sticks” to the label ;)
+ boxLayout->setMargin(0);
+
l = new QLabel(mimeComment, box );
grid->addWidget(box, curRow++, 2);
@@ -966,6 +968,9 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); // Minimum still makes the button grow to the entire layout width
button->setIcon( KDE::icon(QString::fromLatin1("configure")) );
+ boxLayout->addWidget(l);
+ boxLayout->addWidget(button);
+
if (d->mimeType == QLatin1String("application/octet-stream"))
button->setText(i18n("Create New File Type"));
else
diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp b/kioslave/http/kcookiejar/kcookiewin.cpp
index 4e09500..92a9eb6 100644
--- a/kioslave/http/kcookiejar/kcookiewin.cpp
+++ b/kioslave/http/kcookiejar/kcookiewin.cpp
@@ -51,7 +51,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klineedit.h>
#include <kiconloader.h>
#include <kapplication.h>
-#include <kvbox.h>
#include <kdatetime.h>
KCookieWin::KCookieWin( QWidget *parent, KHttpCookieList cookieList,
@@ -82,11 +81,15 @@ KCookieWin::KCookieWin( QWidget *parent, KHttpCookieList cookieList,
kapp->updateUserTimestamp();
}
#endif
- KVBox* vBox1 = new KVBox( this );
- vBox1->setSpacing( -1 );
+ QFrame* vBox1 = new QFrame( this );
+ QVBoxLayout* vBox1Layout = new QVBoxLayout( vBox1 );
+ vBox1Layout->setSpacing( -1 );
+ vBox1Layout->setMargin( 0 );
+
setMainWidget(vBox1);
// Cookie image and message to user
QFrame* hBox = new QFrame( vBox1 );
+ vBox1Layout->addWidget( hBox );
QHBoxLayout* hBoxLayout = new QHBoxLayout( hBox );
hBoxLayout->setSpacing( 0 );
hBoxLayout->setMargin( 0 );
@@ -98,11 +101,15 @@ KCookieWin::KCookieWin( QWidget *parent, KHttpCookieList cookieList,
int count = cookieList.count();
- KVBox* vBox = new KVBox( hBox );
+ QFrame* vBox = new QFrame( hBox );
+ QVBoxLayout* vBoxLayout = new QVBoxLayout( vBox );
+ vBoxLayout->setSpacing( 0 );
+ vBoxLayout->setMargin( 0 );
hBoxLayout->addWidget( vBox );
QString txt = i18np("You received a cookie from",
"You received %1 cookies from", count);
QLabel* lbl = new QLabel( txt, vBox );
+ vBoxLayout->addWidget( lbl );
lbl->setAlignment( Qt::AlignCenter );
const KHttpCookie& cookie = cookieList.first();
@@ -120,16 +127,20 @@ KCookieWin::KCookieWin( QWidget *parent, KHttpCookieList cookieList,
if (cookie.isCrossDomain())
txt += i18n(" <b>[Cross Domain]</b>");
lbl = new QLabel( txt, vBox );
+ vBoxLayout->addWidget( lbl );
lbl->setAlignment( Qt::AlignCenter );
lbl = new QLabel( i18n("Do you want to accept or reject?"), vBox );
+ vBoxLayout->addWidget( lbl );
lbl->setAlignment( Qt::AlignCenter );
// Cookie Details dialog...
m_detailView = new KCookieDetail( cookieList, count, vBox1 );
+ vBox1Layout->addWidget(m_detailView);
setDetailsWidget(m_detailView);
// Cookie policy choice...
QGroupBox *m_btnGrp = new QGroupBox(i18n("Apply Choice To"),vBox1);
+ vBox1Layout->addWidget(m_btnGrp);
QVBoxLayout *vbox = new QVBoxLayout;
txt = (count == 1)? i18n("&Only this cookie") : i18n("&Only these cookies");
m_onlyCookies = new QRadioButton( txt, m_btnGrp );
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp
index 462a9c9..22c7faf 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/kutils/kcmoduleproxy.cpp
@@ -45,8 +45,6 @@
#include <kuser.h>
-#include <kvbox.h>
-
#include <kcmoduleloader.h>
#include "kcolorscheme.h"
diff --git a/kutils/ksettings/dialog_p.h b/kutils/ksettings/dialog_p.h
index f0c9563..2c7d016 100644
--- a/kutils/ksettings/dialog_p.h
+++ b/kutils/ksettings/dialog_p.h
@@ -34,7 +34,6 @@
#include <kpagewidgetmodel.h>
#include <kservice.h>
#include <kplugininfo.h>
-#include <kvbox.h>
class QCheckBox;
diff --git a/security/crypto/crypto.cpp b/security/crypto/crypto.cpp
index b63f278..a42866f 100644
--- a/security/crypto/crypto.cpp
+++ b/security/crypto/crypto.cpp
@@ -68,7 +68,6 @@
#include <ktextbrowser.h>
#include <kurllabel.h>
#include <kurlrequester.h>
-#include <kvbox.h>
#include <ksslconfig.h>
#ifdef KSSL_HAVE_SSL
_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
