Removed FacebookLoginBrowser class, replaced with QWebView.

[situare] / src / common.h

diff --git a/src/common.h b/src/common.h
index 3ef080f..9c27d2b 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -27,44 +27,22 @@
 #include <QFont>
 
 // QSettings identifiers
-const QString DIRECTORY_NAME = "Ixonos";
-const QString FILE_NAME = "Situare";
+const QString SETTINGS_ORGANIZATION_NAME = "Ixonos";
+const QString SETTINGS_APPLICATION_NAME = "Situare";
 
 // QSettings common values
-const QString COOKIES = "cookies";
-const QString EMPTY = "";
 const QString SETTINGS_AUTOMATIC_UPDATE_ENABLED = "SETTINGS_AUTOMATIC_UPDATE_ENABLED";
 const QString SETTINGS_AUTOMATIC_UPDATE_INTERVAL = "SETTINGS_AUTOMATIC_UPDATE_INTERVAL";
 const QString USER_UNSEND_MESSAGE = "UNSEND_MESSAGE_CONTENT";
 const QString USER_UNSEND_MESSAGE_PUBLISH = "UNSEND_MESSAGE_PUBLISH_POLICITY";
 
-const QColor COLOR_GRAY = QColor(152, 152, 152);                           ///< Gray color
-const QFont NOKIA_FONT_NORMAL = QFont("Nokia Sans", 18, QFont::Normal);    ///< Normal font
-const QFont NOKIA_FONT_SMALL = QFont("Nokia Sans", 13, QFont::Normal);     ///< Small font
+// Misc values
+const int DEFAULT_SCREEN_WIDTH = 800;           ///< Default N900 screen width
+const int DEFAULT_SCREEN_HEIGHT = 480;          ///< Default N900 screen height
+const int DEFAULT_NON_FULLSCREEN_HEIGHT = 424;  ///< Default N900 non-fullscreen height
 
-// Facobook login page pieces
-const QString FACEBOOK_LOGINBASE = "http://www.facebook.com/login.php?";
-const QString SITUARE_PUBLIC_FACEBOOKAPI_KEY = "api_key=4197c64da2fb6b927236feaea32d7d81";
-const QString SITUARE_DEVELOPER_FACEBOOK_APIKEY = "api_key=cf77865a5070f2c2ba3b52cbf3371579";
-const QString INTERVAL1 = "&connect_display=popup&v=1.0&next=";
-const QString SITUARE_LOGIN_SUCCESS = "http://www.facebook.com/connect/login_success.html";
-const QString INTERVAL2 = "&cancel_url=";
-const QString SITUARE_LOGIN_FAILURE = "http://www.facebook.com/connect/login_failure.html";
-const QString FACEBOOK_LOGIN_ENDING = "&fbconnect=true&return_session=true&";
-
-// Situare errors
-namespace SituareError {
-    enum errors {
-        SESSION_EXPIRED = 10,       // situare session credentials expired
-        LOGIN_FAILED,               // login to situare service failed
-        UPDATE_FAILED,              // location update to situare failed
-        DATA_RETRIEVAL_FAILED,      // user/friends list retrieval failed
-        ADDRESS_RETRIEVAL_FAILED,   // reversegeo request failed
-        IMAGE_DOWNLOAD_FAILED,      // image download failed from facebook
-        MAP_IMAGE_DOWNLOAD_FAILED,  // map image download failed from OSM
-        GPS_INITIALIZATION_FAILED,  // GPS intialization failed
-        UNKNOWN_REPLY               // unknown reply from situare server
-    };
-}
+const QColor COLOR_GRAY = QColor(152, 152, 152);                        ///< Gray color
+const QFont NOKIA_FONT_NORMAL = QFont("Nokia Sans", 18, QFont::Normal); ///< Normal font
+const QFont NOKIA_FONT_SMALL = QFont("Nokia Sans", 13, QFont::Normal);  ///< Small font
 
 #endif // COMMON_H