Migrating to QT5.

18 files changed, 81 insertions, 59 deletions

diff --git a/qt/about.cpp b/qt/about.cpp
index f141f58369..c147e4dac0 100644
--- a/qt/about.cpp
+++ b/qt/about.cpp
@@ -3,12 +3,15 @@
 #include "../platform/platform.hpp"
 
 #include <QtCore/QFile>
+
 #include <QtGui/QIcon>
-#include <QtGui/QMenuBar>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QTextBrowser>
+
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QTextBrowser>
+
 
 
 AboutDialog::AboutDialog(QWidget * parent)
@@ -22,7 +25,7 @@ AboutDialog::AboutDialog(QWidget * parent)
   labelIcon->setPixmap(icon.pixmap(128));
 
   // @todo insert version to bundle.
-  QLabel * labelVersion = new QLabel(QString::fromAscii("MapsWithMe"));
+  QLabel * labelVersion = new QLabel(QString::fromLocal8Bit("MapsWithMe"));
 
   QHBoxLayout * hBox = new QHBoxLayout();
   hBox->addWidget(labelIcon);
diff --git a/qt/about.hpp b/qt/about.hpp
index 6f2cbe4cf7..882fe69173 100644
--- a/qt/about.hpp
+++ b/qt/about.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 
 class AboutDialog : public QDialog
 {
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index 851ecbe678..376c910191 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -1,5 +1,4 @@
 #include "draw_widget.hpp"
-#include "proxystyle.hpp"
 #include "slider_ctrl.hpp"
 
 #include "../map/render_policy.hpp"
@@ -17,9 +16,10 @@
 #include <QtCore/QLocale>
 
 #include <QtGui/QMouseEvent>
-#include <QtGui/QMenu>
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
+
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
 
 
 namespace qt
diff --git a/qt/info_dialog.cpp b/qt/info_dialog.cpp
index 089c6d4e9a..87d7d1f6b6 100644
--- a/qt/info_dialog.cpp
+++ b/qt/info_dialog.cpp
@@ -3,11 +3,13 @@
 #include "../base/assert.hpp"
 
 #include <QtGui/QIcon>
-#include <QtGui/QTextBrowser>
-#include <QtGui/QPushButton>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QLabel>
+
+#include <QtWidgets/QTextBrowser>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLabel>
+
 
 namespace qt
 {
diff --git a/qt/info_dialog.hpp b/qt/info_dialog.hpp
index 06b6f479b4..c7b5327506 100644
--- a/qt/info_dialog.hpp
+++ b/qt/info_dialog.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 
 namespace qt
 {
diff --git a/qt/main.cpp b/qt/main.cpp
index d31e1c36dc..12643b229b 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -12,11 +12,11 @@
 
 #include "../std/cstdio.hpp"
 
-#include <QtGui/QApplication>
 #include <QtCore/QLocale>
 
-//#include <google/protobuf/stubs/common.h>
+#include <QtWidgets/QApplication>
 
+//#include <google/protobuf/stubs/common.h>
 
 namespace
 {
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index 7d68914202..9a40a35a4b 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -12,12 +12,13 @@
 
 #include "../std/bind.hpp"
 
-#include <QtGui/QAction>
 #include <QtGui/QCloseEvent>
-#include <QtGui/QDockWidget>
-#include <QtGui/QMenu>
-#include <QtGui/QMenuBar>
-#include <QtGui/QToolBar>
+
+#include <QtWidgets/QAction>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QToolBar>
 
 #define IDM_ABOUT_DIALOG        1001
 #define IDM_PREFERENCES_DIALOG  1002
diff --git a/qt/mainwindow.hpp b/qt/mainwindow.hpp
index 0109de2b90..5f37d65898 100644
--- a/qt/mainwindow.hpp
+++ b/qt/mainwindow.hpp
@@ -4,7 +4,7 @@
 
 #include "../std/scoped_ptr.hpp"
 
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 
 class QDockWidget;
diff --git a/qt/preferences_dialog.cpp b/qt/preferences_dialog.cpp
index 8a4b684999..6ec5983352 100644
--- a/qt/preferences_dialog.cpp
+++ b/qt/preferences_dialog.cpp
@@ -3,15 +3,16 @@
 #include "../platform/settings.hpp"
 
 #include <QtGui/QIcon>
-#include <QtGui/QCheckBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QTableWidget>
-#include <QtGui/QHeaderView>
-#include <QtGui/QPushButton>
-#include <QtGui/QGroupBox>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QRadioButton>
+
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QTableWidget>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QRadioButton>
 
 
 namespace qt
diff --git a/qt/preferences_dialog.hpp b/qt/preferences_dialog.hpp
index b37216c9ee..cd36bd728d 100644
--- a/qt/preferences_dialog.hpp
+++ b/qt/preferences_dialog.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 
 class QTableWidget;
 class QButtonGroup;
diff --git a/qt/proxystyle.cpp b/qt/proxystyle.cpp
index 41079132f5..5bbe24561f 100644
--- a/qt/proxystyle.cpp
+++ b/qt/proxystyle.cpp
@@ -117,3 +117,10 @@ void ProxyStyle::unpolish(QApplication* app)
 {
 	style->unpolish(app);
 }
+
+int ProxyStyle::layoutSpacing(QSizePolicy::ControlType control1,
+                              QSizePolicy::ControlType control2, Qt::Orientation orientation,
+                              const QStyleOption *option, const QWidget *widget) const
+{
+  return style->layoutSpacing(control1, control2, orientation, option, widget);
+}
diff --git a/qt/proxystyle.hpp b/qt/proxystyle.hpp
index 56926c8137..57ecc63392 100644
--- a/qt/proxystyle.hpp
+++ b/qt/proxystyle.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QtGui/QStyle>
+#include <QtWidgets/QStyle>
 
 class ProxyStyle : public QStyle
 {
@@ -29,6 +29,9 @@ public:
 	QRect subElementRect(SubElement element, const QStyleOption* option, const QWidget* widget = 0) const;
 	void unpolish(QWidget* widget);
 	void unpolish(QApplication* app);
+  int layoutSpacing(QSizePolicy::ControlType control1,
+                    QSizePolicy::ControlType control2, Qt::Orientation orientation,
+                    const QStyleOption *option = 0, const QWidget *widget = 0) const;
 
 private:
 	QStyle * style;
diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp
index 84d5acbc1f..3c1e6bf5c7 100644
--- a/qt/search_panel.cpp
+++ b/qt/search_panel.cpp
@@ -7,14 +7,15 @@
 
 #include <QtCore/QTimer>
 
-#include <QtGui/QHeaderView>
-#include <QtGui/QTableWidget>
-#include <QtGui/QLineEdit>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QPushButton>
 #include <QtGui/QBitmap>
 
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QTableWidget>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QPushButton>
+
 
 namespace qt
 {
@@ -33,7 +34,7 @@ SearchPanel::SearchPanel(DrawWidget * drawWidget, QWidget * parent)
   m_pTable->setSelectionBehavior(QAbstractItemView::SelectRows);
   m_pTable->verticalHeader()->setVisible(false);
   m_pTable->horizontalHeader()->setVisible(false);
-  m_pTable->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+  m_pTable->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
   connect(m_pTable, SIGNAL(cellClicked(int, int)), this, SLOT(OnSearchPanelItemClicked(int,int)));
 
   m_pClearButton = new QPushButton(this);
@@ -55,8 +56,9 @@ SearchPanel::SearchPanel(DrawWidget * drawWidget, QWidget * parent)
   CHECK(connect(this, SIGNAL(SearchResultSignal(ResultsT *)),
                 this, SLOT(OnSearchResult(ResultsT *)), Qt::QueuedConnection), ());
 
-  setFocusPolicy(Qt::StrongFocus);
-  setFocusProxy(m_pEditor);
+  /// @todo THis is not working on Qt5. QLineEdit doesn't get any input.
+  //setFocusPolicy(Qt::StrongFocus);
+  //setFocusProxy(m_pEditor);
 
   m_params.m_callback = bind(&SearchPanel::SearchResultThreadFunc, this, _1);
 }
diff --git a/qt/search_panel.hpp b/qt/search_panel.hpp
index 1ccc5cc510..ab23a2acb6 100644
--- a/qt/search_panel.hpp
+++ b/qt/search_panel.hpp
@@ -5,9 +5,10 @@
 
 #include "../std/vector.hpp"
 
-#include <QtGui/QWidget>
 #include <QtGui/QPixmap>
 
+#include <QtWidgets/QWidget>
+
 class QTableWidget;
 class QLineEdit;
 class QPushButton;
diff --git a/qt/slider_ctrl.cpp b/qt/slider_ctrl.cpp
index 03f7771647..a30f44d39d 100644
--- a/qt/slider_ctrl.cpp
+++ b/qt/slider_ctrl.cpp
@@ -15,7 +15,8 @@ namespace qt
   QClickSmoothSlider::QClickSmoothSlider(Qt::Orientation orient, QWidget * pParent, int factor)
    : base_t(orient, pParent), m_factor(factor)
   {
-    // this style cause slider to set value exactly to the cursor position (not "page scroll")
+    /// This style cause slider to set value exactly to the cursor position (not "page scroll")
+    /// @todo Do investigate this stuff with Qt5.
     class MyProxyStyle : public ProxyStyle
     {
     public:
diff --git a/qt/slider_ctrl.hpp b/qt/slider_ctrl.hpp
index 2928535a41..2113a1f0fc 100644
--- a/qt/slider_ctrl.hpp
+++ b/qt/slider_ctrl.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QtGui/QSlider>
+#include <QtWidgets/QSlider>
 
 namespace qt
 {
diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp
index e2eb71c634..d952fa897c 100644
--- a/qt/update_dialog.cpp
+++ b/qt/update_dialog.cpp
@@ -7,16 +7,17 @@
 
 #include "../std/bind.hpp"
 
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QTreeWidget>
-#include <QtGui/QHeaderView>
-#include <QtGui/QMessageBox>
-#include <QtGui/QProgressBar>
 #include <QtCore/QDateTime>
 
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QTreeWidget>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QProgressBar>
+
 
 #define CHECK_FOR_UPDATE "Check for update"
 #define LAST_UPDATE_CHECK "Last update check: "
@@ -345,8 +346,8 @@ namespace qt
 
     m_tree->sortByColumn(KColumnIndexCountry, Qt::AscendingOrder);
     m_tree->setSortingEnabled(true);
-    m_tree->header()->setResizeMode(KColumnIndexCountry, QHeaderView::ResizeToContents);
-    m_tree->header()->setResizeMode(KColumnIndexStatus, QHeaderView::ResizeToContents);
+    m_tree->header()->setSectionResizeMode(KColumnIndexCountry, QHeaderView::ResizeToContents);
+    m_tree->header()->setSectionResizeMode(KColumnIndexStatus, QHeaderView::ResizeToContents);
   }
 
   void UpdateDialog::OnCountryChanged(TIndex const & index)
diff --git a/qt/update_dialog.hpp b/qt/update_dialog.hpp
index 829e9eed49..4b4f74e875 100644
--- a/qt/update_dialog.hpp
+++ b/qt/update_dialog.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "../map/framework.hpp"
 
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 
 class QTreeWidget;
 class QTreeWidgetItem;