Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h
index 1c167ff35a..fd4afd78d7 100644
--- a/src/plugins/cpptools/cppfilesettingspage.h
+++ b/src/plugins/cpptools/cppfilesettingspage.h
@@ -55,7 +55,7 @@ struct CppFileSettings {
 
     void toSettings(QSettings *) const;
     void fromSettings(QSettings *);
-    bool applySuffixesToMimeDB();  
+    bool applySuffixesToMimeDB();
 
     // Convenience to return a license template completely formatted.
     // Currently made public in
@@ -79,7 +79,7 @@ public:
 
     QString searchKeywords() const;
 
-private slots:    
+private slots:
     void slotEdit();
 
 private:
diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h
index 18b991e941..f9c6d667bc 100644
--- a/src/plugins/cpptools/cppmodelmanagerinterface.h
+++ b/src/plugins/cpptools/cppmodelmanagerinterface.h
@@ -128,7 +128,7 @@ public:
 
 public Q_SLOTS:
     void updateModifiedSourceFiles();
-    virtual void updateSourceFiles(const QStringList &sourceFiles) = 0;    
+    virtual void updateSourceFiles(const QStringList &sourceFiles) = 0;
     virtual void GC() = 0;
 };