[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/base/plasma/dataengines/presence
From: George Goldberg <grundleborg () googlemail ! com>
Date: 2009-04-03 10:39:34
Message-ID: 1238755174.711641.20605.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 948600 by gberg:
Fix to compile with latest tpqt4 API.
M +4 -5 presence.cpp
M +4 -5 presence.h
--- trunk/playground/base/plasma/dataengines/presence/presence.cpp \
#948599:948600 @@ -1,5 +1,6 @@
/*
* Copyright (C) 2008 George Goldberg <grundleborg@googlemail.com>
+ * Copyright (C) 2009 Collabora Ltd <http://www.collabora.co.uk>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License version \
2 as @@ -19,8 +20,6 @@
#include "presence.h"
#include <TelepathyQt4/Client/AccountManager>
-#include <TelepathyQt4/Client/PendingReadyAccountManager>
-#include <TelepathyQt4/Client/PendingReadyAccount>
#include <TelepathyQt4/Client/PendingReady>
#include <KDebug>
@@ -198,7 +197,7 @@
void PresenceEngine::createAccountDataSource(const QString &path)
{
kDebug() << path;
- QSharedPointer<Telepathy::Client::Account> account = \
accountFromPath(path); + Telepathy::Client::AccountPtr account = \
accountFromPath(path);
QObject::connect(account.data(), SIGNAL(currentPresenceChanged(const \
Telepathy::SimplePresence &)),
this, SLOT(currentPresenceChanged(const Telepathy::SimplePresence \
&)));
QObject::connect(account->becomeReady(), \
SIGNAL(finished(Telepathy::Client::PendingOperation *)), @@ -228,12 +227,12 \
@@ {
kDebug() << path;
- QSharedPointer<Telepathy::Client::Account> account = \
accountFromPath(path); + Telepathy::Client::AccountPtr account = \
accountFromPath(path); QString identifier = account->uniqueIdentifier();
removeSource(identifier);
}
-QSharedPointer<Telepathy::Client::Account> \
PresenceEngine::accountFromPath(const QString &path) \
+Telepathy::Client::AccountPtr PresenceEngine::accountFromPath(const \
QString &path) {
kDebug();
return m_accountManager->accountForPath(path);
--- trunk/playground/base/plasma/dataengines/presence/presence.h \
#948599:948600 @@ -1,5 +1,6 @@
/*
* Copyright (C) 2008 George Goldberg <grundleborg@googlemail.com>
+ * Copyright (C) 2009 Collabora Ltd <http://www.collabora.co.uk>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License version \
2 as @@ -20,12 +21,10 @@
#define PLASMA_DATAENGINE_PRESENCE_H
#include <plasma/dataengine.h>
-#include <TelepathyQt4/Client/PendingOperation>
+
#include <TelepathyQt4/Client/Account>
+#include <TelepathyQt4/Client/PendingOperation>
-
-#include <QSharedPointer>
-
class QDBusObjectPath;
namespace Telepathy
{
@@ -58,7 +57,7 @@
void currentPresenceChanged(const Telepathy::SimplePresence &);
private:
- QSharedPointer<Telepathy::Client::Account> accountFromPath(const \
QString &path); + Telepathy::Client::AccountPtr accountFromPath(const \
QString &path); void removeAccountDataSource(const QString &path);
void createAccountDataSource(const QString &path);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic