summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-01 12:03:34 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-01 12:03:34 (GMT)
commit8a7fb18b24087ee9a05f08f6a3dbc3ebd93af251 (patch)
treef00e6d29bba3ce174fbfc7f48fdb5d2ebbac3e46
parentcb1c5b8b886d8fc8e258a9ece8bd58e89b73e55e (diff)
Add parent directly
-rw-r--r--kaddressbook/plugins/mergelib/manualmerge/mergecontactsdialog.cpp3
-rw-r--r--kaddressbook/plugins/mergelib/searchduplicate/searchduplicateresultwidget.cpp3
-rw-r--r--kaddressbook/plugins/mergelib/widgets/mergecontactselectinformationwidget.cpp3
-rw-r--r--kaddressbook/plugins/mergelib/widgets/mergecontactselectlistwidget.cpp7
-rw-r--r--plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlconfiguredialog.cpp3
-rw-r--r--plugins/messageviewer/bodypartformatter/calendar/attendeeselector.cpp3
-rw-r--r--plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.cpp5
-rw-r--r--plugins/messageviewerplugins/createeventplugin/eventedit.cpp3
-rw-r--r--plugins/messageviewerplugins/createnoteplugin/noteedit.cpp3
-rw-r--r--plugins/messageviewerplugins/createtodoplugin/todoedit.cpp3
10 files changed, 14 insertions, 22 deletions
diff --git a/kaddressbook/plugins/mergelib/manualmerge/mergecontactsdialog.cpp b/kaddressbook/plugins/mergelib/manualmerge/mergecontactsdialog.cpp
index 90636db..eae5823 100644
--- a/kaddressbook/plugins/mergelib/manualmerge/mergecontactsdialog.cpp
+++ b/kaddressbook/plugins/mergelib/manualmerge/mergecontactsdialog.cpp
@@ -43,8 +43,7 @@ MergeContactsDialog::MergeContactsDialog(QWidget *parent)
setWindowTitle(i18n("Select Contacts to merge"));
mButtonBox = new QDialogButtonBox(QDialogButtonBox::Close);
mButtonBox->setObjectName(QStringLiteral("buttonbox"));
- QVBoxLayout *mainLayout = new QVBoxLayout;
- setLayout(mainLayout);
+ QVBoxLayout *mainLayout = new QVBoxLayout(this);
connect(mButtonBox, &QDialogButtonBox::rejected, this, &MergeContactsDialog::reject);
readConfig();
diff --git a/kaddressbook/plugins/mergelib/searchduplicate/searchduplicateresultwidget.cpp b/kaddressbook/plugins/mergelib/searchduplicate/searchduplicateresultwidget.cpp
index dcd0c57..572452f 100644
--- a/kaddressbook/plugins/mergelib/searchduplicate/searchduplicateresultwidget.cpp
+++ b/kaddressbook/plugins/mergelib/searchduplicate/searchduplicateresultwidget.cpp
@@ -41,9 +41,8 @@ SearchDuplicateResultWidget::SearchDuplicateResultWidget(QWidget *parent)
: QWidget(parent),
mIndexListContact(0)
{
- QVBoxLayout *mainLayout = new QVBoxLayout;
+ QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setMargin(0);
- setLayout(mainLayout);
QSplitter *splitter = new QSplitter;
splitter->setObjectName(QStringLiteral("splitter"));
diff --git a/kaddressbook/plugins/mergelib/widgets/mergecontactselectinformationwidget.cpp b/kaddressbook/plugins/mergelib/widgets/mergecontactselectinformationwidget.cpp
index c3cf6fb..be88ea3 100644
--- a/kaddressbook/plugins/mergelib/widgets/mergecontactselectinformationwidget.cpp
+++ b/kaddressbook/plugins/mergelib/widgets/mergecontactselectinformationwidget.cpp
@@ -25,9 +25,8 @@ using namespace KABMergeContacts;
MergeContactSelectInformationWidget::MergeContactSelectInformationWidget(QWidget *parent)
: QWidget(parent)
{
- QVBoxLayout *mainLayout = new QVBoxLayout;
+ QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setMargin(0);
- setLayout(mainLayout);
}
MergeContactSelectInformationWidget::~MergeContactSelectInformationWidget()
diff --git a/kaddressbook/plugins/mergelib/widgets/mergecontactselectlistwidget.cpp b/kaddressbook/plugins/mergelib/widgets/mergecontactselectlistwidget.cpp
index c94a7df..c7280d6 100644
--- a/kaddressbook/plugins/mergelib/widgets/mergecontactselectlistwidget.cpp
+++ b/kaddressbook/plugins/mergelib/widgets/mergecontactselectlistwidget.cpp
@@ -31,12 +31,11 @@ MergeContactSelectListWidget::MergeContactSelectListWidget(QWidget *parent)
: QWidget(parent),
mConflictType(MergeContacts::None)
{
- QVBoxLayout *vbox = new QVBoxLayout;
- setLayout(vbox);
- mTitle = new QLabel;
+ QVBoxLayout *vbox = new QVBoxLayout(this);
+ mTitle = new QLabel(this);
mTitle->setObjectName(QStringLiteral("title"));
vbox->addWidget(mTitle);
- mSelectListWidget = new QListWidget;
+ mSelectListWidget = new QListWidget(this);
mSelectListWidget->setObjectName(QStringLiteral("listwidget"));
vbox->addWidget(mSelectListWidget);
}
diff --git a/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlconfiguredialog.cpp b/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlconfiguredialog.cpp
index 7f8cb51..4b89e3b 100644
--- a/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlconfiguredialog.cpp
+++ b/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlconfiguredialog.cpp
@@ -31,8 +31,7 @@ ShortUrlConfigureDialog::ShortUrlConfigureDialog(QWidget *parent)
{
setWindowTitle(i18n("Configure engine"));
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults);
- QVBoxLayout *mainLayout = new QVBoxLayout;
- setLayout(mainLayout);
+ QVBoxLayout *mainLayout = new QVBoxLayout(this);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
diff --git a/plugins/messageviewer/bodypartformatter/calendar/attendeeselector.cpp b/plugins/messageviewer/bodypartformatter/calendar/attendeeselector.cpp
index 7447d62..b50d4e2 100644
--- a/plugins/messageviewer/bodypartformatter/calendar/attendeeselector.cpp
+++ b/plugins/messageviewer/bodypartformatter/calendar/attendeeselector.cpp
@@ -33,10 +33,9 @@ AttendeeSelector::AttendeeSelector(QWidget *parent)
: QDialog(parent)
{
setWindowTitle(i18n("Select Attendees"));
+ QVBoxLayout *mainLayout = new QVBoxLayout(this);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
QWidget *mainWidget = new QWidget(this);
- QVBoxLayout *mainLayout = new QVBoxLayout;
- setLayout(mainLayout);
mainLayout->addWidget(mainWidget);
mOkButton = buttonBox->button(QDialogButtonBox::Ok);
mOkButton->setDefault(true);
diff --git a/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.cpp b/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.cpp
index ae12547..4bfd329 100644
--- a/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.cpp
+++ b/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.cpp
@@ -30,7 +30,7 @@ using namespace MessageViewer;
DefaultGrantleeHeaderStyleInterface::DefaultGrantleeHeaderStyleInterface(MessageViewer::HeaderStylePlugin *plugin, QObject *parent)
: MessageViewer::HeaderStyleInterface(plugin, parent)
{
-
+ qDebug()<<" DefaultGrantleeHeaderStyleInterface"<<this;
}
DefaultGrantleeHeaderStyleInterface::~DefaultGrantleeHeaderStyleInterface()
@@ -40,7 +40,7 @@ DefaultGrantleeHeaderStyleInterface::~DefaultGrantleeHeaderStyleInterface()
void DefaultGrantleeHeaderStyleInterface::createAction(KActionMenu *menu, QActionGroup *actionGroup, KActionCollection *ac)
{
-
+ qDebug()<<" void DefaultGrantleeHeaderStyleInterface::createAction(KActionMenu *menu, QActionGroup *actionGroup, KActionCollection *ac)";
const QStringList defaultThemePath = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("messageviewer/defaultthemes/"), QStandardPaths::LocateDirectory);
if (!defaultThemePath.isEmpty()) {
const QString themeName = DefaultGrantleeHeaderStylePluginSettings::self()->themeName();
@@ -63,6 +63,7 @@ void DefaultGrantleeHeaderStyleInterface::activateAction()
void DefaultGrantleeHeaderStyleInterface::slotDefaultGrantleeHeaders()
{
+ qDebug()<<" void DefaultGrantleeHeaderStyleInterface::slotDefaultGrantleeHeaders()************";
mHeaderStylePlugin->headerStyle()->setTheme(mDefaultTheme);
slotStyleChanged();
}
diff --git a/plugins/messageviewerplugins/createeventplugin/eventedit.cpp b/plugins/messageviewerplugins/createeventplugin/eventedit.cpp
index e402380..afed597 100644
--- a/plugins/messageviewerplugins/createeventplugin/eventedit.cpp
+++ b/plugins/messageviewerplugins/createeventplugin/eventedit.cpp
@@ -50,10 +50,9 @@ using namespace MessageViewer;
EventEdit::EventEdit(QWidget *parent)
: QWidget(parent)
{
- QVBoxLayout *vbox = new QVBoxLayout;
+ QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setMargin(5);
vbox->setSpacing(2);
- setLayout(vbox);
QHBoxLayout *hbox = new QHBoxLayout;
hbox->setMargin(0);
diff --git a/plugins/messageviewerplugins/createnoteplugin/noteedit.cpp b/plugins/messageviewerplugins/createnoteplugin/noteedit.cpp
index 8110586..2f9b364 100644
--- a/plugins/messageviewerplugins/createnoteplugin/noteedit.cpp
+++ b/plugins/messageviewerplugins/createnoteplugin/noteedit.cpp
@@ -45,10 +45,9 @@ using namespace MessageViewer;
NoteEdit::NoteEdit(QWidget *parent)
: QWidget(parent)
{
- QVBoxLayout *vbox = new QVBoxLayout;
+ QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setMargin(5);
vbox->setSpacing(2);
- setLayout(vbox);
QHBoxLayout *hbox = new QHBoxLayout;
hbox->setMargin(0);
diff --git a/plugins/messageviewerplugins/createtodoplugin/todoedit.cpp b/plugins/messageviewerplugins/createtodoplugin/todoedit.cpp
index b2fd4f2..af27c7e 100644
--- a/plugins/messageviewerplugins/createtodoplugin/todoedit.cpp
+++ b/plugins/messageviewerplugins/createtodoplugin/todoedit.cpp
@@ -48,10 +48,9 @@ using namespace MessageViewer;
TodoEdit::TodoEdit(QWidget *parent)
: QWidget(parent)
{
- QVBoxLayout *vbox = new QVBoxLayout;
+ QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setMargin(5);
vbox->setSpacing(2);
- setLayout(vbox);
mMsgWidget = new KMessageWidget(this);
mMsgWidget->setCloseButtonVisible(true);