GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r32:8866878c2cb6

Minor fixes...

Alexandre Leroux -

r32:8866878c2cb6

parent child

Context file:

r32:8866878c2cb6

Collapse all files

.gitignore +2 0

              build/
              CMakeLists.txt.user
              /.project
+             core/src/Version.cpp
+             core/include/Version.h

app/src/main.cpp +1 -2

              int main(int argc, char *argv[])
              {
-                 int ad;
-                 SqpApplication a(argc, argv);
+                 SqpApplication a{argc, argv};
                  SqpApplication::setOrganizationName("LPP");
                  SqpApplication::setOrganizationDomain("lpp.fr");
                  SqpApplication::setApplicationName("SciQLop");

core/include/Common/spimpl.h +14 -12

              template <class T, class D, class C>
              struct is_default_manageable
-                 : public std::integral_constant<bool, std::is_same<D, default_deleter_t<T> >::value
-                                                           && std::is_same<C, default_copier_t<T> >::value> {
+                 : public std::integral_constant<bool,
+                                                 std::is_same<D, default_deleter_t<T> >::value
+                                                     && std::is_same<C, default_copier_t<T> >::value> {
              };
              }
                  }
                  template <class U>
-                 impl_ptr(U *u, typename std::enable_if<std::is_convertible<U *, pointer>::value
-                                                            && is_default_manageable::value,
-                                                        dummy_t_>::type
-                                = dummy_t_()) SPIMPL_NOEXCEPT
+                 impl_ptr(U *u,
+                          typename std::enable_if<std::is_convertible<U *, pointer>::value
+                                                      && is_default_manageable::value,
+                                                  dummy_t_>::type
+                          = dummy_t_()) SPIMPL_NOEXCEPT
                      : impl_ptr(u, &details::default_delete<T>, &details::default_copy<T>)
                  {
                  }
              #ifdef SPIMPL_HAS_AUTO_PTR
                  template <class U>
-                 impl_ptr(std::auto_ptr<U> &&u, typename std::enable_if<std::is_convertible<U *, pointer>::value
-                                                                            && is_default_manageable::value,
-                                                                        dummy_t_>::type
-                                                = dummy_t_()) SPIMPL_NOEXCEPT
-                     : ptr_(u.release(), &details::default_delete<T>),
-                       copier_(&details::default_copy<T>)
+                 impl_ptr(std::auto_ptr<U> &&u,
+                          typename std::enable_if<std::is_convertible<U *, pointer>::value
+                                                      && is_default_manageable::value,
+                                                  dummy_t_>::type
+                          = dummy_t_()) SPIMPL_NOEXCEPT : ptr_(u.release(), &details::default_delete<T>),
+                                                          copier_(&details::default_copy<T>)
                  {
                  }
              #endif

core/include/DataSource/DataSourceController.h 0 -2

              #ifndef SCIQLOP_DATASOURCECONTROLLER_H
              #define SCIQLOP_DATASOURCECONTROLLER_H
-             #include "DataSourceController.h"
              #include <QLoggingCategory>
              #include <QObject>

core/src/DataSource/DataSourceController.cpp +9 -11

-             #include "DataSource/DataSourceController.h"
+             #include <DataSource/DataSourceController.h>
              #include <QMutex>
              #include <QThread>
              class DataSourceController::DataSourceControllerPrivate {
              public:
-                 DataSourceControllerPrivate() {}
                  QMutex m_WorkingMutex;
              };
              DataSourceController::DataSourceController(QObject *parent)
                      : impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()}
              {
-                 qCDebug(LOG_DataSourceController()) << tr("Construction du DataSourceController")
-                                                     << QThread::currentThread();
+                 qCDebug(LOG_DataSourceController())
+                     << tr("DataSourceController construction") << QThread::currentThread();
              }
              DataSourceController::~DataSourceController()
              {
-                 qCDebug(LOG_DataSourceController()) << tr("Desctruction du DataSourceController")
-                                                     << QThread::currentThread();
+                 qCDebug(LOG_DataSourceController())
+                     << tr("DataSourceController destruction") << QThread::currentThread();
                  this->waitForFinish();
              }
              void DataSourceController::initialize()
              {
-                 qCDebug(LOG_DataSourceController()) << tr("initialize du DataSourceController")
-                                                     << QThread::currentThread();
+                 qCDebug(LOG_DataSourceController())
+                     << tr("DataSourceController init") << QThread::currentThread();
                  impl->m_WorkingMutex.lock();
-                 qCDebug(LOG_DataSourceController()) << tr("initialize du DataSourceController END");
+                 qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END");
              }
              void DataSourceController::finalize()
              void DataSourceController::waitForFinish()
              {
-                 QMutexLocker locker(&impl->m_WorkingMutex);
+                 QMutexLocker locker{&impl->m_WorkingMutex};
              }

gui/include/SqpApplication.h +3 -3

              /**
               * @brief The SqpApplication class aims to make the link between SciQlop
-              * and its plugins. This is the intermediate class that SciQlop have to use
-              * in the way to connect a data source. Please first use load method to intialize
+              * and its plugins. This is the intermediate class that SciQlop has to use
+              * in the way to connect a data source. Please first use load method to initialize
               * a plugin specified by its metadata name (JSON plugin source) then others specifics
-              * method will ba able to access it.
+              * method will be able to access it.
               * You can load a data source driver plugin then create a data source.
               */

gui/src/SqpApplication.cpp +8 -7

              class SqpApplication::SqpApplicationPrivate {
              public:
-                 SqpApplicationPrivate() {}
+                 SqpApplicationPrivate() : m_DataSourceController{std::make_unique<DataSourceController>()}
+                 {
+                     m_DataSourceController->moveToThread(&m_DataSourceControllerThread);
+                 }
                  virtual ~SqpApplicationPrivate()
                  {
-                     qCInfo(LOG_SqpApplication()) << tr("Desctruction du SqpApplicationPrivate");
+                     qCInfo(LOG_SqpApplication()) << tr("SqpApplicationPrivate destruction");
                      m_DataSourceControllerThread.quit();
                      m_DataSourceControllerThread.wait();
                  }
              SqpApplication::SqpApplication(int &argc, char **argv)
-                     : QApplication(argc, argv), impl{spimpl::make_unique_impl<SqpApplicationPrivate>()}
+                     : QApplication{argc, argv}, impl{spimpl::make_unique_impl<SqpApplicationPrivate>()}
              {
-                 qCInfo(LOG_SqpApplication()) << tr("Construction du SqpApplication");
-                 impl->m_DataSourceController = std::make_unique<DataSourceController>();
-                 impl->m_DataSourceController->moveToThread(&impl->m_DataSourceControllerThread);
+                 qCInfo(LOG_SqpApplication()) << tr("SqpApplication construction");
                  connect(&impl->m_DataSourceControllerThread, &QThread::started,
                          impl->m_DataSourceController.get(), &DataSourceController::initialize);

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages