diff --git a/main.cpp b/main.cpp index f0dcf72..480fd53 100644 --- a/main.cpp +++ b/main.cpp @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) signal(SIGTERM, cleanup); signal(SIGKILL, cleanup); #endif - w = new servermain(settingsFile, logFilename); + w = new servermain(settingsFile); #else a.setWheelScrollLines(1); // one line per wheel click wfmain w(settingsFile, logFilename, debugMode); diff --git a/selectradio.cpp b/selectradio.cpp index 6fe9b00..9c274dc 100644 --- a/selectradio.cpp +++ b/selectradio.cpp @@ -60,7 +60,7 @@ void selectRadio::setInUse(quint8 radio, quint8 busy, QString user, QString ip) void selectRadio::on_table_cellClicked(int row, int col) { qInfo() << "Clicked on " << row << "," << col; -#if (QT_VERSION < QT_VERSION_CHECK(6,0,0)) +#if (QT_VERSION < QT_VERSION_CHECK(5,11,0)) if (ui->table->item(row, col)->backgroundColor() != Qt::darkGreen) { #else if (ui->table->item(row, col)->background() != Qt::darkGreen) { diff --git a/servermain.cpp b/servermain.cpp index 791d8fd..2d39d5e 100644 --- a/servermain.cpp +++ b/servermain.cpp @@ -8,7 +8,7 @@ // This code is copyright 2017-2020 Elliott H. Liggett // All rights reserved -servermain::servermain(const QString settingsFile, const QString logFile) +servermain::servermain(const QString settingsFile) { qRegisterMetaType (); // Needs to be registered early. diff --git a/servermain.h b/servermain.h index b19d8ca..b04da11 100644 --- a/servermain.h +++ b/servermain.h @@ -46,7 +46,7 @@ class servermain : public QObject Q_OBJECT public: - servermain(const QString logFile, const QString settingsFile); + servermain(const QString logFile); ~servermain(); signals: