Commit 5c92a276 authored by Volker Krause's avatar Volker Krause

Compile without obsolete Qt API

The KDELibs4Support removal made those inaccessible too.
parent 97210bc6
......@@ -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
......
......@@ -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;
......
......@@ -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();
}
......
......@@ -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();
......
......@@ -21,7 +21,7 @@
#include <AgentManager>
#include <QWeakPointer>
#include <QPointer>
using namespace Akonadi;
using namespace KPIM;
......
......@@ -47,7 +47,7 @@ private:
void instanceNameChanged(const Akonadi::AgentInstance &);
Akonadi::AgentInstance mAgent;
QWeakPointer<ProgressItem> const mItem;
QPointer<ProgressItem> const mItem;
};
}
......
Markdown is supported
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