From 82e694b7daa47e7a5333bd8b26ee83e4ad2425a8 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 27 Sep 2011 10:51:08 +0200 Subject: Calm down QWidget::setLayout() warnings --- src/urlbar/bookmarkwidget.cpp | 4 +--- src/urlbar/favoritewidget.cpp | 4 +--- src/urlbar/rsswidget.cpp | 2 -- src/urlbar/sslwidget.cpp | 3 +-- src/urlbar/webshortcutwidget.cpp | 4 +--- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp index 3dfcf508..5beecb4c 100644 --- a/src/urlbar/bookmarkwidget.cpp +++ b/src/urlbar/bookmarkwidget.cpp @@ -59,7 +59,7 @@ BookmarkWidget::BookmarkWidget(const KBookmark &bookmark, QWidget *parent) bookmarkIcon->setPixmap(KIcon("bookmarks").pixmap(32, 32)); // Title - QVBoxLayout *vLayout = new QVBoxLayout(this); + QVBoxLayout *vLayout = new QVBoxLayout; QLabel *bookmarkInfo = new QLabel(this); bookmarkInfo->setText(i18n("Edit this Bookmark")); QFont f = bookmarkInfo->font(); @@ -95,8 +95,6 @@ BookmarkWidget::BookmarkWidget(const KBookmark &bookmark, QWidget *parent) connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); connect(buttonBox, SIGNAL(rejected()), this, SLOT(close())); layout->addWidget(buttonBox); - - setLayout(layout); } diff --git a/src/urlbar/favoritewidget.cpp b/src/urlbar/favoritewidget.cpp index c3370db9..da94410d 100644 --- a/src/urlbar/favoritewidget.cpp +++ b/src/urlbar/favoritewidget.cpp @@ -56,7 +56,7 @@ FavoriteWidget::FavoriteWidget(WebTab *tab, QWidget *parent) setFixedWidth(350); QFormLayout *layout = new QFormLayout(this); - QVBoxLayout *vLay = new QVBoxLayout(this); + QVBoxLayout *vLay = new QVBoxLayout; // Favorite icon QLabel *bookmarkIcon = new QLabel(this); @@ -84,8 +84,6 @@ FavoriteWidget::FavoriteWidget(WebTab *tab, QWidget *parent) connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); connect(buttonBox, SIGNAL(rejected()), this, SLOT(close())); layout->addWidget(buttonBox); - - setLayout(layout); } diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp index 846a11d2..ee5ea29f 100644 --- a/src/urlbar/rsswidget.cpp +++ b/src/urlbar/rsswidget.cpp @@ -104,8 +104,6 @@ RSSWidget::RSSWidget(const QMap< KUrl, QString > &map, QWidget *parent) connect(buttonBox, SIGNAL(rejected()), this, SLOT(close())); layout->addRow(buttonBox); - - setLayout(layout); } diff --git a/src/urlbar/sslwidget.cpp b/src/urlbar/sslwidget.cpp index 1366d5cc..525df7a1 100644 --- a/src/urlbar/sslwidget.cpp +++ b/src/urlbar/sslwidget.cpp @@ -58,6 +58,7 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, QWidget *parent) QStringList firstCertErrorList; if (!certErrorList.isEmpty()) firstCertErrorList = certErrorList.first(); + QGridLayout *layout = new QGridLayout(this); QLabel *label; @@ -220,8 +221,6 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, QWidget *parent) } layout->addWidget(label, rows++, 1); - // ----------------------------------------------------------------------------------- - setLayout(layout); } diff --git a/src/urlbar/webshortcutwidget.cpp b/src/urlbar/webshortcutwidget.cpp index 247c7db8..6fe22fbb 100644 --- a/src/urlbar/webshortcutwidget.cpp +++ b/src/urlbar/webshortcutwidget.cpp @@ -52,7 +52,7 @@ WebShortcutWidget::WebShortcutWidget(QWidget *parent) setFixedWidth(350); QFormLayout *layout = new QFormLayout(this); - QVBoxLayout *vLay = new QVBoxLayout(this); + QVBoxLayout *vLay = new QVBoxLayout; // Web Search Icon QLabel *webSearchIcon = new QLabel(this); @@ -84,8 +84,6 @@ WebShortcutWidget::WebShortcutWidget(QWidget *parent) connect(buttonBox, SIGNAL(rejected()), this, SLOT(close())); layout->addWidget(buttonBox); - setLayout(layout); - m_providers = KServiceTypeTrader::self()->query("SearchProvider"); m_wsLineEdit->setFocus(); -- cgit v1.2.1