Merge branch 'master' into new_panels

Conflicts:
	src/ui/friendlistpanel.h
	src/ui/sidepanel.cpp
	src/ui/tabbedpanel.h
	src/ui/userinfo.cpp
	src/ui/userinfopanel.h

diff --git a/src/main.cpp b/src/main.cpp
index 67a34c4..d354beb 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,9 +19,8 @@
     USA.
  */
 
-#include <QtGui>
-#include <QTranslator>
-#include <QLocale>
+#include <QApplication>
+
 #include "engine/engine.h"
 #ifdef Q_WS_MAEMO_5
 #include "application.h"

diff --git a/src/ui/friendlistpanel.cpp b/src/ui/friendlistpanel.cpp
index 31aa90a..3e258f1 100644 (file)
--- a/src/ui/friendlistpanel.cpp
+++ b/src/ui/friendlistpanel.cpp
@@ -21,6 +21,10 @@
     USA.
  */
 
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+
 #include "coordinates/geocoordinate.h"
 #include "listview.h"
 #include "friendlistitem.h"

diff --git a/src/ui/friendlistpanel.h b/src/ui/friendlistpanel.h
index 87eb2b7..a10a6b5 100644 (file)
--- a/src/ui/friendlistpanel.h
+++ b/src/ui/friendlistpanel.h
@@ -24,10 +24,10 @@
 #ifndef FRIENDLISTPANEL_H
 #define FRIENDLISTPANEL_H
 
-#include <QtGui>
+#include <QWidget>
 
 class QLabel;
-class QWidget;
+class QPushButton;
 
 class FriendListItemDelegate;
 class GeoCoordinate;

diff --git a/src/ui/logindialog.cpp b/src/ui/logindialog.cpp
index 8077193..23b3e00 100644 (file)
--- a/src/ui/logindialog.cpp
+++ b/src/ui/logindialog.cpp
@@ -19,9 +19,13 @@
    USA.
 */
 
-#include <QtGui>
 #include <QDebug>
+#include <QDialogButtonBox>
 #include <QFormLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+
 #include "logindialog.h"
 
 LoginDialog::LoginDialog(QWidget *parent)

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 16ea4fd..b46fd44 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -24,9 +24,12 @@
    USA.
 */
 
-#include <QtGui>
-#include <QtWebKit>
+#include <QAction>
+#include <QApplication>
+#include <QMenuBar>
+#include <QMessageBox>
 #include <QtAlgorithms>
+#include <QtWebKit>
 
 #include "facebookservice/facebookauthentication.h"
 #include "map/mapcommon.h"

diff --git a/src/ui/searchdialog.cpp b/src/ui/searchdialog.cpp
index f73f1c2..2e5ea9f 100644 (file)
--- a/src/ui/searchdialog.cpp
+++ b/src/ui/searchdialog.cpp
@@ -20,7 +20,10 @@
 */
 
 #include <QDebug>
-#include <QtGui>
+#include <QDialogButtonBox>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QPushButton>
 
 #include "searchdialog.h"
 

diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp
index e3ccb18..c7b6195 100644 (file)
--- a/src/ui/settingsdialog.cpp
+++ b/src/ui/settingsdialog.cpp
@@ -24,10 +24,19 @@
 #include <QMaemo5ValueButton>
 #endif
 
-#include <QtGui>
+#include <QCheckBox>
 #include <QDebug>
+#include <QDialogButtonBox>
+#include <QFormLayout>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QSettings>
 #include <QTime>
+
 #include "common.h"
+
 #include "settingsdialog.h"
 
 const int LIST_MINUTES_STEP = 5;

diff --git a/src/ui/tabbedpanel.cpp b/src/ui/tabbedpanel.cpp
index 4576328..ec2aff2 100644 (file)
--- a/src/ui/tabbedpanel.cpp
+++ b/src/ui/tabbedpanel.cpp
@@ -22,8 +22,10 @@
 
 #include <QButtonGroup>
 #include <QDebug>
-#include <QPainter>
-#include <QRegion>
+#include <QPropertyAnimation>
+#include <QSignalTransition>
+#include <QStackedWidget>
+#include <QStateMachine>
 
 #include "panelbar.h"
 #include "panelcontent.h"

