astyle formatting

cli/cmdlineparser.h

@@ -54,48 +54,42 @@ class CmdLineParser {
     /**
      * Return if user wanted to see program version.
      */
-    bool GetShowVersion() const
-    {
+    bool GetShowVersion() const {
         return _showVersion;
     }
 
     /**
      * Return if user wanted to see list of error messages.
      */
-    bool GetShowErrorMessages() const
-    {
+    bool GetShowErrorMessages() const {
         return _showErrorMessages;
     }
 
     /**
      * Return the path names user gave to command line.
      */
-    const std::vector<std::string>& GetPathNames() const
-    {
+    const std::vector<std::string>& GetPathNames() const {
         return _pathnames;
     }
 
     /**
      * Return if help is shown to user.
      */
-    bool GetShowHelp() const
-    {
+    bool GetShowHelp() const {
         return _showHelp;
     }
 
     /**
      * Return if we should exit after printing version, help etc.
      */
-    bool ExitAfterPrinting() const
-    {
+    bool ExitAfterPrinting() const {
         return _exitAfterPrint;
     }
 
     /**
      * Return a list of paths user wants to ignore.
      */
-    const std::vector<std::string>& GetIgnoredPaths() const
-    {
+    const std::vector<std::string>& GetIgnoredPaths() const {
         return _ignoredPaths;
     }
 

cli/filelister.h

@@ -37,8 +37,7 @@ class FileLister {
      * @param files output map that associates the size of each file with its name
      * @param path root path
      */
-    static void recursiveAddFiles(std::map<std::string, std::size_t> &files, const std::string &path)
-    {
+    static void recursiveAddFiles(std::map<std::string, std::size_t> &files, const std::string &path) {
         const std::set<std::string> extra;
         recursiveAddFiles(files, path, extra);
     }

cli/threadexecutor.h

@@ -98,8 +98,7 @@ class ThreadExecutor : public ErrorLogger {
     /**
      * @return true if support for threads exist.
      */
-    static bool isEnabled()
-    {
+    static bool isEnabled() {
         return true;
     }
 
@@ -129,17 +128,15 @@ class ThreadExecutor : public ErrorLogger {
     /**
      * @return true if support for threads exist.
      */
-    static bool isEnabled()
-    {
+    static bool isEnabled() {
         return true;
     }
 #else
 public:
     /**
      * @return true if support for threads exist.
      */
-    static bool isEnabled()
-    {
+    static bool isEnabled() {
         return false;
     }
 #endif

democlient/democlient.cpp

@@ -33,28 +33,24 @@ class CppcheckExecutor : public ErrorLogger {
     CppcheckExecutor()
         : ErrorLogger()
         , stoptime(std::time(NULL)+2U)
-        , cppcheck(*this,false)
-    {
+        , cppcheck(*this,false) {
         cppcheck.settings().addEnabled("all");
         cppcheck.settings().inconclusive = true;
     }
 
-    void run(const char code[])
-    {
+    void run(const char code[]) {
         cppcheck.check("test.c", code);
     }
 
     void reportOut(const std::string &outmsg) { }
-    void reportErr(const ErrorLogger::ErrorMessage &msg)
-    {
+    void reportErr(const ErrorLogger::ErrorMessage &msg) {
         printf("%s\n", msg.toString(true).c_str());
     }
 
     void reportProgress(const
                         std::string &filename,
                         const char stage[],
-                        const unsigned int value)
-    {
+                        const unsigned int value) {
         if (std::time(NULL) >= stoptime) {
             printf("time to analyse the "
                    "code is more than 1 "

gui/application.h

@@ -49,53 +49,47 @@ class Application {
     * @brief Get application name.
     * @return Application name.
     */
-    QString getName() const
-    {
+    QString getName() const {
         return mName;
     }
 
     /**
     * @brief Get application path.
     * @return Application path.
     */
-    QString getPath() const
-    {
+    QString getPath() const {
         return mPath;
     }
 
     /**
     * @brief Get application command line parameters.
     * @return Application command line parameters.
     */
-    QString getParameters() const
-    {
+    QString getParameters() const {
         return mParameters;
     }
 
     /**
     * @brief Set application name.
     * @param name Application name.
     */
-    void setName(const QString &name)
-    {
+    void setName(const QString &name) {
         mName = name;
     }
 
     /**
     * @brief Set application path.
     * @param path Application path.
     */
-    void setPath(const QString &path)
-    {
+    void setPath(const QString &path) {
         mPath = path;
     }
 
     /**
     * @brief Set application command line parameters.
     * @param parameters Application command line parameters.
     */
-    void setParameters(const QString &parameters)
-    {
+    void setParameters(const QString &parameters) {
         mParameters = parameters;
     }
 

gui/applicationlist.h

@@ -69,8 +69,7 @@ class ApplicationList : public QObject {
     * @brief Return the default application.
     * @return Index of the default application.
     */
-    int GetDefaultApplication() const
-    {
+    int GetDefaultApplication() const {
         return mDefaultApplicationIndex;
     }
 

gui/erroritem.h

@@ -37,13 +37,11 @@ class ErrorLine;
  */
 class GuiSeverity {
 public:
-    static QString toString(Severity::SeverityType severity)
-    {
+    static QString toString(Severity::SeverityType severity) {
         return QString(Severity::toString(severity).c_str());
     }
 
-    static Severity::SeverityType fromString(const QString &severity)
-    {
+    static Severity::SeverityType fromString(const QString &severity) {
         return Severity::fromString(severity.toStdString());
     }
 };

gui/filelist.cpp

@@ -68,7 +68,7 @@ void FileList::AddDirectory(const QString &directory, bool recursive)
         dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
         QFileInfoList list = dir.entryInfoList();
         QFileInfo item;
-        foreach (item, list) {
+        foreach(item, list) {
             const QString path = item.canonicalFilePath();
             AddDirectory(path, recursive);
         }
@@ -78,7 +78,7 @@ void FileList::AddDirectory(const QString &directory, bool recursive)
 void FileList::AddPathList(const QStringList &paths)
 {
     QString path;
-    foreach (path, paths) {
+    foreach(path, paths) {
         QFileInfo inf(path);
         if (inf.isFile())
             AddFile(path);
@@ -91,7 +91,7 @@ QStringList FileList::GetFileList() const
 {
     if (mExcludedPaths.empty()) {
         QStringList names;
-        foreach (QFileInfo item, mFileList) {
+        foreach(QFileInfo item, mFileList) {
             QString name = QDir::fromNativeSeparators(item.canonicalFilePath());
             names << name;
         }
@@ -109,7 +109,7 @@ void FileList::AddExcludeList(const QStringList &paths)
 QStringList FileList::ApplyExcludeList() const
 {
     QStringList paths;
-    foreach (QFileInfo item, mFileList) {
+    foreach(QFileInfo item, mFileList) {
         QString name = QDir::fromNativeSeparators(item.canonicalFilePath());
         if (!Match(name))
             paths << name;

gui/main.cpp

@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     QSettings* settings = new QSettings("Cppcheck", "Cppcheck-GUI", &app);
 
     // Set data dir..
-    foreach (const QString arg, app.arguments()) {
+    foreach(const QString arg, app.arguments()) {
         if (arg.startsWith("--data-dir=")) {
             settings->setValue("DATADIR", arg.mid(11));
             return 0;

gui/mainwindow.cpp

@@ -499,7 +499,7 @@ void MainWindow::CheckDirectory()
 void MainWindow::AddIncludeDirs(const QStringList &includeDirs, Settings &result)
 {
     QString dir;
-    foreach (dir, includeDirs) {
+    foreach(dir, includeDirs) {
         QString incdir;
         if (!QDir::isAbsolutePath(dir))
             incdir = mCurrentDirectory + "/";
@@ -560,14 +560,14 @@ Settings MainWindow::GetCppcheckSettings()
 
         QStringList defines = pfile->GetDefines();
         QString define;
-        foreach (define, defines) {
+        foreach(define, defines) {
             if (!result.userDefines.empty())
                 result.userDefines += ";";
             result.userDefines += define.toStdString();
         }
 
         QStringList libraries = pfile->GetLibraries();
-        foreach (QString library, libraries) {
+        foreach(QString library, libraries) {
             const QString filename = library + ".cfg";
             const Library::Error error = LoadLibrary(&result.library, filename);
             if (error.errorcode != Library::ErrorCode::OK) {
@@ -604,7 +604,7 @@ Settings MainWindow::GetCppcheckSettings()
         }
 
         QStringList suppressions = pfile->GetSuppressions();
-        foreach (QString suppression, suppressions) {
+        foreach(QString suppression, suppressions) {
             result.nomsg.addSuppressionLine(suppression.toStdString());
         }
 

gui/project.h

@@ -79,8 +79,7 @@ class Project : public QObject {
     * @brief Return current project file.
     * @return project file.
     */
-    ProjectFile * GetProjectFile() const
-    {
+    ProjectFile * GetProjectFile() const {
         return mPFile;
     }