Skip to content
This repository was archived by the owner on Aug 25, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hairless-midiserial.pro
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
#-------------------------------------------------

QT += core gui
QT += core gui widgets

TARGET = hairless-midiserial
TEMPLATE = app
Expand Down
2 changes: 1 addition & 1 deletion src/Bridge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ void Bridge::sendMidiMessage() {
if(msg_data.length() == 0)
return;
if(bufferStartsWith(MSG_DEBUG)) {
QString debug_msg = QString::fromAscii(msg_data.mid(4, msg_data[3]).data());
QString debug_msg = QString::fromLatin1(msg_data.mid(4, msg_data[3]).data());
emit displayMessage(applyTimeStamp(QString("Serial Says: %1").arg(debug_msg)));
} else {
emit debugMessage(applyTimeStamp(QString("Serial In: %1").arg(describeMIDI(msg_data))));
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <QtGui/QApplication>
#include <QtWidgets/QApplication>
#include "ui/mainwindow.h"

int main(int argc, char *argv[])
Expand Down
2 changes: 1 addition & 1 deletion src/ui/aboutdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
{
ui->setupUi(this);

QString text = ui->label_info->text().arg(QString::fromAscii(VERSION)).arg(QString::fromAscii(__DATE__));
QString text = ui->label_info->text().arg(QString::fromLatin1(VERSION)).arg(QString::fromLatin1(__DATE__));
ui->label_info->setText(text);
}

Expand Down
3 changes: 3 additions & 0 deletions src/ui/mainwindow.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H

#include <QtWidgets>
/*
#include <QMainWindow>
#include <QComboBox>
#include <QLabel>
#include <QTime>
#include <QMenuBar>
#include <QTimer>
*/
#include "RtMidi.h"
#include "Bridge.h"

Expand Down
1 change: 1 addition & 0 deletions src/ui/settingsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ static void populateBaudRate(QComboBox *box, BaudRateType initialValue)
box->addItem("14400", BAUD14400);
#endif
box->addItem("19200", BAUD19200);
box->addItem("31250 (Native MIDI)", BAUD31250);
box->addItem("38400", BAUD38400);
#ifdef Q_OS_WIN32
box->addItem("56000", BAUD56000);
Expand Down