diff --git a/src/ui/tabbedpanel.h b/src/ui/tabbedpanel.h
index d952a08..170d45b 100644 (file)
--- a/src/ui/tabbedpanel.h
+++ b/src/ui/tabbedpanel.h
@@ -42,6 +42,7 @@ class QStateMachine;
 class PanelBar;
 class PanelContent;
 
+
 /**
  * @brief Class for tabbed panels
  *

diff --git a/src/ui/updatelocation/texteditautoresizer.cpp b/src/ui/updatelocation/texteditautoresizer.cpp
index 8852d71..2dd86e8 100755 (executable)
--- a/src/ui/updatelocation/texteditautoresizer.cpp
+++ b/src/ui/updatelocation/texteditautoresizer.cpp
@@ -19,21 +19,25 @@
    USA.
 */
 
-#include <QtGui>
+#include <QDebug>
+#include <QFrame>
+#include <QTextDocument>
+#include <QPlainTextEdit>
+
 #include "texteditautoresizer.h"
 
 TextEditAutoResizer::TextEditAutoResizer(QWidget *parent)
-    : QObject(parent)
-    , m_edit(qobject_cast<QFrame *>(parent))
-    , m_plainTextEdit(qobject_cast<QPlainTextEdit *>(parent))
-    , m_textEdit(qobject_cast<QTextEdit *>(parent))
-    {
+    : QObject(parent),
+      m_edit(qobject_cast<QFrame *>(parent)),
+      m_plainTextEdit(qobject_cast<QPlainTextEdit *>(parent)),
+      m_textEdit(qobject_cast<QTextEdit *>(parent))
+{
      //parent must either inherit QPlainTextEdit or  QTextEdit!
     Q_ASSERT(m_plainTextEdit || m_textEdit);
 
     connect(parent, SIGNAL(textChanged()), this, SLOT(textEditChanged()));
     connect(parent, SIGNAL(cursorPositionChanged()), this, SLOT(textEditChanged()));
-    }
+}
 
 void TextEditAutoResizer::textEditChanged()
 {

diff --git a/src/ui/updatelocation/texteditautoresizer.h b/src/ui/updatelocation/texteditautoresizer.h
index 1730411..ac0e7c4 100755 (executable)
--- a/src/ui/updatelocation/texteditautoresizer.h
+++ b/src/ui/updatelocation/texteditautoresizer.h
@@ -22,22 +22,25 @@
 #ifndef TEXTEDITAUTORESIZER_H
 #define TEXTEDITAUTORESIZER_H
 
-#include <QtGui>
 #ifdef Q_WS_MAEMO_5
 #include <QAbstractKineticScroller>
 #endif // Q_WS_MAEMO_5
 
+#include <QObject>
+
+class QFrame;
+class QPlainTextEdit;
+class QTextEdit;
+
 /**
 * @brief TextEditAutoResizer class
 *
 * class is used to automatically resize the QTextEdit once the contents
 *        become too large.
-*
-* @class TextEditAutoResizer
 */
 class TextEditAutoResizer : public QObject
 {
-Q_OBJECT
+    Q_OBJECT
 
 public:
     /**
@@ -53,8 +56,6 @@ public:
 private slots:
     /**
     * @brief Private slot which indicate when textEdit has been changed
-    *
-    * @fn textEditChanged
     */
     void textEditChanged();
 
@@ -62,9 +63,9 @@ private slots:
  * DATA MEMBERS
  ******************************************************************************/
 private:
-    QFrame *m_edit; ///< Pointer to Frame
-    QPlainTextEdit *m_plainTextEdit; ///< Pointer to PlainTextEdit
-    QTextEdit *m_textEdit; ///< Pointer to TextEdit
+    QFrame *m_edit;                     ///< Pointer to Frame
+    QPlainTextEdit *m_plainTextEdit;    ///< Pointer to PlainTextEdit
+    QTextEdit *m_textEdit;              ///< Pointer to TextEdit
 };
 
 #endif // TEXTEDITAUTORESIZER_H

diff --git a/src/ui/updatelocation/updatelocationdialog.cpp b/src/ui/updatelocation/updatelocationdialog.cpp
index ad9008a..b047149 100644 (file)
--- a/src/ui/updatelocation/updatelocationdialog.cpp
+++ b/src/ui/updatelocation/updatelocationdialog.cpp
@@ -20,7 +20,15 @@
    USA.\r
 */\r
 \r
+#include <QCheckBox>\r
 #include <QDebug>\r
+#include <QDialogButtonBox>\r
+#include <QGridLayout>\r
+#include <QLabel>\r
+#include <QPushButton>\r
+#include <QScrollArea>\r
+#include <QTextEdit>\r
+\r
 #include "updatelocationdialog.h"\r
 \r
 const int MESSAGE_MAX_LENGTH = 255;\r

diff --git a/src/ui/userinfo.cpp b/src/ui/userinfo.cpp
index 7ee573f..70bd35f 100644 (file)
--- a/src/ui/userinfo.cpp
+++ b/src/ui/userinfo.cpp
@@ -23,11 +23,17 @@
    USA.
 */
 
-#include "userinfo.h"
+#include <QFormLayout>
+#include <QLabel>
+#include <QPainter>
+#include <QSettings>
+#include <QVBoxLayout>
 
-#include "../user/user.h"
 #include "common.h"
 #include "imagebutton.h"
+#include "../user/user.h"
+
+#include "userinfo.h"
 
 const int BACKGROUND_WIDTH = 368;           ///< Width for item
 const int BACKGROUND_TOP_HEIGHT = 20;       ///< Height for item top
@@ -334,7 +340,7 @@ QString UserInfo::shortenText(const QLabel *label, const QString &text, int text
             textParam.truncate(index);
             textParam.append("...");
         }
-            if (textWidth > 250)
+            if (textWidth > 250) ///< @todo magic number
                 textParam.insert(LINE_LENGTH, QString("\n"));
 
    return labelMetrics.elidedText(textParam, Qt::ElideRight, textMaxWidth);

diff --git a/src/ui/userinfopanel.cpp b/src/ui/userinfopanel.cpp
index ac9dc4f..1b2f87a 100644 (file)
--- a/src/ui/userinfopanel.cpp
+++ b/src/ui/userinfopanel.cpp
@@ -21,10 +21,13 @@
     USA.
  */
 
-#include "userinfopanel.h"
+#include <QScrollArea>
+#include <QVBoxLayout>
 
-#include "userinfo.h"
 #include "panelcommon.h"
+#include "userinfo.h"
+
+#include "userinfopanel.h"
 
 UserInfoPanel::UserInfoPanel(QWidget *parent)
     : QWidget(parent)

diff --git a/src/ui/userinfopanel.h b/src/ui/userinfopanel.h
index ed4367f..449aa0a 100644 (file)
--- a/src/ui/userinfopanel.h
+++ b/src/ui/userinfopanel.h
@@ -24,9 +24,9 @@
 #ifndef USERPANEL_H
 #define USERPANEL_H
 
-#include <QtGui>
+#include <QWidget>
 
-#include "../user/user.h"
+#include "user/user.h"
 
 class UserInfo;
 

diff --git a/tests/ui/friendlistitem/testfriendlistitem.cpp b/tests/ui/friendlistitem/testfriendlistitem.cpp
index d85b28f..652be3c 100644 (file)
--- a/tests/ui/friendlistitem/testfriendlistitem.cpp
+++ b/tests/ui/friendlistitem/testfriendlistitem.cpp
@@ -20,11 +20,11 @@
 */
 
 #include <QtTest>
-#include <QtGui>
 
-#include "../../../src/ui/friendlistitem.h"
-#include "../../../src/user/user.h"
-#include "../../../src/ui/listcommon.h"
+#include "ui/listcommon.h"
+#include "user/user.h"
+
+#include "ui/friendlistitem.h"
 
 class TestFriendListItem: public QObject
 {

diff --git a/tests/ui/listview/testlistview.cpp b/tests/ui/listview/testlistview.cpp
index d3fc0c6..e90741e 100644 (file)
--- a/tests/ui/listview/testlistview.cpp
+++ b/tests/ui/listview/testlistview.cpp
@@ -20,10 +20,9 @@
 */
 
 #include <QtTest>
-#include <QtGui>
 
-#include "../../../src/ui/friendlistitem.h"
-#include "../../../src/ui/listview.h"
+#include "ui/friendlistitem.h"
+#include "ui/listview.h"
 
 class TestListView: public QObject
 {