Merge branch 'new_panels' into locationlistview

[situare] / src / ui / mainwindow.cpp

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 24b6efb..abdd148 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -24,10 +24,14 @@
    USA.
 */
 
-#include <QtGui>
-#include <QtWebKit>
+#include <QAction>
+#include <QApplication>
+#include <QMenuBar>
+#include <QMessageBox>
 #include <QtAlgorithms>
+#include <QtWebKit>
 
+///< @todo sort
 #include "facebookservice/facebookauthentication.h"
 #include "map/mapcommon.h"
 #include "map/mapview.h"
@@ -63,7 +67,7 @@ MainWindow::MainWindow(QWidget *parent)
       m_refresh(false),
       m_progressIndicatorCount(0),
       m_ownLocationCrosshair(0),
-      m_email(),
+      m_email(), ///< @todo WTF?!?!?!?
       m_password(),
       m_webView(0),
       m_fullScreenButton(0),
@@ -539,9 +543,10 @@ void MainWindow::drawFullScreenButton(const QSize &size)
 {
     qDebug() << __PRETTY_FUNCTION__ << size.width() << "x" << size.height();
 
-    if(m_fullScreenButton)
+    if (m_fullScreenButton) {
         m_fullScreenButton->move(size.width() - m_fullScreenButton->size().width(),
                                  size.height() - m_fullScreenButton->size().height());
+    }
 }
 
 void MainWindow::drawMapScale(const QSize &size)
@@ -550,7 +555,6 @@ void MainWindow::drawMapScale(const QSize &size)
 
     const int LEFT_SCALE_MARGIN = 10;
     const int BOTTOM_SCALE_MARGIN = 2;
-//    qDebug() << __PRETTY_FUNCTION__ << size.width() << "x" << size.height();
 
     m_mapScale->move(LEFT_SCALE_MARGIN,
                      size.height() - m_mapScale->size().height() - BOTTOM_SCALE_MARGIN);
@@ -938,6 +942,8 @@ void MainWindow::showPanels()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
+///< @todo check how this is called and can this method be removed
+
     drawFullScreenButton(m_viewPortSize);
 
 //    if(m_loggedIn) {
@@ -1001,6 +1007,8 @@ void MainWindow::updateItemVisibility()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
+///< @todo can this be removed?
+
 //    if(!m_loggedIn) {
 //        m_friendsListPanel->closePanel();
 //        m_friendsListPanel->hide();