From 483a3ddfe17750d774109f2e49990c8dd34e493b Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Tue, 10 Aug 2010 07:26:59 +0200 Subject: [PATCH] Fixed #1925 (fix some cppcheck warnings in cppcheck) --- gui/resultstree.cpp | 4 ++-- gui/resultstree.h | 4 ++-- gui/settingsdialog.cpp | 4 ++-- gui/settingsdialog.h | 4 ++-- gui/translationhandler.cpp | 4 ++-- gui/translationhandler.h | 4 ++-- lib/checkbufferoverrun.cpp | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp index 81dd96fb0..5821d0043 100644 --- a/gui/resultstree.cpp +++ b/gui/resultstree.cpp @@ -210,7 +210,7 @@ ShowTypes ResultsTree::VariantToShowType(const QVariant &data) return (ShowTypes)value; } -ShowTypes ResultsTree::SeverityToShowType(const QString & severity) +ShowTypes ResultsTree::SeverityToShowType(const QString & severity) const { if (severity == "error") return SHOW_ERRORS; @@ -610,7 +610,7 @@ void ResultsTree::CopyPath(QStandardItem *target, bool fullPath) } } -QString ResultsTree::SeverityToIcon(const QString &severity) +QString ResultsTree::SeverityToIcon(const QString &severity) const { if (severity == "possible error") return ":images/dialog-warning.png"; diff --git a/gui/resultstree.h b/gui/resultstree.h index 5f35c6f63..9f4184365 100644 --- a/gui/resultstree.h +++ b/gui/resultstree.h @@ -187,7 +187,7 @@ protected: * * @param severity Severity string */ - QString SeverityToIcon(const QString &severity); + QString SeverityToIcon(const QString &severity) const; /** * @brief Helper function to open an error within target with application* @@ -247,7 +247,7 @@ protected: * @param severity Error severity string * @return Severity converted to ShowTypes value */ - ShowTypes SeverityToShowType(const QString &severity); + ShowTypes SeverityToShowType(const QString &severity) const; /** * @brief Convert ShowType to severity string diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index 1272ac687..713398cb6 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -77,7 +77,7 @@ SettingsDialog::~SettingsDialog() SaveSettings(); } -Qt::CheckState SettingsDialog::BoolToCheckState(bool yes) +Qt::CheckState SettingsDialog::BoolToCheckState(bool yes) const { if (yes) { @@ -86,7 +86,7 @@ Qt::CheckState SettingsDialog::BoolToCheckState(bool yes) return Qt::Unchecked; } -bool SettingsDialog::CheckStateToBool(Qt::CheckState state) +bool SettingsDialog::CheckStateToBool(Qt::CheckState state) const { if (state == Qt::Checked) { diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h index e35239c0c..9697910f4 100644 --- a/gui/settingsdialog.h +++ b/gui/settingsdialog.h @@ -146,7 +146,7 @@ protected: * @param yes value to convert * @return value converted to Qt::CheckState */ - Qt::CheckState BoolToCheckState(bool yes); + Qt::CheckState BoolToCheckState(bool yes) const; /** * @brief Converts Qt::CheckState to bool @@ -154,7 +154,7 @@ protected: * @param state Qt::CheckState to convert * @return converted value */ - bool CheckStateToBool(Qt::CheckState state); + bool CheckStateToBool(Qt::CheckState state) const; /** diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp index d1d0d9144..b77f42c41 100644 --- a/gui/translationhandler.cpp +++ b/gui/translationhandler.cpp @@ -62,12 +62,12 @@ TranslationHandler::~TranslationHandler() { } -const QStringList TranslationHandler::GetNames() +const QStringList TranslationHandler::GetNames() const { return mNames; } -const QStringList TranslationHandler::GetFiles() +const QStringList TranslationHandler::GetFiles() const { return mFiles; } diff --git a/gui/translationhandler.h b/gui/translationhandler.h index dd1098d9a..5b80fb867 100644 --- a/gui/translationhandler.h +++ b/gui/translationhandler.h @@ -33,8 +33,8 @@ class TranslationHandler : QObject public: TranslationHandler(QObject *parent); virtual ~TranslationHandler(); - const QStringList GetNames(); - const QStringList GetFiles(); + const QStringList GetNames() const; + const QStringList GetFiles() const; bool SetLanguage(const int index, QString &error); int GetCurrentLanguage() const; int SuggestLanguage() const; diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp index d896cd8ad..dd6076230 100644 --- a/lib/checkbufferoverrun.cpp +++ b/lib/checkbufferoverrun.cpp @@ -1831,7 +1831,7 @@ class ExecutionPathBufferOverrun : public ExecutionPath public: /** Startup constructor */ ExecutionPathBufferOverrun(Check *c, const std::map &arrayinfo) - : ExecutionPath(c, 0), arrayInfo(arrayinfo) + : ExecutionPath(c, 0), arrayInfo(arrayinfo), value(0) { }