Ported to Qt5

[evaf] / src / libs / Common / prop.cpp

diff --git a/src/libs/Common/prop.cpp b/src/libs/Common/prop.cpp
index b3ccb6fa98b383d9ebc3ee034c1dee88e7c4b9e4..f6cfec6395b2813131aa91103d071dcd33cde47b 100644 (file)
--- a/src/libs/Common/prop.cpp
+++ b/src/libs/Common/prop.cpp
@@ -34,7 +34,7 @@ using namespace eVaf::Common;
 iProp * iProp::instance()
 {
     static Internal::Prop singleton;
-    return singleton.interface();
+    return singleton._interface();
 }
 
 
@@ -47,6 +47,9 @@ Prop::Prop()
     , mPersistentProps(0)
 {
     setObjectName(QString("%1.iProp").arg(VER_MODULE_NAME_STR));
+
+    // Register the iProp interface
+    iRegistry::instance()->registerInterface("iProp", this);
 }
 
 Prop::~Prop()
@@ -54,16 +57,13 @@ Prop::~Prop()
     done();
 }
 
-iProp * Prop::interface() const
+iProp * Prop::_interface() const
 {
     return evafQueryInterface<iProp>("iProp");
 }
 
 bool Prop::init()
 {
-    // Register the iProp interface
-    iRegistry::instance()->registerInterface("iProp", this);
-
     // Set application name and language properties
     setValue("applicationName", iApp::instance()->name());
     setValue("applicationLanguage", iApp::instance()->language());