mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

desktop-widgets/facebook: remove SettingsObjectWrapper

Browse source 
remove use of SettingsObjectWrapper::
remove include of SettingsObjectWrapper.h
use qPrefFoo:: for setters and getters
replace prefs.foo with qPrefXYZ::foo() where feasible
(this expands to the same code, but gives us more control
over the variable).

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-15 11:55:27 +02:00 committed by Dirk Hohndel
parent 4b2071728d
commit c6998ee926
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
View file

@ -27,7 +27,7 @@
#include "core/pref.h" #include "core/pref.h"
#include "core/qthelper.h" #include "core/qthelper.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h" #include "core/settings/qPrefFacebook.h"
#include "ui_socialnetworksdialog.h" #include "ui_socialnetworksdialog.h"
#include "ui_facebookconnectwidget.h" #include "ui_facebookconnectwidget.h"
@ -88,18 +88,16 @@ void FacebookManager::tryLogin(const QUrl& loginResponse)
int to = result.indexOf("&expires_in"); int to = result.indexOf("&expires_in");
QString securityToken = result.mid(from, to-from); QString securityToken = result.mid(from, to-from);
auto fb = qPrefFacebook::instance(); qPrefFacebook::set_access_token(securityToken);
fb->set_access_token(securityToken);
qCDebug(lcFacebook) << "Got securityToken" << securityToken; qCDebug(lcFacebook) << "Got securityToken" << securityToken;
requestUserId(); requestUserId();
} }
void FacebookManager::logout() void FacebookManager::logout()
{ {
auto fb = qPrefFacebook::instance(); qPrefFacebook::set_access_token(QString());
fb->set_access_token(QString()); qPrefFacebook::set_user_id(QString());
fb->set_user_id(QString()); qPrefFacebook::set_album_id(QString());
fb->set_album_id(QString());
emit justLoggedOut(true); emit justLoggedOut(true);
} }
@ -116,15 +114,14 @@ void FacebookManager::albumListReceived()
QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender()); QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
QJsonDocument albumsDoc = QJsonDocument::fromJson(reply->readAll()); QJsonDocument albumsDoc = QJsonDocument::fromJson(reply->readAll());
QJsonArray albumObj = albumsDoc.object().value("data").toArray(); QJsonArray albumObj = albumsDoc.object().value("data").toArray();
auto fb = qPrefFacebook::instance();
reply->deleteLater(); reply->deleteLater();
foreach(const QJsonValue &v, albumObj){ foreach(const QJsonValue &v, albumObj){
QJsonObject obj = v.toObject(); QJsonObject obj = v.toObject();
if (obj.value("name").toString() == fbInfo.albumName) { if (obj.value("name").toString() == fbInfo.albumName) {
fb->set_album_id(obj.value("id").toString()); qPrefFacebook::set_album_id(obj.value("id").toString());
qCDebug(lcFacebook) << "Album" << fbInfo.albumName << "already exists, using id" << obj.value("id").toString(); qCDebug(lcFacebook) << "Album" << fbInfo.albumName << "already exists, using id" << obj.value("id").toString();
emit albumIdReceived(fb->album_id()); emit albumIdReceived(qPrefFacebook::album_id());
return; return;
} }
} }
@ -158,9 +155,8 @@ void FacebookManager::facebookAlbumCreated()
if (album.contains("id")) { if (album.contains("id")) {
qCDebug(lcFacebook) << "Album" << fbInfo.albumName << "created successfully with id" << album.value("id").toString(); qCDebug(lcFacebook) << "Album" << fbInfo.albumName << "created successfully with id" << album.value("id").toString();
auto fb = qPrefFacebook::instance(); qPrefFacebook::set_album_id(album.value("id").toString());
fb->set_album_id(album.value("id").toString()); emit albumIdReceived(qPrefFacebook::album_id());
emit albumIdReceived(fb->album_id());
return; return;
} else { } else {
qCDebug(lcFacebook) << "It was not possible to create the album with name" << fbInfo.albumName; qCDebug(lcFacebook) << "It was not possible to create the album with name" << fbInfo.albumName;
@ -168,8 +164,7 @@ void FacebookManager::facebookAlbumCreated()
// FIXME: we are lacking 'user_photos' facebook permission to create an album, // FIXME: we are lacking 'user_photos' facebook permission to create an album,
// but we are able to upload the image to Facebook (album will be named 'Subsurface Photos') // but we are able to upload the image to Facebook (album will be named 'Subsurface Photos')
qCDebug(lcFacebook) << "But we are still able to upload data. Album name will be 'Subsurface Photos'"; qCDebug(lcFacebook) << "But we are still able to upload data. Album name will be 'Subsurface Photos'";
auto fb = qPrefFacebook::instance(); emit albumIdReceived(qPrefFacebook::album_id());
emit albumIdReceived(fb->album_id());
} }
} }
@ -189,7 +184,7 @@ void FacebookManager::userIdReceived()
QJsonObject obj = jsonDoc.object(); QJsonObject obj = jsonDoc.object();
if (obj.keys().contains("id")) { if (obj.keys().contains("id")) {
qCDebug(lcFacebook) << "User id requested successfully:" << obj.value("id").toString(); qCDebug(lcFacebook) << "User id requested successfully:" << obj.value("id").toString();
qPrefFacebook::instance()->set_user_id(obj.value("id").toString()); qPrefFacebook::set_user_id(obj.value("id").toString());
emit sendMessage(tr("Facebook logged in successfully")); emit sendMessage(tr("Facebook logged in successfully"));
emit justLoggedIn(true); emit justLoggedIn(true);
} else { } else {