forked from Ivasoft/DSView
fix qt5 compilation issues
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
|
||||
#include <getopt.h>
|
||||
|
||||
#include <QtGui/QApplication>
|
||||
#include <QApplication>
|
||||
#include <QDebug>
|
||||
#include <QFile>
|
||||
#include <QDir>
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
|
||||
#include <QtGui/QApplication>
|
||||
#include <QApplication>
|
||||
#include <QObject>
|
||||
#include <QDebug>
|
||||
#include <QDir>
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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"));
|
||||
|
||||
@@ -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"));
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
|
||||
#include <QtGui/QApplication>
|
||||
#include <QApplication>
|
||||
#include <QEvent>
|
||||
#include <QMouseEvent>
|
||||
#include <QScrollBar>
|
||||
|
||||
Reference in New Issue
Block a user