summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-11 05:07:31 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-11 05:07:31 (GMT)
commitcf4948cb94873e225dbf6f297197120678315939 (patch)
tree8b968f8ac14819183bea3739436ee7aea71f1835
parented27421a96327e7aa2e9825d4df23d84c2eda748 (diff)
Reactivate code
-rw-r--r--kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp16
-rw-r--r--kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h7
2 files changed, 11 insertions, 12 deletions
diff --git a/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp b/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp
index 6881d33..0278a8b 100644
--- a/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp
+++ b/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp
@@ -29,8 +29,8 @@ using namespace KAddressBookImportExport;
KAddressBookContactSelectionDialog::KAddressBookContactSelectionDialog(QItemSelectionModel *selectionModel, bool allowToSelectTypeToExport,
QWidget *parent)
- : QDialog(parent)//,
- //mVCardExport(Q_NULLPTR)
+ : QDialog(parent),
+ mVCardExport(Q_NULLPTR)
{
setWindowTitle(i18n("Select Contacts"));
@@ -39,10 +39,8 @@ KAddressBookContactSelectionDialog::KAddressBookContactSelectionDialog(QItemSele
mSelectionWidget = new KAddressBookContactSelectionWidget(selectionModel, this);
if (allowToSelectTypeToExport) {
mainLayout->addWidget(mSelectionWidget);
-#if 0
- mVCardExport = new VCardExportSelectionWidget(this);
+ mVCardExport = new KAddressBookExportSelectionWidget(this);
mainLayout->addWidget(mVCardExport);
-#endif
} else {
mainLayout->addWidget(mSelectionWidget);
}
@@ -75,16 +73,16 @@ KAddressBookImportExport::KAddressBookImportExportContactList KAddressBookContac
{
return mSelectionWidget->selectedContacts();
}
-#if 0
-VCardExportSelectionWidget::ExportFields KAddressBookContactSelectionDialog::exportType() const
+
+
+KAddressBookExportSelectionWidget::ExportFields KAddressBookContactSelectionDialog::exportType() const
{
if (mVCardExport) {
return mVCardExport->exportType();
} else {
- return VCardExportSelectionWidget::None;
+ return KAddressBookExportSelectionWidget::None;
}
}
-#endif
void KAddressBookContactSelectionDialog::setAddGroupContact(bool addGroupContact)
{
diff --git a/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h b/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h
index eca3e26..478acb9 100644
--- a/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h
+++ b/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h
@@ -25,7 +25,7 @@
#include <KContacts/Addressee>
#include <QDialog>
#include <KAddressBookImportExport/KAddressBookImportExportContactList>
-//#include <xxport/vcard/vcardexportselectionwidget.h>
+#include <KAddressBookImportExport/KAddressBookExportSelectionWidget>
#include <AkonadiCore/Item>
class QItemSelectionModel;
class KAddressBookContactSelectionWidget;
@@ -41,6 +41,7 @@ class Collection;
*/
namespace KAddressBookImportExport
{
+class KAddressBookExportSelectionWidget;
class KAddressBookContactSelectionWidget;
class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookContactSelectionDialog : public QDialog
{
@@ -70,13 +71,13 @@ public:
*/
KAddressBookImportExport::KAddressBookImportExportContactList selectedContacts() const;
- //VCardExportSelectionWidget::ExportFields exportType() const;
+ KAddressBookExportSelectionWidget::ExportFields exportType() const;
void setAddGroupContact(bool addGroupContact);
Akonadi::Item::List selectedItems() const;
private:
KAddressBookContactSelectionWidget *mSelectionWidget;
- //VCardExportSelectionWidget *mVCardExport;
+ KAddressBookExportSelectionWidget *mVCardExport;
};
}
#endif