Some cleanup for FacebookServices and SituareServices

[situare] / src / facebookservice / facebookauthentication.cpp

diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp
index 116828e..555393b 100644 (file)
--- a/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@ -20,10 +20,10 @@
    USA.
 */
 
-#include "facebookauthentication.h"
 #include <QtGui>
 #include <QtDebug>
 #include <QDateTime>
+#include "facebookauthentication.h"
 
 FacebookAuthentication::FacebookAuthentication(QWidget *parent)
     : QMainWindow(parent)
@@ -33,6 +33,7 @@ FacebookAuthentication::FacebookAuthentication(QWidget *parent)
     m_webView = new QWebView;
     m_mainlayout = new QHBoxLayout;
 
+    // ToDo: use common.h etc.
     QString facebookLoginBase = "http://www.facebook.com/login.php?";
     QString situarePublicFacebookApiKey = "api_key=4197c64da2fb6b927236feaea32d7d81";
     //QString situareDeveloperFacebookApiKey = "api_key=cf77865a5070f2c2ba3b52cbf3371579";
@@ -72,7 +73,7 @@ void FacebookAuthentication::start()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    const double fontSize = 1.2;
+    const double fontSize = 1.2; // ToDo: use common.h etc.
 
     m_webView->setZoomFactor(fontSize);
     m_webView->load(m_facebookLoginPage);
@@ -203,7 +204,6 @@ bool FacebookAuthentication::updateCredentials(const QUrl &url)
         }
     }
 
-
     else {
         qDebug() << " Loading of page failed invalid URL" << endl;
         emit loginFailure();
@@ -219,11 +219,11 @@ void FacebookAuthentication::writeCredentials(const FacebookCredentials &credent
     qDebug() << __PRETTY_FUNCTION__;
     QSettings settings("Ixonos", "Situare");
 
-    settings.setValue("Session Key", credentials.getSessionKey());
-    settings.setValue("User ID", credentials.getUserID());
-    settings.setValue("Expires", credentials.getExpires());
-    settings.setValue("Session Secret", credentials.getSessionSecret());
-    settings.setValue("Sig", credentials.getSig());
+    settings.setValue("Session Key", credentials.sessionKey());
+    settings.setValue("User ID", credentials.userID());
+    settings.setValue("Expires", credentials.expires());
+    settings.setValue("Session Secret", credentials.sessionSecret());
+    settings.setValue("Sig", credentials.sig());
 }
 
 void FacebookAuthentication::readCredentials(FacebookCredentials &credentialsFromFile)
@@ -239,7 +239,7 @@ void FacebookAuthentication::readCredentials(FacebookCredentials &credentialsFro
     credentialsFromFile.setSig(settings.value("Sig", "Error").toString());
 }
 
- FacebookCredentials FacebookAuthentication::getLoginCredentials() const
+ FacebookCredentials FacebookAuthentication::loginCredentials() const
  {
      qDebug() << __PRETTY_FUNCTION__;
      return m_loginCredentials;
@@ -248,7 +248,7 @@ void FacebookAuthentication::readCredentials(FacebookCredentials &credentialsFro
  bool FacebookAuthentication::verifyCredentials(const FacebookCredentials &credentials) const
  {
      qDebug() << __PRETTY_FUNCTION__;
-     QString expires = credentials.getExpires();
+     QString expires = credentials.expires();
      QDateTime expireTime;
      expireTime.setTime_t(expires.toInt());
      QString expiresString = expireTime.toString("dd.MM.yyyy  hh:mm:ss");