New upstream version 1.2.3.6

1 files changed, 25 insertions, 29 deletions

diff --git a/LocalPluginOptions.cpp b/LocalPluginOptions.cpp
index b81e880..5e25bf0 100644
--- a/LocalPluginOptions.cpp
+++ b/LocalPluginOptions.cpp
@@ -1,63 +1,59 @@
 /** \file LocalPluginOptions.cpp
 \brief To bind the options of the plugin, into unique group options
 \author alpha_one_x86
-\version 0.3
-\date 2010
 \licence GPL3, see the file COPYING */
 
 #include "LocalPluginOptions.h"
 
 LocalPluginOptions::LocalPluginOptions(const QString &group)
 {
-	ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Notice,"start(\""+group+"\",[...])");
-	groupOptionAdded=false;
-	this->group=group;
-	options=OptionEngine::getInstance();
-	connect(options,SIGNAL(resetOptions()),this,SIGNAL(resetOptions()));
+    ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start(\"")+group+QStringLiteral("\",[...])"));
+    groupOptionAdded=false;
+    this->group=group;
+    connect(OptionEngine::optionEngine,&OptionEngine::resetOptions,this,&OptionInterface::resetOptions);
 }
 
 LocalPluginOptions::~LocalPluginOptions()
 {
-	ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Notice,"start(\""+group+"\",[...])");
-	if(groupOptionAdded)
-		options->removeOptionGroup(group);
-	else
-		ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Notice,"option not used");
-	OptionEngine::destroyInstanceAtTheLastCall();
+    if(groupOptionAdded)
+    {
+        if(OptionEngine::optionEngine!=NULL)
+            OptionEngine::optionEngine->removeOptionGroup(group);
+    }
 }
 
 /// \brief To add option group to options
 bool LocalPluginOptions::addOptionGroup(const QList<QPair<QString, QVariant> > &KeysList)
 {
-	ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Notice,"start(\""+group+"\",[...])");
-	if(groupOptionAdded)
-	{
-		ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Critical,"Group already added!");
-		return false;
-	}
-	else
-	{
-		groupOptionAdded=true;
-		return options->addOptionGroup(group,KeysList);
-	}
+    ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start(\"")+group+QStringLiteral("\",[...])"));
+    if(groupOptionAdded)
+    {
+        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,QStringLiteral("Group already added!"));
+        return false;
+    }
+    else
+    {
+        groupOptionAdded=true;
+        return OptionEngine::optionEngine->addOptionGroup(group,KeysList);
+    }
 }
 
 /// \brief To get option value
-QVariant LocalPluginOptions::getOptionValue(const QString &variableName)
+QVariant LocalPluginOptions::getOptionValue(const QString &variableName) const
 {
-	return options->getOptionValue(group,variableName);
+    return OptionEngine::optionEngine->getOptionValue(group,variableName);
 }
 
 /// \brief To set option value
 void LocalPluginOptions::setOptionValue(const QString &variableName,const QVariant &value)
 {
-	options->setOptionValue(group,variableName,value);
+    OptionEngine::optionEngine->setOptionValue(group,variableName,value);
 }
 
 /*-> disabled because the value will not externaly changed, then useless notification
 void LocalPluginOptions::newOptionValue(QString group,QString variable,QVariant value)
 {
-	if(group==this->group)
-		emit newOptionValue(variable,value);
+    if(group==this->group)
+        emit newOptionValue(variable,value);
 }*/