Commit 6e963afc authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Clean up

parent 5d8633b4
......@@ -17,7 +17,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
set(PIM_VERSION "5.3.52")
set(PIM_VERSION "5.3.53")
set(KDEPIM_APPS_LIB_VERSION ${PIM_VERSION})
set(QT_REQUIRED_VERSION "5.6.0")
......
......@@ -54,6 +54,7 @@ ecm_generate_headers(KaddressbookImportExport_CamelCase_HEADERS
KAddressBookImportExportContactList
KAddressBookContactSelectionDialog
KAddressBookExportSelectionWidget
KAddressBookContactSelectionWidget
REQUIRED_HEADERS KaddressbookImportExport_HEADERS
PREFIX KAddressBookImportExport
)
......
......@@ -18,8 +18,8 @@
02110-1301, USA.
*/
#ifndef CONTACTEXPORTSELECTIONDIALOG_H
#define CONTACTEXPORTSELECTIONDIALOG_H
#ifndef KADDRESSBOOKIMPORTEXPORTCONTACTEXPORTSELECTIONDIALOG_H
#define KADDRESSBOOKIMPORTEXPORTCONTACTEXPORTSELECTIONDIALOG_H
#include "kaddressbook_importexport_export.h"
#include <KContacts/Addressee>
......
......@@ -23,6 +23,7 @@
#include <KContacts/Addressee>
#include <AkonadiCore/Item>
#include "kaddressbook_importexport_export.h"
#include "KAddressBookImportExport/KAddressBookImportExportContactList"
#include <QWidget>
......@@ -45,7 +46,7 @@ class CollectionComboBox;
*/
namespace KAddressBookImportExport
{
class KAddressBookContactSelectionWidget : public QWidget
class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookContactSelectionWidget : public QWidget
{
Q_OBJECT
......
......@@ -74,16 +74,6 @@ void KAddressBookImportExportPluginInterface::setDefaultCollection(const Akonadi
mDefaultCollection = defaultCollection;
}
KAddressBookImportExport::KAddressBookImportExportContactList KAddressBookImportExportPluginInterface::addressBookImportExportList() const
{
return mAddressBookImportExportList;
}
void KAddressBookImportExportPluginInterface::setAddressBookImportExportList(const KAddressBookImportExport::KAddressBookImportExportContactList &addressBookImportExportList)
{
mAddressBookImportExportList = addressBookImportExportList;
}
QItemSelectionModel *KAddressBookImportExportPluginInterface::itemSelectionModel() const
{
return mItemSelectionModel;
......@@ -93,3 +83,9 @@ void KAddressBookImportExportPluginInterface::setItemSelectionModel(QItemSelecti
{
mItemSelectionModel = itemSelectionModel;
}
bool KAddressBookImportExportPluginInterface::canImportFileType(const QUrl &url)
{
Q_UNUSED(url);
return false;
}
......@@ -24,7 +24,6 @@
#include <PimCommon/AbstractGenericPluginInterface>
#include <QList>
#include <AkonadiCore/Collection>
#include <KAddressBookImportExport/KAddressBookImportExportContactList>
class QItemSelectionModel;
namespace KAddressBookImportExport
{
......@@ -52,16 +51,14 @@ public:
Akonadi::Collection defaultCollection() const;
void setDefaultCollection(const Akonadi::Collection &defaultCollection);
KAddressBookImportExport::KAddressBookImportExportContactList addressBookImportExportList() const;
void setAddressBookImportExportList(const KAddressBookImportExport::KAddressBookImportExportContactList &addressBookImportExportList);
void setSelectionModel(QItemSelectionModel *model);
QItemSelectionModel *itemSelectionModel() const;
void setItemSelectionModel(QItemSelectionModel *itemSelectionModel);
virtual bool canImportFileType(const QUrl &url);
protected:
KAddressBookImportExport::KAddressBookImportExportContactList mAddressBookImportExportList;
QList<QAction *> mImportActions;
QList<QAction *> mExportActions;
ImportExportAction mImportExportAction;
......
Supports Markdown
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