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

Perforce/Subversion: Display diff/annotation with correct encoding.

Browse Source
This commit is contained in:
Friedemann Kleint
2009-08-11 11:22:30 +02:00
parent 556c824a66
commit e89a3b00d4
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/perforce/perforceplugin.cpp
View File

@@ -884,8 +884,7 @@ Core::IEditor * PerforcePlugin::showOutputInEditor(const QString& title, const Q
if (Perforce::Constants::debug) if (Perforce::Constants::debug)
qDebug() << "PerforcePlugin::showOutputInEditor" << title << kind << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec); qDebug() << "PerforcePlugin::showOutputInEditor" << title << kind << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title; QString s = title;
Core::IEditor *editor = Core::EditorManager::instance()-> Core::IEditor *editor = Core::EditorManager::instance()->newFile(kind, &s, output);
newFile(kind, &s, output.toLocal8Bit());
PerforceEditor *e = qobject_cast<PerforceEditor*>(editor->widget()); PerforceEditor *e = qobject_cast<PerforceEditor*>(editor->widget());
if (!e) if (!e)
return 0; return 0;

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

@@ -979,7 +979,7 @@ Core::IEditor * SubversionPlugin::showOutputInEditor(const QString& title, const
if (Subversion::Constants::debug) if (Subversion::Constants::debug)
qDebug() << "SubversionPlugin::showOutputInEditor" << title << kind << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec); qDebug() << "SubversionPlugin::showOutputInEditor" << title << kind << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title; QString s = title;
Core::IEditor *editor = Core::EditorManager::instance()->newFile(kind, &s, output.toLocal8Bit()); Core::IEditor *editor = Core::EditorManager::instance()->newFile(kind, &s, output);
SubversionEditor *e = qobject_cast<SubversionEditor*>(editor->widget()); SubversionEditor *e = qobject_cast<SubversionEditor*>(editor->widget());
if (!e) if (!e)
return 0; return 0;