More Qt6 porting

Change-Id: I96bef1772149eb718e250563c65bf5da7259d9d6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-07-22 11:34:30 +02:00
parent 2d78bd4b19
commit 086a4be734
4 changed files with 8 additions and 1 deletions

View File

@@ -332,7 +332,7 @@ Utils::Text::Replacements utf16Replacements(const QTextDocument *doc,
if (isInsideDummyTextInLine(lineText, bufferLineText, lineColUtf16.column))
continue;
lineColUtf16.column = std::min(lineColUtf16.column, lineText.length() + 1);
lineColUtf16.column = std::min(lineColUtf16.column, int(lineText.length()) + 1);
const int utf16Offset = Utils::Text::positionInText(doc,
lineColUtf16.line,

View File

@@ -30,6 +30,8 @@
#include <QIcon>
#include <QMultiMap>
#include <QMutex>
#include <QSet>
#include <QUrl>
namespace Help {
namespace Internal {

View File

@@ -28,8 +28,11 @@
#include "utils/optional.h"
#include <languageserverprotocol/languagefeatures.h>
#include <languageserverprotocol/lsptypes.h>
#include <QMap>
#include <QObject>
#include <QSet>
#include <QTimer>
namespace LanguageClient {

View File

@@ -32,6 +32,8 @@
#include <languageserverprotocol/languagefeatures.h>
#include <languageserverprotocol/workspace.h>
#include <QVector>
namespace Core { class IEditor; }
namespace LanguageClient {