diff --git a/CMakeLists.txt b/CMakeLists.txt index f6bf4114..279bd497 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,64 +1,64 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.12.43") +set(PIM_VERSION "5.12.44") project(Akonadi-Contact VERSION ${PIM_VERSION}) # ECM setup set(KF5_MIN_VERSION "5.60.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) include(ECMGenerateHeaders) include(ECMGeneratePriFile) include(ECMSetupVersion) include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMInstallIcons) include(ECMQtDeclareLoggingCategory) set(AKONADI_CONTACTS_VERSION ${PIM_VERSION}) set(KCONTACTS_VERSION "5.12.40") set(KMIMELIB_VERSION "5.12.40") set(AKONADI_VERSION "5.12.40") set(QT_REQUIRED_VERSION "5.11.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test) ########### Find packages ########### find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Service ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Contacts ${KCONTACTS_VERSION} CONFIG REQUIRED) find_package(KF5Mime ${KMIMELIB_VERSION} CONFIG REQUIRED) find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) ########### Targets ########### add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) add_subdirectory(kcm) add_subdirectory(serializers) install( FILES akonadi-contacts.renamecategories akonadi-contacts.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/akonadi-contacts/abstractemailaddressselectiondialog.h b/src/akonadi-contacts/abstractemailaddressselectiondialog.h index 760ace5d..49f751cf 100644 --- a/src/akonadi-contacts/abstractemailaddressselectiondialog.h +++ b/src/akonadi-contacts/abstractemailaddressselectiondialog.h @@ -1,49 +1,51 @@ /* Copyright (C) 2019 Laurent Montel This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef ABSTRACTEMAILADDRESSSELECTIONDIALOG_H #define ABSTRACTEMAILADDRESSSELECTIONDIALOG_H #include "akonadi-contact_export.h" #include "emailaddressselectionwidget.h" #include - +#include namespace Akonadi { class AKONADI_CONTACT_EXPORT AbstractEmailAddressSelectionDialog : public QDialog { Q_OBJECT public: explicit AbstractEmailAddressSelectionDialog(QWidget *parent = nullptr); virtual ~AbstractEmailAddressSelectionDialog(); /** * Returns the list of selected email addresses. */ Q_REQUIRED_RESULT virtual EmailAddressSelection::List selectedAddresses() const = 0; /** * Returns the email address selection view that is used. */ Q_REQUIRED_RESULT virtual EmailAddressSelectionWidget *view() const = 0; +Q_SIGNALS: + void insertAddresses(const KContacts::Addressee::List &list); }; } #endif // ABSTRACTEMAILADDRESSSELECTIONDIALOG_H