feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Subversion: WS fix

Browse Source 
Change-Id: Ifc8d46086fd4228b80bc42859aba84819650777f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-03-27 13:53:28 +01:00
parent 138d009cc7
commit 03ac09d34c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/subversion/subversionplugin.cpp
View File

@@ -813,8 +813,8 @@ void SubversionPlugin::annotateVersion(const QString &workingDirectory,
} }
void SubversionPlugin::vcsAnnotate(const QString &workingDir, const QString &file, void SubversionPlugin::vcsAnnotate(const QString &workingDir, const QString &file,
const QString &revision /* = QString() */, const QString &revision /* = QString() */,
int lineNumber /* = -1 */) int lineNumber /* = -1 */)
{ {
const QString source = VcsBaseEditor::getSource(workingDir, file); const QString source = VcsBaseEditor::getSource(workingDir, file);
QTextCodec *codec = VcsBaseEditor::getCodec(source); QTextCodec *codec = VcsBaseEditor::getCodec(source);

11
src/plugins/subversion/subversionplugin.h
View File

@@ -112,7 +112,8 @@ private slots:
void revertAll(); void revertAll();
void filelogCurrentFile(); void filelogCurrentFile();
void annotateCurrentFile(); 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 projectStatus();
void describe(const QString &source, const QString &changeNr); void describe(const QString &source, const QString &changeNr);
void slotDescribe(); void slotDescribe();
@@ -134,9 +135,9 @@ protected:
private: private:
inline bool isCommitEditorOpen() const; inline bool isCommitEditorOpen() const;
Core::IEditor * showOutputInEditor(const QString& title, const QString &output, Core::IEditor *showOutputInEditor(const QString &title, const QString &output,
int editorType, const QString &source, int editorType, const QString &source,
QTextCodec *codec); QTextCodec *codec);
void filelog(const QString &workingDir, void filelog(const QString &workingDir,
const QString &file = QString(), const QString &file = QString(),
@@ -180,7 +181,7 @@ private:
QAction *m_submitUndoAction; QAction *m_submitUndoAction;
QAction *m_submitRedoAction; QAction *m_submitRedoAction;
QAction *m_menuAction; QAction *m_menuAction;
bool m_submitActionTriggered; bool m_submitActionTriggered;
static SubversionPlugin *m_subversionPluginInstance; static SubversionPlugin *m_subversionPluginInstance;
}; };