Commit 1d24f1df authored by Laurent Montel's avatar Laurent Montel 😁

clean up

parent d5d9d745
......@@ -41,7 +41,7 @@
typedef struct {
QString displayName;
QString fileName;
bool isDeletable;
bool isDeletable = false;
} TemplateInfo;
class TemplatesModel : public QAbstractTableModel
......
......@@ -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);
}
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment