Add parent directly

src/contactgroupeditordialog.cpp

@@ -87,9 +87,9 @@ ContactGroupEditorDialog::ContactGroupEditorDialog(Mode mode, QWidget *parent)
     , d(new Private(this, mode))
 {
     setWindowTitle(mode == CreateMode ? i18n("New Contact Group") : i18n("Edit Contact Group"));
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-    QVBoxLayout *mainLayout = new QVBoxLayout;
-    setLayout(mainLayout);
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,this);
     d->okButton = buttonBox->button(QDialogButtonBox::Ok);
     d->okButton->setDefault(true);
     d->okButton->setShortcut(Qt::CTRL | Qt::Key_Return);

src/contactgroupviewerdialog.cpp

@@ -43,9 +43,9 @@ ContactGroupViewerDialog::ContactGroupViewerDialog(QWidget *parent)
     , d(new Private)
 {
     setWindowTitle(i18n("Show Contact Group"));
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
-    QVBoxLayout *mainLayout = new QVBoxLayout;
-    setLayout(mainLayout);
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok, this);
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
     okButton->setDefault(true);
     okButton->setShortcut(Qt::CTRL | Qt::Key_Return);

src/contactviewerdialog.cpp

@@ -70,11 +70,10 @@ ContactViewerDialog::ContactViewerDialog(QWidget *parent)
     , d(new Private(this))
 {
     setWindowTitle(i18n("Show Contact"));
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
     QWidget *mainWidget = new QWidget(this);
-    QVBoxLayout *mainLayout = new QVBoxLayout;
-    setLayout(mainLayout);
     mainLayout->addWidget(mainWidget);
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
     okButton->setDefault(true);

src/editor/addresseditor/addresslocationwidget.cpp

@@ -45,8 +45,7 @@ AddressLocationWidget::AddressLocationWidget(QWidget *parent)
       mCurrentAddress(-1),
       mCurrentMode(CreateAddress)
 {
-    QVBoxLayout *topLayout = new QVBoxLayout;
-    setLayout(topLayout);
+    QVBoxLayout *topLayout = new QVBoxLayout(this);
 
     QGridLayout *gridLayout = new QGridLayout;
     topLayout->addLayout(gridLayout);

src/editor/generalinfoeditor/mail/maillistwidget.cpp

@@ -31,10 +31,9 @@ using namespace Akonadi;
 MailListWidget::MailListWidget(QWidget *parent)
     : QWidget(parent)
 {
-    QVBoxLayout *topLayout = new QVBoxLayout;
+    QVBoxLayout *topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
     topLayout->setSpacing(0);
-    setLayout(topLayout);
 
     QLabel *label = new QLabel(i18n("Email"), this);
     label->setObjectName(QStringLiteral("emaillistlabel"));

src/editor/generalinfoeditor/messaging/messaginglistwidget.cpp

@@ -31,10 +31,9 @@ using namespace Akonadi;
 MessagingListWidget::MessagingListWidget(QWidget *parent)
     : QWidget(parent)
 {
-    QVBoxLayout *topLayout = new QVBoxLayout;
+    QVBoxLayout *topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
     topLayout->setSpacing(0);
-    setLayout(topLayout);
 
     QLabel *label = new QLabel(i18n("Messaging"), this);
     label->setObjectName(QStringLiteral("messaginglistlabel"));

src/editor/generalinfoeditor/nameeditdialog.cpp

@@ -36,7 +36,7 @@ NameEditDialog::NameEditDialog(QWidget *parent)
 {
     setWindowTitle(i18n("Edit Contact Name"));
 
-    QVBoxLayout *mainLayout = new QVBoxLayout;
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
     setLayout(mainLayout);
 
     QFormLayout *layout = new QFormLayout;

src/editor/generalinfoeditor/phone/phonelistwidget.cpp

@@ -31,10 +31,9 @@ using namespace Akonadi;
 PhoneListWidget::PhoneListWidget(QWidget *parent)
     : QWidget(parent)
 {
-    QVBoxLayout *topLayout = new QVBoxLayout;
+    QVBoxLayout *topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
     topLayout->setSpacing(0);
-    setLayout(topLayout);
 
     QLabel *label = new QLabel(i18n("Phone"), this);
     label->setObjectName(QStringLiteral("phonelistlabel"));

src/editor/generalinfoeditor/web/weblistwidget.cpp

@@ -32,10 +32,9 @@ using namespace Akonadi;
 WebListWidget::WebListWidget(QWidget *parent)
     : QWidget(parent)
 {
-    QVBoxLayout *topLayout = new QVBoxLayout;
+    QVBoxLayout *topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
     topLayout->setSpacing(0);
-    setLayout(topLayout);
 
     QLabel *label = new QLabel(i18n("Web"), this);
     label->setObjectName(QStringLiteral("weblistlabel"));