diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/changereplay.cpp | 2 | ||||
-rw-r--r-- | common/domainadaptor.h | 7 | ||||
-rw-r--r-- | common/resourcefacade.cpp | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/common/changereplay.cpp b/common/changereplay.cpp index 51443e8..0096bd0 100644 --- a/common/changereplay.cpp +++ b/common/changereplay.cpp | |||
@@ -128,5 +128,5 @@ void ChangeReplay::revisionChanged() | |||
128 | 128 | ||
129 | #pragma clang diagnostic push | 129 | #pragma clang diagnostic push |
130 | #pragma clang diagnostic ignored "-Wundefined-reinterpret-cast" | 130 | #pragma clang diagnostic ignored "-Wundefined-reinterpret-cast" |
131 | #include "changereplay.moc" | 131 | #include "moc_changereplay.cpp" |
132 | #pragma clang diagnostic pop | 132 | #pragma clang diagnostic pop |
diff --git a/common/domainadaptor.h b/common/domainadaptor.h index e97c5f5..8ac8171 100644 --- a/common/domainadaptor.h +++ b/common/domainadaptor.h | |||
@@ -94,14 +94,13 @@ public: | |||
94 | { | 94 | { |
95 | } | 95 | } |
96 | 96 | ||
97 | virtual QVariant setProperty(const QByteArray &key, const QVariant &value) const | 97 | virtual void setProperty(const QByteArray &key, const QVariant &value) Q_DECL_OVERRIDE |
98 | { | 98 | { |
99 | Q_ASSERT(false); | ||
100 | Warning() << "Can't set property " << key; | 99 | Warning() << "Can't set property " << key; |
101 | return QVariant(); | 100 | Q_ASSERT(false); |
102 | } | 101 | } |
103 | 102 | ||
104 | virtual QVariant getProperty(const QByteArray &key) const | 103 | virtual QVariant getProperty(const QByteArray &key) const Q_DECL_OVERRIDE |
105 | { | 104 | { |
106 | if (mResourceBuffer && mResourceMapper->hasMapping(key)) { | 105 | if (mResourceBuffer && mResourceMapper->hasMapping(key)) { |
107 | return mResourceMapper->getProperty(key, mResourceBuffer); | 106 | return mResourceMapper->getProperty(key, mResourceBuffer); |
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp index 65ff05c..3901f43 100644 --- a/common/resourcefacade.cpp +++ b/common/resourcefacade.cpp | |||
@@ -220,5 +220,5 @@ IdentityFacade::~IdentityFacade() | |||
220 | 220 | ||
221 | #pragma clang diagnostic push | 221 | #pragma clang diagnostic push |
222 | #pragma clang diagnostic ignored "-Wundefined-reinterpret-cast" | 222 | #pragma clang diagnostic ignored "-Wundefined-reinterpret-cast" |
223 | #include "resourcefacade.moc" | 223 | #include "moc_resourcefacade.cpp" |
224 | #pragma clang diagnostic pop | 224 | #pragma clang diagnostic pop |