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

DiffEditor: Drop Utils:: prefix when using namespace Utils

Browse Source 
Change-Id: I640447bcd90bba4281b2b945f53c54040060d3bc
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2022-06-03 15:19:02 +02:00
parent 9ab0510eaf
commit 457fe4eb87
4 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/diffeditor/diffeditordocument.cpp
View File

@@ -308,8 +308,8 @@ bool DiffEditorDocument::reload(QString *errorString, ReloadFlag flag, ChangeTyp
return open(errorString, filePath(), filePath()) == OpenResult::Success; return open(errorString, filePath(), filePath()) == OpenResult::Success;
} }
Core::IDocument::OpenResult DiffEditorDocument::open(QString *errorString, const Utils::FilePath &filePath, Core::IDocument::OpenResult DiffEditorDocument::open(QString *errorString, const FilePath &filePath,
const Utils::FilePath &realFilePath) const FilePath &realFilePath)
{ {
QTC_CHECK(filePath == realFilePath); // does not support autosave QTC_CHECK(filePath == realFilePath); // does not support autosave
beginReload(); beginReload();

2
src/plugins/diffeditor/diffeditorfactory.cpp
View File

@@ -61,7 +61,7 @@ DiffEditorFactory::DiffEditorFactory() :
}, },
rightHandler { rightHandler {
Constants::DIFF_EDITOR_ID, Constants::DIFF_EDITOR_ID,
Utils::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2), Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2),
TextEditorActionHandler::None, TextEditorActionHandler::None,
[](Core::IEditor *e) { return static_cast<DiffEditor *>(e)->rightEditorWidget(); } [](Core::IEditor *e) { return static_cast<DiffEditor *>(e)->rightEditorWidget(); }
} }

49
src/plugins/diffeditor/diffeditorplugin.cpp
View File

