Final fix for little version

l3dlp-sandbox · Apr 6, 2018 · 77177e4 · 77177e4
1 parent 1e50493
commit 77177e4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/other-pro/OptionsEngineLittle.cpp → little/OptionsEngineLittle.cpp b/other-pro/OptionsEngineLittle.cpp → little/OptionsEngineLittle.cpp
diff --git a/other-pro/OptionsEngineLittle.h → little/OptionsEngineLittle.h b/other-pro/OptionsEngineLittle.h → little/OptionsEngineLittle.h
diff --git a/little/main-little.cpp b/little/main-little.cpp
@@ -51,6 +51,10 @@ int main(int argc, char *argv[])
     qRegisterMetaType<std::string>("std::string");
     qRegisterMetaType<std::vector<std::string> >("std::vector<std::string>");
     qRegisterMetaType<Ultracopier::DebugLevel>("Ultracopier::DebugLevel");
+    qRegisterMetaType<Ultracopier::EngineActionInProgress>("Ultracopier::EngineActionInProgress");
+    qRegisterMetaType<std::vector<Ultracopier::ReturnActionOnCopyList> >("std::vector<Ultracopier::ReturnActionOnCopyList>");
+    qRegisterMetaType<uint64_t>("uint64_t");
+    qRegisterMetaType<std::vector<Ultracopier::ProgressionItem> >("std::vector<Ultracopier::ProgressionItem>");
 
     FacilityEngine facilityEngine;
     ThemesFactory themesFactory;
@@ -62,10 +66,15 @@ int main(int argc, char *argv[])
     engine=static_cast<CopyEngine *>(copyEngineFactory.getInstance());
 
     connectEngine();
+    connectInterfaceAndSync();
     forUpateInformation.setInterval(ULTRACOPIER_TIME_INTERFACE_UPDATE);
+    forUpateInformation.start();
     QObject::connect(&forUpateInformation,	&QTimer::timeout,						&periodicSynchronization);
 
-    return ultracopierApplication.exec();
+    const int returnVar=ultracopierApplication.exec();
+
+    delete engine;
+    return returnVar;
 }
 
 void connectEngine()
@@ -75,6 +84,7 @@ void connectEngine()
     failed|=!QObject::connect(engine,&CopyEngine::actionInProgess,           interface,&Themes::actionInProgess,Qt::QueuedConnection);
     failed|=!QObject::connect(engine,&CopyEngine::isInPause,                 interface,&Themes::isInPause,Qt::QueuedConnection);//to check to change
     failed|=!QObject::connect(engine,&CopyEngine::cancelAll,					QCoreApplication::instance(),&QCoreApplication::quit,Qt::QueuedConnection);
+    failed|=!QObject::connect(engine,&CopyEngine::canBeDeleted,					QCoreApplication::instance(),&QCoreApplication::quit,Qt::QueuedConnection);
     /*failed|=!QObject::connect(engine,&CopyEngine::error,                     interface,&Themes::error,Qt::QueuedConnection);
     failed|=!QObject::connect(engine,&CopyEngine::rmPath,                    interface,&Themes::rmPath,Qt::QueuedConnection);
     failed|=!QObject::connect(engine,&CopyEngine::mkPath,                    interface,&Themes::mkPath,Qt::QueuedConnection);

diff --git a/other-pro/ultracopier-little.pro b/other-pro/ultracopier-little.pro
@@ -47,7 +47,7 @@ SOURCES += \
     ../plugins/Themes/Oxygen/ThemesFactory.cpp \
     ../plugins/Themes/Oxygen/TransferModel.cpp \
     ../plugins/Themes/Oxygen/interface.cpp \
-    OptionsEngineLittle.cpp \
+    ../little/OptionsEngineLittle.cpp \
     ../FacilityEngine.cpp \
     ../cpp11addition.cpp \
     ../cpp11additionstringtointcpp.cpp
@@ -108,7 +108,7 @@ HEADERS += \
     ../plugins/Themes/Oxygen/interface.h \
     ../plugins/Themes/Oxygen/DebugEngineMacro.h \
     ../plugins/Themes/Oxygen/Environment.h \
-    OptionsEngineLittle.h \
+    ../little/OptionsEngineLittle.h \
     ../FacilityEngine.h \
     ../Variable.h \
     ../interface/FacilityInterface.h \