Changed the names of panel opening slots and signals into "more" appropriate ones

[situare] / src / common.h

diff --git a/src/common.h b/src/common.h
index 0f400bd..2c1ab24 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -39,8 +39,9 @@ const QString USER_UNSEND_MESSAGE = "UNSEND_MESSAGE_CONTENT";
 const QString USER_UNSEND_MESSAGE_PUBLISH = "UNSEND_MESSAGE_PUBLISH_POLICITY";
 
 // 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_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
 
 const QColor COLOR_GRAY = QColor(152, 152, 152);                        ///< Gray color
 const QFont NOKIA_FONT_NORMAL = QFont("Nokia Sans", 18, QFont::Normal); ///< Normal font
@@ -56,32 +57,4 @@ 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 {
-        ERROR_GENERAL = 0,          // an unknown/unspecified error
-        ERROR_MISSING_ARGUMENT,     // missing mandatory argument for requested action
-        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
-        INVALID_JSON,               // JSON parsing failed i.e. invalid JSON string
-        ERROR_GEOLOCATION_SERVER_UNAVAILABLE = 501, // reverseGeo server not responding
-        ERROR_GEOLOCATION_REQUEST_FAIL,             // reverseGeo response failed
-        ERROR_GEOLOCATION_LONLAT_INVALID            // reverseGeo failed, invalid lon/lat
-    };
-}
-
-// Error contexts
-namespace ErrorContext {
-    enum context {
-        SITUARE = 0,                // situare context
-        NETWORK                     // QNetworkReply context
-    };
-}
-
 #endif // COMMON_H