diff options
| author | Nicolas Arnaud-Cormos <nicolas.arnaud-cormos.qnx@kdab.com> | 2012-03-12 20:28:52 -0700 |
|---|---|---|
| committer | Nicolas Arnaud-Cormos <nicolas@kdab.com> | 2012-03-13 04:30:40 +0100 |
| commit | 33521e7512b7e3a2c44db12eb4887c74ea810235 (patch) | |
| tree | 76e2ea6791f77ed5325de2826062fad370607b70 | |
| parent | 5bae76fa4d9f7faa8b904d40e90ceff81bfeda88 (diff) | |
Fix compilation with last master.
Change-Id: If9763f2d6a41e6664f7c3eafccfb1f363a3bceaf
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
| -rw-r--r-- | gammarayengine.cpp | 2 | ||||
| -rw-r--r-- | gammaraysettings.cpp | 3 | ||||
| -rw-r--r-- | gammaraysettings.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/gammarayengine.cpp b/gammarayengine.cpp index d8e3cee..acb4c96 100644 --- a/gammarayengine.cpp +++ b/gammarayengine.cpp @@ -72,7 +72,7 @@ GammarayEngine::GammarayEngine(IAnalyzerTool *tool, AnalyzerSettings *settings = 0; if (runConfiguration) { - settings = runConfiguration->extraAspect<AnalyzerProjectSettings>(); + settings = runConfiguration->extraAspect<AnalyzerRunConfigurationAspect>(); } if (!settings) { settings = AnalyzerGlobalSettings::instance(); diff --git a/gammaraysettings.cpp b/gammaraysettings.cpp index 45e7ad7..56ea118 100644 --- a/gammaraysettings.cpp +++ b/gammaraysettings.cpp @@ -68,7 +68,7 @@ QVariantMap GammarayBaseSettings::defaults() const return map; } -bool GammarayBaseSettings::fromMap(const QVariantMap &map) +void GammarayBaseSettings::fromMap(const QVariantMap &map) { int injector = 0; setIfPresent(map, injectorC, &injector); @@ -78,7 +78,6 @@ bool GammarayBaseSettings::fromMap(const QVariantMap &map) setIfPresent(map, gammarayForQtC, &m_gammarayForQt); emit changed(); - return true; } QString GammarayBaseSettings::id() const diff --git a/gammaraysettings.h b/gammaraysettings.h index a94fb0e..9842964 100644 --- a/gammaraysettings.h +++ b/gammaraysettings.h @@ -52,7 +52,7 @@ public: virtual QVariantMap toMap() const; virtual QVariantMap defaults() const; - virtual bool fromMap(const QVariantMap &map); + virtual void fromMap(const QVariantMap &map); virtual QString id() const; virtual QString displayName() const; |