Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanek Bevendorff <janek@jbev.net>2017-03-10 16:28:26 +0300
committerJanek Bevendorff <janek@jbev.net>2017-03-10 18:11:52 +0300
commitda0afd39395ed5aaae5ebf35d1905ccc9f94d186 (patch)
tree36f5958b877d12cf00c667b0ef2fc015de18956b
parent31494ec32796ed723cd5b772bae014cc6e8afe6c (diff)
Fix compiler warnings
-rw-r--r--src/gui/Application.cpp4
-rw-r--r--src/gui/EditWidgetIcons.cpp3
-rw-r--r--src/gui/MainWindow.ui4
-rw-r--r--src/gui/entry/EditEntryWidgetAutoType.ui5
4 files changed, 5 insertions, 11 deletions
diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp
index 26d9d2283..34d1b8680 100644
--- a/src/gui/Application.cpp
+++ b/src/gui/Application.cpp
@@ -148,7 +148,7 @@ void Application::handleUnixSignal(int sig)
case SIGTERM:
{
char buf = 0;
- ::write(unixSignalSocket[0], &buf, sizeof(buf));
+ Q_UNUSED(::write(unixSignalSocket[0], &buf, sizeof(buf)));
return;
}
case SIGHUP:
@@ -160,7 +160,7 @@ void Application::quitBySignal()
{
m_unixSignalNotifier->setEnabled(false);
char buf;
- ::read(unixSignalSocket[1], &buf, sizeof(buf));
+ Q_UNUSED(::read(unixSignalSocket[1], &buf, sizeof(buf)));
if (nullptr != m_mainWindow)
static_cast<MainWindow*>(m_mainWindow)->appExit();
diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index 1e1f5db29..d789eb498 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -48,9 +48,9 @@ EditWidgetIcons::EditWidgetIcons(QWidget* parent)
, m_defaultIconModel(new DefaultIconModel(this))
, m_customIconModel(new CustomIconModel(this))
#ifdef WITH_XC_HTTP
- , m_httpClient(nullptr)
, m_fallbackToGoogle(true)
, m_redirectCount(0)
+ , m_httpClient(nullptr)
#endif
{
m_ui->setupUi(this);
@@ -149,6 +149,7 @@ void EditWidgetIcons::setUrl(const QString& url)
m_ui->faviconButton->setVisible(!url.isEmpty());
resetFaviconDownload();
#else
+ Q_UNUSED(url);
m_ui->faviconButton->setVisible(false);
#endif
}
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index 6e3ecf684..1d57d557c 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -123,9 +123,7 @@
</spacer>
</item>
<item>
- <widget class="WelcomeWidget" name="welcomeWidget" native="true">
- <zorder>horizontalSpacer_2</zorder>
- </widget>
+ <widget class="WelcomeWidget" name="welcomeWidget" native="true"/>
</item>
<item>
<spacer name="horizontalSpacer_2">
diff --git a/src/gui/entry/EditEntryWidgetAutoType.ui b/src/gui/entry/EditEntryWidgetAutoType.ui
index 21e102bfe..a8090f768 100644
--- a/src/gui/entry/EditEntryWidgetAutoType.ui
+++ b/src/gui/entry/EditEntryWidgetAutoType.ui
@@ -259,11 +259,6 @@
</layout>
</item>
</layout>
- <zorder></zorder>
- <zorder></zorder>
- <zorder></zorder>
- <zorder></zorder>
- <zorder></zorder>
</widget>
</item>
</layout>