diff --git a/src/awards.h b/src/awards.h index 06cac907..9fd12f10 100644 --- a/src/awards.h +++ b/src/awards.h @@ -111,9 +111,7 @@ public: 6 - Default: Not applicable */ - private: - void setAwardDXCC(const int _qsoId); //bool setAwardDXCC(const int _dxcc, const int _band, const int _mode, const QString &_workedOrConfirmed, const int _logNumber, const int _qsoId); int setAwardDXCCst(const int _dxcc, const int _band, const int _mode, const bool _confirmed, const int _logNumber, const int _qsoId); @@ -156,7 +154,6 @@ private: DXMarathon *dxMarathon; Utilities *util; - typedef QMultiHash DXStatus; DXStatus dxccWorked, dxccConfirmed, wazWorked, wazConfirmed; diff --git a/src/charts/statscqzperyearbarchartwidget.h b/src/charts/statscqzperyearbarchartwidget.h index 3ca44177..0885e55c 100644 --- a/src/charts/statscqzperyearbarchartwidget.h +++ b/src/charts/statscqzperyearbarchartwidget.h @@ -39,6 +39,7 @@ class StatsCQZPerYearBarChartWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsCQZPerYearBarChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsCQZPerYearBarChartWidget(); @@ -55,7 +56,6 @@ private: //QChart *chart; QChartView *chartView; - }; #endif // QSOSPERYEARBARCHARTWIDGET_H diff --git a/src/charts/statsdxccsonsatswidget.h b/src/charts/statsdxccsonsatswidget.h index f3977162..a08309e7 100644 --- a/src/charts/statsdxccsonsatswidget.h +++ b/src/charts/statsdxccsonsatswidget.h @@ -39,12 +39,12 @@ class StatsDXCCOnSatsWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsDXCCOnSatsWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsDXCCOnSatsWidget(); void prepareChart(const int _log=-1) override; - signals: private slots: @@ -58,6 +58,5 @@ private: QCheckBox *confirmedOnlyCheckBox, *onlyLEOSatCheckBox; QLabel *numberLabel; int log; - }; #endif // STATSGRIDSONSATSWIDGET_H diff --git a/src/charts/statsentitiesperyearbarchartwidget.h b/src/charts/statsentitiesperyearbarchartwidget.h index 1ea3823a..7aa44ddc 100644 --- a/src/charts/statsentitiesperyearbarchartwidget.h +++ b/src/charts/statsentitiesperyearbarchartwidget.h @@ -38,6 +38,7 @@ class StatsEntitiesPerYearBarChartWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsEntitiesPerYearBarChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsEntitiesPerYearBarChartWidget(); @@ -53,7 +54,6 @@ private: //QChart *chart; QChartView *chartView; - }; #endif // QSOSPERYEARBARCHARTWIDGET_H diff --git a/src/charts/statsfieldperbandwidget.cpp b/src/charts/statsfieldperbandwidget.cpp index d0e2b3dd..58a9c472 100644 --- a/src/charts/statsfieldperbandwidget.cpp +++ b/src/charts/statsfieldperbandwidget.cpp @@ -145,6 +145,5 @@ void StatsFieldPerBandWidget::slotModeComboBoxChanged() { modeInUse = modeComboBox->currentText (); } - prepareChart (log); } diff --git a/src/charts/statsfieldperbandwidget.h b/src/charts/statsfieldperbandwidget.h index 5861c1c1..b626e728 100644 --- a/src/charts/statsfieldperbandwidget.h +++ b/src/charts/statsfieldperbandwidget.h @@ -42,12 +42,12 @@ class StatsFieldPerBandWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsFieldPerBandWidget(DataProxy_SQLite *dp, ValidFieldsForStats _field, QWidget *parent = nullptr); ~StatsFieldPerBandWidget(); void prepareChart(const int _log=-1); - signals: private slots: @@ -64,6 +64,5 @@ private: QComboBox *modeComboBox; QString modeInUse; int log; - }; #endif // STATSFIELDPERBANDWIDGET_H diff --git a/src/charts/statsgeneralchartwidget.h b/src/charts/statsgeneralchartwidget.h index 821f0fa3..b527155a 100644 --- a/src/charts/statsgeneralchartwidget.h +++ b/src/charts/statsgeneralchartwidget.h @@ -33,6 +33,7 @@ class StatsGeneralChartWidget : public QWidget { Q_OBJECT + public: StatsGeneralChartWidget(); StatsGeneralChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); @@ -40,7 +41,6 @@ public: private: virtual void createUI(); - }; #endif // GENERALCHARTWIDGET_H diff --git a/src/charts/statsgridsonsatswidget.h b/src/charts/statsgridsonsatswidget.h index 5b651daa..d86c5cf9 100644 --- a/src/charts/statsgridsonsatswidget.h +++ b/src/charts/statsgridsonsatswidget.h @@ -39,6 +39,7 @@ class StatsGridsOnSatsWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsGridsOnSatsWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsGridsOnSatsWidget(); @@ -58,6 +59,5 @@ private: QCheckBox *confirmedOnlyCheckBox, *onlyLEOSatCheckBox; QLabel *numberLabel; int log; - }; #endif // STATSGRIDSONSATSWIDGET_H diff --git a/src/charts/statsqsosperbandbarchartwidget.h b/src/charts/statsqsosperbandbarchartwidget.h index df995408..44c77fba 100644 --- a/src/charts/statsqsosperbandbarchartwidget.h +++ b/src/charts/statsqsosperbandbarchartwidget.h @@ -39,6 +39,7 @@ class StatsQSOsPerBandBarChartWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsQSOsPerBandBarChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsQSOsPerBandBarChartWidget(); @@ -54,7 +55,6 @@ private: //QChart *chart; QChartView *chartView; - }; #endif // QSOSPERBANDBARCHARTWIDGET_H diff --git a/src/charts/statsqsospercontinentbarchartwidget.h b/src/charts/statsqsospercontinentbarchartwidget.h index 45e26229..19176560 100644 --- a/src/charts/statsqsospercontinentbarchartwidget.h +++ b/src/charts/statsqsospercontinentbarchartwidget.h @@ -39,6 +39,7 @@ class StatsQSOsPerContinentBarChartWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsQSOsPerContinentBarChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsQSOsPerContinentBarChartWidget(); @@ -54,7 +55,6 @@ private: //QChart *chart; QChartView *chartView; - }; #endif // QSOSPERBANDBARCHARTWIDGET_H diff --git a/src/charts/statsqsosperdxccbarchartwidget.h b/src/charts/statsqsosperdxccbarchartwidget.h index e7c5fe2c..44e83e4f 100644 --- a/src/charts/statsqsosperdxccbarchartwidget.h +++ b/src/charts/statsqsosperdxccbarchartwidget.h @@ -39,6 +39,7 @@ class StatsQSOsPerDXCCBarChartWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsQSOsPerDXCCBarChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsQSOsPerDXCCBarChartWidget(); @@ -54,7 +55,6 @@ private: //QChart *chart; QChartView *chartView; - }; #endif // QSOSPERBANDBARCHARTWIDGET_H diff --git a/src/charts/statsqsosperhourbarchartwidget.h b/src/charts/statsqsosperhourbarchartwidget.h index 659e7490..f9d65396 100644 --- a/src/charts/statsqsosperhourbarchartwidget.h +++ b/src/charts/statsqsosperhourbarchartwidget.h @@ -39,6 +39,7 @@ class StatsQSOsPerHourBarChartWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsQSOsPerHourBarChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsQSOsPerHourBarChartWidget(); @@ -54,7 +55,6 @@ private: //QChart *chart; QChartView *chartView; - }; #endif // QSOSPERBANDBARCHARTWIDGET_H diff --git a/src/charts/statsqsospermodebarchartwidget.h b/src/charts/statsqsospermodebarchartwidget.h index 71ea21b0..e5f6e8ac 100644 --- a/src/charts/statsqsospermodebarchartwidget.h +++ b/src/charts/statsqsospermodebarchartwidget.h @@ -39,6 +39,7 @@ class StatsQSOsPerModeBarChartWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsQSOsPerModeBarChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsQSOsPerModeBarChartWidget(); @@ -54,7 +55,6 @@ private: //QChart *chart; QChartView *chartView; - }; #endif // QSOSPERMODEBARCHARTWIDGET_H diff --git a/src/charts/statsqsospermonthbarchartwidget.h b/src/charts/statsqsospermonthbarchartwidget.h index 3cda85c7..b2845370 100644 --- a/src/charts/statsqsospermonthbarchartwidget.h +++ b/src/charts/statsqsospermonthbarchartwidget.h @@ -39,6 +39,7 @@ class StatsQSOsPerMonthBarChartWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsQSOsPerMonthBarChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsQSOsPerMonthBarChartWidget(); @@ -54,7 +55,6 @@ private: //QChart *chart; QChartView *chartView; - }; #endif // QSOSPERMONTHBARCHARTWIDGET_H diff --git a/src/charts/statsqsosperyearbarchartwidget.h b/src/charts/statsqsosperyearbarchartwidget.h index 6278096c..e99b6b1a 100644 --- a/src/charts/statsqsosperyearbarchartwidget.h +++ b/src/charts/statsqsosperyearbarchartwidget.h @@ -39,6 +39,7 @@ class StatsQSOsPerYearBarChartWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsQSOsPerYearBarChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsQSOsPerYearBarChartWidget(); @@ -54,7 +55,6 @@ private: //QChart *chart; QChartView *chartView; - }; #endif // QSOSPERYEARBARCHARTWIDGET_H diff --git a/src/charts/statssentconfirmedpiechartwidget.h b/src/charts/statssentconfirmedpiechartwidget.h index 2761016f..52ea79a8 100644 --- a/src/charts/statssentconfirmedpiechartwidget.h +++ b/src/charts/statssentconfirmedpiechartwidget.h @@ -39,6 +39,7 @@ class StatsSentConfirmedPieChartWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsSentConfirmedPieChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsSentConfirmedPieChartWidget(); @@ -54,7 +55,6 @@ private: //QChart *chart; QChartView *chartView; - }; #endif // QSOSPERBANDBARCHARTWIDGET_H diff --git a/src/charts/statsworkedconfirmedpiechartwidget.h b/src/charts/statsworkedconfirmedpiechartwidget.h index 4f0b2bba..a11c5fa7 100644 --- a/src/charts/statsworkedconfirmedpiechartwidget.h +++ b/src/charts/statsworkedconfirmedpiechartwidget.h @@ -39,6 +39,7 @@ class StatsWorkedConfirmedPieChartWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsWorkedConfirmedPieChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsWorkedConfirmedPieChartWidget(); @@ -54,7 +55,6 @@ private: //QChart *chart; QChartView *chartView; - }; #endif // QSOSPERBANDBARCHARTWIDGET_H diff --git a/src/charts/statsworkedsentpiechartwidget.h b/src/charts/statsworkedsentpiechartwidget.h index 4f96e698..fcc77722 100644 --- a/src/charts/statsworkedsentpiechartwidget.h +++ b/src/charts/statsworkedsentpiechartwidget.h @@ -39,6 +39,7 @@ class StatsWorkedSentPieChartWidget : public StatsGeneralChartWidget { Q_OBJECT + public: StatsWorkedSentPieChartWidget(DataProxy_SQLite *dp, QWidget *parent = nullptr); ~StatsWorkedSentPieChartWidget(); @@ -54,7 +55,6 @@ private: //QChart *chart; QChartView *chartView; - }; #endif // QSOSPERBANDBARCHARTWIDGET_H diff --git a/src/elogclublog.h b/src/elogclublog.h index 380efddd..b2a3916c 100644 --- a/src/elogclublog.h +++ b/src/elogclublog.h @@ -39,6 +39,7 @@ class eLogClubLog : public QObject { Q_OBJECT + public: explicit eLogClubLog(); ~eLogClubLog(); diff --git a/src/elogqrzlog.h b/src/elogqrzlog.h index 6cb583bb..5da4b44c 100644 --- a/src/elogqrzlog.h +++ b/src/elogqrzlog.h @@ -45,6 +45,7 @@ class eLogQrzLog : public QObject { Q_OBJECT + public: explicit eLogQrzLog(DataProxy_SQLite *dp, const QString &_parentFunction, const QString &_klogVersion); ~eLogQrzLog(); @@ -70,7 +71,6 @@ private slots: void downloadProgress(qint64 received, qint64 total); void slotErrorManagement(QNetworkReply::NetworkError networkError); - signals: void actionReturnDownload(const int _i, const int _qsoId); void done(); diff --git a/src/eqslutilities.h b/src/eqslutilities.h index 15840d18..58480a6e 100644 --- a/src/eqslutilities.h +++ b/src/eqslutilities.h @@ -40,6 +40,7 @@ // https://www.eqsl.cc/qslcard/Programming.cfm class eQSLUtilities : public QObject { Q_OBJECT + public: explicit eQSLUtilities(const QString &_parentFunction); ~eQSLUtilities(); @@ -52,7 +53,6 @@ public: void sendLogFile(const QString &_file, QList _qso); - private: //QString geteQSLAdif(const QStringList _q); //int sendData(const QString &_eQSLUser, const QString &_q); // Sends the data (http post) to eQSL diff --git a/src/locator.h b/src/locator.h index 68870a88..2ccf81ef 100644 --- a/src/locator.h +++ b/src/locator.h @@ -44,7 +44,6 @@ const double KM_IN_A_MILE = 1.609344; class Locator{ public: - Locator(); ~Locator(); diff --git a/src/logmodel.cpp b/src/logmodel.cpp index 76170299..4aaacd54 100644 --- a/src/logmodel.cpp +++ b/src/logmodel.cpp @@ -39,7 +39,6 @@ LogModel::LogModel(DataProxy_SQLite *dp, QObject *parent):QSqlRelationalTableMod //qDebug() << Q_FUNC_INFO << " - END"; } - void LogModel::createlogModel(const int _i) { /* @@ -78,7 +77,7 @@ This should be coherent with the logview } void LogModel::setColumns(const QStringList &_columns) - { +{ //qDebug() << Q_FUNC_INFO ; //QString auxt; //foreach(auxt, _columns) @@ -99,7 +98,6 @@ This should be coherent with the logview if (!sqlOK) { emit queryError(Q_FUNC_INFO, q.lastError().databaseText(), q.lastError().nativeErrorCode(), q.lastQuery()); - } q.next(); rec = q.record(); // Number of columns diff --git a/src/searchwidget.cpp b/src/searchwidget.cpp index fc267008..4ca01055 100644 --- a/src/searchwidget.cpp +++ b/src/searchwidget.cpp @@ -220,7 +220,6 @@ void SearchWidget::createUI() connect(searchWindow, SIGNAL( actionDeleteQSO(int)), this, SLOT( slotQsoDeleteFromSearch(int) )); connect(searchWindow, SIGNAL( updateSearchLineEdit()), this, SLOT( slotSearchBoxTextChanged() )); connect(searchWindow, SIGNAL( requestFocus()), this, SLOT( slotRequestFocus() )); - } diff --git a/src/setuppages/hamlibserialconfigwidget.h b/src/setuppages/hamlibserialconfigwidget.h index 067adbc7..d78886f9 100644 --- a/src/setuppages/hamlibserialconfigwidget.h +++ b/src/setuppages/hamlibserialconfigwidget.h @@ -9,6 +9,7 @@ class HamLibSerialConfigWidget : public QWidget { Q_OBJECT + public: explicit HamLibSerialConfigWidget(QWidget *parent = nullptr); void createUI(); @@ -31,7 +32,6 @@ private slots: void slotScanPorts(); private: - QStringList getAvailableSerialPorts(); void fillSerialPortsComboBox(); diff --git a/src/setuppages/setuppagedxcluster.h b/src/setuppages/setuppagedxcluster.h index cb57c4fa..41f4e106 100644 --- a/src/setuppages/setuppagedxcluster.h +++ b/src/setuppages/setuppagedxcluster.h @@ -74,7 +74,6 @@ private: Utilities *util; //QStringList dxClusterServers; - }; #endif // SETUPPAGEDXCLUSTER_H diff --git a/src/setuppages/setuppagelogs.h b/src/setuppages/setuppagelogs.h index 03033e29..942b20e3 100644 --- a/src/setuppages/setuppagelogs.h +++ b/src/setuppages/setuppagelogs.h @@ -107,7 +107,6 @@ private: DataProxy_SQLite *dataProxy; int selectedLog; QString defaultStationCallSign, defaultOperators; - }; diff --git a/src/setuppages/setuppageudp.h b/src/setuppages/setuppageudp.h index b2fcff2e..43063fe1 100644 --- a/src/setuppages/setuppageudp.h +++ b/src/setuppages/setuppageudp.h @@ -31,10 +31,10 @@ #include #include "../utilities.h" - class SetupPageUDP : public QWidget { Q_OBJECT + public: SetupPageUDP(QWidget *parent = nullptr); ~SetupPageUDP(); @@ -80,8 +80,6 @@ public slots: //void slotAutoLogFromWSJTCheckBoxClicked(); //void slotRealFromWSJTCheckBoxClicked(); void slotUDPServerCheckBoxClicked(); - - }; #endif // SETUPPAGEUDP_H diff --git a/tests/tst_mainqsoentrywidget/tst_mainqsoentrywidget.cpp b/tests/tst_mainqsoentrywidget/tst_mainqsoentrywidget.cpp index 00403739..cf900002 100644 --- a/tests/tst_mainqsoentrywidget/tst_mainqsoentrywidget.cpp +++ b/tests/tst_mainqsoentrywidget/tst_mainqsoentrywidget.cpp @@ -53,7 +53,6 @@ private slots: private: DataProxy_SQLite *dataProxy; MainQSOEntryWidget *mainQSOEntryWidget; - }; tst_MainQSOEntryWidget::tst_MainQSOEntryWidget() diff --git a/tests/tst_setuphamlibserialwidget/tst_setuphamlibserialwidget.cpp b/tests/tst_setuphamlibserialwidget/tst_setuphamlibserialwidget.cpp index e886a5cb..ec4ae792 100644 --- a/tests/tst_setuphamlibserialwidget/tst_setuphamlibserialwidget.cpp +++ b/tests/tst_setuphamlibserialwidget/tst_setuphamlibserialwidget.cpp @@ -66,10 +66,8 @@ private slots: */ - private: HamLibSerialConfigWidget *serialHamLibWidget; - }; tst_SetupHamLibSerialWidget::tst_SetupHamLibSerialWidget() @@ -82,16 +80,9 @@ tst_SetupHamLibSerialWidget::~tst_SetupHamLibSerialWidget(){} void tst_SetupHamLibSerialWidget::initTestCase(){} -void tst_SetupHamLibSerialWidget::cleanupTestCase() -{ +void tst_SetupHamLibSerialWidget::cleanupTestCase(){} -} - - -void tst_SetupHamLibSerialWidget::test_Constructor() -{ - -} +void tst_SetupHamLibSerialWidget::test_Constructor(){} void tst_SetupHamLibSerialWidget::test_DataBits() { @@ -161,8 +152,7 @@ void tst_SetupHamLibSerialWidget::test_SerialSpeed() QVERIFY2(serialHamLibWidget->getSerialBauds() == 1200, qPrintable(QString("Serial Speed default not OK"))); } -void tst_SetupHamLibSerialWidget::test_SerialPort() -{} +void tst_SetupHamLibSerialWidget::test_SerialPort(){} QTEST_MAIN(tst_SetupHamLibSerialWidget)