Skip to content

Commit 6d8da40

Browse files
pbekpbek
committed
kf6: try to fix build errors
Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
1 parent 10929e7 commit 6d8da40

File tree

1 file changed

+32
-29
lines changed

1 file changed

+32
-29
lines changed

‎src/libraries/fakevim/fakevim/fakevimhandler.cpp

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,8 @@ static QString vimPatternToQtPattern_QString(const QString &needle, bool &initIg
432432
if (range) {
433433
QChar c2 = pattern[pattern.size() - 2];
434434
pattern.remove(pattern.size() - 2, 2);
435-
pattern.append(c2.toUpper() + '-' + c.toUpper());
436-
pattern.append(c2.toLower() + '-' + c.toLower());
435+
pattern.append(QString(c2.toUpper()) + QString('-') + QString(c.toUpper()));
436+
pattern.append(QString(c2.toLower()) + QString('-') + QString(c.toLower()));
437437
range = false;
438438
} else if (escape) {
439439
escape = false;
@@ -3732,7 +3732,8 @@ bool FakeVimHandler::Private::handleCommandSubSubMode(const Input &input) {
37323732
pushUndoState(false);
37333733
beginEditBlock();
37343734

3735-
const QString dotCommand = "ys" + g.dotCommand + "f" + g.surroundFunction + "<CR>";
3735+
const QString dotCommand =
3736+
QString("ys") + g.dotCommand + QString("f") + g.surroundFunction + QString("<CR>");
37363737

37373738
surroundCurrentRange(Input(')'), g.surroundFunction);
37383739

@@ -4201,7 +4202,7 @@ bool FakeVimHandler::Private::handleNoSubMode(const Input &input) {
42014202
}
42024203
} else if ((!isVisualMode() && input.is('a')) || (isVisualMode() && input.is('A'))) {
42034204
if (isVisualMode()) {
4204-
if (!isVisualBlockMode()) dotCommand = QString::number(count()) + "a";
4205+
if (!isVisualBlockMode()) dotCommand = QString::number(count()) + QString("a");
42054206
enterVisualInsertMode('A');
42064207
} else {
42074208
moveRight(qMin<int>(rightDist(), 1));
@@ -4244,7 +4245,7 @@ bool FakeVimHandler::Private::handleNoSubMode(const Input &input) {
42444245
} else if (g.gflag && input.is('r') && s.emulateReplaceWithRegister.value()) {
42454246
g.submode = ReplaceWithRegisterSubMode;
42464247
if (isVisualMode()) {
4247-
dotCommand = visualDotCommand() + QString::number(count()) + "gr";
4248+
dotCommand = visualDotCommand() + QString::number(count()) + QString("gr");
42484249
pasteText(true);
42494250
} else {
42504251
setAnchor();
@@ -4300,7 +4301,7 @@ bool FakeVimHandler::Private::handleNoSubMode(const Input &input) {
43004301
if (atEndOfLine()) moveLeft();
43014302
} else if (input.is('I')) {
43024303
if (isVisualMode()) {
4303-
if (!isVisualBlockMode()) dotCommand = QString::number(count()) + "i";
4304+
if (!isVisualBlockMode()) dotCommand = QString::number(count()) + QString("i");
43044305
enterVisualInsertMode('I');
43054306
} else {
43064307
if (g.gflag)
@@ -4478,7 +4479,7 @@ bool FakeVimHandler::Private::handleNoSubMode(const Input &input) {
44784479
setAnchor();
44794480
} else {
44804481
const QString movementCommand = QStringLiteral("%1l%1l").arg(count());
4481-
handleAs("g" + input.toString() + movementCommand);
4482+
handleAs(QString("g") + input.toString() + movementCommand);
44824483
}
44834484
} else if (input.is('@')) {
44844485
g.submode = MacroExecuteSubMode;
@@ -4534,7 +4535,7 @@ bool FakeVimHandler::Private::handleReplaceSubMode(const Input &input) {
45344535
bool handled = true;
45354536

45364537
const QChar c = input.asChar();
4537-
setDotCommand(visualDotCommand() + 'r' + c);
4538+
setDotCommand(visualDotCommand() + QString('r') + c);
45384539
if (isVisualMode()) {
45394540
pushUndoState();
45404541
leaveVisualMode();
@@ -4559,7 +4560,7 @@ bool FakeVimHandler::Private::handleReplaceSubMode(const Input &input) {
45594560
moveRight(count() - 1);
45604561
}
45614562
setTargetColumn();
4562-
setDotCommand("%1r" + input.text(), count());
4563+
setDotCommand(QString("%1r") + input.text(), count());
45634564
} else {
45644565
handled = false;
45654566
}
@@ -4594,9 +4595,10 @@ bool FakeVimHandler::Private::handleReplaceWithRegisterSubMode(const Input &inpu
45944595
pushUndoState(false);
45954596
beginEditBlock();
45964597

4597-
const QString movement = (count() == 1) ? QString() : (QString::number(count() - 1) + "j");
4598+
const QString movement =
4599+
(count() == 1) ? QString() : (QString::number(count() - 1) + QString("j"));
45984600

4599-
g.dotCommand = "V" + movement + "gr";
4601+
g.dotCommand = QString("V").append(movement).append("gr");
46004602
replay(g.dotCommand);
46014603

46024604
endEditBlock();
@@ -4841,7 +4843,7 @@ void FakeVimHandler::Private::handleReplaceMode(const Input &input) {
48414843
commitInsertState();
48424844
moveLeft(qMin<int>(1, leftDist()));
48434845
enterCommandMode();
4844-
g.dotCommand.append(m_buffer->lastInsertion + "<ESC>");
4846+
g.dotCommand.append(m_buffer->lastInsertion + QString("<ESC>"));
48454847
} else if (input.isKey(Key_Left)) {
48464848
moveLeft();
48474849
} else if (input.isKey(Key_Right)) {
@@ -4944,7 +4946,7 @@ void FakeVimHandler::Private::finishInsertMode() {
49444946

49454947
if (newLineBefore || newLineAfter)
49464948
m_buffer->lastInsertion.remove(0, m_buffer->lastInsertion.indexOf('\n') + 1);
4947-
g.dotCommand.append(m_buffer->lastInsertion + "<ESC>");
4949+
g.dotCommand.append(m_buffer->lastInsertion + QString("<ESC>"));
49484950

49494951
setTargetColumn();
49504952
enterCommandMode();
@@ -5295,7 +5297,7 @@ EventResult FakeVimHandler::Private::handleSearchSubSubMode(const Input &input)
52955297

52965298
if (finishSearch()) {
52975299
if (g.submode != NoSubMode)
5298-
finishMovement(g.searchBuffer.prompt() + g.lastSearch + '\n');
5300+
finishMovement(g.searchBuffer.prompt() + g.lastSearch + QString('\n'));
52995301
if (g.currentMessage.isEmpty()) showMessage(MessageCommand, g.searchBuffer.display());
53005302
} else {
53015303
handled = EventCancelled; // Not found so cancel mapping if any.
@@ -5817,7 +5819,7 @@ bool FakeVimHandler::Private::handleExSetCommand(const ExCommand &cmd) {
58175819

58185820
FvBaseAspect *act = s.item(optionName);
58195821
if (!act) {
5820-
showMessage(MessageError, Tr::tr("Unknown option:") + ' ' + cmd.args);
5822+
showMessage(MessageError, Tr::tr("Unknown option:") + QString(' ') + cmd.args);
58215823
} else if (act->defaultValue().type() == QVariant::Bool) {
58225824
bool oldValue = act->value().toBool();
58235825
if (printOption) {
@@ -5827,11 +5829,12 @@ bool FakeVimHandler::Private::handleExSetCommand(const ExCommand &cmd) {
58275829
act->setValue(!oldValue);
58285830
}
58295831
} else if (negateOption && !printOption) {
5830-
showMessage(MessageError, Tr::tr("Invalid argument:") + ' ' + cmd.args);
5832+
showMessage(MessageError, Tr::tr("Invalid argument:") + QString(' ') + cmd.args);
58315833
} else if (toggleOption) {
5832-
showMessage(MessageError, Tr::tr("Trailing characters:") + ' ' + cmd.args);
5834+
showMessage(MessageError, Tr::tr("Trailing characters:") + QString(' ') + cmd.args);
58335835
} else {
5834-
showMessage(MessageInfo, act->settingsKey().toLower() + "=" + act->value().toString());
5836+
showMessage(MessageInfo,
5837+
act->settingsKey().toLower() + QString("=") + act->value().toString());
58355838
}
58365839
}
58375840
updateEditor();
@@ -6059,7 +6062,7 @@ bool FakeVimHandler::Private::handleExBangCommand(const ExCommand &cmd) // :!
60596062
if (!cmd.cmd.isEmpty() || !cmd.hasBang) return false;
60606063

60616064
bool replaceText = cmd.range.isValid();
6062-
const QString command = QString(cmd.cmd.mid(1) + ' ' + cmd.args).trimmed();
6065+
const QString command = QString(cmd.cmd.mid(1) + QString(' ') + cmd.args).trimmed();
60636066
const QString input = replaceText ? selectText(cmd.range) : QString();
60646067

60656068
const QString result = getProcessOutput(command, input);
@@ -7114,22 +7117,22 @@ void FakeVimHandler::Private::toggleComment(const Range &range) {
71147117
transformText(range, [&commentString](const QString &text) -> QString {
71157118
QStringList lines = text.split('\n');
71167119

7117-
const QRegularExpression checkForComment("^\\s*" +
7120+
const QRegularExpression checkForComment(QString("^\\s*") +
71187121
QRegularExpression::escape(commentString));
71197122

71207123
const bool firstLineIsComment = !lines.empty() && lines.front().contains(checkForComment);
71217124

71227125
for (auto &line : lines) {
71237126
if (!line.isEmpty()) {
71247127
if (firstLineIsComment) {
7125-
const bool hasSpaceAfterCommentString =
7126-
line.contains(QRegularExpression(checkForComment.pattern() + "\\s"));
7128+
const bool hasSpaceAfterCommentString = line.contains(
7129+
QRegularExpression(checkForComment.pattern() + QString("\\s")));
71277130
const int sizeToReplace = hasSpaceAfterCommentString ? commentString.size() + 1
71287131
: commentString.size();
71297132
line.replace(line.indexOf(commentString), sizeToReplace, "");
71307133
} else {
71317134
const int indexOfFirstNonSpace = line.indexOf(QRegularExpression("[^\\s]"));
7132-
line = line.left(indexOfFirstNonSpace) + commentString + " " +
7135+
line = line.left(indexOfFirstNonSpace) + commentString + QString(" ") +
71337136
line.right(line.size() - indexOfFirstNonSpace);
71347137
}
71357138
}
@@ -7169,7 +7172,7 @@ void FakeVimHandler::Private::replaceWithRegister(const Range &range) {
71697172

71707173
void FakeVimHandler::Private::surroundCurrentRange(const Input &input, const QString &prefix) {
71717174
QString dotCommand;
7172-
if (isVisualMode()) dotCommand = visualDotCommand() + "S" + input.asChar();
7175+
if (isVisualMode()) dotCommand = visualDotCommand() + QString("S") + input.asChar();
71737176

71747177
const bool wasVisualCharMode = isVisualCharMode();
71757178
const bool wasVisualLineMode = isVisualLineMode();
@@ -7207,11 +7210,11 @@ void FakeVimHandler::Private::surroundCurrentRange(const Input &input, const QSt
72077210
if (wasVisualLineMode)
72087211
newBack += "\n";
72097212
else
7210-
newBack = "\n" + newBack;
7213+
newBack = QString("\n") + newBack;
72117214
} else if (input.is('(') || input.is('{') || input.is('[') || input.is('[')) {
72127215
// Opening characters add an extra space
7213-
newFront = newFront + " ";
7214-
newBack = " " + newBack;
7216+
newFront = newFront + QString(" ");
7217+
newBack = QString(" ") + newBack;
72157218
}
72167219

72177220
if (!newFront.isEmpty()) {
@@ -8558,8 +8561,8 @@ void FakeVimHandler::Private::getRegisterType(int *reg, bool *isClipboard, bool
85588561

85598562
if (c == '"') {
85608563
QStringList list = s.clipboard.value().split(',');
8561-
clipboard = list.contains("unnamedplus");
8562-
selection = list.contains("unnamed");
8564+
clipboard = list.contains(QString("unnamedplus"));
8565+
selection = list.contains(QString("unnamed"));
85638566
} else if (c == '+') {
85648567
clipboard = true;
85658568
} else if (c == '*') {

0 commit comments

Comments
 (0)