trying a C++11x feature

Josh Klontz
1 parent 7dcdbe00
Showing 2 changed files with 4 additions and 4 deletions
CMakeLists.txt
sdk/plugins/meta.cpp
@@ -40,7 +40,7 @@ if(APPLE)
 endif()
 if(UNIX)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fvisibility=hidden -fno-omit-frame-pointer")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-c++11-extensions -fvisibility=hidden -fno-omit-frame-pointer")
 endif()
 if(CMAKE_COMPILER_IS_GNUXX)
@@ -329,9 +329,8 @@ class LoadStoreTransform : public MetaTransform
 {
     Q_OBJECT
     Q_PROPERTY(QString description READ get_description WRITE set_description RESET reset_description STORED false)
-    Q_PROPERTY(br::Transform *transform READ get_transform WRITE set_transform RESET reset_transform STORED false)
     BR_PROPERTY(QString, description, "Identity")
-    BR_PROPERTY(br::Transform*, transform, NULL)
+    Transform *transform = NULL;
     QString baseName;
@@ -354,7 +353,7 @@ class LoadStoreTransform : public MetaTransform
         QDataStream stream(&byteArray, QFile::WriteOnly);
         stream << description;
         transform->store(stream);
-        QtUtils::writeFile(getFileName(), byteArray);
+        QtUtils::writeFile(baseName, byteArray);
     }
     void project(const Template &src, Template &dst) const
@@ -369,6 +368,7 @@ class LoadStoreTransform : public MetaTransform
     QString getFileName() const
     {
+        if (QFileInfo(baseName).exists()) return baseName;
         const QString file = Globals->sdkPath + "/share/openbr/models/transforms/" + baseName;
         return QFileInfo(file).exists() ? file : QString();
     }