summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Krause <[email protected]>2017-09-13 12:39:07 +0200
committerVolker Krause <[email protected]>2017-09-13 12:39:07 +0200
commit5c92a27621b63309b08c6ae966fbeb1460c92a17 (patch)
tree210612d1e5898c56a892c32e30a6b98bdbb62a26
parent97210bc6fb385495cab32f4b05b3a89d1cba9506 (diff)
Compile without obsolete Qt API
The KDELibs4Support removal made those inaccessible too.
-rw-r--r--src/libkdepim/ldap/ldapsearchdialog.cpp6
-rw-r--r--src/libkdepim/progresswidget/progressmanager.h4
-rw-r--r--src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp2
-rw-r--r--src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.h4
-rw-r--r--src/libkdepimakonadi/progresswidget/agentprogressmonitor.cpp2
-rw-r--r--src/libkdepimakonadi/progresswidget/agentprogressmonitor.h2
6 files changed, 11 insertions, 9 deletions
diff --git a/src/libkdepim/ldap/ldapsearchdialog.cpp b/src/libkdepim/ldap/ldapsearchdialog.cpp
index a61fe4d..57d4bf5 100644
--- a/src/libkdepim/ldap/ldapsearchdialog.cpp
+++ b/src/libkdepim/ldap/ldapsearchdialog.cpp
@@ -247,9 +247,10 @@ public:
void addContact(const KLDAP::LdapAttrMap &contact, const QString &server)
{
+ beginResetModel();
mContactList.append(contact);
mServerList.append(server);
- reset();
+ endResetModel();
}
QPair<KLDAP::LdapAttrMap, QString> contact(const QModelIndex &index) const
@@ -281,9 +282,10 @@ public:
void clear()
{
+ beginResetModel();
mContactList.clear();
mServerList.clear();
- reset();
+ endResetModel();
}
int rowCount(const QModelIndex &parent = QModelIndex()) const override
diff --git a/src/libkdepim/progresswidget/progressmanager.h b/src/libkdepim/progresswidget/progressmanager.h
index 2fb9ab9..1b36965 100644
--- a/src/libkdepim/progresswidget/progressmanager.h
+++ b/src/libkdepim/progresswidget/progressmanager.h
@@ -30,7 +30,7 @@
#include <QString>
#include <QMap>
#include <QHash>
-#include <QWeakPointer>
+#include <QPointer>
namespace KPIM {
class ProgressItem;
@@ -240,7 +240,7 @@ private:
QString mId;
QString mLabel;
QString mStatus;
- QWeakPointer<ProgressItem> mParent;
+ QPointer<ProgressItem> mParent;
bool mCanBeCanceled;
unsigned int mProgress;
ProgressItemMap mChildren;
diff --git a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp
index 9b827f5..4ecfde1 100644
--- a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp
+++ b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp
@@ -407,7 +407,7 @@ void AddresseeLineEditPrivate::akonadiPerformSearch()
qCDebug(LIBKDEPIMAKONADI_LOG) << "searching akonadi with:" << mSearchString;
// first, kill all job still in flight, they are no longer current
- for (const QWeakPointer<Akonadi::Job> &job : qAsConst(AddresseeLineEditManager::self()->akonadiJobsInFlight)) {
+ for (const QPointer<Akonadi::Job> &job : qAsConst(AddresseeLineEditManager::self()->akonadiJobsInFlight)) {
if (!job.isNull()) {
job.data()->kill();
}
diff --git a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.h b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.h
index 2a77b3a..2b7a2cd 100644
--- a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.h
+++ b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.h
@@ -24,7 +24,7 @@
#include <AkonadiCore/Item>
#include <AkonadiCore/Session>
#include <QVector>
-#include <QWeakPointer>
+#include <QPointer>
#include <ldap/ldapclientsearch.h>
#include <QColor>
@@ -83,7 +83,7 @@ public:
QMap<Akonadi::Collection::Id, collectionInfo> akonadiCollectionToCompletionSourceMap;
// a list of akonadi items (contacts) that have not had their collection fetched yet
Akonadi::Item::List akonadiPendingItems;
- QVector<QWeakPointer<Akonadi::Job> > akonadiJobsInFlight;
+ QVector<QPointer<Akonadi::Job> > akonadiJobsInFlight;
//Ldap
void initializeLdap();
diff --git a/src/libkdepimakonadi/progresswidget/agentprogressmonitor.cpp b/src/libkdepimakonadi/progresswidget/agentprogressmonitor.cpp
index f69349d..d7c2108 100644
--- a/src/libkdepimakonadi/progresswidget/agentprogressmonitor.cpp
+++ b/src/libkdepimakonadi/progresswidget/agentprogressmonitor.cpp
@@ -21,7 +21,7 @@
#include <AgentManager>
-#include <QWeakPointer>
+#include <QPointer>
using namespace Akonadi;
using namespace KPIM;
diff --git a/src/libkdepimakonadi/progresswidget/agentprogressmonitor.h b/src/libkdepimakonadi/progresswidget/agentprogressmonitor.h
index 7791d6f..692a676 100644
--- a/src/libkdepimakonadi/progresswidget/agentprogressmonitor.h
+++ b/src/libkdepimakonadi/progresswidget/agentprogressmonitor.h
@@ -47,7 +47,7 @@ private:
void instanceNameChanged(const Akonadi::AgentInstance &);
Akonadi::AgentInstance mAgent;
- QWeakPointer<ProgressItem> const mItem;
+ QPointer<ProgressItem> const mItem;
};
}