From 751f2c82c4121d28d0740bffb29a4fb273ec55c5 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 21 Jun 2016 22:19:15 +0200 Subject: Catch errors --- common/changereplay.cpp | 2 +- common/domainadaptor.h | 7 +++---- common/resourcefacade.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'common') 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() #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wundefined-reinterpret-cast" -#include "changereplay.moc" +#include "moc_changereplay.cpp" #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: { } - virtual QVariant setProperty(const QByteArray &key, const QVariant &value) const + virtual void setProperty(const QByteArray &key, const QVariant &value) Q_DECL_OVERRIDE { - Q_ASSERT(false); Warning() << "Can't set property " << key; - return QVariant(); + Q_ASSERT(false); } - virtual QVariant getProperty(const QByteArray &key) const + virtual QVariant getProperty(const QByteArray &key) const Q_DECL_OVERRIDE { if (mResourceBuffer && mResourceMapper->hasMapping(key)) { 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() #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wundefined-reinterpret-cast" -#include "resourcefacade.moc" +#include "moc_resourcefacade.cpp" #pragma clang diagnostic pop -- cgit v1.2.3