forked from qt-creator/qt-creator
More Qt 6 fixes
Task-number: QTCREATORBUG-24098 Change-Id: I1e30b49218b18f426aea6e4cd3680be513894746 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -7234,8 +7234,8 @@ void FakeVimHandler::Private::invertCase(const Range &range)
|
|||||||
[] (const QString &text) -> QString {
|
[] (const QString &text) -> QString {
|
||||||
QString result = text;
|
QString result = text;
|
||||||
for (int i = 0; i < result.length(); ++i) {
|
for (int i = 0; i < result.length(); ++i) {
|
||||||
QCharRef c = result[i];
|
const QChar c = result[i];
|
||||||
c = c.isUpper() ? c.toLower() : c.toUpper();
|
result[i] = c.isUpper() ? c.toLower() : c.toUpper();
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
|
@@ -34,9 +34,9 @@
|
|||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
namespace Core {
|
QT_BEGIN_NAMESPACE
|
||||||
class IEditor;
|
class QTextCodec;
|
||||||
}
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
namespace TextEditor {
|
namespace TextEditor {
|
||||||
class BaseTextEditor;
|
class BaseTextEditor;
|
||||||
|
@@ -147,17 +147,17 @@
|
|||||||
#include <utils/stringutils.h>
|
#include <utils/stringutils.h>
|
||||||
#include <utils/utilsicons.h>
|
#include <utils/utilsicons.h>
|
||||||
|
|
||||||
#include <QFileInfo>
|
|
||||||
#include <QSettings>
|
|
||||||
|
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
|
#include <QActionGroup>
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
|
#include <QFileInfo>
|
||||||
#include <QInputDialog>
|
#include <QInputDialog>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QPair>
|
#include <QPair>
|
||||||
|
#include <QSettings>
|
||||||
#include <QThreadPool>
|
#include <QThreadPool>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
|
@@ -222,7 +222,7 @@ static bool extractFuncAndArgs(const QString &s,
|
|||||||
retFuncName = removeWhitespace(s.mid(funcStart, funcEnd - funcStart + 1));
|
retFuncName = removeWhitespace(s.mid(funcStart, funcEnd - funcStart + 1));
|
||||||
|
|
||||||
QString argStr = s.mid(openBrace + 1, closeBrace - openBrace - 1);
|
QString argStr = s.mid(openBrace + 1, closeBrace - openBrace - 1);
|
||||||
retArgs = argStr.split(QLatin1Char(','), QString::KeepEmptyParts);
|
retArgs = argStr.split(',');
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@@ -64,8 +64,8 @@ void HighlighterSettingsPage::HighlighterSettingsPagePrivate::migrateGenericHigh
|
|||||||
QDir userDefinitionPath(m_settings.definitionFilesPath());
|
QDir userDefinitionPath(m_settings.definitionFilesPath());
|
||||||
if (userDefinitionPath.mkdir("syntax")) {
|
if (userDefinitionPath.mkdir("syntax")) {
|
||||||
const auto link = Utils::HostOsInfo::isAnyUnixHost()
|
const auto link = Utils::HostOsInfo::isAnyUnixHost()
|
||||||
? QOverload<const QString &, const QString &>::of(&QFile::link)
|
? static_cast<bool(*)(const QString &, const QString &)>(&QFile::link)
|
||||||
: QOverload<const QString &, const QString &>::of(&QFile::copy);
|
: static_cast<bool(*)(const QString &, const QString &)>(&QFile::copy);
|
||||||
|
|
||||||
for (const QFileInfo &file : userDefinitionPath.entryInfoList({"*.xml"}, QDir::Files))
|
for (const QFileInfo &file : userDefinitionPath.entryInfoList({"*.xml"}, QDir::Files))
|
||||||
link(file.filePath(), file.absolutePath() + "/syntax/" + file.fileName());
|
link(file.filePath(), file.absolutePath() + "/syntax/" + file.fileName());
|
||||||
|
Reference in New Issue
Block a user