commit 84b7c7c63ec6d3148fb1cfd72cd29b8cf67849f5
Author: piorekf <piorek@piorekf.org>
Date: Wed Apr 6 21:06:35 2016 +0200
Applied a Qt5 compatibility patch recieved from a user - fixes #43
diff --git a/plug/main.cpp b/plug/main.cpp
index 0be20ba..5306beb 100644
--- a/plug/main.cpp
+++ b/plug/main.cpp
@@ -16,7 +16,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <QtGui/QApplication>
+#include <QApplication>
#include "mainwindow.h"
int main(int argc, char *argv[])
diff --git a/plug/mainwindow.cpp b/plug/mainwindow.cpp
index 03f0cc8..64bb709 100644
--- a/plug/mainwindow.cpp
+++ b/plug/mainwindow.cpp
@@ -682,7 +682,7 @@ void MainWindow::update_firmware()
ui->centralWidget->setDisabled(true);
ui->menuBar->setDisabled(true);
this->repaint();
- ret = amp_ops->update(filename.toAscii().data()); // magic part
+ ret = amp_ops->update(filename.toLatin1().data()); // magic part
ui->centralWidget->setDisabled(false);
ui->menuBar->setDisabled(false);
ui->statusBar->showMessage("", 1);
diff --git a/plug/plug.pro b/plug/plug.pro
index 4a33e6b..464db37 100644
--- a/plug/plug.pro
+++ b/plug/plug.pro
@@ -4,7 +4,7 @@
#
#-------------------------------------------------
-QT += core gui network
+QT += core widgets gui network
TARGET = plug
TEMPLATE = app
diff --git a/plug/save_effects.cpp b/plug/save_effects.cpp
index 3489984..4d1d4d2 100644
--- a/plug/save_effects.cpp
+++ b/plug/save_effects.cpp
@@ -56,7 +56,7 @@ void SaveEffects::send()
number++;
}
- dynamic_cast<MainWindow*>(parent())->save_effects(ui->comboBox->currentIndex(), ui->lineEdit->text().toAscii().data(), number,
+ dynamic_cast<MainWindow*>(parent())->save_effects(ui->comboBox->currentIndex(), ui->lineEdit->text().toLatin1().data(), number,
ui->checkBox->isChecked(), ui->checkBox_2->isChecked(), ui->checkBox_3->isChecked());
this->close();
}
diff --git a/plug/saveonamp.cpp b/plug/saveonamp.cpp
index bcde91d..46facc6 100644
--- a/plug/saveonamp.cpp
+++ b/plug/saveonamp.cpp
@@ -30,7 +30,7 @@ void SaveOnAmp::save()
ui->comboBox->setItemText(ui->comboBox->currentIndex(), name);
dynamic_cast<MainWindow*>(parent())->change_name(ui->comboBox->currentIndex(), &name);
- dynamic_cast<MainWindow*>(parent())->save_on_amp(ui->lineEdit->text().toAscii().data(), ui->comboBox->currentIndex());
+ dynamic_cast<MainWindow*>(parent())->save_on_amp(ui->lineEdit->text().toLatin1().data(), ui->comboBox->currentIndex());
if(!settings.value("Settings/keepWindowsOpen").toBool())
this->close();
}