Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

src/plugins/git/changeselectiondialog.h

@@ -51,7 +51,7 @@ public:
 public slots:
     void selectWorkingDirectory();
 
-private:    
+private:
     Ui_ChangeSelectionDialog m_ui;
 };
 

src/plugins/git/gitcommand.cpp

@@ -149,7 +149,7 @@ void GitCommand::run()
         output += process.readAllStandardOutput();
         error += QString::fromLocal8Bit(process.readAllStandardError());
         switch (m_reportTerminationMode) {
-        case NoReport:            
+        case NoReport:
             break;
         case ReportStdout:
             output += msgTermination(process.exitCode(), m_binaryPath, m_jobs.at(j).arguments).toUtf8();

src/plugins/git/gitorious/gitorioushostwidget.cpp

@@ -228,7 +228,7 @@ void GitoriousHostWidget::slotBrowse()
 }
 
 void GitoriousHostWidget::slotDelete()
-{    
+{
     const QModelIndex index = ui->hostView->selectionModel()->currentIndex();
     ui->hostView->selectionModel()->clear();
     if (index.isValid()) {

src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp

@@ -80,7 +80,7 @@ GitoriousRepositoryWizardPage::GitoriousRepositoryWizardPage(const GitoriousProj
 {
     QStringList headers;
     headers << tr("Name") << tr("Owner") << tr("Description");
-    m_model->setHorizontalHeaderLabels(headers);    
+    m_model->setHorizontalHeaderLabels(headers);
     // Filter on all columns
     m_filterModel->setSourceModel(m_model);
     m_filterModel->setFilterKeyColumn(-1);

src/plugins/git/gitplugin.h

@@ -86,7 +86,7 @@ public:
     GitSettings settings() const;
     void setSettings(const GitSettings &s);
 
-    GitClient *gitClient() const;  
+    GitClient *gitClient() const;
 
 private slots:
     void diffCurrentFile();

src/plugins/git/gitsubmiteditorwidget.cpp

@@ -55,13 +55,13 @@ static QTextCharFormat commentFormat()
 // keywords (words in front of a colon as in 'Task: <bla>').
 
 class GitSubmitHighlighter : QSyntaxHighlighter {
-public:    
+public:
     explicit GitSubmitHighlighter(QTextEdit *parent);
     virtual void highlightBlock(const QString &text);
 
 private:
     enum State { Header, Comment, Other };
-    const QTextCharFormat m_commentFormat;    
+    const QTextCharFormat m_commentFormat;
     const QRegExp m_keywordPattern;
     const QChar m_hashChar;
 };
@@ -87,7 +87,7 @@ void GitSubmitHighlighter::highlightBlock(const QString &text)
             state = Comment;
     }
     // Apply format.
-    switch (state) {        
+    switch (state) {
     case Header: {
             QTextCharFormat charFormat = format(0);
             charFormat.setFontWeight(QFont::Bold);