Merge branch 'master' of https://invent.kde.org/pim/kdepim-runtime into etesync2resource

CMakeLists.txt

@@ -146,7 +146,7 @@ find_package(KF5GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
 option(KDEPIM_RUN_ISOLATED_TESTS "Run the isolated tests." FALSE)
 
 #add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054B00)
+add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054C00)
 find_package(Xsltproc)
 set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
 add_definitions(-DQT_NO_EMIT)

agents/migration/migrationstatuswidget.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "migrationstatuswidget.h"
-#include "migrationscheduler.h"
 #include <QVBoxLayout>
 #include <QTreeView>
 #include <QAction>

agents/newmailnotifier/newmailnotifierselectcollectionwidget.cpp

@@ -14,7 +14,6 @@
 
 #include <ChangeRecorder>
 #include <EntityTreeModel>
-#include <Collection>
 #include <KMime/Message>
 
 #include <KLocalizedString>
@@ -23,7 +22,6 @@
 #include "newmailnotifier_debug.h"
 
 #include <QVBoxLayout>
-#include <QIdentityProxyModel>
 #include <QHBoxLayout>
 #include <QTreeView>
 #include <QLabel>

agents/newmailnotifier/specialnotifierjob.h

@@ -25,7 +25,6 @@ public:
     void setDefaultIconName(const QString &iconName);
 
 Q_SIGNALS:
-    void displayDefaultIconNotification(const QString &message);
     void displayNotification(const QPixmap &pixmap, const QString &message);
     void say(const QString &message);
 

kcms/ldap/kcmldap.desktop

@@ -83,6 +83,7 @@ X-KDE-Keywords[ia]=kaddressbook, configura, preferentias, LDAP
 X-KDE-Keywords[it]=kaddressbook, configurazione, impostazioni, LDAP
 X-KDE-Keywords[ko]=kaddressbook, configure, settings, LDAP, 설정, 주소록
 X-KDE-Keywords[nl]=kaddressbook, configureren, instellingen, LDAP
+X-KDE-Keywords[pl]=kaddressbook, konfiguruj, ustawienia, LDAP
 X-KDE-Keywords[pt]=kaddressbook, configurar, configuração, LDAP
 X-KDE-Keywords[pt_BR]=kaddressbook, configurar, configurações, LDAP
 X-KDE-Keywords[sl]=kaddressbook, configure, settings, LDAP, nastavitve

migration/googlegroupware/googleresourcemigrator.cpp

@@ -9,7 +9,6 @@
 #include "migration_debug.h"
 
 #include <AkonadiCore/AgentManager>
-#include <AkonadiCore/AgentInstance>
 #include <AkonadiCore/ServerManager>
 #include <AkonadiCore/AgentInstanceCreateJob>
 

migration/migratorbase.cpp

@@ -9,7 +9,6 @@
 #include "migration_debug.h"
 #include <KLocalizedString>
 #include <AkonadiCore/servermanager.h>
-#include <QFile>
 #include <QDateTime>
 #include <QStandardPaths>
 #include <QFileInfo>

resources/dav/resource/configdialog.cpp

@@ -17,7 +17,6 @@
 #include <KLocalizedString>
 #include <KMessageBox>
 
-#include <QList>
 #include <QPointer>
 #include <QStringList>
 #include <QStandardItem>

resources/dav/resource/davgroupwareresource.cpp

@@ -55,8 +55,6 @@
 #include <KLocalizedString>
 #include "davresource_debug.h"
 
-#include <QSet>
-
 using namespace Akonadi;
 
 typedef QSharedPointer<KCalendarCore::Incidence> IncidencePtr;

resources/dav/resource/setupwizard.cpp

@@ -21,7 +21,6 @@
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QHBoxLayout>
-#include <QLabel>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QRegularExpressionValidator>

resources/dav/resource/utils.cpp

@@ -12,7 +12,6 @@
 #include <KDAV/ProtocolInfo>
 
 #include <AkonadiCore/Collection>
-#include <AkonadiCore/Item>
 #include <KContacts/Addressee>
 #include <KContacts/VCardConverter>
 #include <KCalendarCore/ICalFormat>

resources/etesync/etesyncresource.desktop

@@ -6,6 +6,7 @@ Name[en_GB]=EteSync Groupware Resource
 Name[es]=Recurso de software colaborativo EteSync
 Name[fr]=Ressource pour logiciels de groupe « EteSync »
 Name[ia]=Ressource de EteSync Groupware
+Name[it]=Risorsa di groupware EteSync
 Name[ko]=EteSync 그룹웨어 자원
 Name[nl]=EteSync-groupware-hulpbron
 Name[pt]=Recurso de 'Groupware' EteSync

resources/etesync/setupwizard.cpp

@@ -11,7 +11,6 @@
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QIcon>
-#include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
 

resources/ews/ewsclient/ewsattendee.cpp

@@ -11,7 +11,6 @@
 
 #include "ewsclient_debug.h"
 #include "ewsmailbox.h"
-#include "ewstypes.h"
 
 class EwsAttendeePrivate : public QSharedData
 {

resources/ews/ewsclient/ewsclient.cpp

@@ -6,8 +6,6 @@
 
 #include "ewsclient.h"
 
-#include <QString>
-
 #include "auth/ewsabstractauth.h"
 #include "ewsclient_debug.h"
 

resources/ews/ewsclient/ewseffectiverights.cpp

@@ -11,7 +11,6 @@
 #include <QXmlStreamReader>
 
 #include "ewsclient_debug.h"
-#include "ewstypes.h"
 
 class EwsEffectiveRightsPrivate : public QSharedData
 {

resources/ews/ewsclient/ewsid.cpp

@@ -6,7 +6,6 @@
 
 #include "ewsid.h"
 
-#include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 #include <QDebug>

resources/ews/ewsclient/ewsoccurrence.cpp

@@ -11,7 +11,6 @@
 
 #include "ewsclient_debug.h"
 #include "ewsid.h"
-#include "ewstypes.h"
 
 class EwsOccurrencePrivate : public QSharedData
 {

resources/ews/ewsclient/ewsrequest.cpp

@@ -8,9 +8,7 @@
 
 #include <QTemporaryFile>
 
-#include "ewsclient.h"
 #include "ewsclient_debug.h"
-#include "ewsserverversion.h"
 #include "auth/ewsabstractauth.h"
 
 EwsRequest::EwsRequest(EwsClient &client, QObject *parent)

resources/ews/ewsclient/ewsxml.cpp

@@ -8,7 +8,6 @@
 
 #include <QDateTime>
 
-#include "ewsclient_debug.h"
 #include "ewsfolder.h"
 #include "ewsid.h"
 #include "ewsitem.h"