From e94fcd2b413f9ad973f0e3395b8b89618ad415f6 Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Sun, 13 Jan 2013 14:35:42 -0500 Subject: [PATCH] trying a C++11x feature --- CMakeLists.txt | 2 +- sdk/plugins/meta.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ba7bfa..32013ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/sdk/plugins/meta.cpp b/sdk/plugins/meta.cpp index f6240bb..172db9b 100644 --- a/sdk/plugins/meta.cpp +++ b/sdk/plugins/meta.cpp @@ -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(); } -- libgit2 0.21.4