Commit 30ca854b authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Git: Use proper name for patches from codepasters

Task-number: QTCREATORBUG-3207
parent 8d59cd8b
...@@ -127,6 +127,7 @@ bool State::equals(const State &rhs) const ...@@ -127,6 +127,7 @@ bool State::equals(const State &rhs) const
return currentFile == rhs.currentFile return currentFile == rhs.currentFile
&& currentFileName == rhs.currentFileName && currentFileName == rhs.currentFileName
&& currentPatchFile == rhs.currentPatchFile && currentPatchFile == rhs.currentPatchFile
&& currentPatchFileDisplayName == rhs.currentPatchFileDisplayName
&& currentFileTopLevel == rhs.currentFileTopLevel && currentFileTopLevel == rhs.currentFileTopLevel
&& currentProjectPath == rhs.currentProjectPath && currentProjectPath == rhs.currentProjectPath
&& currentProjectName == rhs.currentProjectName && currentProjectName == rhs.currentProjectName
...@@ -181,6 +182,8 @@ StateListener::StateListener(QObject *parent) : ...@@ -181,6 +182,8 @@ StateListener::StateListener(QObject *parent) :
Core::ICore *core = Core::ICore::instance(); Core::ICore *core = Core::ICore::instance();
connect(core->fileManager(), SIGNAL(currentFileChanged(QString)), connect(core->fileManager(), SIGNAL(currentFileChanged(QString)),
this, SLOT(slotStateChanged())); this, SLOT(slotStateChanged()));
connect(core->editorManager()->instance(), SIGNAL(currentEditorStateChanged(Core::IEditor*)),
this, SLOT(slotStateChanged()));
if (ProjectExplorer::ProjectExplorerPlugin *pe = ProjectExplorer::ProjectExplorerPlugin::instance()) if (ProjectExplorer::ProjectExplorerPlugin *pe = ProjectExplorer::ProjectExplorerPlugin::instance())
connect(pe, SIGNAL(currentProjectChanged(ProjectExplorer::Project*)), connect(pe, SIGNAL(currentProjectChanged(ProjectExplorer::Project*)),
...@@ -228,6 +231,7 @@ void StateListener::slotStateChanged() ...@@ -228,6 +231,7 @@ void StateListener::slotStateChanged()
if (isTempFile || state.currentFile.contains(QLatin1Char('#'))) if (isTempFile || state.currentFile.contains(QLatin1Char('#')))
state.currentFile.clear(); state.currentFile.clear();
} }
// Get the file and its control. Do not use the file unless we find one // Get the file and its control. Do not use the file unless we find one
Core::IVersionControl *fileControl = 0; Core::IVersionControl *fileControl = 0;
if (!state.currentFile.isEmpty()) { if (!state.currentFile.isEmpty()) {
......
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