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

List:       kde-commits
Subject:    [kdepim-addons] /: Add parent
From:       Montel Laurent <null () kde ! org>
Date:       2017-09-30 15:48:34
Message-ID: E1dyK0I-000506-LD () code ! kde ! org
[Download RAW message or body]

Git commit 57a33e3c48630aa2de712fed753965c487f8c08a by Montel Laurent.
Committed on 30/09/2017 at 15:48.
Pushed by mlaurent into branch 'master'.

Add parent

M  +1    -1    kaddressbook/importexportplugins/csv/import/csvimportdialog.cpp
M  +1    -1    plugins/webengineurlinterceptor/adblock/lib/widgets/adblockaddsubscriptiondialog.cpp


https://commits.kde.org/kdepim-addons/57a33e3c48630aa2de712fed753965c487f8c08a

diff --git a/kaddressbook/importexportplugins/csv/import/csvimportdialog.cpp \
b/kaddressbook/importexportplugins/csv/import/csvimportdialog.cpp index \
                58973768..95167c1c 100644
--- a/kaddressbook/importexportplugins/csv/import/csvimportdialog.cpp
+++ b/kaddressbook/importexportplugins/csv/import/csvimportdialog.cpp
@@ -265,8 +265,8 @@ KContacts::AddresseeList CSVImportDialog::contacts() const
 
 void CSVImportDialog::initGUI()
 {
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel);  QWidget *page = new QWidget(this);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel);  
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->addWidget(page);
diff --git a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockaddsubscriptiondialog.cpp \
b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockaddsubscriptiondialog.cpp
 index 700be9a3..e8108268 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockaddsubscriptiondialog.cpp
                
+++ b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockaddsubscriptiondialog.cpp
 @@ -57,7 +57,7 @@ AdBlockAddSubscriptionDialog::AdBlockAddSubscriptionDialog(const \
QStringList &ex  lay->addWidget(mShowList);
     connect(mShowList, &QToolButton::clicked, this, \
&AdBlockAddSubscriptionDialog::slotShowList);  
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel); +    QDialogButtonBox *buttonBox = new \
                QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, \
                this);
     buttonBox->setObjectName(QStringLiteral("listsubscriptionbuttonBox"));
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
     okButton->setDefault(true);


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