From: lampehe-local Date: Tue, 25 May 2010 06:46:28 +0000 (+0300) Subject: Bugs with master X-Git-Tag: v0.5~27 X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=5678a769596363ded8f15f0a3bf27f723c7ce38f;p=situare Bugs with master --- diff --git a/doc/test_cases/functionality-tests.doc b/doc/test_cases/functionality-tests.doc index e792e7b..66a3299 100644 Binary files a/doc/test_cases/functionality-tests.doc and b/doc/test_cases/functionality-tests.doc differ diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index 00d25d5..759a3f0 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -177,6 +177,19 @@ void SituareEngine::invalidCredentials() m_facebookAuthenticator->start(); } +void SituareEngine::loginActionPressed() +{ + qDebug() << __PRETTY_FUNCTION__; + + if(m_loggedIn) { + logout(); + m_situareService->clearUserData(); + } + else { + m_facebookAuthenticator->start(); + } +} + void SituareEngine::loginOk(bool freshLogin, const FacebookCredentials &credentials) { qDebug() << __PRETTY_FUNCTION__; @@ -192,19 +205,6 @@ void SituareEngine::loginOk(bool freshLogin, const FacebookCredentials &credenti m_situareService->fetchLocations(); // request user locations } -void SituareEngine::loginPressed() -{ - qDebug() << __PRETTY_FUNCTION__; - - if(m_loggedIn) { - logout(); - m_situareService->clearUserData(); - } - else { - m_facebookAuthenticator->start(); - } -} - void SituareEngine::loginProcessCancelled() { qDebug() << __PRETTY_FUNCTION__; @@ -288,8 +288,8 @@ void SituareEngine::signalsFromMainWindow() { qDebug() << __PRETTY_FUNCTION__; - connect(m_ui, SIGNAL(loginPressed()), - this, SLOT(loginPressed())); + connect(m_ui, SIGNAL(loginActionPressed()), + this, SLOT(loginActionPressed())); connect(m_ui, SIGNAL(updateCredentials(QUrl)), m_facebookAuthenticator, SLOT(updateCredentials(QUrl))); diff --git a/src/engine/engine.h b/src/engine/engine.h index 9c5237a..d171810 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -78,18 +78,18 @@ public slots: void fetchUsernameFromSettings(); /** - * @brief Slot to intercept signal from successful login + * @brief Slot to intercept signal when Login/Logout action is pressed * - * @param freshLogin Was login done via login dialog - * @param credentials Facebook credentials */ - void loginOk(bool freshLogin, const FacebookCredentials &credentials); + void loginActionPressed(); /** - * @brief Slot to intercept signal when Login/Logout action is pressed + * @brief Slot to intercept signal from successful login * + * @param freshLogin Was login done via login dialog + * @param credentials Facebook credentials */ - void loginPressed(); + void loginOk(bool freshLogin, const FacebookCredentials &credentials); /** * @brief Slot to intercept signal when user has cancelled login process diff --git a/src/facebookservice/facebookcredentials.cpp b/src/facebookservice/facebookcredentials.cpp index 52f2927..9e4d225 100644 --- a/src/facebookservice/facebookcredentials.cpp +++ b/src/facebookservice/facebookcredentials.cpp @@ -26,6 +26,15 @@ FacebookCredentials::FacebookCredentials() { } +void FacebookCredentials::clearCredentials() +{ + m_expires.clear(); + m_sessionKey.clear(); + m_sessionSecret.clear(); + m_sig.clear(); + m_userID.clear(); +} + void FacebookCredentials::setSessionKey(const QString & sessionKeyParameter) { m_sessionKey = sessionKeyParameter; @@ -87,12 +96,3 @@ bool FacebookCredentials::operator==(const FacebookCredentials &credentials) return expireBool && sessionKeyBool && sessionSecretBool && sigBool && userIdBool; } - -void FacebookCredentials::clearCredentials() -{ - m_expires.clear(); - m_sessionKey.clear(); - m_sessionSecret.clear(); - m_sig.clear(); - m_userID.clear(); -} diff --git a/src/src.pro b/src/src.pro index 7049872..eca216b 100644 --- a/src/src.pro +++ b/src/src.pro @@ -85,8 +85,7 @@ HEADERS += ui/mainwindow.h \ ui/sidepanel.h QT += network \ webkit - -DEFINES += QT_NO_DEBUG_OUTPUT +#DEFINES += QT_NO_DEBUG_OUTPUT maemo5 | simulator { SOURCES += gps/gpspositionprivate.cpp diff --git a/src/ui/friendlistitem.cpp b/src/ui/friendlistitem.cpp index 8710c8d..1c2bb88 100644 --- a/src/ui/friendlistitem.cpp +++ b/src/ui/friendlistitem.cpp @@ -167,18 +167,21 @@ void FriendListItem::setData(User *user) { qDebug() << __PRETTY_FUNCTION__; - m_user = user; + if(user) { + m_user = user; + qWarning() << m_user->address(); - m_findButton->setButtonIcon(m_user->profileImage()); + m_findButton->setButtonIcon(m_user->profileImage()); - QString unit; - double value; - user->distance(value, unit); - m_distanceTextLabel->setText(QString::number(value) + " " + unit); - setDistanceIcon(value, unit); + QString unit; + double value; + user->distance(value, unit); + m_distanceTextLabel->setText(QString::number(value) + " " + unit); + setDistanceIcon(value, unit); - shortenTexts(); - setText(false); + shortenTexts(); + setText(false); + } } void FriendListItem::setDistanceIcon(double value, const QString &unit) diff --git a/src/ui/friendlistpanel.cpp b/src/ui/friendlistpanel.cpp index 1cd3989..639cce0 100644 --- a/src/ui/friendlistpanel.cpp +++ b/src/ui/friendlistpanel.cpp @@ -64,6 +64,7 @@ void FriendListPanel::friendInfoReceived(QList &friendList) this, SIGNAL(findFriend(QPointF))); } else { + qDebug() << "ISO"; item = m_friendListView->widget(user->userId()); item->setData(user); } diff --git a/src/ui/friendlistview.cpp b/src/ui/friendlistview.cpp index 3df3f22..67b8ac0 100644 --- a/src/ui/friendlistview.cpp +++ b/src/ui/friendlistview.cpp @@ -58,7 +58,7 @@ void FriendListView::clearUnused(const QStringList &userIDs) foreach (QString key, m_widgets.keys()) { if (!userIDs.contains(key)) { QWidget *widget = m_widgets.value(key); - + qWarning() << key; if (widget) { m_friendListLayout->removeWidget(widget); disconnect(widget, 0, 0, 0); diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 4babd8f..565af75 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -246,7 +246,7 @@ void MainWindow::createMenus() // login/logout m_loginAct = new QAction(tr("Login"), this); connect(m_loginAct, SIGNAL(triggered()), - this, SIGNAL(loginPressed())); + this, SIGNAL(loginActionPressed())); // settings m_toSettingsAct = new QAction(tr("Settings"), this); diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index 691a112..d34d0ad 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -327,7 +327,7 @@ signals: * @brief Signals when Login/Logout action is pressed * */ - void loginPressed(); + void loginActionPressed(); /** * @brief MapView has been resized