From c8050984a289a6ea98812395313ef37d4c7fd059 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Enar=20V=C3=A4ikene?= <enar@vaikene.net>
Date: Mon, 14 May 2012 19:49:28 +0300
Subject: [PATCH] Fixed small mistakes detected with clang++
---
src/apps/FileFinder/GUI/gui.h | 2 +-
src/apps/PswGen/CLI/cli.cpp | 4 ++--
src/libs/Common/logger.cpp | 2 +-
src/libs/Plugins/pluginmanager.cpp | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/apps/FileFinder/GUI/gui.h b/src/apps/FileFinder/GUI/gui.h
index 2c55cc5..4d22d0b 100644
--- a/src/apps/FileFinder/GUI/gui.h
+++ b/src/apps/FileFinder/GUI/gui.h
@@ -41,7 +41,7 @@ namespace SdiWindow {
struct iSdiWindow;
} // namespace eVaf::SdiWindow
namespace FileFinder {
- struct iFileFinder;
+ class iFileFinder;
namespace GUI {
namespace Internal {
diff --git a/src/apps/PswGen/CLI/cli.cpp b/src/apps/PswGen/CLI/cli.cpp
index 1b59e8b..cd18b85 100644
--- a/src/apps/PswGen/CLI/cli.cpp
+++ b/src/apps/PswGen/CLI/cli.cpp
@@ -54,8 +54,8 @@ int const Module::DefaultPasswordLength = 16;
Module::Module()
: Plugins::iPlugin()
, mReady(false)
- , mGenerator(false)
- , mStorage(false)
+ , mGenerator(0)
+ , mStorage(0)
, mEvReady(0)
{
setObjectName(QString("%1-Module").arg(VER_MODULE_NAME_STR));
diff --git a/src/libs/Common/logger.cpp b/src/libs/Common/logger.cpp
index 809670a..bb88073 100644
--- a/src/libs/Common/logger.cpp
+++ b/src/libs/Common/logger.cpp
@@ -425,7 +425,7 @@ QString Logger::printf(char const * const fmt, ...) const
va_end(ap);
#else
::va_start(ap, fmt);
- if (::vasprintf(&str, fmt, ap)); // IF is needed to avoid the compiler warning
+ if (::vasprintf(&str, fmt, ap)) {}; // IF is needed to avoid the compiler warning
::va_end(ap);
#endif
diff --git a/src/libs/Plugins/pluginmanager.cpp b/src/libs/Plugins/pluginmanager.cpp
index 69ca736..21db40b 100644
--- a/src/libs/Plugins/pluginmanager.cpp
+++ b/src/libs/Plugins/pluginmanager.cpp
@@ -457,7 +457,7 @@ iPlugin * Module::create(QString const & name)
// If the module is not loaded, load it now
if (!mLoader) {
if (!load())
- return false;
+ return 0;
}
iPlugin * i = 0;
--
2.49.0