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

Replace old svn diff editor with the new one

Browse Source 
Change-Id: I4137b709be718603cdc221ac938e139326c88835
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2014-11-06 13:23:40 +01:00
committed by Jarek Kobus
parent 07e3a032ff
commit 8d1940a796
12 changed files with 347 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,6 +93,9 @@ public:
QString monitorFile(const QString &repository) const;
QString synchronousTopic(const QString &repository) const;
SubversionResponse runSvn(const QString &workingDir,
const QStringList &arguments, int timeOut,
unsigned flags, QTextCodec *outputCodec = 0) const;
public slots:
void vcsAnnotate(const QString &workingDir, const QString &file,
@@ -123,8 +126,6 @@ private slots:
void statusRepository();
void updateRepository();
#ifdef WITH_TESTS
void testDiffFileResolving_data();
void testDiffFileResolving();
void testLogResolving();
#endif
@@ -137,9 +138,6 @@ private:
Core::IEditor * showOutputInEditor(const QString& title, const QString &output,
int editorType, const QString &source,
QTextCodec *codec);
SubversionResponse runSvn(const QString &workingDir,
const QStringList &arguments, int timeOut,
unsigned flags, QTextCodec *outputCodec = 0) const;
void filelog(const QString &workingDir,
const QString &file = QString(),