astyle: Update to astyle 1.24

Daniel Marjam&auml;ki · Daniel Marjam&auml;ki · commit c718a7c59542 · 2010-04-15T20:08:51.000+02:00
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -93,9 +93,9 @@ void CppCheckExecutor::reportStatus(unsigned int index, unsigned int max)
     {
         std::ostringstream oss;
         oss << index << "/" << max
-        << " files checked " <<
-        static_cast<int>(static_cast<double>(index) / max*100)
-        << "% done";
+            << " files checked " <<
+            static_cast<int>(static_cast<double>(index) / max*100)
+            << "% done";
         std::cout << oss.str() << std::endl;
     }
 }
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -30,7 +30,7 @@
 #endif
 
 ThreadExecutor::ThreadExecutor(const std::vector<std::string> &filenames, const Settings &settings, ErrorLogger &errorLogger)
-        : _filenames(filenames), _settings(settings), _errorLogger(errorLogger), _fileCount(0)
+    : _filenames(filenames), _settings(settings), _errorLogger(errorLogger), _fileCount(0)
 {
 
 }
diff --git a/gui/aboutdialog.cpp b/gui/aboutdialog.cpp
@@ -23,7 +23,7 @@
 #include "aboutdialog.h"
 
 AboutDialog::AboutDialog(const QString &version, QWidget *parent)
