Commit 770b2d40 by Carwyn

1.同步基础接口InitService/UninitService

parent 121df1a2
...@@ -16,14 +16,14 @@ FMPSettings::FMPSettings(ctkPluginContext *context) ...@@ -16,14 +16,14 @@ FMPSettings::FMPSettings(ctkPluginContext *context)
StartService(); StartService();
} }
int FMPSettings::StartService() void FMPSettings::InitService()
{ {
return d_func()->DoStartService(); d_func()->Init();
} }
int FMPSettings::StopService() void FMPSettings::UninitService()
{ {
return d_func()->DoStopService(); d_func()->Uninit();
} }
int FMPSettings::PostEvent(const QString &topic, const FMPProps &pps) int FMPSettings::PostEvent(const QString &topic, const FMPProps &pps)
...@@ -57,7 +57,7 @@ FMPSettingsPrivate::FMPSettingsPrivate(ctkPluginContext *ctx) ...@@ -57,7 +57,7 @@ FMPSettingsPrivate::FMPSettingsPrivate(ctkPluginContext *ctx)
{ {
} }
int FMPSettingsPrivate::DoStartService() int FMPSettingsPrivate::Init()
{ {
if (!_sets) { if (!_sets) {
_sets = new QSettings(_ctx->getProperty(FMP_PROPKEY_CFG).toString(), QSettings::IniFormat); _sets = new QSettings(_ctx->getProperty(FMP_PROPKEY_CFG).toString(), QSettings::IniFormat);
...@@ -66,7 +66,7 @@ int FMPSettingsPrivate::DoStartService() ...@@ -66,7 +66,7 @@ int FMPSettingsPrivate::DoStartService()
return FMP_SUCCESS; return FMP_SUCCESS;
} }
int FMPSettingsPrivate::DoStopService() int FMPSettingsPrivate::Uninit()
{ {
if (_sets) { if (_sets) {
delete _sets; delete _sets;
......
...@@ -19,10 +19,10 @@ class FMPSettings : public QObject, public FMPSettingsInterface ...@@ -19,10 +19,10 @@ class FMPSettings : public QObject, public FMPSettingsInterface
public: public:
explicit FMPSettings(ctkPluginContext *context); explicit FMPSettings(ctkPluginContext *context);
//! BaseInterface
int StartService();
int StopService();
protected: protected:
//! BaseInterface
void InitService();
void UninitService();
int PostEvent(const QString &topic, const FMPProps &pps = FMPProps()); int PostEvent(const QString &topic, const FMPProps &pps = FMPProps());
//! SettingsInterface //! SettingsInterface
...@@ -45,8 +45,8 @@ class FMPSettingsPrivate ...@@ -45,8 +45,8 @@ class FMPSettingsPrivate
public: public:
explicit FMPSettingsPrivate(ctkPluginContext *ctx); explicit FMPSettingsPrivate(ctkPluginContext *ctx);
int DoStartService(); int Init();
int DoStopService(); int Uninit();
QVariant GetValue(const QString &k, QVariant default_val); QVariant GetValue(const QString &k, QVariant default_val);
bool SetValue(const QString&k, QVariant v); bool SetValue(const QString&k, QVariant v);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment