eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix warnings and dependencies

Browse source
This commit is contained in:
eelke 2025-02-23 16:52:39 +01:00
parent 86a9a0d709
commit ee86327869
14 changed files with 38 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pglablib/ASyncDBConnection.cpp
View file

@ -263,7 +263,7 @@ void ASyncDBConnectionThread::waitForAndSendCommand()
{
WaitHandleList whl;
auto wait_result_new_command = whl.add(m_commandQueue.m_newEvent);
auto wait_result_stop = whl.add(m_stopEvent);
whl.add(m_stopEvent);
DWORD res = MsgWaitForMultipleObjectsEx(
whl.count(), // _In_ DWORD nCount,
@ -284,7 +284,6 @@ void ASyncDBConnectionThread::doNewCommand()
// get command from top of queue (but leave it in the queue, we need the callback)
if (! m_commandQueue.m_queue.empty()) {
const Command &command = m_commandQueue.m_queue.front();
bool query_send = false;
if (command.params.empty())
m_connection.sendQuery(command.command.c_str());
else

33
pglablib/ParamListJson.cpp
View file

@ -8,12 +8,12 @@ Json::Value ParamToJson(const Param &param)
return v;
}
Param ParamFromJson(const Json::Value &json)
{
Param p;
// Param ParamFromJson(const Json::Value &json)
// {
// Param p;
return p;
}
// return p;
// }
Json::Value ParamListToJson(const t_ParamList &list)
{
@ -24,14 +24,15 @@ Json::Value ParamListToJson(const t_ParamList &list)
return root;
}
t_ParamList ParamListFromJson(const Json::Value &json)
{
t_ParamList result;
if (json.isArray()) {
result.reserve(json.size());
for (auto &e : json) {
result.push_back(ParamFromJson(e));
}
}
return result;
}
// t_ParamList ParamListFromJson(const Json::Value &json)
// {
// t_ParamList result;
// if (json.isArray()) {
// result.reserve(json.size());
// for (auto &e : json) {
// result.push_back(ParamFromJson(e));
// }
// }
// return result;
//}

2
pglablib/ParamListModel.cpp
View file

@ -41,7 +41,7 @@ QVariant ParamListModel::headerData(int section, Qt::Orientation orientation, in
int ParamListModel::rowCount(const QModelIndex &) const
{
return m_paramList.size();
return static_cast<int>(m_paramList.size());
}
int ParamListModel::columnCount(const QModelIndex &) const

8
pglablib/codebuilder/StringEscapeRule.cpp
View file

@ -2,7 +2,7 @@
/**
*/
QString convert(QStringView in, ConvertToNumericEscape conversion, NumericEscapeFormat format, QString prefix)
{
return "TODO";
}
// QString convert(QStringView in, ConvertToNumericEscape conversion, NumericEscapeFormat format, QString prefix)
// {
// return "TODO";
// }

2
pglablib/utils/HumanReadableBytes.cpp
View file

@ -42,7 +42,7 @@ std::string HumanReadableBytes(uint64_t bytes)
};
std::ostringstream out;
for (int i = 0; i < (sizeof(scales) / sizeof(scale)); ++i)
for (unsigned int i = 0; i < (sizeof(scales) / sizeof(scale)); ++i)
{
if (bytes >= scales[i].scale)
{

8
pglablib/utils/KeyStrengthener.cpp
View file

@ -44,10 +44,10 @@ void KeyStrengthener::saveParams(SQLiteConnection &db, const QString &table_name
+ "VALUES(?1, ?2, ?3, ?4, ?5, ?6, ?7)");
stmt.Bind(1, 1);
stmt.Bind(2, "Scrypt");
stmt.Bind(3, i1);
stmt.Bind(4, i2);
stmt.Bind(5, i3);
stmt.Bind(6, m_keySize);
stmt.Bind(3, (int)i1);
stmt.Bind(4, (int)i2);
stmt.Bind(5, (int)i3);
stmt.Bind(6, (int)m_keySize);
stmt.Bind(7, salt_str);
stmt.Step();
}