Warning fixes and copyright update.

diff --git a/src/apps/FileFinder/Engine/CMakeLists.txt b/src/apps/FileFinder/Engine/CMakeLists.txt
index 310d5090a9d9950ed6613407b591ba4a0b7a867e..ba802a39aee46318d8fdc0a0aaa44950c82eabc3 100644 (file)
--- a/src/apps/FileFinder/Engine/CMakeLists.txt
+++ b/src/apps/FileFinder/Engine/CMakeLists.txt
@@ -17,6 +17,9 @@ set(eVaf_LIBRARIES CommonLib PluginsLib)
 # Source files
 set(SRCS
     engine.cpp
 # Source files
 set(SRCS
     engine.cpp

+    engine.h
+    ifilefinder.h
+    version.h

 )
 
 # Header files for the meta-object compiler
 )
 
 # Header files for the meta-object compiler

diff --git a/src/apps/FileFinder/Engine/engine.cpp b/src/apps/FileFinder/Engine/engine.cpp
index bd15220e0f051fd3682be9bb036953b08c92eec8..1cded9037cebbf7ead028bfdcbeca54586122413 100644 (file)
--- a/src/apps/FileFinder/Engine/engine.cpp
+++ b/src/apps/FileFinder/Engine/engine.cpp
@@ -3,7 +3,7 @@
  * @brief Module for the FileFinder application that searches for files
  * @author Enar Vaikene
  *
  * @brief Module for the FileFinder application that searches for files
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -79,7 +79,7 @@ void Module::done()
 
 Internal::Engine::Engine()
     : iFileFinder()
 
 Internal::Engine::Engine()
     : iFileFinder()