@@ -150,9 +150,8 @@ DiffFilesController::DiffFilesController(IDocument *document)
setReloader([this] { setReloader([this] {
cancelReload(); cancelReload();
m_futureWatcher.setFuture(Utils::map(reloadInputList(), m_futureWatcher.setFuture(map(reloadInputList(),
DiffFile(ignoreWhitespace(), DiffFile(ignoreWhitespace(), contextLineCount())));
contextLineCount())));
Core::ProgressManager::addTask(m_futureWatcher.future(), Core::ProgressManager::addTask(m_futureWatcher.future(),
tr("Calculating diff"), "DiffEditor"); tr("Calculating diff"), "DiffEditor");
@@ -203,11 +202,11 @@ QList<ReloadInput> DiffCurrentFileController::reloadInputList() const
if (textDocument && textDocument->isModified()) { if (textDocument && textDocument->isModified()) {
QString errorString; QString errorString;
Utils::TextFileFormat format = textDocument->format(); TextFileFormat format = textDocument->format();
QString leftText; QString leftText;
const Utils::TextFileFormat::ReadResult leftResult const TextFileFormat::ReadResult leftResult
= Utils::TextFileFormat::readFile(FilePath::fromString(m_fileName), format.codec, = TextFileFormat::readFile(FilePath::fromString(m_fileName), format.codec,
&leftText, &format, &errorString); &leftText, &format, &errorString);
const QString rightText = textDocument->plainText(); const QString rightText = textDocument->plainText();
@@ -220,9 +219,9 @@ QList<ReloadInput> DiffCurrentFileController::reloadInputList() const
reloadInput.leftFileInfo.typeInfo = tr("Saved"); reloadInput.leftFileInfo.typeInfo = tr("Saved");
reloadInput.rightFileInfo.typeInfo = tr("Modified"); reloadInput.rightFileInfo.typeInfo = tr("Modified");
reloadInput.rightFileInfo.patchBehaviour = DiffFileInfo::PatchEditor; reloadInput.rightFileInfo.patchBehaviour = DiffFileInfo::PatchEditor;
reloadInput.binaryFiles = (leftResult == Utils::TextFileFormat::ReadEncodingError); reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError);
if (leftResult == Utils::TextFileFormat::ReadIOError) if (leftResult == TextFileFormat::ReadIOError)
reloadInput.fileOperation = FileData::NewFile; reloadInput.fileOperation = FileData::NewFile;
result << reloadInput; result << reloadInput;
@@ -259,11 +258,11 @@ QList<ReloadInput> DiffOpenFilesController::reloadInputList() const
if (textDocument && textDocument->isModified()) { if (textDocument && textDocument->isModified()) {
QString errorString; QString errorString;
Utils::TextFileFormat format = textDocument->format(); TextFileFormat format = textDocument->format();
QString leftText; QString leftText;
const QString fileName = textDocument->filePath().toString(); const QString fileName = textDocument->filePath().toString();
const Utils::TextFileFormat::ReadResult leftResult = Utils::TextFileFormat::readFile( const TextFileFormat::ReadResult leftResult = TextFileFormat::readFile(
FilePath::fromString(fileName), format.codec, &leftText, &format, &errorString); FilePath::fromString(fileName), format.codec, &leftText, &format, &errorString);
const QString rightText = textDocument->plainText(); const QString rightText = textDocument->plainText();
@@ -276,9 +275,9 @@ QList<ReloadInput> DiffOpenFilesController::reloadInputList() const
reloadInput.leftFileInfo.typeInfo = tr("Saved"); reloadInput.leftFileInfo.typeInfo = tr("Saved");
reloadInput.rightFileInfo.typeInfo = tr("Modified"); reloadInput.rightFileInfo.typeInfo = tr("Modified");
reloadInput.rightFileInfo.patchBehaviour = DiffFileInfo::PatchEditor; reloadInput.rightFileInfo.patchBehaviour = DiffFileInfo::PatchEditor;
reloadInput.binaryFiles = (leftResult == Utils::TextFileFormat::ReadEncodingError); reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError);
if (leftResult == Utils::TextFileFormat::ReadIOError) if (leftResult == TextFileFormat::ReadIOError)
reloadInput.fileOperation = FileData::NewFile; reloadInput.fileOperation = FileData::NewFile;
result << reloadInput; result << reloadInput;
@@ -313,15 +312,15 @@ QList<ReloadInput> DiffModifiedFilesController::reloadInputList() const
for (const QString &fileName : m_fileNames) { for (const QString &fileName : m_fileNames) {
auto textDocument = qobject_cast<TextEditor::TextDocument *>( auto textDocument = qobject_cast<TextEditor::TextDocument *>(
DocumentModel::documentForFilePath(Utils::FilePath::fromString(fileName))); DocumentModel::documentForFilePath(FilePath::fromString(fileName)));
if (textDocument && textDocument->isModified()) { if (textDocument && textDocument->isModified()) {
QString errorString; QString errorString;
Utils::TextFileFormat format = textDocument->format(); TextFileFormat format = textDocument->format();
QString leftText; QString leftText;
const QString fileName = textDocument->filePath().toString(); const QString fileName = textDocument->filePath().toString();
const Utils::TextFileFormat::ReadResult leftResult = Utils::TextFileFormat::readFile( const TextFileFormat::ReadResult leftResult = TextFileFormat::readFile(
FilePath::fromString(fileName), format.codec, &leftText, &format, &errorString); FilePath::fromString(fileName), format.codec, &leftText, &format, &errorString);
const QString rightText = textDocument->plainText(); const QString rightText = textDocument->plainText();
@@ -334,9 +333,9 @@ QList<ReloadInput> DiffModifiedFilesController::reloadInputList() const
reloadInput.leftFileInfo.typeInfo = tr("Saved"); reloadInput.leftFileInfo.typeInfo = tr("Saved");
reloadInput.rightFileInfo.typeInfo = tr("Modified"); reloadInput.rightFileInfo.typeInfo = tr("Modified");
reloadInput.rightFileInfo.patchBehaviour = DiffFileInfo::PatchEditor; reloadInput.rightFileInfo.patchBehaviour = DiffFileInfo::PatchEditor;
reloadInput.binaryFiles = (leftResult == Utils::TextFileFormat::ReadEncodingError); reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError);
if (leftResult == Utils::TextFileFormat::ReadIOError) if (leftResult == TextFileFormat::ReadIOError)
reloadInput.fileOperation = FileData::NewFile; reloadInput.fileOperation = FileData::NewFile;
result << reloadInput; result << reloadInput;
@@ -371,15 +370,15 @@ DiffExternalFilesController::DiffExternalFilesController(IDocument *document, co
QList<ReloadInput> DiffExternalFilesController::reloadInputList() const QList<ReloadInput> DiffExternalFilesController::reloadInputList() const
{ {
QString errorString; QString errorString;
Utils::TextFileFormat format; TextFileFormat format;
format.codec = EditorManager::defaultTextCodec(); format.codec = EditorManager::defaultTextCodec();
QString leftText; QString leftText;
QString rightText; QString rightText;
const Utils::TextFileFormat::ReadResult leftResult = Utils::TextFileFormat::readFile( const TextFileFormat::ReadResult leftResult = TextFileFormat::readFile(
FilePath::fromString(m_leftFileName), format.codec, &leftText, &format, &errorString); FilePath::fromString(m_leftFileName), format.codec, &leftText, &format, &errorString);
const Utils::TextFileFormat::ReadResult rightResult = Utils::TextFileFormat::readFile( const TextFileFormat::ReadResult rightResult = TextFileFormat::readFile(
FilePath::fromString(m_rightFileName), format.codec, &rightText, &format, &errorString); FilePath::fromString(m_rightFileName), format.codec, &rightText, &format, &errorString);
ReloadInput reloadInput; ReloadInput reloadInput;
@@ -387,11 +386,11 @@ QList<ReloadInput> DiffExternalFilesController::reloadInputList() const
reloadInput.rightText = rightText; reloadInput.rightText = rightText;
reloadInput.leftFileInfo.fileName = m_leftFileName; reloadInput.leftFileInfo.fileName = m_leftFileName;
reloadInput.rightFileInfo.fileName = m_rightFileName; reloadInput.rightFileInfo.fileName = m_rightFileName;
reloadInput.binaryFiles = (leftResult == Utils::TextFileFormat::ReadEncodingError reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError
|| rightResult == Utils::TextFileFormat::ReadEncodingError); || rightResult == TextFileFormat::ReadEncodingError);
const bool leftFileExists = (leftResult != Utils::TextFileFormat::ReadIOError); const bool leftFileExists = (leftResult != TextFileFormat::ReadIOError);
const bool rightFileExists = (rightResult != Utils::TextFileFormat::ReadIOError); const bool rightFileExists = (rightResult != TextFileFormat::ReadIOError);
if (!leftFileExists && rightFileExists) if (!leftFileExists && rightFileExists)
reloadInput.fileOperation = FileData::NewFile; reloadInput.fileOperation = FileData::NewFile;
else if (leftFileExists && !rightFileExists) else if (leftFileExists && !rightFileExists)
@@ -518,7 +517,7 @@ void DiffEditorPluginPrivate::updateDiffCurrentFileAction()
void DiffEditorPluginPrivate::updateDiffOpenFilesAction() void DiffEditorPluginPrivate::updateDiffOpenFilesAction()
{ {
const bool enabled = Utils::anyOf(DocumentModel::openedDocuments(), [](IDocument *doc) { const bool enabled = anyOf(DocumentModel::openedDocuments(), [](IDocument *doc) {
QTC_ASSERT(doc, return false); QTC_ASSERT(doc, return false);
return doc->isModified() && qobject_cast<TextEditor::TextDocument *>(doc); return doc->isModified() && qobject_cast<TextEditor::TextDocument *>(doc);
}); });

8
src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
View File

@@ -68,7 +68,7 @@ DiffEditorWidgetController::DiffEditorWidgetController(QWidget *diffEditorWidget
void DiffEditorWidgetController::setDocument(DiffEditorDocument *document) void DiffEditorWidgetController::setDocument(DiffEditorDocument *document)
{ {
if (!m_progressIndicator) { if (!m_progressIndicator) {
m_progressIndicator = new Utils::ProgressIndicator(Utils::ProgressIndicatorSize::Large); m_progressIndicator = new ProgressIndicator(ProgressIndicatorSize::Large);
m_progressIndicator->attachToWidget(m_diffEditorWidget); m_progressIndicator->attachToWidget(m_diffEditorWidget);
m_progressIndicator->hide(); m_progressIndicator->hide();
} }
@@ -182,7 +182,7 @@ void DiffEditorWidgetController::patch(bool revert, int fileIndex, int chunkInde
if (!textDocument) if (!textDocument)
return; return;
Utils::TemporaryFile contentsCopy("diff"); TemporaryFile contentsCopy("diff");
if (!contentsCopy.open()) if (!contentsCopy.open())
return; return;
@@ -306,12 +306,12 @@ void DiffEditorWidgetController::updateCannotDecodeInfo()
if (!m_document) if (!m_document)
return; return;
Utils::InfoBar *infoBar = m_document->infoBar(); InfoBar *infoBar = m_document->infoBar();
Id selectEncodingId(Constants::SELECT_ENCODING); Id selectEncodingId(Constants::SELECT_ENCODING);
if (m_document->hasDecodingError()) { if (m_document->hasDecodingError()) {
if (!infoBar->canInfoBeAdded(selectEncodingId)) if (!infoBar->canInfoBeAdded(selectEncodingId))
return; return;
Utils::InfoBarEntry info(selectEncodingId, InfoBarEntry info(selectEncodingId,
tr("<b>Error:</b> Could not decode \"%1\" with \"%2\"-encoding.") tr("<b>Error:</b> Could not decode \"%1\" with \"%2\"-encoding.")
.arg(m_document->displayName(), .arg(m_document->displayName(),
QString::fromLatin1(m_document->codec()->name()))); QString::fromLatin1(m_document->codec()->name())));