Commit 03ac09d3 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Subversion: WS fix



Change-Id: Ifc8d46086fd4228b80bc42859aba84819650777f
Reviewed-by: default avatarOrgad Shaneh <orgads@gmail.com>
parent 138d009c
......@@ -813,8 +813,8 @@ void SubversionPlugin::annotateVersion(const QString &workingDirectory,
}
void SubversionPlugin::vcsAnnotate(const QString &workingDir, const QString &file,
const QString &revision /* = QString() */,
int lineNumber /* = -1 */)
const QString &revision /* = QString() */,
int lineNumber /* = -1 */)
{
const QString source = VcsBaseEditor::getSource(workingDir, file);
QTextCodec *codec = VcsBaseEditor::getCodec(source);
......
......@@ -112,7 +112,8 @@ private slots:
void revertAll();
void filelogCurrentFile();
void annotateCurrentFile();
void annotateVersion(const QString &workingDirectory, const QString &file, const QString &revision, int lineNumber);
void annotateVersion(const QString &workingDirectory, const QString &file,
const QString &revision, int lineNumber);
void projectStatus();
void describe(const QString &source, const QString &changeNr);
void slotDescribe();
......@@ -134,9 +135,9 @@ protected:
private:
inline bool isCommitEditorOpen() const;
Core::IEditor * showOutputInEditor(const QString& title, const QString &output,
int editorType, const QString &source,
QTextCodec *codec);
Core::IEditor *showOutputInEditor(const QString &title, const QString &output,
int editorType, const QString &source,
QTextCodec *codec);
void filelog(const QString &workingDir,
const QString &file = QString(),
......@@ -180,7 +181,7 @@ private:
QAction *m_submitUndoAction;
QAction *m_submitRedoAction;
QAction *m_menuAction;
bool m_submitActionTriggered;
bool m_submitActionTriggered;
static SubversionPlugin *m_subversionPluginInstance;
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment