From e9f8c013a897765c3d6317f8e6bba905b1d6ee88 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Mon, 29 Aug 2016 14:33:12 +0200 Subject: [PATCH] Make it compiles when deprecated method are disabled. Add more find package --- akregator/CMakeLists.txt | 4 ++++ akregator/src/articlelistview.cpp | 6 +++--- akregator/src/articlemodel.cpp | 3 ++- akregator/src/mainwidget.cpp | 1 + importwizard/CMakeLists.txt | 1 + kontact/CMakeLists.txt | 2 ++ kontact/src/iconsidepane.cpp | 3 ++- mboximporter/CMakeLists.txt | 1 + sieveeditor/CMakeLists.txt | 4 ++++ sieveeditor/src/sieveeditorutil.cpp | 6 ++++-- storageservicemanager/CMakeLists.txt | 2 ++ 11 files changed, 26 insertions(+), 7 deletions(-) diff --git a/akregator/CMakeLists.txt b/akregator/CMakeLists.txt index e6b205a417..a7b0eb7ade 100644 --- a/akregator/CMakeLists.txt +++ b/akregator/CMakeLists.txt @@ -60,6 +60,10 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR}) find_package(KF5Parts ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5TextEditor ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5Notifications ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5WindowSystem ${KF5_VERSION} CONFIG REQUIRED) + # Find KdepimLibs Package find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED) diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index 53d88959fc..5e4774e288 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -167,7 +167,7 @@ void ArticleListView::setArticleModel(ArticleModel *model) setModel(columnsProxy); header()->setContextMenuPolicy(Qt::CustomContextMenu); - header()->setResizeMode(QHeaderView::Interactive); + header()->setSectionResizeMode(QHeaderView::Interactive); } void ArticleListView::showHeaderMenu(const QPoint &pos) @@ -326,7 +326,7 @@ void ArticleListView::startResizingTitleColumn() // content. finishResizingTitleColumn() will turn the resize mode back to // Interactive so that the user can still resize the column himself if he // wants to - header()->setResizeMode(ArticleModel::ItemTitleColumn, QHeaderView::Stretch); + header()->setSectionResizeMode(ArticleModel::ItemTitleColumn, QHeaderView::Stretch); QMetaObject::invokeMethod(this, "finishResizingTitleColumn", Qt::QueuedConnection); } @@ -337,7 +337,7 @@ void ArticleListView::finishResizingTitleColumn() QMetaObject::invokeMethod(this, "finishResizingTitleColumn", Qt::QueuedConnection); return; } - header()->setResizeMode(QHeaderView::Interactive); + header()->setSectionResizeMode(QHeaderView::Interactive); } ArticleListView::~ArticleListView() diff --git a/akregator/src/articlemodel.cpp b/akregator/src/articlemodel.cpp index a19d22b0a2..36f47e2df4 100644 --- a/akregator/src/articlemodel.cpp +++ b/akregator/src/articlemodel.cpp @@ -183,9 +183,10 @@ QVariant ArticleModel::data(const QModelIndex &index, int role) const void ArticleModel::clear() { + beginResetModel(); d->articles.clear(); d->titleCache.clear(); - reset(); + endResetModel(); } void ArticleModel::articlesAdded(TreeNode *, const QVector
&l) diff --git a/akregator/src/mainwidget.cpp b/akregator/src/mainwidget.cpp index dca15233c7..7ecc8805ef 100644 --- a/akregator/src/mainwidget.cpp +++ b/akregator/src/mainwidget.cpp @@ -82,6 +82,7 @@ #include #include #include +#include #include #include diff --git a/importwizard/CMakeLists.txt b/importwizard/CMakeLists.txt index 2058fd4a2f..841c3df99d 100644 --- a/importwizard/CMakeLists.txt +++ b/importwizard/CMakeLists.txt @@ -61,6 +61,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${importwizard_SOURCE_DIR}) find_package(KF5Auth ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5DocTools ${KF5_VERSION} REQUIRED) find_package(KF5Crash ${KF5_VERSION} REQUIRED) + find_package(KF5KIO ${KF5_VERSION} REQUIRED) # Find KdepimLibs Package find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) diff --git a/kontact/CMakeLists.txt b/kontact/CMakeLists.txt index 8297ac6786..aae52cf96e 100644 --- a/kontact/CMakeLists.txt +++ b/kontact/CMakeLists.txt @@ -56,6 +56,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kontact_SOURCE_DIR}) find_package(KF5DocTools ${KF5_VERSION} REQUIRED) find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Crash ${KF5_VERSION} REQUIRED) + find_package(KF5WindowSystem ${KF5_VERSION} REQUIRED) + find_package(KF5IconThemes ${KF5_VERSION} REQUIRED) # Find KdepimLibs Package diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index e5e961c7df..fde4bdd5ea 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -95,7 +95,8 @@ public: void emitReset() { - Q_EMIT reset(); + //FIXME + //Q_EMIT reset(); } void setPluginList(const QList &list) diff --git a/mboximporter/CMakeLists.txt b/mboximporter/CMakeLists.txt index 2e8d14606f..23410feb0c 100644 --- a/mboximporter/CMakeLists.txt +++ b/mboximporter/CMakeLists.txt @@ -52,6 +52,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${mboximporter_SOURCE_DIR}) find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Service ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Crash ${KF5_VERSION} REQUIRED) + find_package(KF5KIO ${KF5_VERSION} REQUIRED) # Find KdepimLibs Package find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) diff --git a/sieveeditor/CMakeLists.txt b/sieveeditor/CMakeLists.txt index 553c68ece6..31952d6f1c 100644 --- a/sieveeditor/CMakeLists.txt +++ b/sieveeditor/CMakeLists.txt @@ -52,6 +52,10 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${sieveeditor_SOURCE_DIR}) find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5DocTools ${KF5_VERSION} REQUIRED) find_package(KF5Crash ${KF5_VERSION} REQUIRED) + find_package(KF5Bookmarks ${KF5_VERSION} REQUIRED) + find_package(KF5IconThemes ${KF5_VERSION} REQUIRED) + find_package(KF5KIO ${KF5_VERSION} REQUIRED) + # Find KdepimLibs Package find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) diff --git a/sieveeditor/src/sieveeditorutil.cpp b/sieveeditor/src/sieveeditorutil.cpp index c0ae9bdba4..a861c9a5d0 100644 --- a/sieveeditor/src/sieveeditorutil.cpp +++ b/sieveeditor/src/sieveeditorutil.cpp @@ -27,6 +27,7 @@ #include #include +#include #include QUrl SieveEditorUtil::SieveServerConfig::url() const @@ -62,8 +63,9 @@ QUrl SieveEditorUtil::SieveServerConfig::url() const authStr = QStringLiteral("PLAIN"); break; } - u.addQueryItem(QStringLiteral("x-mech"), authStr); - + QUrlQuery query; + query.addQueryItem(QStringLiteral("x-mech"), authStr); + u.setQuery(query); return u; } diff --git a/storageservicemanager/CMakeLists.txt b/storageservicemanager/CMakeLists.txt index 7e0fa67de1..e017227ddf 100644 --- a/storageservicemanager/CMakeLists.txt +++ b/storageservicemanager/CMakeLists.txt @@ -60,6 +60,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${storageservicemanager_SOURCE_DIR}) find_package(KF5NotifyConfig ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5DocTools ${KF5_VERSION} REQUIRED) find_package(KF5Crash ${KF5_VERSION} REQUIRED) + find_package(KF5KIO ${KF5_VERSION} REQUIRED) + find_package(KF5Notifications ${KF5_VERSION} REQUIRED) # Find KdepimLibs Package find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) -- 2.11.4.GIT