summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-12-13 22:01:23 +0100
committerMontel Laurent <[email protected]>2017-12-13 22:01:23 +0100
commit1d24f1dff8c082d036282a697eb3c94afa94c8e2 (patch)
tree45f228f45c8dd0638f88a45b0aa20e39607f337d
parentd5d9d7458d906f13023617e0e2a6ecb0083ea738 (diff)
clean up
-rw-r--r--kaddressbook/importexportplugins/csv/import/templateselectiondialog.cpp2
-rw-r--r--kaddressbook/plugins/mergelib/manualmerge/mergecontactwidget.cpp8
-rw-r--r--kaddressbook/plugins/mergelib/manualmerge/mergecontactwidget.h1
3 files changed, 1 insertions, 10 deletions
diff --git a/kaddressbook/importexportplugins/csv/import/templateselectiondialog.cpp b/kaddressbook/importexportplugins/csv/import/templateselectiondialog.cpp
index 1aced53..e8c9953 100644
--- a/kaddressbook/importexportplugins/csv/import/templateselectiondialog.cpp
+++ b/kaddressbook/importexportplugins/csv/import/templateselectiondialog.cpp
@@ -41,7 +41,7 @@
typedef struct {
QString displayName;
QString fileName;
- bool isDeletable;
+ bool isDeletable = false;
} TemplateInfo;
class TemplatesModel : public QAbstractTableModel
diff --git a/kaddressbook/plugins/mergelib/manualmerge/mergecontactwidget.cpp b/kaddressbook/plugins/mergelib/manualmerge/mergecontactwidget.cpp
index b809add..375c263 100644
--- a/kaddressbook/plugins/mergelib/manualmerge/mergecontactwidget.cpp
+++ b/kaddressbook/plugins/mergelib/manualmerge/mergecontactwidget.cpp
@@ -91,13 +91,10 @@ MergeContactWidget::MergeContactWidget(QWidget *parent)
lay->addLayout(hbox);
- hbox = new QHBoxLayout;
- hbox->addStretch();
mMergeButton = new QPushButton(i18n("merge"));
mMergeButton->setObjectName(QStringLiteral("mergebutton"));
hbox->addWidget(mMergeButton);
mMergeButton->setEnabled(false);
- lay->addLayout(hbox);
connect(mMergeButton, &QPushButton::clicked, this, &MergeContactWidget::slotMergeContacts);
}
@@ -109,11 +106,6 @@ MergeContactWidget::~MergeContactWidget()
void MergeContactWidget::setContacts(const Akonadi::Item::List &items)
{
mItems = items;
- fillListContact();
-}
-
-void MergeContactWidget::fillListContact()
-{
mListWidget->fillListContact(mItems);
}
diff --git a/kaddressbook/plugins/mergelib/manualmerge/mergecontactwidget.h b/kaddressbook/plugins/mergelib/manualmerge/mergecontactwidget.h
index 9edf51f..9131c07 100644
--- a/kaddressbook/plugins/mergelib/manualmerge/mergecontactwidget.h
+++ b/kaddressbook/plugins/mergelib/manualmerge/mergecontactwidget.h
@@ -54,7 +54,6 @@ private:
void slotMergeDone(const Akonadi::Item &item);
Akonadi::Item::List listSelectedContacts() const;
Akonadi::Item currentItem() const;
- void fillListContact();
MergeContacts::ConflictInformations mConflictTypes;
Akonadi::Item::List mSelectedItems;
Akonadi::Item::List mItems;