Skip to content

Commit

Permalink
Refactor dataproxy_sqlite
Browse files Browse the repository at this point in the history
  • Loading branch information
d authored and d committed Mar 16, 2024
1 parent 6223070 commit 6c8efa5
Show file tree
Hide file tree
Showing 6 changed files with 241 additions and 3,063 deletions.
9 changes: 0 additions & 9 deletions src/awards.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ QString Awards::getQSOofAward (const int _enti, const int _bandid, const int _lo
stringQuery = QString("SELECT call, qso_date from log where dxcc='%1' AND bandid='%2' AND lognumber='%3'").arg(_enti).arg(_bandid).arg(_log);
}


sqlOK = query.exec(stringQuery);
//qDebug() << "Awards::getQSOofAward: stringQuery: " << stringQuery;
if (sqlOK)
Expand Down Expand Up @@ -1151,7 +1150,6 @@ void Awards::setColors (const QString &_newOne, const QString &_needed, const QS
#else
defaultColor.setNamedColor(_default.toUpper()); //To be replaced by .fromString in Qt6.6
#endif

}

if (neededColor.isValid())
Expand All @@ -1161,7 +1159,6 @@ void Awards::setColors (const QString &_newOne, const QString &_needed, const QS
#else
neededColor.setNamedColor(_needed.toUpper()); //To be replaced by .fromString in Qt6.6
#endif

}

if (confirmedColor.isValid())
Expand All @@ -1172,7 +1169,6 @@ void Awards::setColors (const QString &_newOne, const QString &_needed, const QS
confirmedColor.setNamedColor(_confirmed.toUpper()); //To be replaced by .fromString in Qt6.6
#endif
}

if (newOneColor.isValid())
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
Expand All @@ -1181,16 +1177,13 @@ void Awards::setColors (const QString &_newOne, const QString &_needed, const QS
newOneColor.setNamedColor(_newOne.toUpper()); //To be replaced by .fromString in Qt6.6
#endif
}

if (workedColor.isValid())
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
workedColor.fromString(_worked.toUpper());
#else
workedColor.setNamedColor(_worked.toUpper());
#endif


}
}

Expand Down Expand Up @@ -1649,7 +1642,6 @@ int Awards::dxccStatusBand(const int _ent, const int _band, const int _logNumber
query.finish();
return -1;
}

//qDebug() << "Awards::dxccStatusBand: return - 0.3";
return status; // if arrives to here decision => not worked
}
Expand Down Expand Up @@ -1819,7 +1811,6 @@ bool Awards::updateDXCCBandsStatus(const int _logNumber)
if (sqlOK)
{
//qDebug() << Q_FUNC_INFO << " - exec query: " << query.lastQuery ();

dxccStatusList.clear();
while(query.next())
{
Expand Down
Loading

0 comments on commit 6c8efa5

Please sign in to comment.