Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-13 08:19:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Resolve compiler warnings for unused return values

Browse Source 
* Fixes #1932 - See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425#c29

Adding a negation before the function call allows the (void) syntax to work properly.
This commit is contained in:
Jonathan White 2021-06-08 22:55:53 -04:00
parent a0912b057e
commit 6a8b070b0a
No known key found for this signature in database
GPG Key ID: 440FC65F2E0C6E01
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/Application.cpp
View File

@ -256,7 +256,7 @@ void Application::handleUnixSignal(int sig)
case SIGINT: case SIGINT:
case SIGTERM: { case SIGTERM: {
char buf = 0; char buf = 0;
Q_UNUSED(::write(unixSignalSocket[0], &buf, sizeof(buf))); Q_UNUSED(!::write(unixSignalSocket[0], &buf, sizeof(buf)));
return; return;
} }
case SIGHUP: case SIGHUP:
@ -268,7 +268,7 @@ void Application::quitBySignal()
{ {
m_unixSignalNotifier->setEnabled(false); m_unixSignalNotifier->setEnabled(false);
char buf; char buf;
Q_UNUSED(::read(unixSignalSocket[1], &buf, sizeof(buf))); Q_UNUSED(!::read(unixSignalSocket[1], &buf, sizeof(buf)));
emit quitSignalReceived(); emit quitSignalReceived();
} }
#endif #endif

2
tests/TestKeys.cpp
View File

@ -235,7 +235,7 @@ void TestKeys::benchmarkTransformKey()
QBENCHMARK QBENCHMARK
{ {
Q_UNUSED(compositeKey->transform(kdf, result)); Q_UNUSED(!compositeKey->transform(kdf, result));
}; };
} }

13
tests/gui/TestGui.cpp
View File

@ -851,7 +851,7 @@ void TestGui::testTotp()
void TestGui::testSearch() void TestGui::testSearch()
{ {
// Add canned entries for consistent testing // Add canned entries for consistent testing
Q_UNUSED(addCannedEntries()); addCannedEntries();
auto* toolBar = m_mainWindow->findChild<QToolBar*>("toolBar"); auto* toolBar = m_mainWindow->findChild<QToolBar*>("toolBar");
@ -1005,7 +1005,7 @@ void TestGui::testSearch()
void TestGui::testDeleteEntry() void TestGui::testDeleteEntry()
{ {
// Add canned entries for consistent testing // Add canned entries for consistent testing
Q_UNUSED(addCannedEntries()); addCannedEntries();
auto* groupView = m_dbWidget->findChild<GroupView*>("groupView"); auto* groupView = m_dbWidget->findChild<GroupView*>("groupView");
auto* entryView = m_dbWidget->findChild<EntryView*>("entryView"); auto* entryView = m_dbWidget->findChild<EntryView*>("entryView");
@ -1685,10 +1685,8 @@ void TestGui::testAutoType()
entryView->selectionModel()->clearSelection(); entryView->selectionModel()->clearSelection();
} }
int TestGui::addCannedEntries() void TestGui::addCannedEntries()
{ {
int entries_added = 0;
// Find buttons // Find buttons
auto* toolBar = m_mainWindow->findChild<QToolBar*>("toolBar"); auto* toolBar = m_mainWindow->findChild<QToolBar*>("toolBar");
QWidget* entryNewWidget = toolBar->widgetForAction(m_mainWindow->findChild<QAction*>("actionEntryNew")); QWidget* entryNewWidget = toolBar->widgetForAction(m_mainWindow->findChild<QAction*>("actionEntryNew"));
@ -1701,22 +1699,17 @@ int TestGui::addCannedEntries()
QTest::keyClicks(titleEdit, "test"); QTest::keyClicks(titleEdit, "test");
auto* editEntryWidgetButtonBox = editEntryWidget->findChild<QDialogButtonBox*>("buttonBox"); auto* editEntryWidgetButtonBox = editEntryWidget->findChild<QDialogButtonBox*>("buttonBox");
QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton);
++entries_added;
// Add entry "something 2" // Add entry "something 2"
QTest::mouseClick(entryNewWidget, Qt::LeftButton); QTest::mouseClick(entryNewWidget, Qt::LeftButton);
QTest::keyClicks(titleEdit, "something 2"); QTest::keyClicks(titleEdit, "something 2");
QTest::keyClicks(passwordEdit, "something 2"); QTest::keyClicks(passwordEdit, "something 2");
QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton);
++entries_added;
// Add entry "something 3" // Add entry "something 3"
QTest::mouseClick(entryNewWidget, Qt::LeftButton); QTest::mouseClick(entryNewWidget, Qt::LeftButton);
QTest::keyClicks(titleEdit, "something 3"); QTest::keyClicks(titleEdit, "something 3");
QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton);
++entries_added;
return entries_added;
} }
void TestGui::checkDatabase(QString dbFileName) void TestGui::checkDatabase(QString dbFileName)

2
tests/gui/TestGui.h
View File

@ -72,7 +72,7 @@ private slots:
void testTrayRestoreHide(); void testTrayRestoreHide();
private: private:
int addCannedEntries(); void addCannedEntries();
void checkDatabase(QString dbFileName = ""); void checkDatabase(QString dbFileName = "");
void triggerAction(const QString& name); void triggerAction(const QString& name);
void dragAndDropGroup(const QModelIndex& sourceIndex, void dragAndDropGroup(const QModelIndex& sourceIndex,