From ea33bed56401babbf53f7efcfce311c0bda1c0ca Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 28 Jan 2013 20:50:05 +0200
Subject: [PATCH] VCS: Un-static testDiffFileResolving

Change-Id: I43c40585e5ac50369422d78f74240d7249be95ae
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/bazaar/bazaarplugin.cpp         | 2 +-
 src/plugins/clearcase/clearcaseplugin.cpp   | 2 +-
 src/plugins/cvs/cvsplugin.cpp               | 2 +-
 src/plugins/git/gitplugin.cpp               | 2 +-
 src/plugins/mercurial/mercurialplugin.cpp   | 2 +-
 src/plugins/subversion/subversionplugin.cpp | 2 +-
 src/plugins/vcsbase/vcsbaseeditor.cpp       | 6 +++---
 src/plugins/vcsbase/vcsbaseeditor.h         | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index bfee3ee6348..23b56f30c51 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -622,7 +622,7 @@ void BazaarPlugin::testDiffFileResolving_data()
 void BazaarPlugin::testDiffFileResolving()
 {
     BazaarEditor editor(editorParameters + 3, 0);
-    VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
+    editor.testDiffFileResolving();
 }
 #endif
 
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 215a0741e21..6fffa00c8af 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -1961,7 +1961,7 @@ void ClearCasePlugin::testDiffFileResolving_data()
 void ClearCasePlugin::testDiffFileResolving()
 {
     ClearCaseEditor editor(editorParameters + 3, 0);
-    VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
+    editor.testDiffFileResolving();
 }
 #endif
 
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 2b99b0df0d9..04873b9c7a3 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -1398,7 +1398,7 @@ void CvsPlugin::testDiffFileResolving_data()
 void CvsPlugin::testDiffFileResolving()
 {
     CvsEditor editor(editorParameters + 3, 0);
-    VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
+    editor.testDiffFileResolving();
 }
 #endif
 
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 033e9d6e166..2f3695cc9e9 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -1312,7 +1312,7 @@ void GitPlugin::testDiffFileResolving_data()
 void GitPlugin::testDiffFileResolving()
 {
     GitEditor editor(editorParameters + 3, 0);
-    VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
+    editor.testDiffFileResolving();
 }
 #endif
 
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 05c8afc6dff..892a0b542ac 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -718,7 +718,7 @@ void MercurialPlugin::testDiffFileResolving_data()
 void MercurialPlugin::testDiffFileResolving()
 {
     MercurialEditor editor(editorParameters + 3, 0);
-    VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
+    editor.testDiffFileResolving();
 }
 #endif
 
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 9b663950ad4..9059d6c7a24 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -1425,7 +1425,7 @@ void SubversionPlugin::testDiffFileResolving_data()
 void SubversionPlugin::testDiffFileResolving()
 {
     SubversionEditor editor(editorParameters + 3, 0);
-    VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
+    editor.testDiffFileResolving();
 }
 #endif
 
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 5cc5aa8fed9..6e179aa8768 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -1528,14 +1528,14 @@ Core::IEditor* VcsBaseEditorWidget::locateEditorByTag(const QString &tag)
 #ifdef WITH_TESTS
 #include <QTest>
 
-void VcsBase::VcsBaseEditorWidget::testDiffFileResolving(VcsBaseEditorWidget *editor)
+void VcsBase::VcsBaseEditorWidget::testDiffFileResolving()
 {
     QFETCH(QByteArray, header);
     QFETCH(QByteArray, fileName);
     QTextDocument doc(QString::fromLatin1(header));
-    editor->init();
+    init();
     QTextBlock block = doc.lastBlock();
-    QVERIFY(editor->fileNameFromDiffSpecification(block).endsWith(QString::fromLatin1(fileName)));
+    QVERIFY(fileNameFromDiffSpecification(block).endsWith(QString::fromLatin1(fileName)));
 }
 #endif
 
diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h
index 9d61a03fc36..4ee988a5eb8 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.h
+++ b/src/plugins/vcsbase/vcsbaseeditor.h
@@ -275,7 +275,7 @@ private:
 
 #ifdef WITH_TESTS
 public:
-    static void testDiffFileResolving(VcsBaseEditorWidget *editor);
+    void testDiffFileResolving();
 #endif
 };
 
-- 
GitLab