From 4d171184bd4648a99a4841da0a23d9ad021fd7ad Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Thu, 2 Apr 2015 14:53:42 +0300
Subject: [PATCH] Forgot change methods.

--HG--
branch : develop
---
 .travis.yml                              | 2 +-
 src/app/dialogs/app/dialogsavelayout.cpp | 2 +-
 src/app/dialogs/tools/dialogline.cpp     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f613b37db..0b9d36b75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
   - sudo add-apt-repository ppa:ubuntu-sdk-team/ppa -y
   - sudo apt-get update -qq
   - sudo apt-get install -y qtbase5-dev libqt5svg5-dev ccache qt5-default qttools5-dev-tools libqt5xmlpatterns5-dev
-  - sudo apt-get install -y libqt5core5 libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 libstdc++6 xpdf
+  - sudo apt-get install -y libqt5core5 libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 xpdf
 
 before_script:
   - mkdir build
diff --git a/src/app/dialogs/app/dialogsavelayout.cpp b/src/app/dialogs/app/dialogsavelayout.cpp
index 8ee9364db..145f6d55a 100644
--- a/src/app/dialogs/app/dialogsavelayout.cpp
+++ b/src/app/dialogs/app/dialogsavelayout.cpp
@@ -93,7 +93,7 @@ QString DialogSaveLayout::FileName() const
 QString DialogSaveLayout::Formate() const
 {
 #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-    return ui->comboBoxFormat->currentData(ui->comboBoxFormat->currentIndex()).toString();
+    return ui->comboBoxFormat->itemData(ui->comboBoxFormat->currentIndex()).toString();
 #else
     return ui->comboBoxFormat->currentData().toString();
 #endif
diff --git a/src/app/dialogs/tools/dialogline.cpp b/src/app/dialogs/tools/dialogline.cpp
index fb0e8e3b2..7efe52b47 100644
--- a/src/app/dialogs/tools/dialogline.cpp
+++ b/src/app/dialogs/tools/dialogline.cpp
@@ -217,7 +217,7 @@ void DialogLine::ChosenObject(quint32 id, const SceneObject &type)
 quint32 DialogLine::GetFirstPoint() const
 {
 #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-    return qvariant_cast<quint32>(ui->comboBoxFirstPoint->currentData(ui->comboBoxFirstPoint->currentIndex()));
+    return qvariant_cast<quint32>(ui->comboBoxFirstPoint->itemData(ui->comboBoxFirstPoint->currentIndex()));
 #else
     return qvariant_cast<quint32>(ui->comboBoxFirstPoint->currentData());
 #endif
@@ -231,7 +231,7 @@ quint32 DialogLine::GetFirstPoint() const
 quint32 DialogLine::GetSecondPoint() const
 {
 #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-    return qvariant_cast<quint32>(ui->comboBoxSecondPoint->currentData(ui->comboBoxSecondPoint->currentIndex()));
+    return qvariant_cast<quint32>(ui->comboBoxSecondPoint->itemData(ui->comboBoxSecondPoint->currentIndex()));
 #else
     return qvariant_cast<quint32>(ui->comboBoxSecondPoint->currentData());
 #endif