From b8294c122278f20ef6a41ddc587db43815b65a75 Mon Sep 17 00:00:00 2001
From: "Diego F. Asanza" <f.asanza@gmail.com>
Date: Sat, 18 Apr 2015 22:59:58 +0200
Subject: [PATCH] fix qt5 compilation issues

---
 DSView/main.cpp                | 2 +-
 DSView/pv/devicemanager.cpp    | 2 +-
 DSView/pv/mainwindow.cpp       | 5 ++---
 DSView/pv/toolbars/filebar.cpp | 6 +++---
 DSView/pv/toolbars/logobar.cpp | 4 ++--
 DSView/pv/view/view.cpp        | 2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index 3964880a..9320ec81 100644
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -30,7 +30,7 @@
 
 #include <getopt.h>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDebug>
 #include <QFile>
 #include <QDir>
diff --git a/DSView/pv/devicemanager.cpp b/DSView/pv/devicemanager.cpp
index 6bee8b71..e4a2b6e8 100644
--- a/DSView/pv/devicemanager.cpp
+++ b/DSView/pv/devicemanager.cpp
@@ -31,7 +31,7 @@
 #include <stdexcept>
 #include <string>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QObject>
 #include <QDebug>
 #include <QDir>
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 7a0c9407..650a347f 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -225,8 +225,7 @@ void MainWindow::setup_ui()
 	// Set the title
     QString title = QApplication::applicationName()+" v"+QApplication::applicationVersion();
     std::string std_title = title.toStdString();
-    setWindowTitle(QApplication::translate("MainWindow", std_title.c_str(), 0,
-		QApplication::UnicodeUTF8));
+    setWindowTitle(QApplication::translate("MainWindow", std_title.c_str(), 0));
 
 	// Setup _session events
 	connect(&_session, SIGNAL(capture_state_changed(int)), this,
@@ -522,7 +521,7 @@ void MainWindow::on_screenShot()
                        tr("%1 Files (*.%2);;All Files (*)")
                        .arg(format.toUpper()).arg(format));
     if (!fileName.isEmpty())
-        pixmap.save(fileName, format.toAscii());
+        pixmap.save(fileName, format.toLatin1());
 }
 
 void MainWindow::on_save()
diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
index 736b57b8..0b795cc5 100644
--- a/DSView/pv/toolbars/filebar.cpp
+++ b/DSView/pv/toolbars/filebar.cpp
@@ -48,7 +48,7 @@ FileBar::FileBar(SigSession &session, QWidget *parent) :
 
     _action_open = new QAction(this);
     _action_open->setText(QApplication::translate(
-        "File", "&Open...", 0, QApplication::UnicodeUTF8));
+        "File", "&Open...", 0));
     _action_open->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/open.png")));
     _action_open->setObjectName(QString::fromUtf8("actionOpen"));
@@ -57,7 +57,7 @@ FileBar::FileBar(SigSession &session, QWidget *parent) :
 
     _action_save = new QAction(this);
     _action_save->setText(QApplication::translate(
-        "File", "&Save...", 0, QApplication::UnicodeUTF8));
+        "File", "&Save...", 0));
     _action_save->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/save.png")));
     _action_save->setObjectName(QString::fromUtf8("actionSave"));
@@ -66,7 +66,7 @@ FileBar::FileBar(SigSession &session, QWidget *parent) :
 
     _action_capture = new QAction(this);
     _action_capture->setText(QApplication::translate(
-        "File", "&Capture...", 0, QApplication::UnicodeUTF8));
+        "File", "&Capture...", 0));
     _action_capture->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/capture.png")));
     _action_capture->setObjectName(QString::fromUtf8("actionCapture"));
diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp
index 842a74ed..00063406 100644
--- a/DSView/pv/toolbars/logobar.cpp
+++ b/DSView/pv/toolbars/logobar.cpp
@@ -47,7 +47,7 @@ LogoBar::LogoBar(SigSession &session, QWidget *parent) :
 
     _about = new QAction(this);
     _about->setText(QApplication::translate(
-        "File", "&About...", 0, QApplication::UnicodeUTF8));
+        "File", "&About...", 0));
     _about->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/about.png")));
     _about->setObjectName(QString::fromUtf8("actionAbout"));
@@ -56,7 +56,7 @@ LogoBar::LogoBar(SigSession &session, QWidget *parent) :
 
     _wiki = new QAction(this);
     _wiki->setText(QApplication::translate(
-        "File", "&Wiki", 0, QApplication::UnicodeUTF8));
+        "File", "&Wiki", 0));
     _wiki->setIcon(QIcon::fromTheme("file",
         QIcon(":/icons/wiki.png")));
     _wiki->setObjectName(QString::fromUtf8("actionWiki"));
diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp
index 1a912d40..64efed43 100644
--- a/DSView/pv/view/view.cpp
+++ b/DSView/pv/view/view.cpp
@@ -27,7 +27,7 @@
 
 #include <boost/foreach.hpp>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QEvent>
 #include <QMouseEvent>
 #include <QScrollBar>