Minor changes

diff --git a/src/libs/Common/app.cpp b/src/libs/Common/app.cpp
index f6668d956e997aa656bfbb29eba75a51f0df6ab8..b907a4b4ebe05c7749d026a4e52fd9d9a598cb14 100644 (file)
--- a/src/libs/Common/app.cpp
+++ b/src/libs/Common/app.cpp
@@ -295,7 +295,7 @@ QString const App::xmlFileName() const
 int App::exec()
 {
     setReady(true);
-    int rval = QCoreApplication::exec();
+    int const rval = QCoreApplication::exec();
     setReady(false);
     return rval;
 }

diff --git a/src/main/CLI/main.cpp b/src/main/CLI/main.cpp
index c795bbaa9603390a4ecb75b285e61a14e7f0debf..0be3f3697de7522f1fe8e985efbc20fa0a994ba2 100644 (file)
--- a/src/main/CLI/main.cpp
+++ b/src/main/CLI/main.cpp
@@ -265,7 +265,7 @@ int main(int argc, char ** argv)
 
     // The main run loop
     bool quit = false;
-    int rval;
+    int rval = 0;
     while (!quit) {
 
         EVAF_INFO("%s is starting up", VER_MODULE_NAME_STR);

diff --git a/src/plugins/LogView/factory.cpp b/src/plugins/LogView/factory.cpp
index 52a7773290c2267509857c08a6aa7e5c10c7c6b5..27372fd04cbeac14237aef5adbd3c76f3921ecd8 100644 (file)
--- a/src/plugins/LogView/factory.cpp
+++ b/src/plugins/LogView/factory.cpp
@@ -33,7 +33,7 @@ VER_EXPORT_VERSION_INFO()
 
 Factory::Factory()
     : Plugins::iPluginFactory()
-    , mPlugin(0)
+    , mPlugin(nullptr)
 {
     setObjectName(QString("%1-Factory").arg(VER_MODULE_NAME_STR));
 
@@ -52,7 +52,7 @@ QObject * Factory::create(QString const & name)
 {
     Q_UNUSED(name);
 
-    if (mPlugin == 0)
+    if (mPlugin == nullptr)
         mPlugin = new Internal::Module;
     return mPlugin;
 }

diff --git a/src/plugins/LogView/logview.h b/src/plugins/LogView/logview.h
index dd768585587f7e7cf5e8a19ffc6ea5f34409f4f7..e652f619b7d3e4aec5a1a1b10608ec50231449b1 100644 (file)
--- a/src/plugins/LogView/logview.h
+++ b/src/plugins/LogView/logview.h
@@ -79,11 +79,11 @@ public:
         QString where;
     };
 
-    Model(QObject * parent = 0);
+    Model(QObject * parent = nullptr);
 
     Message const & messageAt(int idx) const { return mData.at(idx); }
 
-    virtual int rowCount(QModelIndex const & parent = QModelIndex()) const { return mData.size(); }
+    virtual int rowCount(QModelIndex const & = QModelIndex()) const { return mData.size(); }
 
     virtual QVariant data(QModelIndex const & index, int role = Qt::DisplayRole) const;
 
@@ -135,7 +135,7 @@ class Widget : public QWidget
 
 public:
 
-    Widget(QString const & source, QWidget * parent = 0);
+    Widget(QString const & source, QWidget * parent = nullptr);
 
     QString const & source() const { return mSource; }
 
@@ -178,7 +178,7 @@ class Window : public Gui::Panel
 
 public:
 
-    Window(QString const & args, QWidget * parent = 0, Qt::WindowFlags flags = 0);
+    Window(QString const & args, QWidget * parent = nullptr, Qt::WindowFlags flags = 0);
 
     virtual ~Window();
 
@@ -226,7 +226,7 @@ public:
 
     virtual void done();
 
-    virtual bool isReady() const { return wWindow != 0; }
+    virtual bool isReady() const { return wWindow != nullptr; }
 
 private: // Members