-    , mWorker(0)
+    , mWorker(nullptr)

 {
     setObjectName(QString("%1.Engine").arg(VER_MODULE_NAME_STR));
 
 {
     setObjectName(QString("%1.Engine").arg(VER_MODULE_NAME_STR));
 


@@ -108,10 +108,10 @@ bool Internal::Engine::init()
 
 void Internal::Engine::done()
 {
 
 void Internal::Engine::done()
 {

-    if (mWorker) {
+    if (mWorker != nullptr) {

         mWorker->stop();
         delete mWorker;
         mWorker->stop();
         delete mWorker;

-        mWorker = 0;
+        mWorker = nullptr;

     }
 
     EVAF_INFO("%s finalized", qPrintable(objectName()));
     }
 
     EVAF_INFO("%s finalized", qPrintable(objectName()));


@@ -119,20 +119,20 @@ void Internal::Engine::done()
 
 void Internal::Engine::search(QString const & dir, bool recursive, Filter const & filter)
 {
 
 void Internal::Engine::search(QString const & dir, bool recursive, Filter const & filter)
 {

-    if (mWorker)
+    if (mWorker != nullptr)

         mWorker->search(dir, recursive, filter);
 }
 
 bool Internal::Engine::busy() const
 {
         mWorker->search(dir, recursive, filter);
 }
 
 bool Internal::Engine::busy() const
 {

-    if (mWorker)
+    if (mWorker != nullptr)

         return mWorker->busy();
     return false;
 }
 
 void Internal::Engine::cancel()
 {
         return mWorker->busy();
     return false;
 }
 
 void Internal::Engine::cancel()
 {

-    if (mWorker)
+    if (mWorker != nullptr)

         mWorker->cancel();
 }
 
         mWorker->cancel();
 }
 


@@ -194,7 +194,7 @@ QStringList Internal::RegExpChain::split(const QString & pattern)
     bool e = false;
 
     while (offset < sz) {
     bool e = false;
 
     while (offset < sz) {

-        QChar ch = pattern.at(offset++);
+        QChar const ch = pattern.at(offset++);

         if (e) {
             e = false;
             if (ch == '*' || ch == '?' || ch == '[' || ch == ']')
         if (e) {
             e = false;
             if (ch == '*' || ch == '?' || ch == '[' || ch == ']')


@@ -328,7 +328,7 @@ void Internal::Worker::recursiveSearch(QString const & path)
     QDir dir(l);
 
     // Get the list of files in this directory
     QDir dir(l);
 
     // Get the list of files in this directory

-    QStringList files = dir.entryList(QDir::Files | QDir::NoSymLinks);
+    QStringList const files = dir.entryList(QDir::Files | QDir::NoSymLinks);

     foreach (QString const & file, files) {
 
         // Check for the cancel flag
     foreach (QString const & file, files) {
 
         // Check for the cancel flag


@@ -377,7 +377,7 @@ void Internal::Worker::recursiveSearch(QString const & path)
                  * ReadBufferSize bytes of data. Every block is checked twice, but we make sure that
                  * also strings that stretch from one block to another are checked.
                  */
                  * ReadBufferSize bytes of data. Every block is checked twice, but we make sure that
                  * also strings that stretch from one block to another are checked.
                  */

-                QByteArray b = f.read(ReadBufferSize);
+                QByteArray const b = f.read(ReadBufferSize);

                 buf.append(b);
                 if (buf.size() > (2 * ReadBufferSize))
                     buf.remove(0, ReadBufferSize);
                 buf.append(b);
                 if (buf.size() > (2 * ReadBufferSize))
                     buf.remove(0, ReadBufferSize);


@@ -398,7 +398,7 @@ void Internal::Worker::recursiveSearch(QString const & path)
 
     // Process sub-directories
     if (mRecursive) {
 
     // Process sub-directories
     if (mRecursive) {

-        QStringList dirs = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks);
+        QStringList const dirs = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks);

         foreach (QString const & directory, dirs) {
 
             // Check for the cancel flag
         foreach (QString const & directory, dirs) {
 
             // Check for the cancel flag

diff --git a/src/apps/FileFinder/Engine/engine.h b/src/apps/FileFinder/Engine/engine.h
index a17d3ccfbcb22cab08805b46f6ca1c085d7bf94f..a6c2370f864a159f36344cbc601be38d6c9fd882 100644 (file)
--- a/src/apps/FileFinder/Engine/engine.h
+++ b/src/apps/FileFinder/Engine/engine.h
@@ -3,7 +3,7 @@
  * @brief Module for the FileFinder application that searches for files
  * @author Enar Vaikene
  *
  * @brief Module for the FileFinder application that searches for files
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -181,7 +181,7 @@ class Worker : public QThread
 
 public:
 
 
 public:
 

-    Worker(QObject * parent = 0);
+    Worker(QObject * parent = nullptr);

 
     virtual ~Worker();
 
 
     virtual ~Worker();
 

diff --git a/src/apps/FileFinder/Engine/ifilefinder.h b/src/apps/FileFinder/Engine/ifilefinder.h
index 7c0380e77b966fefa593201c209b60466c7ffe47..539a95cc327034a1cdd9ea522c39ccd0c1f48c58 100644 (file)
--- a/src/apps/FileFinder/Engine/ifilefinder.h
+++ b/src/apps/FileFinder/Engine/ifilefinder.h
@@ -3,7 +3,7 @@
  * @brief Interface for the file finder engine
  * @author Enar Vaikene
  *
  * @brief Interface for the file finder engine
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/apps/FileFinder/Engine/version.h b/src/apps/FileFinder/Engine/version.h
index 510754b06a88fed8d4e21aa483373ddd70d99b2f..936534c94e9d32f5c88911822de40e2381fecbde 100644 (file)
--- a/src/apps/FileFinder/Engine/version.h
+++ b/src/apps/FileFinder/Engine/version.h
@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
 /**
  * Module/library version number in the form major,minor,release,build
  */

-#define VER_FILE_VERSION                0,1,3,3
+#define VER_FILE_VERSION                0,1,3,4

 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */

-#define VER_FILE_VERSION_STR            "0.1.3.3\0"
+#define VER_FILE_VERSION_STR            "0.1.3.4\0"

 
 /**
  * Module/library name (shall end with \0)
 
 /**
  * Module/library name (shall end with \0)

diff --git a/src/apps/FileFinder/GUI/CMakeLists.txt b/src/apps/FileFinder/GUI/CMakeLists.txt
index 3c9d64cfd08ddfd77b68e5b7bfccd77b3a440699..186882699bd6a4e11dd280ad61a30db58b6eb7f1 100644 (file)
--- a/src/apps/FileFinder/GUI/CMakeLists.txt
+++ b/src/apps/FileFinder/GUI/CMakeLists.txt
@@ -13,6 +13,8 @@ set(eVaf_LIBRARIES CommonLib PluginsLib GuiLib)
 # Source files
 set(SRCS
     gui.cpp
 # Source files
 set(SRCS
     gui.cpp

+    gui.h
+    version.h

 )
 
 # Header files for the meta-object compiler
 )
 
 # Header files for the meta-object compiler

diff --git a/src/apps/FileFinder/GUI/gui.cpp b/src/apps/FileFinder/GUI/gui.cpp
index 9574df1e61004998b22e5ddd12cd5c061f73f62f..b0531af0ca42db36b7c36d97df721371ebe9dae3 100644 (file)
--- a/src/apps/FileFinder/GUI/gui.cpp
+++ b/src/apps/FileFinder/GUI/gui.cpp
@@ -3,7 +3,7 @@
  * @brief GUI for the FileFinder application
  * @author Enar Vaikene
  *
  * @brief GUI for the FileFinder application
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -78,19 +78,19 @@ int const FileFinder::GUI::Module::MaxHistoryItems = 20;
 FileFinder::GUI::Module::Module()
     : Plugins::iPlugin()
     , mReady(false)
 FileFinder::GUI::Module::Module()
     : Plugins::iPlugin()
     , mReady(false)

-    , mFinder(0)
-    , mOpenFileAction(0)
-    , mOpenDirectoryAction(0)
-    , mCopyNameAction(0)
-    , mCopyAllNamesAction(0)
-    , wMain(0)
-    , wDirectory(0)
-    , wRecursive(0)
-    , wIncludeNames(0)
-    , wExcludeNames(0)
-    , wIncludeContent(0)
-    , wExcludeContent(0)
-    , wFind(0)
+    , mFinder(nullptr)
+    , mOpenFileAction(nullptr)
+    , mOpenDirectoryAction(nullptr)
+    , mCopyNameAction(nullptr)
+    , mCopyAllNamesAction(nullptr)
+    , wMain(nullptr)
+    , wDirectory(nullptr)
+    , wRecursive(nullptr)
+    , wIncludeNames(nullptr)
+    , wExcludeNames(nullptr)
+    , wIncludeContent(nullptr)
+    , wExcludeContent(nullptr)
+    , wFind(nullptr)

 {
     setObjectName(QString("%1.Module").arg(VER_MODULE_NAME_STR));
 
 {
     setObjectName(QString("%1.Module").arg(VER_MODULE_NAME_STR));
 


@@ -107,13 +107,13 @@ bool FileFinder::GUI::Module::init(QString const & args)
     Q_UNUSED(args)
 
     // Get the iFileFinder interface
     Q_UNUSED(args)
 
     // Get the iFileFinder interface

-    EVAF_TEST_X((mFinder = evafQueryInterface<FileFinder::iFileFinder>("iFileFinder")), "No iFileFinder interface");
+    EVAF_TEST_X((mFinder = evafQueryInterface<FileFinder::iFileFinder>("iFileFinder")), "No iFileFinder interface")

     connect(mFinder, SIGNAL(found(QString,QString)), this, SLOT(found(QString,QString)));
     connect(mFinder, SIGNAL(finished(bool)), this, SLOT(finished(bool)));
 
     // Get the main window interface and fill it with widgets
     SdiWindow::iSdiWindow * win = evafQueryInterface<SdiWindow::iSdiWindow>("iSdiWindow");
     connect(mFinder, SIGNAL(found(QString,QString)), this, SLOT(found(QString,QString)));
     connect(mFinder, SIGNAL(finished(bool)), this, SLOT(finished(bool)));
 
     // Get the main window interface and fill it with widgets
     SdiWindow::iSdiWindow * win = evafQueryInterface<SdiWindow::iSdiWindow>("iSdiWindow");

-    EVAF_TEST_X(win, "No iSdiWindow interface");
+    EVAF_TEST_X(win, "No iSdiWindow interface")

 
     // Create the main widget for this window
     wMain = new Internal::MainWidget;
 
     // Create the main widget for this window
     wMain = new Internal::MainWidget;


@@ -140,14 +140,14 @@ void FileFinder::GUI::Module::done()
 {
     mReady = false;
 
 {
     mReady = false;
 

-    mFinder = 0;
+    mFinder = nullptr;

 
     /*
      * Widgets are deleted by the SdiWindow module. We use wMain to track calls to done() without
      * proper init().
      */
     if (wMain) {
 
     /*
      * Widgets are deleted by the SdiWindow module. We use wMain to track calls to done() without
      * proper init().
      */
     if (wMain) {

-        wMain = 0;
+        wMain = nullptr;

         saveHistory();
     }
 
         saveHistory();
     }
 

diff --git a/src/apps/FileFinder/GUI/gui.h b/src/apps/FileFinder/GUI/gui.h
index 283b1676f3384e197b0d4ae7b2f67c6a3ad6055e..3b584c3cb08a5a1ea6800a770a61cd66634be545 100644 (file)
--- a/src/apps/FileFinder/GUI/gui.h
+++ b/src/apps/FileFinder/GUI/gui.h
@@ -3,7 +3,7 @@
  * @brief GUI for the FileFinder application
  * @author Enar Vaikene
  *
  * @brief GUI for the FileFinder application
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -57,7 +57,7 @@ class MainWidget : public Gui::Panel
 
 public:
 
 
 public:
 

-    MainWidget(QWidget * parent = 0)
+    MainWidget(QWidget * parent = nullptr)

         : Gui::Panel(parent)
     {}
 
         : Gui::Panel(parent)
     {}
 

diff --git a/src/apps/FileFinder/GUI/version.h b/src/apps/FileFinder/GUI/version.h
index 248d5e09afb2762815c0c0ee156c39cfa7b87412..6ff25cc05028baab4a7232b4d01a24cec00e432d 100644 (file)
--- a/src/apps/FileFinder/GUI/version.h
+++ b/src/apps/FileFinder/GUI/version.h
@@ -3,7 +3,7 @@
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
 /**
  * Module/library version number in the form major,minor,release,build
  */

-#define VER_FILE_VERSION                0,1,5,5
+#define VER_FILE_VERSION                0,1,5,6

 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */

-#define VER_FILE_VERSION_STR            "0.1.5.5\0"
+#define VER_FILE_VERSION_STR            "0.1.5.6\0"

 
 /**
  * Module/library name (shall end with \0)
 
 /**
  * Module/library name (shall end with \0)

diff --git a/src/apps/PswGen/CLI/CMakeLists.txt b/src/apps/PswGen/CLI/CMakeLists.txt
index 862916895593be2fae47294bade7f14493625eff..8140b4c43c34bd23966a62260a48f279ff921337 100644 (file)
--- a/src/apps/PswGen/CLI/CMakeLists.txt
+++ b/src/apps/PswGen/CLI/CMakeLists.txt
@@ -10,6 +10,9 @@ set(eVaf_LIBRARIES CommonLib PluginsLib)
 # Source files
 set(SRCS
     cli.cpp
 # Source files
 set(SRCS
     cli.cpp

+    cli.h
+    lib.h
+    version.h

 )
 
 # Header files for the meta-object compiler
 )
 
 # Header files for the meta-object compiler

diff --git a/src/apps/PswGen/CLI/cli.cpp b/src/apps/PswGen/CLI/cli.cpp
index 2d2ca1cd55a9b0067acf0073610e65adac82f193..b27fa8a712b905d92f7d7c3383b21493991c5c36 100644 (file)
--- a/src/apps/PswGen/CLI/cli.cpp
+++ b/src/apps/PswGen/CLI/cli.cpp
@@ -3,7 +3,7 @@
  * @brief Command line interface for the PswGen application
  * @author Enar Vaikene
  *
  * @brief Command line interface for the PswGen application
  * @author Enar Vaikene
  *

- * Copyright (c) 2011-2012 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -53,8 +53,8 @@ int const Module::DefaultPasswordLength = 16;
 Module::Module()
     : Plugins::iPlugin()
     , mReady(false)
 Module::Module()
     : Plugins::iPlugin()
     , mReady(false)

-    , mGenerator(0)
-    , mStorage(0)
+    , mGenerator(nullptr)
+    , mStorage(nullptr)

     , mEvReady(0)
 {
     setObjectName(QString("%1-Module").arg(VER_MODULE_NAME_STR));
     , mEvReady(0)
 {
     setObjectName(QString("%1-Module").arg(VER_MODULE_NAME_STR));


@@ -68,10 +68,10 @@ Module::~Module()
 
 bool Module::init(QString const & args)
 {
 
 bool Module::init(QString const & args)
 {

-    Q_UNUSED(args);
+    Q_UNUSED(args)

 
     // Get the iGenerator interface
 
     // Get the iGenerator interface

-    EVAF_TEST_X((mGenerator = evafQueryInterface<PswGen::iGenerator>("iGenerator")), "No iGenerator interface");
+    EVAF_TEST_X((mGenerator = evafQueryInterface<PswGen::iGenerator>("iGenerator")), "No iGenerator interface")

 
     // Get the optional iStorage interface
     mStorage = evafQueryInterface<PswGen::iStorage>("iStorage");
 
     // Get the optional iStorage interface
     mStorage = evafQueryInterface<PswGen::iStorage>("iStorage");


@@ -80,10 +80,10 @@ bool Module::init(QString const & args)
 
     // Get the iEventQueue interface and subscribe to the 'ready' event
     Common::iEventQueue * eventQueue = evafQueryInterface<Common::iEventQueue>("iEventQueue");
 
     // Get the iEventQueue interface and subscribe to the 'ready' event
     Common::iEventQueue * eventQueue = evafQueryInterface<Common::iEventQueue>("iEventQueue");

-    EVAF_TEST_X(eventQueue, "No iEventQueue interface");
+    EVAF_TEST_X(eventQueue, "No iEventQueue interface")

 
     // Subscribe to the 'ready' event
 
     // Subscribe to the 'ready' event

-    EVAF_TEST_X((mEvReady = eventQueue->subscribeEvent(eventQueue->queryEvent(Common::iApp::EV_READY), this)), "No 'ready' event");
+    EVAF_TEST_X((mEvReady = eventQueue->subscribeEvent(eventQueue->queryEvent(Common::iApp::EV_READY), this)), "No 'ready' event")

 
     mReady = true;
 
 
     mReady = true;
 

diff --git a/src/apps/PswGen/CLI/cli.h b/src/apps/PswGen/CLI/cli.h
index cf53859331f2df2509e08bafc170a5d32500a7d7..74062559d891ce56579acebc5bf93d49a362a063 100644 (file)
--- a/src/apps/PswGen/CLI/cli.h
+++ b/src/apps/PswGen/CLI/cli.h
@@ -3,7 +3,7 @@
  * @brief Command line interface for the PswGen application
  * @author Enar Vaikene
  *
  * @brief Command line interface for the PswGen application
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/apps/PswGen/CLI/version.h b/src/apps/PswGen/CLI/version.h
index eb872f513921e7c71eeaab3914090057dc81b624..1618338642594c2235e1d76e8c8e1ecb990539de 100644 (file)
--- a/src/apps/PswGen/CLI/version.h
+++ b/src/apps/PswGen/CLI/version.h
@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
 /**
  * Module/library version number in the form major,minor,release,build
  */

-#define VER_FILE_VERSION                0,2,1,3
+#define VER_FILE_VERSION                0,2,1,4

 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */

-#define VER_FILE_VERSION_STR            "0.2.1.3\0"
+#define VER_FILE_VERSION_STR            "0.2.1.4\0"

 
 /**
  * Module/library name (shall end with \0)
 
 /**
  * Module/library name (shall end with \0)

diff --git a/src/apps/PswGen/GUI/CMakeLists.txt b/src/apps/PswGen/GUI/CMakeLists.txt
index 89e947384745249b26cf59448576b59b4ed6799b..a582bd257b171381edfb163fc7285d9a89d767d0 100644 (file)
--- a/src/apps/PswGen/GUI/CMakeLists.txt
+++ b/src/apps/PswGen/GUI/CMakeLists.txt
@@ -10,6 +10,9 @@ set(eVaf_LIBRARIES CommonLib PluginsLib GuiLib)
 # Source files
 set(SRCS
     gui.cpp
 # Source files
 set(SRCS
     gui.cpp

+    gui.h
+    lib.h
+    version.h

 )
 
 # Header files for the meta-object compiler
 )
 
 # Header files for the meta-object compiler

diff --git a/src/apps/PswGen/GUI/gui.cpp b/src/apps/PswGen/GUI/gui.cpp
index 99cd6cb7e78ea88a0cc2a91bba72382fa8a13818..2a030894bd9873915afd2637ea8aa89ddf91b9a0 100644 (file)
--- a/src/apps/PswGen/GUI/gui.cpp
+++ b/src/apps/PswGen/GUI/gui.cpp
@@ -3,7 +3,7 @@
  * @brief GUI for the PswGen application
  * @author Enar Vaikene
  *
  * @brief GUI for the PswGen application
  * @author Enar Vaikene
  *

- * Copyright (c) 2011-2012 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -44,8 +44,8 @@ int const Module::DefaultPasswordLength = 16;
 Module::Module()
     : Plugins::iPlugin()
     , mReady(false)
 Module::Module()
     : Plugins::iPlugin()
     , mReady(false)

-    , mGenerator(NULL)
-    , mStorage(NULL)
+    , mGenerator(nullptr)
+    , mStorage(nullptr)

 {
     setObjectName(QString("%1.%2").arg(VER_MODULE_NAME_STR).arg(__FUNCTION__));
 
 {
     setObjectName(QString("%1.%2").arg(VER_MODULE_NAME_STR).arg(__FUNCTION__));
 


@@ -59,10 +59,10 @@ Module::~Module()
 
 bool Module::init(QString const & args)
 {
 
 bool Module::init(QString const & args)
 {

-    Q_UNUSED(args);
+    Q_UNUSED(args)

 
     // Get the iGenerator interface
 
     // Get the iGenerator interface

-    EVAF_TEST_X((mGenerator = evafQueryInterface<PswGen::iGenerator>("iGenerator")), "No iGenerator interface");
+    EVAF_TEST_X((mGenerator = evafQueryInterface<PswGen::iGenerator>("iGenerator")), "No iGenerator interface")

 
     // Get the iStorage interface (can be null)
     mStorage = evafQueryInterface<PswGen::iStorage>("iStorage");
 
     // Get the iStorage interface (can be null)
     mStorage = evafQueryInterface<PswGen::iStorage>("iStorage");


@@ -71,7 +71,7 @@ bool Module::init(QString const & args)
 
     // Get the main window interface and fill it with the widgets
     SdiWindow::iSdiWindow * win = evafQueryInterface<SdiWindow::iSdiWindow>("iSdiWindow");
 
     // Get the main window interface and fill it with the widgets
     SdiWindow::iSdiWindow * win = evafQueryInterface<SdiWindow::iSdiWindow>("iSdiWindow");

-    EVAF_TEST_X(win, "No iSdiWindow interface");
+    EVAF_TEST_X(win, "No iSdiWindow interface")

 
     Gui::Panel * panel = new Gui::Panel;
     win->addPanel("PswGen", panel);
 
     Gui::Panel * panel = new Gui::Panel;
     win->addPanel("PswGen", panel);

diff --git a/src/apps/PswGen/GUI/gui.h b/src/apps/PswGen/GUI/gui.h
index f4abd248b0399d02480c454b5dc1422f5d1222fb..e672201a1652c2e149d10dd12815a37aecb1b82f 100644 (file)
--- a/src/apps/PswGen/GUI/gui.h
+++ b/src/apps/PswGen/GUI/gui.h
@@ -3,7 +3,7 @@
  * @brief GUI for the PswGen application
  * @author Enar Vaikene
  *
  * @brief GUI for the PswGen application
  * @author Enar Vaikene
  *

- * Copyright (c) 2011-2012 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/apps/PswGen/GUI/version.h b/src/apps/PswGen/GUI/version.h
index b9003fd0fcf5943921eb2389caf93e66fa598466..f8de08f7a90a9e4aaf32dec8e46827c8777e5990 100644 (file)
--- a/src/apps/PswGen/GUI/version.h
+++ b/src/apps/PswGen/GUI/version.h
@@ -3,7 +3,7 @@
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *

- * Copyright (c) 2011-2012 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
 /**
  * Module/library version number in the form major,minor,release,build
  */

-#define VER_FILE_VERSION                0,2,1,7
+#define VER_FILE_VERSION                0,2,1,8

 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */

-#define VER_FILE_VERSION_STR            "0.2.1.7\0"
+#define VER_FILE_VERSION_STR            "0.2.1.8\0"

 
 /**
  * Module/library name (shall end with \0)
 
 /**
  * Module/library name (shall end with \0)

diff --git a/src/apps/PswGen/Generator/CMakeLists.txt b/src/apps/PswGen/Generator/CMakeLists.txt
index c4ca65fb543479ec63ae85e50c566069384ad9b5..4224491e27f5bf4ba895f1c3b16fe54bd0d494ad 100644 (file)
--- a/src/apps/PswGen/Generator/CMakeLists.txt
+++ b/src/apps/PswGen/Generator/CMakeLists.txt
@@ -12,7 +12,11 @@ set(eVaf_LIBRARIES CommonLib PluginsLib)
 
 # Source files
 set(SRCS
 
 # Source files
 set(SRCS

+    igenerator.h
+    lib.h

     module.cpp
     module.cpp

+    module.h
+    version.h

 )
 
 # Header files for the meta-object compiler
 )
 
 # Header files for the meta-object compiler

diff --git a/src/apps/PswGen/Generator/igenerator.h b/src/apps/PswGen/Generator/igenerator.h
index 3d1db68b0228640e33993707831a737f4dd21e8e..f33104913ac6cd7ba3c2e3f008bed3b2b4b289f6 100644 (file)
--- a/src/apps/PswGen/Generator/igenerator.h
+++ b/src/apps/PswGen/Generator/igenerator.h
@@ -3,7 +3,7 @@
  * @brief Interface for password generator modules
  * @author Enar Vaikene
  *
  * @brief Interface for password generator modules
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -41,6 +41,11 @@ struct iGenerator
         ALPHANUMERIC            = 0x01              ///< Generated password contains only alphanumeric characters
     };
 
         ALPHANUMERIC            = 0x01              ///< Generated password contains only alphanumeric characters
     };
 

+    /**
+     * Empty virtual destructor
+     */
+    virtual ~iGenerator() {}
+

     /**
      * Generates a strong password
      * @param name Name of the password
     /**
      * Generates a strong password
      * @param name Name of the password

diff --git a/src/apps/PswGen/Generator/module.cpp b/src/apps/PswGen/Generator/module.cpp
index bca195479139b33c2e953b0f9c7a0bc2366f3605..7921337b5fd9fb4366c3269666d56f3ec73b7e57 100644 (file)
--- a/src/apps/PswGen/Generator/module.cpp
+++ b/src/apps/PswGen/Generator/module.cpp
@@ -3,7 +3,7 @@
  * @brief Implementation of the iGenerator interface
  * @author Enar Vaikene
  *
  * @brief Implementation of the iGenerator interface
  * @author Enar Vaikene
  *

- * Copyright (c) 2011-2012 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -51,7 +51,7 @@ Module::~Module()
 
 bool Module::init(QString const & args)
 {
 
 bool Module::init(QString const & args)
 {

-    Q_UNUSED(args);
+    Q_UNUSED(args)

 
     EVAF_INFO("%s initialized", qPrintable(objectName()));
 
 
     EVAF_INFO("%s initialized", qPrintable(objectName()));
 


@@ -85,7 +85,7 @@ GeneratorImpl::~GeneratorImpl()
 
 QString GeneratorImpl::generatePassword(QString const & name, QString const & masterPassword, int length, uint flags) const
 {
 
 QString GeneratorImpl::generatePassword(QString const & name, QString const & masterPassword, int length, uint flags) const
 {

-    Q_UNUSED(flags);
+    Q_UNUSED(flags)

 
     QByteArray inputString = QString("%1%2").arg(name).arg(masterPassword).toLatin1();
     QCryptographicHash hash(QCryptographicHash::Md5);
 
     QByteArray inputString = QString("%1%2").arg(name).arg(masterPassword).toLatin1();
     QCryptographicHash hash(QCryptographicHash::Md5);


@@ -97,7 +97,7 @@ QString GeneratorImpl::generatePassword(QString const & name, QString const & ma
     if (flags & uint(ALPHANUMERIC)) {
         // Convert all characters to alpha-numeric
         for (int i = 0; i < result.size(); ++i) {
     if (flags & uint(ALPHANUMERIC)) {
         // Convert all characters to alpha-numeric
         for (int i = 0; i < result.size(); ++i) {

-            unsigned char c = result.at(i);
+            char c = result.at(i);

             while (isalnum(c) == 0)
                 c++;
             result[i] = c;
             while (isalnum(c) == 0)
                 c++;
             result[i] = c;

diff --git a/src/apps/PswGen/Generator/module.h b/src/apps/PswGen/Generator/module.h
index 68cdb4ccb4cf2e976d979f6b8900af2077fcca79..99706f46e350408bddf565c77b716589ecaa0afb 100644 (file)
--- a/src/apps/PswGen/Generator/module.h
+++ b/src/apps/PswGen/Generator/module.h
@@ -3,7 +3,7 @@
  * @brief Implementation of the iGenerator interface
  * @author Enar Vaikene
  *
  * @brief Implementation of the iGenerator interface
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/apps/PswGen/Generator/version.h b/src/apps/PswGen/Generator/version.h
index c2e78d034ed2614a1d96114161d3429e9203ae5b..f59b0f19fd4b94df26141c7e80bd5fe8fff0389c 100644 (file)
--- a/src/apps/PswGen/Generator/version.h
+++ b/src/apps/PswGen/Generator/version.h
@@ -3,7 +3,7 @@
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *

- * Copyright (c) 2011-2012 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
 /**
  * Module/library version number in the form major,minor,release,build
  */

-#define VER_FILE_VERSION                0,1,2,2
+#define VER_FILE_VERSION                0,1,2,3

 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */

-#define VER_FILE_VERSION_STR            "0.1.2.2\0"
+#define VER_FILE_VERSION_STR            "0.1.2.3\0"

 
 /**
  * Module/library name (shall end with \0)
 
 /**
  * Module/library name (shall end with \0)

diff --git a/src/apps/PswGen/Storage/CMakeLists.txt b/src/apps/PswGen/Storage/CMakeLists.txt
index e3ffd48ab4bc9aefe3e3b31712c6dabc26155479..8387080ad4b01d58f45626c8d7c8aca2d1816737 100644 (file)
--- a/src/apps/PswGen/Storage/CMakeLists.txt
+++ b/src/apps/PswGen/Storage/CMakeLists.txt
@@ -12,7 +12,11 @@ set(eVaf_LIBRARIES CommonLib PluginsLib)
 
 # Source files
 set(SRCS
 
 # Source files
 set(SRCS

+    istorage.h
+    lib.h

     module.cpp
     module.cpp

+    module.h
+    version.h

 )
 
 # Header files for the meta-object compiler
 )
 
 # Header files for the meta-object compiler

diff --git a/src/apps/PswGen/Storage/istorage.h b/src/apps/PswGen/Storage/istorage.h
index e9abef95850f773a72f147630d5f45aa6cf7768b..add6f7a342d7a496835b0dfb69f062b6a3391da7 100644 (file)
--- a/src/apps/PswGen/Storage/istorage.h
+++ b/src/apps/PswGen/Storage/istorage.h
@@ -3,7 +3,7 @@
  * @brief Interface for password storage modules
  * @author Enar Vaikene
  *
  * @brief Interface for password storage modules
  * @author Enar Vaikene
  *

- * Copyright (c) 2011-2012 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -117,6 +117,11 @@ private:
 struct iStorage
 {
 
 struct iStorage
 {
 

+    /**
+     * Empty virtual destructor
+     */
+    ~iStorage() {}
+

     /**
      * Saves the data record
      * @param name Name of the password
     /**
      * Saves the data record
      * @param name Name of the password

diff --git a/src/apps/PswGen/Storage/lib.h b/src/apps/PswGen/Storage/lib.h
index 2dbfa67bb6710f1cdfbdf69616a50fc0592a8df3..7c63b6c789854057001bc9388889b8e4bbad308e 100644 (file)
--- a/src/apps/PswGen/Storage/lib.h
+++ b/src/apps/PswGen/Storage/lib.h
@@ -2,7 +2,7 @@
  * @file PswGen/Storage/lib.h
  * @author Enar Vaikene
  *
  * @file PswGen/Storage/lib.h
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/apps/PswGen/Storage/module.cpp b/src/apps/PswGen/Storage/module.cpp
index fc75dbb194fc57070e34baaa3a37bb3d9ec8a376..8e65360d2c8a29e323b090113a77e56a34565796 100644 (file)
--- a/src/apps/PswGen/Storage/module.cpp
+++ b/src/apps/PswGen/Storage/module.cpp
@@ -3,7 +3,7 @@
  * @brief Implementation of the iStorage interface
  * @author Enar Vaikene
  *
  * @brief Implementation of the iStorage interface
  * @author Enar Vaikene
  *

- * Copyright (c) 2011-2012 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -57,7 +57,7 @@ Module::~Module()
 
 bool Module::init(QString const & args)
 {
 
 bool Module::init(QString const & args)
 {

-    Q_UNUSED(args);
+    Q_UNUSED(args)

 
     if (!mStorage->init())
         return false;
 
     if (!mStorage->init())
         return false;


@@ -149,8 +149,8 @@ void StorageImpl::done()
 
 bool StorageImpl::save(QString const & name, QExplicitlySharedDataPointer<Storage::Data> data)
 {
 
 bool StorageImpl::save(QString const & name, QExplicitlySharedDataPointer<Storage::Data> data)
 {

-    EVAF_TEST_X(data, "Data cannot be null");
-    EVAF_TEST_X(!name.isEmpty(), "Name cannot be empty");
+    EVAF_TEST_X(data, "Data cannot be null")
+    EVAF_TEST_X(!name.isEmpty(), "Name cannot be empty")

 
     if (!QSqlDatabase::contains(DbConnectionName))
     {
 
     if (!QSqlDatabase::contains(DbConnectionName))
     {

diff --git a/src/apps/PswGen/Storage/module.h b/src/apps/PswGen/Storage/module.h
index e0839b391ee3183f0c2c9b914b1763f8f03a0c58..68416f0034143a9feb7b06013359e2e7b094a3e0 100644 (file)
--- a/src/apps/PswGen/Storage/module.h
+++ b/src/apps/PswGen/Storage/module.h
@@ -3,7 +3,7 @@
  * @brief Implementation of the iStorage interface
  * @author Enar Vaikene
  *
  * @brief Implementation of the iStorage interface
  * @author Enar Vaikene
  *

- * Copyright (c) 2011-2012 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -113,7 +113,7 @@ public:
         QAbstractListModel methods
     */
 
         QAbstractListModel methods
     */
 

-    virtual int rowCount(QModelIndex const & parent) const { return mData.count(); }
+    virtual int rowCount(QModelIndex const &) const { return mData.count(); }

 
     virtual QVariant data(QModelIndex const & index, int role = Qt::DisplayRole) const;
 
 
     virtual QVariant data(QModelIndex const & index, int role = Qt::DisplayRole) const;
 

diff --git a/src/apps/PswGen/Storage/version.h b/src/apps/PswGen/Storage/version.h
index cbcf67f9b63218b70da26abf4cc414c251c4761c..b7f03f83e1262656210d31068959d59d167db8cc 100644 (file)
--- a/src/apps/PswGen/Storage/version.h
+++ b/src/apps/PswGen/Storage/version.h
@@ -3,7 +3,7 @@
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *

- * Copyright (c) 2011-2012 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
 /**
  * Module/library version number in the form major,minor,release,build
  */

-#define VER_FILE_VERSION                0,2,1,3
+#define VER_FILE_VERSION                0,2,1,4

 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */

-#define VER_FILE_VERSION_STR            "0.2.1.3\0"
+#define VER_FILE_VERSION_STR            "0.2.1.4\0"

 
 /**
  * Module/library name (shall end with \0)
 
 /**
  * Module/library name (shall end with \0)

diff --git a/src/apps/ScosTime/CMakeLists.txt b/src/apps/ScosTime/CMakeLists.txt
index e32c9efd4a44967a69bda62e6cde0f580464a780..f193dd69d19463d09ca49b311c9680c9dd08ecc4 100644 (file)
--- a/src/apps/ScosTime/CMakeLists.txt
+++ b/src/apps/ScosTime/CMakeLists.txt
@@ -10,6 +10,9 @@ set(eVaf_LIBRARIES CommonLib PluginsLib GuiLib)
 # Source files
 set(SRCS
     gui.cpp
 # Source files
 set(SRCS
     gui.cpp

+    gui.h
+    lib.h
+    version.h

 )
 
 # Header files for the meta-object compiler
 )
 
 # Header files for the meta-object compiler

diff --git a/src/apps/ScosTime/gui.cpp b/src/apps/ScosTime/gui.cpp
index 6b4b1163d1278c5ff19852b56fb57600f13c1cb1..4888288757739d3b1889df6fc672144211085f0c 100644 (file)
--- a/src/apps/ScosTime/gui.cpp
+++ b/src/apps/ScosTime/gui.cpp
@@ -3,7 +3,7 @@
  * @brief GUI for the ScosTime application
  * @author Enar Vaikene
  *
  * @brief GUI for the ScosTime application
  * @author Enar Vaikene
  *

- * Copyright (c) 2012 Enar Vaikene
+ * Copyright (c) 2012-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -173,7 +173,6 @@ QDateTime Internal::DateTime::strToDateTime(QString const & s, Type type) const
             dt = dt.addDays(days - 1);
 
             return QDateTime(dt, QTime(hours, minutes, secs, msecs), Qt::UTC);
             dt = dt.addDays(days - 1);
 
             return QDateTime(dt, QTime(hours, minutes, secs, msecs), Qt::UTC);

-            break;

         }
         case ISO:
         {
         }
         case ISO:
         {


@@ -186,13 +185,12 @@ QDateTime Internal::DateTime::strToDateTime(QString const & s, Type type) const
             QDateTime dt = QDateTime::fromString(tmp, Qt::ISODate);
             dt.setTimeSpec(Qt::UTC);
             return dt;
             QDateTime dt = QDateTime::fromString(tmp, Qt::ISODate);
             dt.setTimeSpec(Qt::UTC);
             return dt;

-            break;

         }
         case CUC:
         {
             // Get the CUC coarse and fine values
             bool ok = false;
         }
         case CUC:
         {
             // Get the CUC coarse and fine values
             bool ok = false;

-            int coarse = s.left(8).toLong(&ok, 16);
+            int const coarse = static_cast<int>(s.left(8).toLong(&ok, 16));

             if (!ok)
             {
                 return QDateTime();
             if (!ok)
             {
                 return QDateTime();


@@ -200,7 +198,7 @@ QDateTime Internal::DateTime::strToDateTime(QString const & s, Type type) const
             int fine = 0;
             if (s.size() == 12)
             {
             int fine = 0;
             if (s.size() == 12)
             {

-                fine = s.mid(8, 4).toLong(&ok, 16);
+                fine = static_cast<int>(s.mid(8, 4).toLong(&ok, 16));

                 if (!ok)
                 {
                     return QDateTime();
                 if (!ok)
                 {
                     return QDateTime();


@@ -209,10 +207,8 @@ QDateTime Internal::DateTime::strToDateTime(QString const & s, Type type) const
 
             // Get the date/time value
             QDateTime tm = mEpoch.addSecs(coarse);
 
             // Get the date/time value
             QDateTime tm = mEpoch.addSecs(coarse);

-            tm = tm.addMSecs(rint((double(fine) / 58.0 * 885.0) / 1000.0));
+            tm = tm.addMSecs(static_cast<int>(rint((double(fine) / 58.0 * 885.0) / 1000.0)));

             return tm;
             return tm;

-
-            break;

         }
         default:
         {
         }
         default:
         {


@@ -281,11 +277,11 @@ Module::~Module()
 
 bool Module::init(QString const & args)
 {
 
 bool Module::init(QString const & args)
 {

-    Q_UNUSED(args);
+    Q_UNUSED(args)

 
     // Get the main window interface and fill it with the widgets
     SdiWindow::iSdiWindow * win = evafQueryInterface<SdiWindow::iSdiWindow>("iSdiWindow");
 
     // Get the main window interface and fill it with the widgets
     SdiWindow::iSdiWindow * win = evafQueryInterface<SdiWindow::iSdiWindow>("iSdiWindow");

-    EVAF_TEST_X(win, "No iSdiWindow interface");
+    EVAF_TEST_X(win, "No iSdiWindow interface")

 
     Gui::Panel * panel = new Gui::Panel;
     win->addPanel("PswGen", panel);
 
     Gui::Panel * panel = new Gui::Panel;
     win->addPanel("PswGen", panel);

diff --git a/src/apps/ScosTime/gui.h b/src/apps/ScosTime/gui.h
index 42516e5ec736af20be2a74a0a9fe776a55c3143d..1d7483bcfc5dd1b9de639bf487ce74699636aeb2 100644 (file)
--- a/src/apps/ScosTime/gui.h
+++ b/src/apps/ScosTime/gui.h
@@ -3,7 +3,7 @@
  * @brief GUI for the ScosTime application
  * @author Enar Vaikene
  *
  * @brief GUI for the ScosTime application
  * @author Enar Vaikene
  *

- * Copyright (c) 2012 Enar Vaikene
+ * Copyright (c) 2012-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/apps/ScosTime/version.h b/src/apps/ScosTime/version.h
index d3a0b51a81dda1e33e6c6d931ec5d942a59cfc51..638afd3832be28faa28b0fd198a1e575d7cdbe9f 100644 (file)
--- a/src/apps/ScosTime/version.h
+++ b/src/apps/ScosTime/version.h
@@ -3,7 +3,7 @@
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *

- * Copyright (c) 2012 Enar Vaikene
+ * Copyright (c) 2012-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
 /**
  * Module/library version number in the form major,minor,release,build
  */

-#define VER_FILE_VERSION                0,1,1,1
+#define VER_FILE_VERSION                0,1,1,2

 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */

-#define VER_FILE_VERSION_STR            "0.1.1.1\0"
+#define VER_FILE_VERSION_STR            "0.1.1.2\0"

 
 /**
  * Module/library name (shall end with \0)
 
 /**
  * Module/library name (shall end with \0)

diff --git a/src/libs/Common/CMakeLists.txt b/src/libs/Common/CMakeLists.txt
index ce5f10cda42580644eb007deaf79a305272b55ac..c5083a39a4406268b96ae2fccad634fa54438a3c 100644 (file)
--- a/src/libs/Common/CMakeLists.txt
+++ b/src/libs/Common/CMakeLists.txt
@@ -12,16 +12,35 @@ set(eVaf_LIBRARIES)
 
 # Source files
 set(SRCS
 
 # Source files
 set(SRCS

-    app.cpp
-    event.cpp
+    app.h
+    config.cpp
+    config.h

     eventqueue.cpp
     eventqueue.cpp

+    eventqueue.h

     globals.cpp
     globals.cpp

+    globals.h
+    iapp.h
+    iconfig.h
+    ieventqueue.h
+    ilogger.h
+    inifile.h
+    iprop.h
+    iregistry.h
+    libcommon.h
+    logger.h
+    prop.cpp
+    prop.h
+    app.cpp
+    event.h
+    event.cpp
+    inifile_p.h
+    inifile.cpp

     logger.cpp
     registry.cpp
     logger.cpp
     registry.cpp

+    registry.h

     util.cpp
     util.cpp

-    inifile.cpp
-    config.cpp
-    prop.cpp
+    util.h
+    version.h

 )
 
 # Header files for the meta-object compiler
 )
 
 # Header files for the meta-object compiler

diff --git a/src/libs/Common/event.cpp b/src/libs/Common/event.cpp
index be9f34b5b76b7a487ff28a53ff8e4614a068c5b0..8ebc14f2fec0a2e35994096e650077c11805f9fc 100644 (file)
--- a/src/libs/Common/event.cpp
+++ b/src/libs/Common/event.cpp
@@ -3,7 +3,7 @@
  * @brief Event class implementation
  * @author Enar Vaikene
  *
  * @brief Event class implementation
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -22,3 +22,6 @@
 using namespace eVaf::Common;
 
 QEvent::Type const Event::eVafEvent = QEvent::Type(QEvent::registerEventType());
 using namespace eVaf::Common;
 
 QEvent::Type const Event::eVafEvent = QEvent::Type(QEvent::registerEventType());

+
+Event::~Event()
+{}

diff --git a/src/libs/Common/event.h b/src/libs/Common/event.h
index 44396c1af7bd00dd04982b5a2dd3a6d8eb11da35..0658a6a4652fb201a8a76437c8bce5ff74ad95a3 100644 (file)
--- a/src/libs/Common/event.h
+++ b/src/libs/Common/event.h
@@ -65,6 +65,8 @@ public:
         , mData(dataObj)
     {}
 
         , mData(dataObj)
     {}
 

+    virtual ~Event();
+

     /**
      * Returns the event ID value
      */
     /**
      * Returns the event ID value
      */

diff --git a/src/libs/Common/inifile.cpp b/src/libs/Common/inifile.cpp
index 55b9fd782a2548945fcbdd8e54cc70954d4e7618..ebdfd73affa70de1f0c75be772a31c541613d1f3 100644 (file)
--- a/src/libs/Common/inifile.cpp
+++ b/src/libs/Common/inifile.cpp
@@ -3,7 +3,7 @@
  * @brief Internal implementation of the class for reading and writing parameter values in INI files.
  * @author Enar Vaikene
  *
  * @brief Internal implementation of the class for reading and writing parameter values in INI files.
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -96,7 +96,7 @@ IniFileImpl::~IniFileImpl()
     mCache.clear();
 }
 
     mCache.clear();
 }
 

-void IniFileImpl::updateCache(quint64 pos, qint64 diff)
+void IniFileImpl::updateCache(qint64 pos, qint64 diff)

 {
     // Walk through all the sections in the cache
     QHash<QByteArray, QExplicitlySharedDataPointer<IniFileSection> >::const_iterator it;
 {
     // Walk through all the sections in the cache
     QHash<QByteArray, QExplicitlySharedDataPointer<IniFileSection> >::const_iterator it;


@@ -181,7 +181,7 @@ QExplicitlySharedDataPointer<IniFileValue> IniFileImpl::getParameter(QFile & fil
     while (mValid && !file.atEnd()) {
 
         // Current file position
     while (mValid && !file.atEnd()) {
 
         // Current file position

-        quint64 currentPos = file.pos();
+        qint64 currentPos = file.pos();

 
         QByteArray line = file.readLine().trimmed();
 
 
         QByteArray line = file.readLine().trimmed();
 


@@ -352,7 +352,7 @@ bool IniFileImpl::setValue(QByteArray const & paramName, QVariant const & value)
             if (c.unicode() < 32 || c.unicode() >= 127)
                 valueString = QByteArray("\\0x").append(QByteArray::number(c.unicode(), 16));
             else
             if (c.unicode() < 32 || c.unicode() >= 127)
                 valueString = QByteArray("\\0x").append(QByteArray::number(c.unicode(), 16));
             else

-                valueString = QByteArray(1, (char const)c.unicode());
+                valueString = QByteArray(1, static_cast<char const>(c.unicode()));

             break;
         }
         case QVariant::ByteArray:
             break;
         }
         case QVariant::ByteArray:


@@ -399,7 +399,7 @@ bool IniFileImpl::setValue(QByteArray const & paramName, QVariant const & value)
         }
 
         // Current file position
         }
 
         // Current file position

-        quint64 currentPos = f.pos();
+        qint64 currentPos = f.pos();

 
         // Add the new section to the internal cache
         sectionObject = new IniFileSection(currentPos);
 
         // Add the new section to the internal cache
         sectionObject = new IniFileSection(currentPos);


@@ -423,8 +423,8 @@ bool IniFileImpl::setValue(QByteArray const & paramName, QVariant const & value)
 
     // If the section is found, use the existing section object from the cache
     else {
 
     // If the section is found, use the existing section object from the cache
     else {

-        quint64 currentPos;
-        quint64 oldPos = f.pos();
+        qint64 currentPos;
+        qint64 oldPos = f.pos();

         QString prefix; // Platform-specific prefix
 
         // Locate the parameter value
         QString prefix; // Platform-specific prefix
 
         // Locate the parameter value

diff --git a/src/libs/Common/inifile_p.h b/src/libs/Common/inifile_p.h
index 07ac793cdc8347ccc72c446c6cc0f54c767aecc9..e886bb342ec22d946faabeb44065b2159ae58d4b 100644 (file)
--- a/src/libs/Common/inifile_p.h
+++ b/src/libs/Common/inifile_p.h
@@ -40,7 +40,7 @@ class IniFileValue : public QSharedData
 {
 public:
 
 {
 public:
 

-    IniFileValue(quint64 pos)
+    IniFileValue(qint64 pos)

         : QSharedData()
         , filePos(pos)
         , thisOsOnly(false)
         : QSharedData()
         , filePos(pos)
         , thisOsOnly(false)


@@ -52,7 +52,7 @@ public:
      * Offset of the parameter in the INI file. By seeking the file to this offset value,
      * the next character read or written will be the beginning of the key name.
      */
      * Offset of the parameter in the INI file. By seeking the file to this offset value,
      * the next character read or written will be the beginning of the key name.
      */

-    quint64 filePos;
+    qint64 filePos;

 
     /**
      * Key name of the parameter
 
     /**
      * Key name of the parameter


@@ -82,7 +82,7 @@ class IniFileSection : public QSharedData
 {
 public:
 
 {
 public:
 

-    IniFileSection(quint64 pos)
+    IniFileSection(qint64 pos)

         : QSharedData()
         , filePos(pos)
     {}
         : QSharedData()
         , filePos(pos)
     {}


@@ -93,7 +93,7 @@ public:
      * Offset of the section in the INI file. By seeking the file to this offset value,
      * the next character read or written will be the first character of the section.
      */
      * Offset of the section in the INI file. By seeking the file to this offset value,
      * the next character read or written will be the first character of the section.
      */

-    quint64 filePos;
+    qint64 filePos;

 
     /**
      * Name of the section
 
     /**
      * Name of the section


@@ -167,7 +167,7 @@ private: /// Methods
      * Sections and parameters that come after the modified parameter value are shifted and their file
      * positions changed. This method updates items in the internal cache after changes to the INI file.
      */
      * Sections and parameters that come after the modified parameter value are shifted and their file
      * positions changed. This method updates items in the internal cache after changes to the INI file.
      */

-    void updateCache(quint64 pos, qint64 diff);
+    void updateCache(qint64 pos, qint64 diff);

 
     /**
      * Looks for a section in the INI file
 
     /**
      * Looks for a section in the INI file

diff --git a/src/libs/Common/logger.cpp b/src/libs/Common/logger.cpp
index 870af5f0347d3c3e5528b01fd056b45131051f62..94d9fa9eb9e7ea70136ed359960376a9ce844c68 100644 (file)
--- a/src/libs/Common/logger.cpp
+++ b/src/libs/Common/logger.cpp
@@ -3,7 +3,7 @@
  * @brief iLogger interface implementation
  * @author Enar Vaikene
  *
  * @brief iLogger interface implementation
  * @author Enar Vaikene
  *

- * Copyright (c) 2011-2012 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -42,7 +42,7 @@
 
 [[noreturn]] void eVaf::Common::Internal::defFatalMsgHandler(QString const & msg, QString const & source, QString const & where)
 {
 
 [[noreturn]] void eVaf::Common::Internal::defFatalMsgHandler(QString const & msg, QString const & source, QString const & where)
 {

-    Q_UNUSED(source);
+    Q_UNUSED(source)

 
     fprintf(stderr, "FATAL ERROR: %s (occurred in %s)\n", qPrintable(msg), qPrintable(where));
 
 
     fprintf(stderr, "FATAL ERROR: %s (occurred in %s)\n", qPrintable(msg), qPrintable(where));
 


@@ -443,7 +443,7 @@ QString Logger::printf(char const * const fmt, ...) const
     va_end(ap);
 #else
     ::va_start(ap, fmt);
     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
 
     ::va_end(ap);
 #endif
 

diff --git a/src/libs/Common/registry.cpp b/src/libs/Common/registry.cpp
index 37b47e03e4037208427242734e755b9650bdae9a..c3bc2bef251e08c2d0a96a891d845d50fa0ec1a1 100644 (file)
--- a/src/libs/Common/registry.cpp
+++ b/src/libs/Common/registry.cpp
@@ -3,7 +3,7 @@
  * @brief Common registry implementation
  * @author Enar Vaikene
  *
  * @brief Common registry implementation
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -65,7 +65,7 @@ bool Registry::registerInterface(QString const & name, QObject * obj)
 QObject * Registry::queryInterface(QString const & name) const
 {
     Interfaces::const_iterator it = mInterfaces.constFind(name);
 QObject * Registry::queryInterface(QString const & name) const
 {
     Interfaces::const_iterator it = mInterfaces.constFind(name);

-    return it != mInterfaces.constEnd() ? *it : 0;
+    return it != mInterfaces.constEnd() ? *it : nullptr;

 }
 
 void Registry::interfaceDestroyed(QObject * obj)
 }
 
 void Registry::interfaceDestroyed(QObject * obj)

diff --git a/src/libs/Common/registry.h b/src/libs/Common/registry.h
index e8bf68b13128e1ab6e48b6787ad8093fc398eea6..3df7d58ac62526fae07086080ad984de3d082aed 100644 (file)
--- a/src/libs/Common/registry.h
+++ b/src/libs/Common/registry.h
@@ -3,7 +3,7 @@
  * @brief Common registry implementation
  * @author Enar Vaikene
  *
  * @brief Common registry implementation
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -66,7 +66,7 @@ private slots:
 
     /// Interface object destroyed
     /// We need to remove the interface from the list of registered interfaces
 
     /// Interface object destroyed
     /// We need to remove the interface from the list of registered interfaces

-    void interfaceDestroyed(QObject * obj = 0);
+    void interfaceDestroyed(QObject * obj = nullptr);

 
 };
 
 
 };
 

diff --git a/src/libs/Common/util.cpp b/src/libs/Common/util.cpp
index 30874ebadcaf6bd9df0babe5065b7fe62f9ba376..3e8a3755608a48314a097e865f88051c4e8d5185 100644 (file)
--- a/src/libs/Common/util.cpp
+++ b/src/libs/Common/util.cpp
@@ -3,7 +3,7 @@
  * @brief Global utility functions for eVaf
  * @author Enar Vaikene
  *
  * @brief Global utility functions for eVaf
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -33,30 +33,27 @@ QVariant eVaf::Common::toVariant(QString const & value, QVariant const & default
     switch (defaultValue.type()) {
         case QVariant::UInt: {
             bool ok;
     switch (defaultValue.type()) {
         case QVariant::UInt: {
             bool ok;

-            uint v = value.toUInt(&ok, 0);
+            uint const v = value.toUInt(&ok, 0);

             if (ok)
                 return QVariant(v);
             else
                 return defaultValue;
             if (ok)
                 return QVariant(v);
             else
                 return defaultValue;

-            break;

         }
         case QVariant::Int: {
             bool ok;
         }
         case QVariant::Int: {
             bool ok;

-            int v = value.toInt(&ok, 0);
+            int const v = value.toInt(&ok, 0);

             if (ok)
                 return QVariant(v);
             else
                 return defaultValue;
             if (ok)
                 return QVariant(v);
             else
                 return defaultValue;

-            break;

         }
         case QVariant::Double: {
             bool ok;
         }
         case QVariant::Double: {
             bool ok;

-            double v = value.toDouble(&ok);
+            double const v = value.toDouble(&ok);

             if (ok)
                 return QVariant(v);
             else
                 return defaultValue;
             if (ok)
                 return QVariant(v);
             else
                 return defaultValue;

-            break;

         }
         case QVariant::Bool: {
             if (eVaf::Common::isTrue(value))
         }
         case QVariant::Bool: {
             if (eVaf::Common::isTrue(value))


@@ -65,30 +62,29 @@ QVariant eVaf::Common::toVariant(QString const & value, QVariant const & default
                 return QVariant(false);
             else {
                 bool ok;
                 return QVariant(false);
             else {
                 bool ok;

-                uint v = value.toUInt(&ok, 0);
+                uint const v = value.toUInt(&ok, 0);

                 if (ok)
                     return QVariant(v);
                 else
                     return defaultValue;
             }
                 if (ok)
                     return QVariant(v);
                 else
                     return defaultValue;
             }

-            break;

         }
         case QVariant::Char: {
             if (value.size() > 0) {
                 if (value.startsWith("\\0x")) {
                     bool ok;
         }
         case QVariant::Char: {
             if (value.size() > 0) {
                 if (value.startsWith("\\0x")) {
                     bool ok;

-                    char c = value.mid(1).toUInt(&ok, 16);
+                    char const c = static_cast<char>(value.mid(1).toUInt(&ok, 16));

                     if (ok)
                         return QVariant(c);
                 }
                 else if (value.startsWith("\\0")) {
                     bool ok;
                     if (ok)
                         return QVariant(c);
                 }
                 else if (value.startsWith("\\0")) {
                     bool ok;

-                    char c = value.mid(1).toUInt(&ok, 8);
+                    char const c = static_cast<char>(value.mid(1).toUInt(&ok, 8));

                     if (ok)
                         return QVariant(c);
                 }
                 else if (value.startsWith('&')) {
                     if (ok)
                         return QVariant(c);
                 }
                 else if (value.startsWith('&')) {

-                    QString c = strFromEscapedCharArray(value.toLatin1());
+                    QString const c = strFromEscapedCharArray(value.toLatin1());

                     if (c.size() > 0)
                         return QVariant(c.at(0));
                 }
                     if (c.size() > 0)
                         return QVariant(c.at(0));
                 }


@@ -96,7 +92,6 @@ QVariant eVaf::Common::toVariant(QString const & value, QVariant const & default
                     return QVariant(value.at(0));
             }
             return defaultValue;
                     return QVariant(value.at(0));
             }
             return defaultValue;

-            break;

         }
         default:
             return QVariant(value);
         }
         default:
             return QVariant(value);


@@ -120,7 +115,7 @@ QByteArray eVaf::Common::strToEscapedCharArray(QString const & str)
         else if (c == '>')
             rval.append("&gt;");
         else
         else if (c == '>')
             rval.append("&gt;");
         else

-            rval.append((char const)c.unicode());
+            rval.append(static_cast<char const>(c.unicode()));

     }
 
     return rval;
     }
 
     return rval;


@@ -139,7 +134,7 @@ QString eVaf::Common::strFromEscapedCharArray(QByteArray const & str)
                 ref = "&";
             }
             else
                 ref = "&";
             }
             else

-                rval.append(QChar((ushort)c));
+                rval.append(QChar(static_cast<ushort>(c)));

         }
         else {
             ref.append(c);
         }
         else {
             ref.append(c);


@@ -150,7 +145,7 @@ QString eVaf::Common::strFromEscapedCharArray(QByteArray const & str)
                 if (ref.startsWith("&#x")) {
                     // Numeric character reference in the HEX format
                     bool ok;
                 if (ref.startsWith("&#x")) {
                     // Numeric character reference in the HEX format
                     bool ok;

-                    ushort ucode = ref.mid(3, ref.size() - 4).toUInt(&ok, 16);
+                    ushort const ucode = static_cast<ushort>(ref.mid(3, ref.size() - 4).toUInt(&ok, 16));

                     if (ok)
                         rval.append(QChar(ucode));
                     else
                     if (ok)
                         rval.append(QChar(ucode));
                     else


@@ -160,7 +155,7 @@ QString eVaf::Common::strFromEscapedCharArray(QByteArray const & str)
                 else if (ref.startsWith("&#")) {
                     // Numeric character reference in the DEC format
                     bool ok;
                 else if (ref.startsWith("&#")) {
                     // Numeric character reference in the DEC format
                     bool ok;

-                    ushort ucode = ref.mid(2, ref.size() - 3).toUInt(&ok, 10);
+                    ushort const ucode = static_cast<ushort>(ref.mid(2, ref.size() - 3).toUInt(&ok, 10));

                     if (ok)
                         rval.append(QChar(ucode));
                     else
                     if (ok)
                         rval.append(QChar(ucode));
                     else


@@ -190,7 +185,7 @@ QString eVaf::Common::strFromEscapedCharArray(QByteArray const & str)
 QByteArray eVaf::Common::binToEscapedCharArray(QByteArray const & src)
 {
     QByteArray rval;
 QByteArray eVaf::Common::binToEscapedCharArray(QByteArray const & src)
 {
     QByteArray rval;

-    foreach (uchar c, src) {
+    foreach (char const c, src) {

         if (c < 32 || c >= 127)
             rval.append("&#x" + QByteArray::number(c, 16) + ";");
         else if (c == '\"')
         if (c < 32 || c >= 127)
             rval.append("&#x" + QByteArray::number(c, 16) + ";");
         else if (c == '\"')


@@ -234,7 +229,7 @@ QByteArray eVaf::Common::binFromEscapedCharArray(QByteArray const & str)
                 if (ref.startsWith("&#x")) {
                     // Numeric character reference in the HEX format
                     bool ok;
                 if (ref.startsWith("&#x")) {
                     // Numeric character reference in the HEX format
                     bool ok;

-                    uchar ucode = ref.mid(3, ref.size() - 4).toUInt(&ok, 16);
+                    char const ucode = static_cast<char>(ref.mid(3, ref.size() - 4).toUInt(&ok, 16));

                     if (ok)
                         rval.append(ucode);
                     else
                     if (ok)
                         rval.append(ucode);
                     else


@@ -244,7 +239,7 @@ QByteArray eVaf::Common::binFromEscapedCharArray(QByteArray const & str)
                 else if (ref.startsWith("&#")) {
                     // Numeric character reference in the DEC format
                     bool ok;
                 else if (ref.startsWith("&#")) {
                     // Numeric character reference in the DEC format
                     bool ok;

-                    uchar ucode = ref.mid(2, ref.size() - 3).toUInt(&ok, 10);
+                    char const ucode = static_cast<char>(ref.mid(2, ref.size() - 3).toUInt(&ok, 10));

                     if (ok)
                         rval.append(ucode);
                     else
                     if (ok)
                         rval.append(ucode);
                     else

diff --git a/src/libs/Common/util.h b/src/libs/Common/util.h
index 486da25416e43be5bdb46ca024caa741d777c7e9..62a2e99a54d8ba2d5b17cffe4425f7afa8e7bac2 100644 (file)
--- a/src/libs/Common/util.h
+++ b/src/libs/Common/util.h
@@ -3,7 +3,7 @@
  * @brief Global utility functions for eVaf
  * @author Enar Vaikene
  *
  * @brief Global utility functions for eVaf
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/libs/Common/version.h b/src/libs/Common/version.h
index dbc0b8934872cf224556b919214c6f4d8ace70c2..87c126630fb0abfa8c1cd90a9ea80dbe23432b24 100644 (file)
--- a/src/libs/Common/version.h
+++ b/src/libs/Common/version.h
@@ -3,7 +3,7 @@
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *

- * Copyright (c) 2011-2012 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
 /**
  * Module/library version number in the form major,minor,release,build
  */

-#define VER_FILE_VERSION                0,2,4,13
+#define VER_FILE_VERSION                0,2,4,15

 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */

-#define VER_FILE_VERSION_STR            "0.2.4.13\0"
+#define VER_FILE_VERSION_STR            "0.2.4.15\0"

 
 /**
  * Module/library name (shall end with \0)
 
 /**
  * Module/library name (shall end with \0)

diff --git a/src/libs/Gui/CMakeLists.txt b/src/libs/Gui/CMakeLists.txt
index eea9014f4915cd1f299aa4f2dde423d7ee56d5f1..e973a0adb1392f2abc03c22b1f0df8a20fc70486 100644 (file)
--- a/src/libs/Gui/CMakeLists.txt
+++ b/src/libs/Gui/CMakeLists.txt
@@ -12,7 +12,10 @@ set(eVaf_LIBRARIES)
 
 # Source files
 set(SRCS
 
 # Source files
 set(SRCS

+    libgui.h

     panel.cpp
     panel.cpp

+    panel.h
+    version.h

 )
 
 # Header files for the meta-object compiler
 )
 
 # Header files for the meta-object compiler

diff --git a/src/libs/Gui/libgui.h b/src/libs/Gui/libgui.h
index b67d9be91b957f9acd8c15c97063acc800382919..fb4d7fa55a2a771c3b1e25f9bbcdd7dd4f8078a6 100644 (file)
--- a/src/libs/Gui/libgui.h
+++ b/src/libs/Gui/libgui.h
@@ -2,7 +2,7 @@
  * @file Gui/libgui.h
  * @author Enar Vaikene
  *
  * @file Gui/libgui.h
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/libs/Gui/panel.cpp b/src/libs/Gui/panel.cpp
index f5527897b99e904f25626c9bc73fc1344fa73ed7..28c6292cd7225bca10940201835ef2822186ab8d 100644 (file)
--- a/src/libs/Gui/panel.cpp
+++ b/src/libs/Gui/panel.cpp
@@ -3,7 +3,7 @@
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/libs/Gui/panel.h b/src/libs/Gui/panel.h
index 3ac0b577cb963a51beb3ef072771c5a2bb4421d9..0b2d9a30a358a1434469968108e94ecd5b95428a 100644 (file)
--- a/src/libs/Gui/panel.h
+++ b/src/libs/Gui/panel.h
@@ -3,7 +3,7 @@
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -52,7 +52,7 @@ class GUI_EXPORT Panel : public QWidget
 
 public:
 
 
 public:
 

-    Panel(QWidget * parent = nullptr, Qt::WindowFlags f = 0);
+    Panel(QWidget * parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());

 
     virtual ~Panel();
 
 
     virtual ~Panel();
 

diff --git a/src/libs/Gui/version.h b/src/libs/Gui/version.h
index dc36c0a1ba0a2b2afb0b18d0e8f68a902b3d6dbf..3db1f93dc479dad4c153cafe7c6bbe2dbf752266 100644 (file)
--- a/src/libs/Gui/version.h
+++ b/src/libs/Gui/version.h
@@ -3,7 +3,7 @@
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
 /**
  * Module/library version number in the form major,minor,release,build
  */

-#define VER_FILE_VERSION                0,2,1,3
+#define VER_FILE_VERSION                0,2,1,4

 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */

-#define VER_FILE_VERSION_STR            "0.2.1.3\0"
+#define VER_FILE_VERSION_STR            "0.2.1.4\0"

 
 /**
  * Module/library name (shall end with \0)
 
 /**
  * Module/library name (shall end with \0)

diff --git a/src/main/CLI/exithandler.cpp b/src/main/CLI/exithandler.cpp
index dac8008113c9ce78813f33465576efc3b5b3d897..0961ce5a547db21c36aaf910a8663caba321dac2 100644 (file)
--- a/src/main/CLI/exithandler.cpp
+++ b/src/main/CLI/exithandler.cpp
@@ -3,7 +3,7 @@
  * @brief Exit handlers for the eVaf main executable
  * @author Enar Vaikene
  *
  * @brief Exit handlers for the eVaf main executable
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -115,11 +115,11 @@ bool eVaf::CLI::Internal::installExitHandler()
     struct sigaction sa;
     memset(&sa, 0, sizeof(sa));
     sa.sa_handler = signalHandler;
     struct sigaction sa;
     memset(&sa, 0, sizeof(sa));
     sa.sa_handler = signalHandler;

-    if (sigaction(SIGTERM, &sa, NULL) != 0) {
+    if (sigaction(SIGTERM, &sa, nullptr) != 0) {

         EVAF_FATAL_ERROR("sigaction() failed: %m");
         return false;
     }
         EVAF_FATAL_ERROR("sigaction() failed: %m");
         return false;
     }

-    if (sigaction(SIGHUP, &sa, NULL) != 0) {
+    if (sigaction(SIGHUP, &sa, nullptr) != 0) {

         EVAF_FATAL_ERROR("sigaction() failed: %m");
         return false;
     }
         EVAF_FATAL_ERROR("sigaction() failed: %m");
         return false;
     }

diff --git a/src/main/CLI/main.cpp b/src/main/CLI/main.cpp
index 0be3f3697de7522f1fe8e985efbc20fa0a994ba2..908619f45e75ed1c68f767544abe82763ea4e367 100644 (file)
--- a/src/main/CLI/main.cpp
+++ b/src/main/CLI/main.cpp
@@ -2,7 +2,7 @@
  * @file main/CLI/main.cpp
  * @brief The main eVaf CLI application class
  *
  * @file main/CLI/main.cpp
  * @brief The main eVaf CLI application class
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -94,9 +94,9 @@ static void messageOutput(QtMsgType type, QMessageLogContext const &, QString co
  */
 [[noreturn]] static void fatalMsgHandler(QString const & msg, QString const & source, QString const & where)
 {
  */
 [[noreturn]] static void fatalMsgHandler(QString const & msg, QString const & source, QString const & where)
 {

-    Q_UNUSED(msg);
-    Q_UNUSED(source);
-    Q_UNUSED(where);
+    Q_UNUSED(msg)
+    Q_UNUSED(source)
+    Q_UNUSED(where)

     exit(1);
 }
 
     exit(1);
 }
 

diff --git a/src/main/GUI/exithandler.cpp b/src/main/GUI/exithandler.cpp
index 80c364c782c9a9e34acebee5da9c6cd1ba0adce6..0dc97ef319d6bf4e619a0bd7db7ba0751872ca09 100644 (file)
--- a/src/main/GUI/exithandler.cpp
+++ b/src/main/GUI/exithandler.cpp
@@ -3,7 +3,7 @@
  * @brief Exit handlers for the eVaf main executable
  * @author Enar Vaikene
  *
  * @brief Exit handlers for the eVaf main executable
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -115,11 +115,11 @@ bool eVaf::GUI::Internal::installExitHandler()
     struct sigaction sa;
     memset(&sa, 0, sizeof(sa));
     sa.sa_handler = signalHandler;
     struct sigaction sa;
     memset(&sa, 0, sizeof(sa));
     sa.sa_handler = signalHandler;

-    if (sigaction(SIGTERM, &sa, NULL) != 0) {
+    if (sigaction(SIGTERM, &sa, nullptr) != 0) {

         EVAF_FATAL_ERROR("sigaction() failed: %m");
         return false;
     }
         EVAF_FATAL_ERROR("sigaction() failed: %m");
         return false;
     }

-    if (sigaction(SIGHUP, &sa, NULL) != 0) {
+    if (sigaction(SIGHUP, &sa, nullptr) != 0) {

         EVAF_FATAL_ERROR("sigaction() failed: %m");
         return false;
     }
         EVAF_FATAL_ERROR("sigaction() failed: %m");
         return false;
     }

diff --git a/src/main/GUI/exithandler.h b/src/main/GUI/exithandler.h
index e1ccd41c8e00c6ae5514a34faaa029e87f218fff..8230bc303cb744411ebca49c69fc969a2ae92342 100644 (file)
--- a/src/main/GUI/exithandler.h
+++ b/src/main/GUI/exithandler.h
@@ -3,7 +3,7 @@
  * @brief Exit handlers for the eVaf main executable
  * @author Enar Vaikene
  *
  * @brief Exit handlers for the eVaf main executable
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/main/GUI/fatalerr.cpp b/src/main/GUI/fatalerr.cpp
index 24e6a593663fce82f21787ba6e123b003ff71dc9..4d1875e48809e444838cd957aa5bd8dee1ae5173 100644 (file)
--- a/src/main/GUI/fatalerr.cpp
+++ b/src/main/GUI/fatalerr.cpp
@@ -3,7 +3,7 @@
  * @brief Fatal error message dialog box
   * @author Enar Vaikene
 *
  * @brief Fatal error message dialog box
   * @author Enar Vaikene
 *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/main/GUI/fatalerr.h b/src/main/GUI/fatalerr.h
index d10b1d7aef6e2cca533f611ce466bbec608e48a0..7f1a08868ff6074234d9e3fe91065fcc55a16752 100644 (file)
--- a/src/main/GUI/fatalerr.h
+++ b/src/main/GUI/fatalerr.h
@@ -3,7 +3,7 @@
  * @brief Fatal error message dialog box
   * @author Enar Vaikene
 *
  * @brief Fatal error message dialog box
   * @author Enar Vaikene
 *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -53,7 +53,7 @@ public:
      * @param text Text shown on the dialog box
      * @param parent Optional parent widget
      */
      * @param text Text shown on the dialog box
      * @param parent Optional parent widget
      */

-    FatalErr(QString const & title, QString const & text, QWidget * parent = 0);
+    FatalErr(QString const & title, QString const & text, QWidget * parent = nullptr);

 
     /**
      * Shows a fatal error message dialog box
 
     /**
      * Shows a fatal error message dialog box


@@ -62,7 +62,7 @@ public:
      * @param parent Optional parent widget
      * @return The result code
      */
      * @param parent Optional parent widget
      * @return The result code
      */

-    static int message(QString const & title, QString const & text, QWidget * parent = 0);
+    static int message(QString const & title, QString const & text, QWidget * parent = nullptr);

 
 
 protected:
 
 
 protected:

diff --git a/src/main/GUI/main.cpp b/src/main/GUI/main.cpp
index cffe9ba4f250df7e993991a63e9a042211dec1ae..806617b22f1b5ed31b1862f684dfcac8a4eb82cf 100644 (file)
--- a/src/main/GUI/main.cpp
+++ b/src/main/GUI/main.cpp
@@ -3,7 +3,7 @@
  * @brief The main eVaf GUI application class
  * @author Enar Vaikene
  *
  * @brief The main eVaf GUI application class
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -127,7 +127,7 @@ static void messageOutput(QtMsgType type, QMessageLogContext const &, QString co
  */
 static void fatalMsgHandler(QString const & msg, QString const & source, QString const & where)
 {
  */
 static void fatalMsgHandler(QString const & msg, QString const & source, QString const & where)
 {

-    Q_UNUSED(source);
+    Q_UNUSED(source)

 
     // Show the message on the screen
     if (BeVerbose) {
 
     // Show the message on the screen
     if (BeVerbose) {

diff --git a/src/main/GUI/main.h b/src/main/GUI/main.h
index 2c51846c0715c0693fde5a659a269b8bb03d2436..08057e55afbfc480df48d9d88963e2d7ccdbde26 100644 (file)
--- a/src/main/GUI/main.h
+++ b/src/main/GUI/main.h
@@ -3,7 +3,7 @@
  * @brief The main eVaf GUI application class
   * @author Enar Vaikene
 *
  * @brief The main eVaf GUI application class
   * @author Enar Vaikene
 *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/plugins/LogView/CMakeLists.txt b/src/plugins/LogView/CMakeLists.txt
index 1d4b839c0483dcdbff12f7f49be62682efa4f509..37700d7af9c3fa7ebfe78e6668695d0b56de37cd 100644 (file)
--- a/src/plugins/LogView/CMakeLists.txt
+++ b/src/plugins/LogView/CMakeLists.txt
@@ -13,7 +13,11 @@ set(eVaf_LIBRARIES CommonLib PluginsLib GuiLib)
 # Source files
 set(SRCS
     factory.cpp
 # Source files
 set(SRCS
     factory.cpp

+    factory.h
+    liblogview.h

     logview.cpp
     logview.cpp

+    logview.h
+    version.h

 )
 
 # Header files for the meta-object compiler
 )
 
 # Header files for the meta-object compiler

diff --git a/src/plugins/LogView/factory.cpp b/src/plugins/LogView/factory.cpp
index 27372fd04cbeac14237aef5adbd3c76f3921ecd8..aec63ae8866f307d6193d62bb0b275e9acecb12c 100644 (file)
--- a/src/plugins/LogView/factory.cpp
+++ b/src/plugins/LogView/factory.cpp
@@ -3,7 +3,7 @@
  * @brief LogView module's factory class
  * @author Enar Vaikene
  *
  * @brief LogView module's factory class
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -50,7 +50,7 @@ Factory::~Factory()
 
 QObject * Factory::create(QString const & name)
 {
 
 QObject * Factory::create(QString const & name)
 {

-    Q_UNUSED(name);
+    Q_UNUSED(name)

 
     if (mPlugin == nullptr)
         mPlugin = new Internal::Module;
 
     if (mPlugin == nullptr)
         mPlugin = new Internal::Module;

diff --git a/src/plugins/LogView/factory.h b/src/plugins/LogView/factory.h
index bdf396285404c15ba861786d58bbeda38d82b9ca..fd27c33a78fcbec95e55fcf5d752328317c6cc6a 100644 (file)
--- a/src/plugins/LogView/factory.h
+++ b/src/plugins/LogView/factory.h
@@ -3,7 +3,7 @@
  * @brief LogView module's factory class
  * @author Enar Vaikene
  *
  * @brief LogView module's factory class
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/plugins/LogView/liblogview.h b/src/plugins/LogView/liblogview.h
index 1f88060d7b6787623b9919135c6aa183693393d7..8a8b09d6d0fc5cf8b73017b3980c8a53505f7cf2 100644 (file)
--- a/src/plugins/LogView/liblogview.h
+++ b/src/plugins/LogView/liblogview.h
@@ -2,7 +2,7 @@
  * @file LogView/liblogview.h
  * @author Enar Vaikene
  *
  * @file LogView/liblogview.h
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/plugins/LogView/logview.cpp b/src/plugins/LogView/logview.cpp
index 75e973eec3e993d759fab4c9376c3fbb7247498d..1bd41a170a5573cfa799ae89c59417b8000ba709 100644 (file)
--- a/src/plugins/LogView/logview.cpp
+++ b/src/plugins/LogView/logview.cpp
@@ -3,7 +3,7 @@
  * @brief Implementation of the LogView module
  * @author Enar Vaikene
  *
  * @brief Implementation of the LogView module
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -62,7 +62,6 @@ QVariant Model::data(QModelIndex const & index, int role) const
         // Return the message for the display role
         case Qt::DisplayRole: {
             return mData.at(index.row()).simplified;
         // Return the message for the display role
         case Qt::DisplayRole: {
             return mData.at(index.row()).simplified;

-            break;

         }
 
         // Change color for different message types
         }
 
         // Change color for different message types


@@ -71,18 +70,14 @@ QVariant Model::data(QModelIndex const & index, int role) const
             switch (s) {
                 case Common::iLogger::Info:
                     return QBrush(QColor(Qt::blue));
             switch (s) {
                 case Common::iLogger::Info:
                     return QBrush(QColor(Qt::blue));

-                    break;

                 case Common::iLogger::Warning:
                     return QBrush(QColor(Qt::black));
                 case Common::iLogger::Warning:
                     return QBrush(QColor(Qt::black));

-                    break;

                 case Common::iLogger::Error:
                 case Common::iLogger::Fatal:
                     return QBrush(QColor(Qt::red));
                 case Common::iLogger::Error:
                 case Common::iLogger::Fatal:
                     return QBrush(QColor(Qt::red));

-                    break;

                 default:
                     return QVariant();
             }
                 default:
                     return QVariant();
             }

-            break;

         }
     } // switch (role)
 
         }
     } // switch (role)
 


@@ -158,7 +153,7 @@ bool Model::saveToFile(QString const & fileName)
     return true;
 }
 
     return true;
 }
 

-char const * const Model::severityText(Common::iLogger::Severity s) const
+char const * Model::severityText(Common::iLogger::Severity s) const

 {
     if (s >= Common::iLogger::None && s < Common::iLogger::Count)
         return SeverityText[s];
 {
     if (s >= Common::iLogger::None && s < Common::iLogger::Count)
         return SeverityText[s];

diff --git a/src/plugins/LogView/logview.h b/src/plugins/LogView/logview.h
index e652f619b7d3e4aec5a1a1b10608ec50231449b1..228a6895623b62e2a6791e3759abee7ca0b41092 100644 (file)
--- a/src/plugins/LogView/logview.h
+++ b/src/plugins/LogView/logview.h
@@ -3,7 +3,7 @@
  * @brief Implementation of the LogView module
  * @author Enar Vaikene
  *
  * @brief Implementation of the LogView module
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -120,7 +120,7 @@ private: // Members
 
 private: // Methods
 
 
 private: // Methods
 

-    inline char const * const severityText(Common::iLogger::Severity s) const;
+    inline char const * severityText(Common::iLogger::Severity s) const;

 
 };
 
 
 };
 


@@ -178,7 +178,7 @@ class Window : public Gui::Panel
 
 public:
 
 
 public:
 

-    Window(QString const & args, QWidget * parent = nullptr, Qt::WindowFlags flags = 0);
+    Window(QString const & args, QWidget * parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());

 
     virtual ~Window();
 
 
     virtual ~Window();
 

diff --git a/src/plugins/SdiWindow/CMakeLists.txt b/src/plugins/SdiWindow/CMakeLists.txt
index 75f9ce79085cf78b8a3b3f467594db1c5cc81dd2..9d20998b90b3617fb29fd60739ba8e93dcc47774 100644 (file)
--- a/src/plugins/SdiWindow/CMakeLists.txt
+++ b/src/plugins/SdiWindow/CMakeLists.txt
@@ -13,7 +13,12 @@ set(eVaf_LIBRARIES CommonLib PluginsLib GuiLib)
 # Source files
 set(SRCS
     factory.cpp
 # Source files
 set(SRCS
     factory.cpp

+    factory.h
+    isdiwindow.h
+    libsdiwindow.h

     sdiwindow.cpp
     sdiwindow.cpp

+    sdiwindow.h
+    version.h

 )
 
 # Header files for the meta-object compiler
 )
 
 # Header files for the meta-object compiler

diff --git a/src/plugins/SdiWindow/factory.cpp b/src/plugins/SdiWindow/factory.cpp
index 24aa0e55df0bf3f92aba358032119451ac9562e9..6d5621b9c74969ba7d7dcfa2c0446f5301bdfb7d 100644 (file)
--- a/src/plugins/SdiWindow/factory.cpp
+++ b/src/plugins/SdiWindow/factory.cpp
@@ -48,7 +48,7 @@ Factory::~Factory()
 
 QObject * Factory::create(QString const & name)
 {
 
 QObject * Factory::create(QString const & name)
 {

-    Q_UNUSED(name);
+    Q_UNUSED(name)

 
     if (!mPlugin)
         mPlugin.reset(new Internal::SdiWindowPlugin);
 
     if (!mPlugin)
         mPlugin.reset(new Internal::SdiWindowPlugin);

diff --git a/src/plugins/SdiWindow/isdiwindow.h b/src/plugins/SdiWindow/isdiwindow.h
index 4e0e43d88d6ebb2daac904a4f2502eb76e46fbf1..825961ebaf533118367f4ac8ee66016c23d8c087 100644 (file)
--- a/src/plugins/SdiWindow/isdiwindow.h
+++ b/src/plugins/SdiWindow/isdiwindow.h
@@ -3,7 +3,7 @@
  * @brief eVaf SDI window interface
  * @author Enar Vaikene
  *
  * @brief eVaf SDI window interface
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *


@@ -53,6 +53,11 @@ struct SDIWINDOW_EXPORT iSdiWindow
      */
     static iSdiWindow * instance();
 
      */
     static iSdiWindow * instance();
 

+    /**
+     * Empty virtual destructor
+     */
+    virtual ~iSdiWindow() {}
+

     /**
      * Adds a panel to the SDI window manager
      * @param name Name of the panel
     /**
      * Adds a panel to the SDI window manager
      * @param name Name of the panel

diff --git a/src/plugins/SdiWindow/libsdiwindow.h b/src/plugins/SdiWindow/libsdiwindow.h
index 8608fddd5957f5243f47331bf88316191ca2d4a8..2bee518e18a5801616fadcf3a13250796fa95192 100644 (file)
--- a/src/plugins/SdiWindow/libsdiwindow.h
+++ b/src/plugins/SdiWindow/libsdiwindow.h
@@ -2,7 +2,7 @@
  * @file SdiWindow/libsdiwindow.h
  * @author Enar Vaikene
  *
  * @file SdiWindow/libsdiwindow.h
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *

diff --git a/src/plugins/SdiWindow/sdiwindow.h b/src/plugins/SdiWindow/sdiwindow.h
index 40c72111d003ab4d3ab1caf72a1c2f1eccd04684..08bfcd90e5be8b09cf0afcf2979dd988a3cbb7ef 100644 (file)
--- a/src/plugins/SdiWindow/sdiwindow.h
+++ b/src/plugins/SdiWindow/sdiwindow.h
@@ -49,7 +49,7 @@ class MainWindow : public QWidget, public iSdiWindow
 
 public:
 
 
 public:
 

-    MainWindow(QWidget * parent = nullptr, Qt::WindowFlags flags = 0);
+    MainWindow(QWidget * parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());

 
     virtual ~MainWindow();
 
 
     virtual ~MainWindow();
 

diff --git a/src/plugins/SdiWindow/version.h b/src/plugins/SdiWindow/version.h
index c47549d2845bef7affe5e70a473877be9ed3ada8..cbcc2923f743534b3ed21eb738fa0e7d85e21f0f 100644 (file)
--- a/src/plugins/SdiWindow/version.h
+++ b/src/plugins/SdiWindow/version.h
@@ -3,7 +3,7 @@
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *
  * @brief Version information for eVaf modules
  * @author Enar Vaikene
  *

- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene

  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *