From 8f9b0d702c0a1aa584242afb3b57c0e2973a1ccc Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 8 Apr 2014 17:36:30 +0200 Subject: [PATCH] refs #199, removed Q_ASSERT as nullptr shall be a valid return value for non-existing contexts --- src/blackcore/context_runtime.cpp | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/blackcore/context_runtime.cpp b/src/blackcore/context_runtime.cpp index c4137e2f4..8c46178eb 100644 --- a/src/blackcore/context_runtime.cpp +++ b/src/blackcore/context_runtime.cpp @@ -176,89 +176,81 @@ namespace BlackCore IContextNetwork *CRuntime::getIContextNetwork() { - Q_ASSERT_X(this->m_contextNetwork, "CCoreRuntime", "Requested missing network context"); return this->m_contextNetwork; } const IContextNetwork *CRuntime::getIContextNetwork() const { - Q_ASSERT_X(this->m_contextNetwork, "CCoreRuntime", "Requested missing network context"); return this->m_contextNetwork; } IContextAudio *CRuntime::getIContextAudio() { - Q_ASSERT_X(this->m_contextAudio, "CCoreRuntime", "Requested missing audio context"); return this->m_contextAudio; } const IContextAudio *CRuntime::getIContextAudio() const { - Q_ASSERT_X(this->m_contextAudio, "CCoreRuntime", "Requested missing audio context"); return this->m_contextAudio; } IContextSettings *CRuntime::getIContextSettings() { - Q_ASSERT_X(this->m_contextSettings, "CCoreRuntime", "Requested missing settings context"); return this->m_contextSettings; } const IContextSettings *CRuntime::getIContextSettings() const { - Q_ASSERT_X(this->m_contextSettings, "CCoreRuntime", "Requested missing settings context"); return this->m_contextSettings; } const IContextApplication *CRuntime::getIContextApplication() const { - Q_ASSERT_X(this->m_contextApplication, "CCoreRuntime", "Requested missing application context"); return this->m_contextApplication; } IContextApplication *CRuntime::getIContextApplication() { - Q_ASSERT_X(this->m_contextApplication, "CCoreRuntime", "Requested missing application context"); return this->m_contextApplication; } const IContextSimulator *CRuntime::getIContextSimulator() const { - Q_ASSERT_X(this->m_contextSimulator, "CCoreRuntime", "Requested missing simulator context"); return this->m_contextSimulator; } IContextSimulator *CRuntime::getIContextSimulator() { - Q_ASSERT_X(this->m_contextSimulator, "CCoreRuntime", "Requested missing simulator context"); return this->m_contextSimulator; } CContextAudio *CRuntime::getCContextAudio() { - Q_ASSERT_X(this->m_contextAudio, "CCoreRuntime", "Requested missing audio context"); - Q_ASSERT_X(this->m_contextAudio->usingLocalObjects(), "CCoreRuntime", "Cannot specialize to local object"); return static_cast(this->m_contextAudio); } CContextAudio *CRuntime::getCContextAudio() const { - Q_ASSERT_X(this->m_contextAudio, "CCoreRuntime", "Requested missing audio context"); - Q_ASSERT_X(this->m_contextAudio->usingLocalObjects(), "CCoreRuntime", "Cannot specialize to local object"); return static_cast(this->m_contextAudio); } + CContextApplication *CRuntime::getCContextApplication() + { + return static_cast(this->m_contextApplication); + } + + CContextApplication *CRuntime::getCContextApplication() const + { + return static_cast(this->m_contextApplication); + } + CContextSimulator *CRuntime::getCContextSimulator() { - Q_ASSERT_X(this->m_contextSimulator, "CCoreRuntime", "Requested missing simulator context"); - Q_ASSERT_X(this->m_contextSimulator->usingLocalObjects(), "CCoreRuntime", "Cannot specialize to local object"); return static_cast(this->m_contextSimulator); } CContextSimulator *CRuntime::getCContextSimulator() const { - Q_ASSERT_X(this->m_contextSimulator, "CCoreRuntime", "Requested missing simulator context"); - Q_ASSERT_X(this->m_contextSimulator->usingLocalObjects(), "CCoreRuntime", "Cannot specialize to local object"); return static_cast(this->m_contextSimulator); }