-        : QDialog(parent)
+    : QDialog(parent)
 {
     mUI.setupUi(this);
 
diff --git a/gui/applicationdialog.cpp b/gui/applicationdialog.cpp
@@ -30,7 +30,7 @@ ApplicationDialog::ApplicationDialog(const QString &name,
                                      const QString &path,
                                      const QString &title,
                                      QWidget *parent) :
-        QDialog(parent)
+    QDialog(parent)
 {
     mUI.setupUi(this);
 
diff --git a/gui/applicationlist.cpp b/gui/applicationlist.cpp
@@ -21,7 +21,7 @@
 #include "common.h"
 
 ApplicationList::ApplicationList(QObject *parent) :
-        QObject(parent)
+    QObject(parent)
 {
     //ctor
 }
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
@@ -21,9 +21,9 @@
 #include <QDebug>
 
 CheckThread::CheckThread(ThreadResult &result) :
-        mState(Ready),
-        mResult(result),
-        mCppcheck(result)
+    mState(Ready),
+    mResult(result),
+    mCppcheck(result)
 {
     //ctor
 }
diff --git a/gui/csvreport.cpp b/gui/csvreport.cpp
@@ -21,7 +21,7 @@
 #include "csvreport.h"
 
 CsvReport::CsvReport(const QString &filename, QObject * parent) :
-        Report(filename, parent)
+    Report(filename, parent)
 {
 }
 
diff --git a/gui/fileviewdialog.cpp b/gui/fileviewdialog.cpp
@@ -29,7 +29,7 @@
 FileViewDialog::FileViewDialog(const QString &file,
                                const QString &title,
                                QWidget *parent)
-        : QDialog(parent)
+    : QDialog(parent)
 {
     mUI.setupUi(this);
 
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -41,10 +41,10 @@
 #endif
 
 MainWindow::MainWindow() :
-        mSettings(new QSettings("Cppcheck", "Cppcheck-GUI", this)),
-        mApplications(new ApplicationList(this)),
-        mTranslation(new TranslationHandler(this)),
-        mLanguages(new QActionGroup(this))
+    mSettings(new QSettings("Cppcheck", "Cppcheck-GUI", this)),
+    mApplications(new ApplicationList(this)),
+    mTranslation(new TranslationHandler(this)),
+    mLanguages(new QActionGroup(this))
 {
     mUI.setupUi(this);
     mUI.mResults->Initialize(mSettings, mApplications);
diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp
@@ -31,13 +31,13 @@ static const char DirElementName[] = "dir";
 static const char DirNameAttrib[] = "name";
 
 ProjectFile::ProjectFile(QObject *parent) :
-        QObject(parent)
+    QObject(parent)
 {
 }
 
 ProjectFile::ProjectFile(const QString &filename, QObject *parent) :
-        QObject(parent),
-        mFilename(filename)
+    QObject(parent),
+    mFilename(filename)
 {
 }
 
diff --git a/gui/report.cpp b/gui/report.cpp
@@ -20,8 +20,8 @@
 #include "report.h"
 
 Report::Report(const QString &filename, QObject * parent) :
-        QObject(parent),
-        mFilename(filename)
+    QObject(parent),
+    mFilename(filename)
 {
 }
 
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
@@ -29,10 +29,10 @@
 #include "xmlreport.h"
 
 ResultsTree::ResultsTree(QWidget * parent) :
-        QTreeView(parent),
-        mContextItem(0),
-        mCheckPath(""),
-        mVisibleErrors(false)
+    QTreeView(parent),
+    mContextItem(0),
+    mCheckPath(""),
+    mVisibleErrors(false)
 {
     for (int i = 0; i < SHOW_NONE; i++)
         mShowTypes[i] = false;
diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
@@ -27,9 +27,9 @@
 #include "csvreport.h"
 
 ResultsView::ResultsView(QWidget * parent) :
-        QWidget(parent),
-        mErrorsFound(false),
-        mShowNoErrorsMessage(true)
+    QWidget(parent),
+    mErrorsFound(false),
+    mShowNoErrorsMessage(true)
 {
     mUI.setupUi(this);
 }
@@ -72,7 +72,8 @@ void ResultsView::Progress(int value, int max)
         mUI.mProgress->setVisible(false);
         //Should we inform user of non visible/not found errors?
         if (mShowNoErrorsMessage)
-        {   //Tell user that we found no errors
+        {
+            //Tell user that we found no errors
             if (!mErrorsFound)
             {
                 QMessageBox msg(QMessageBox::Information,
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
@@ -29,10 +29,10 @@
 SettingsDialog::SettingsDialog(QSettings *programSettings,
                                ApplicationList *list,
                                QWidget *parent) :
-        QDialog(parent),
-        mSettings(programSettings),
-        mApplications(list),
-        mTempApplications(new ApplicationList(this))
+    QDialog(parent),
+    mSettings(programSettings),
+    mApplications(list),
+    mTempApplications(new ApplicationList(this))
 {
     mUI.setupUi(this);
     mTempApplications->Copy(list);
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
@@ -21,8 +21,8 @@
 #include <QDebug>
 
 ThreadHandler::ThreadHandler(QObject *parent) :
-        QObject(parent),
-        mRunningThreadCount(0)
+    QObject(parent),
+    mRunningThreadCount(0)
 {
     SetThreadCount(1);
 }
diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp
@@ -24,26 +24,26 @@
 #include <QLocale>
 
 TranslationHandler::TranslationHandler(QObject *parent) :
-        QObject(parent),
-        mCurrentLanguage(-1),
-        mTranslator(new QTranslator(this))
+    QObject(parent),
+    mCurrentLanguage(-1),
+    mTranslator(new QTranslator(this))
 {
     //Add our default languages
     mNames  << QT_TRANSLATE_NOOP("MainWindow", "English")
-    << QT_TRANSLATE_NOOP("MainWindow", "Dutch")
-    << QT_TRANSLATE_NOOP("MainWindow", "Finnish")
-    << QT_TRANSLATE_NOOP("MainWindow", "Swedish")
-    << QT_TRANSLATE_NOOP("MainWindow", "German")
-    << QT_TRANSLATE_NOOP("MainWindow", "Russian")
-    << QT_TRANSLATE_NOOP("MainWindow", "Polish");
+            << QT_TRANSLATE_NOOP("MainWindow", "Dutch")
+            << QT_TRANSLATE_NOOP("MainWindow", "Finnish")
+            << QT_TRANSLATE_NOOP("MainWindow", "Swedish")
+            << QT_TRANSLATE_NOOP("MainWindow", "German")
+            << QT_TRANSLATE_NOOP("MainWindow", "Russian")
+            << QT_TRANSLATE_NOOP("MainWindow", "Polish");
 
     mFiles  << "cppcheck_en"
-    << "cppcheck_nl"
-    << "cppcheck_fi"
-    << "cppcheck_se"
-    << "cppcheck_de"
-    << "cppcheck_ru"
-    << "cppcheck_pl";
+            << "cppcheck_nl"
+            << "cppcheck_fi"
+            << "cppcheck_se"
+            << "cppcheck_de"
+            << "cppcheck_ru"
+            << "cppcheck_pl";
 
     //Load english as a fallback language
     QTranslator *english = new QTranslator();
diff --git a/gui/txtreport.cpp b/gui/txtreport.cpp
@@ -21,7 +21,7 @@
 #include "txtreport.h"
 
 TxtReport::TxtReport(const QString &filename, QObject * parent) :
-        Report(filename, parent)
+    Report(filename, parent)
 {
 }
 
diff --git a/gui/xmlreport.cpp b/gui/xmlreport.cpp
@@ -21,7 +21,7 @@
 #include "xmlreport.h"
 
 XmlReport::XmlReport(const QString &filename, QObject * parent) :
-        Report(filename, parent)
+    Report(filename, parent)
 {
 }
 
diff --git a/lib/check.h b/lib/check.h
@@ -39,15 +39,15 @@ class Check
 public:
     /** This constructor is used when registering the CheckClass */
     Check()
-            : _tokenizer(0), _settings(0), _errorLogger(0)
+        : _tokenizer(0), _settings(0), _errorLogger(0)
     {
         instances().push_back(this);
         instances().sort();
     }
 
     /** This constructor is used when running checks. */
     Check(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-            : _tokenizer(tokenizer), _settings(settings), _errorLogger(errorLogger)
+        : _tokenizer(tokenizer), _settings(settings), _errorLogger(errorLogger)
     { }
 
     virtual ~Check()
diff --git a/lib/checkautovariables.h b/lib/checkautovariables.h
@@ -39,7 +39,7 @@ class CheckAutoVariables : public Check
 
     /** This constructor is used when running checks. */
     CheckAutoVariables(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-            : Check(tokenizer, settings, errorLogger)
+        : Check(tokenizer, settings, errorLogger)
     { }
 
     void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -160,7 +160,7 @@ class TokenStrEquals
      * @param str Token::str() is compared against this.
      */
     TokenStrEquals(const std::string &str)
-            : value(str)
+        : value(str)
     {
     }
 
@@ -1294,7 +1294,7 @@ class ExecutionPathBufferOverrun : public ExecutionPath
 public:
     /** Startup constructor */
     ExecutionPathBufferOverrun(Check *c, const std::map<unsigned int, ArrayInfo> &arrayinfo)
-            : ExecutionPath(c, 0), arrayInfo(arrayinfo)
+        : ExecutionPath(c, 0), arrayInfo(arrayinfo)
     {
     }
 
@@ -1313,8 +1313,8 @@ class ExecutionPathBufferOverrun : public ExecutionPath
 
     /** internal constructor for creating extra checks */
     ExecutionPathBufferOverrun(Check *c, const std::map<unsigned int, ArrayInfo> &arrayinfo, unsigned int varid_)
-            : ExecutionPath(c, varid_),
-            arrayInfo(arrayinfo)
+        : ExecutionPath(c, varid_),
+          arrayInfo(arrayinfo)
     {
         // Pretend that variables are initialized to 0
         // This checking is not about uninitialized variables
diff --git a/lib/checkbufferoverrun.h b/lib/checkbufferoverrun.h
@@ -54,7 +54,7 @@ class CheckBufferOverrun : public Check
 
     /** This constructor is used when running checks. */
     CheckBufferOverrun(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-            : Check(tokenizer, settings, errorLogger)
+        : Check(tokenizer, settings, errorLogger)
     { }
 
     void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
diff --git a/lib/checkclass.h b/lib/checkclass.h
@@ -40,7 +40,7 @@ class CheckClass : public Check
 
     /** @brief This constructor is used when running checks. */
     CheckClass(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-            : Check(tokenizer, settings, errorLogger)
+        : Check(tokenizer, settings, errorLogger)
     { }
 
     /** @brief Run checks on the normal token list */
@@ -114,12 +114,12 @@ class CheckClass : public Check
     {
     public:
         Var(const std::string &name_, bool init_ = false, bool priv_ = false, bool mutable_ = false, bool static_ = false, Var *next_ = 0)
-                : name(name_),
-                init(init_),
-                priv(priv_),
-                isMutable(mutable_),
-                isStatic(static_),
-                next(next_)
+            : name(name_),
+              init(init_),
+              priv(priv_),
+              isMutable(mutable_),
+              isStatic(static_),
+              next(next_)
         {
         }
 
diff --git a/lib/checkdangerousfunctions.h b/lib/checkdangerousfunctions.h
@@ -40,7 +40,7 @@ class CheckDangerousFunctions : public Check
 
     /** This constructor is used when running checks. */
     CheckDangerousFunctions(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-            : Check(tokenizer, settings, errorLogger)
+        : Check(tokenizer, settings, errorLogger)
     { }
 
     void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
diff --git a/lib/checkexceptionsafety.h b/lib/checkexceptionsafety.h
@@ -48,7 +48,7 @@ class CheckExceptionSafety : public Check
 
     /** This constructor is used when running checks. */
     CheckExceptionSafety(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-            : Check(tokenizer, settings, errorLogger)
+        : Check(tokenizer, settings, errorLogger)
     { }
 
     void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
diff --git a/lib/checkmemoryleak.h b/lib/checkmemoryleak.h
@@ -84,7 +84,7 @@ class CheckMemoryLeak
 
 public:
     CheckMemoryLeak(const Tokenizer *t, ErrorLogger *e)
-            : tokenizer(t), errorLogger(e)
+        : tokenizer(t), errorLogger(e)
     {
 
     }
@@ -172,7 +172,7 @@ class CheckMemoryLeakInFunction : private Check, public CheckMemoryLeak
 
     /** @brief This constructor is used when running checks */
     CheckMemoryLeakInFunction(const Tokenizer *tokenizr, const Settings *settings, ErrorLogger *errLog)
-            : Check(tokenizr, settings, errLog), CheckMemoryLeak(tokenizr, errLog)
+        : Check(tokenizr, settings, errLog), CheckMemoryLeak(tokenizr, errLog)
     { }
 
     /** @brief run all simplified checks */
@@ -340,7 +340,7 @@ class CheckMemoryLeakInClass : private Check, private CheckMemoryLeak
     { }
 
     CheckMemoryLeakInClass(const Tokenizer *tokenizr, const Settings *settings, ErrorLogger *errLog)
-            : Check(tokenizr, settings, errLog), CheckMemoryLeak(tokenizr, errLog)
+        : Check(tokenizr, settings, errLog), CheckMemoryLeak(tokenizr, errLog)
     { }
 
     void runSimplifiedChecks(const Tokenizer *tokenizr, const Settings *settings, ErrorLogger *errLog)
@@ -380,7 +380,7 @@ class CheckMemoryLeakStructMember : private Check, private CheckMemoryLeak
     { }
 
     CheckMemoryLeakStructMember(const Tokenizer *tokenizr, const Settings *settings, ErrorLogger *errLog)
-            : Check(tokenizr, settings, errLog), CheckMemoryLeak(tokenizr, errLog)
+        : Check(tokenizr, settings, errLog), CheckMemoryLeak(tokenizr, errLog)
     { }
 
     void runSimplifiedChecks(const Tokenizer *tokenizr, const Settings *settings, ErrorLogger *errLog)
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
diff --git a/lib/checkother.h b/lib/checkother.h
diff --git a/lib/checkstl.h b/lib/checkstl.h
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
diff --git a/lib/settings.cpp b/lib/settings.cpp
diff --git a/lib/token.cpp b/lib/token.cpp
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
diff --git a/runastyle b/runastyle
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
diff --git a/test/teststl.cpp b/test/teststl.cpp
diff --git a/test/testsuite.cpp b/test/testsuite.cpp
diff --git a/tools/extracttests.cpp b/tools/extracttests.cpp

Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,9 @@ void CppCheckExecutor::reportStatus(unsigned int index, unsigned int max)`
`93`	`93`	`{`
`94`	`94`	`std::ostringstream oss;`
`95`	`95`	`oss << index << "/" << max`
`96`		`- << " files checked " <<`
`97`		`- static_cast<int>(static_cast<double>(index) / max*100)`
`98`		`- << "% done";`
	`96`	`+ << " files checked " <<`
	`97`	`+ static_cast<int>(static_cast<double>(index) / max*100)`
	`98`	`+ << "% done";`
`99`	`99`	`std::cout << oss.str() << std::endl;`
`100`	`100`	`}`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`#endif`
`31`	`31`
`32`	`32`	`ThreadExecutor::ThreadExecutor(const std::vector<std::string> &filenames, const Settings &settings, ErrorLogger &errorLogger)`
`33`		`- : _filenames(filenames), _settings(settings), _errorLogger(errorLogger), _fileCount(0)`
	`33`	`+ : _filenames(filenames), _settings(settings), _errorLogger(errorLogger), _fileCount(0)`
`34`	`34`	`{`
`35`	`35`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`#include "aboutdialog.h"`
`24`	`24`
`25`	`25`	`AboutDialog::AboutDialog(const QString &version, QWidget *parent)`
`26`		`- : QDialog(parent)`
	`26`	`+ : QDialog(parent)`
`27`	`27`	`{`
`28`	`28`	`mUI.setupUi(this);`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ ApplicationDialog::ApplicationDialog(const QString &name,`
`30`	`30`	`const QString &path,`
`31`	`31`	`const QString &title,`
`32`	`32`	`QWidget *parent) :`
`33`		`- QDialog(parent)`
	`33`	`+ QDialog(parent)`
`34`	`34`	`{`
`35`	`35`	`mUI.setupUi(this);`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`#include "common.h"`
`22`	`22`
`23`	`23`	`ApplicationList::ApplicationList(QObject *parent) :`
`24`		`- QObject(parent)`
	`24`	`+ QObject(parent)`
`25`	`25`	`{`
`26`	`26`	`//ctor`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@`
`21`	`21`	`#include <QDebug>`
`22`	`22`
`23`	`23`	`CheckThread::CheckThread(ThreadResult &result) :`
`24`		`- mState(Ready),`
`25`		`- mResult(result),`
`26`		`- mCppcheck(result)`
	`24`	`+ mState(Ready),`
	`25`	`+ mResult(result),`
	`26`	`+ mCppcheck(result)`
`27`	`27`	`{`
`28`	`28`	`//ctor`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`FileViewDialog::FileViewDialog(const QString &file,`
`30`	`30`	`const QString &title,`
`31`	`31`	`QWidget *parent)`
`32`		`- : QDialog(parent)`
	`32`	`+ : QDialog(parent)`
`33`	`33`	`{`
`34`	`34`	`mUI.setupUi(this);`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,13 @@ static const char DirElementName[] = "dir";`
`31`	`31`	`static const char DirNameAttrib[] = "name";`
`32`	`32`
`33`	`33`	`ProjectFile::ProjectFile(QObject *parent) :`
`34`		`- QObject(parent)`
	`34`	`+ QObject(parent)`
`35`	`35`	`{`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`ProjectFile::ProjectFile(const QString &filename, QObject *parent) :`
`39`		`- QObject(parent),`
`40`		`- mFilename(filename)`
	`39`	`+ QObject(parent),`
	`40`	`+ mFilename(filename)`
`41`	`41`	`{`
`42`	`42`	`}`
`43`	`43`