diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 0b277a13b..7b0d00f10 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -84,7 +84,7 @@ void MainWindow::SaveSettings()
 void MainWindow::DoCheckFiles(QFileDialog::FileMode mode)
 {
     QFileDialog dialog(this);
-    dialog.setDirectory(QDir(mSettings.value(tr("Check path"),"").toString()));
+    dialog.setDirectory(QDir(mSettings.value(tr("Check path"), "").toString()));
     dialog.setFileMode(mode);
 
     if (dialog.exec())
@@ -93,7 +93,7 @@ void MainWindow::DoCheckFiles(QFileDialog::FileMode mode)
         QStringList fileNames;
         QString selection;
 
-        foreach(selection,selected)
+        foreach(selection, selected)
         {
             fileNames << RemoveUnacceptedFiles(GetFilesRecursively(selection));
         }
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
index 062035ce7..4b55c58c3 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -26,7 +26,7 @@ ResultsTree::ResultsTree(QSettings &settings) :
 {
     setModel(&mModel);
     QStringList labels;
-    labels << tr("severity")<<tr("Line") << tr("Message");
+    labels << tr("severity") << tr("Line") << tr("Message");
     mModel.setHorizontalHeaderLabels(labels);
 
     LoadSettings();
diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h
index 832f6d2d2..1c6d01ec7 100644
--- a/gui/settingsdialog.h
+++ b/gui/settingsdialog.h
@@ -42,11 +42,11 @@ public:
     virtual ~SettingsDialog();
     void SaveCheckboxValues();
 protected:
-/**
-    * @brief Load saved values
-    * Loads dialog size and column widths.
-    *
-    */
+    /**
+        * @brief Load saved values
+        * Loads dialog size and column widths.
+        *
+        */
     void SaveSettings();
 
     /**
@@ -64,14 +64,14 @@ protected:
     */
     void SaveCheckboxValue(QCheckBox *box, const QString &name);
 
-/**
-    * @brief Add a new checkbox to layout
-    *
-    * @param layout layout to add to
-    * @param label label for the checkbox
-    * @param settings QSettings name for default value
-    * @return newly created QCheckBox
-    */
+    /**
+        * @brief Add a new checkbox to layout
+        *
+        * @param layout layout to add to
+        * @param label label for the checkbox
+        * @param settings QSettings name for default value
+        * @return newly created QCheckBox
+        */
     QCheckBox* AddCheckbox(QVBoxLayout *layout,
                            const QString &label,
                            const QString &settings,
@@ -143,7 +143,7 @@ protected:
 
 
 
-        /**
+    /**
     * @brief Settings
     *
     */
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
index 7c9541a83..eed089cdf 100644
--- a/gui/threadhandler.cpp
+++ b/gui/threadhandler.cpp
@@ -40,9 +40,10 @@ void ThreadHandler::SetFiles(const QStringList &files)
 {
     mResults.SetFiles(files);
     QString file;
-    qDebug()<<"Files to check:";
-    foreach(file,files) {
-        qDebug()<<file;
+    qDebug() << "Files to check:";
+    foreach(file, files)
+    {
+        qDebug() << file;
     }
 }
 
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
index 61964b9e0..dd13af4b6 100644
--- a/test/testautovariables.cpp
+++ b/test/testautovariables.cpp
@@ -63,7 +63,7 @@ private:
     void run()
     {
         TEST_CASE(testautovar);
-	TEST_CASE(testautovararray);
+        TEST_CASE(testautovararray);
     }
 
 
@@ -76,7 +76,7 @@ private:
               "res=&num;");
         ASSERT_EQUALS(std::string("[test.cpp:3]: (error) Wrong assignement of an auto-variable to an effective parameter of a function\n"), errout.str());
     }
-  void testautovararray()
+    void testautovararray()
     {
         check("void func1(int* arr[2])\n"
               "{\n"