diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/.arcconfig konsole-19.08.3+git201912032047~ubuntu18.04.2/.arcconfig --- konsole-19.12.0+git201912271003~ubuntu18.04.1/.arcconfig 1970-01-01 00:00:00.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/.arcconfig 2019-12-03 20:47:14.000000000 +0000 @@ -0,0 +1,4 @@ +{ + "phabricator.uri" : "https://phabricator.kde.org/", + "project.name" : "Konsole" +} diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/CMakeLists.txt konsole-19.08.3+git201912032047~ubuntu18.04.2/CMakeLists.txt --- konsole-19.12.0+git201912271003~ubuntu18.04.1/CMakeLists.txt 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/CMakeLists.txt 2019-12-03 20:47:14.000000000 +0000 @@ -1,10 +1,10 @@ # Konsole project # KDE Application Version, managed by release script -set (RELEASE_SERVICE_VERSION_MAJOR "20") -set (RELEASE_SERVICE_VERSION_MINOR "03") -set (RELEASE_SERVICE_VERSION_MICRO "70") -set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") +set (KDE_APPLICATIONS_VERSION_MAJOR "20") +set (KDE_APPLICATIONS_VERSION_MINOR "03") +set (KDE_APPLICATIONS_VERSION_MICRO "70") +set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements cmake_minimum_required (VERSION 3.0 FATAL_ERROR) @@ -15,7 +15,7 @@ set (KF5_MIN_VERSION "5.6.0") # Release script will create bugzilla versions -project(konsole VERSION ${RELEASE_SERVICE_VERSION}) +project(konsole VERSION ${KDE_APPLICATIONS_VERSION}) find_program(CCACHE_FOUND "ccache") set(CCACHE_SUPPORT ON CACHE BOOL "Enable ccache support") @@ -45,8 +45,8 @@ include(FeatureSummary) include(ECMQtDeclareLoggingCategory) -ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX KONSOLEPRIVATE - SOVERSION ${RELEASE_SERVICE_VERSION_MAJOR} +ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX KONSOLEPRIVATE + SOVERSION ${KDE_APPLICATIONS_VERSION_MAJOR} ) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core @@ -75,9 +75,11 @@ endif() set(HAVE_X11 ${X11_FOUND}) +# FIXME: Fix code to allow this +#add_definitions(-DQT_NO_FOREACH) + # See above includes for defaults add_definitions( - -DQT_NO_FOREACH -DQT_STRICT_ITERATORS -DQT_NO_URL_CAST_FROM_STRING ) diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/debian/changelog konsole-19.08.3+git201912032047~ubuntu18.04.2/debian/changelog --- konsole-19.12.0+git201912271003~ubuntu18.04.1/debian/changelog 2019-12-27 10:03:45.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/debian/changelog 2020-01-21 18:18:57.000000000 +0000 @@ -1,14 +1,14 @@ -konsole (4:19.12.0+git201912271003~ubuntu18.04.1) bionic; urgency=low +konsole (4:19.08.3+git201912032047~ubuntu18.04.2) bionic; urgency=medium - * Auto build. + * Last good build. - -- Rik Mills Fri, 27 Dec 2019 10:03:45 +0000 + -- Rik Mills Tue, 21 Jan 2020 18:18:57 +0000 -konsole (4:19.12.0-0ubuntu1) focal; urgency=medium +konsole (4:19.08.3+git201912032047~ubuntu18.04.1) bionic; urgency=low - * New upstream release (19.12.0) + * Auto build. - -- Rik Mills Thu, 12 Dec 2019 10:50:39 +0000 + -- Rik Mills Tue, 03 Dec 2019 20:47:44 +0000 konsole (4:19.08.3-0ubuntu1) focal; urgency=medium diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/debian/git-build-recipe.manifest konsole-19.08.3+git201912032047~ubuntu18.04.2/debian/git-build-recipe.manifest --- konsole-19.12.0+git201912271003~ubuntu18.04.1/debian/git-build-recipe.manifest 2019-12-27 10:03:45.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/debian/git-build-recipe.manifest 2019-12-03 20:47:44.000000000 +0000 @@ -1,4 +1,4 @@ -# git-build-recipe format 0.4 deb-version 4:{debupstream}+git201912271003 -lp:~rikmills/+git/konsole-upstream git-commit:e52ec8f420e5d5e1dce2b5c15dd2f05cd2fb4590 -merge packaging lp:~kubuntu-packagers/kubuntu-packaging/+git/konsole git-commit:4ef4f39e1dae83d119199171b8c981d7392de310 +# git-build-recipe format 0.4 deb-version 4:{debupstream}+git201912032047 +lp:~rikmills/+git/konsole-upstream git-commit:5f60bc5a6f1bc0de7d1b99a4aa8e47b0e71b0c4e +merge packaging lp:~kubuntu-packagers/kubuntu-packaging/+git/konsole git-commit:c824786ff8ee8d7edefc2e4c968432c7f171d9da merge daily lp:~kubuntu-packagers/kubuntu-packaging/+git/konsole git-commit:a7bd75ecb78125f9e62507b45e155e015b565247 diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/desktop/konsole.notifyrc konsole-19.08.3+git201912032047~ubuntu18.04.2/desktop/konsole.notifyrc --- konsole-19.12.0+git201912271003~ubuntu18.04.1/desktop/konsole.notifyrc 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/desktop/konsole.notifyrc 2019-12-03 20:47:14.000000000 +0000 @@ -107,7 +107,6 @@ Name[fi]=Äänimerkki kohdistetussa istunnossa Name[fr]=Cloche dans la session sélectionnée Name[gl]=Badalada na sesión co foco -Name[ia]=Campana in session focalisate Name[id]=Bel dalam Sesi Terfokus Name[is]=Bjalla í virkri setu Name[it]=Campanella in sessione visibile @@ -143,7 +142,6 @@ Comment[fi]=Äänimerkki lähetetty kohdistetussa istunnossa Comment[fr]=Cloche émise dans une session sélectionnée Comment[gl]=Badalada emitida nunha sesión co foco. -Comment[ia]=Sono de campana emittite intra un session focalisate Comment[id]=Bel terbunyikan dengan sebuah sesi terfokus Comment[is]=Bjallan hringdi í óvirkri setu Comment[it]=Campanella suonata all'interno di una sessione visibile @@ -182,7 +180,6 @@ Name[fi]=Äänimerkki kohdistamattomassa istunnossa Name[fr]=Cloche dans une session non-sélectionnée Name[gl]=Badalada nunha sesión sen o foco -Name[ia]=Campana in session non focalisate Name[id]=Bel dalam Sesi Nonfokus Name[is]=Bjalla í óvirkri setu Name[it]=Campanella in sessione non visibile @@ -218,7 +215,6 @@ Comment[fi]=Äänimerkki lähetetty kohdistamattomassa istunnossa Comment[fr]=Cloche émise dans une session non-sélectionnée Comment[gl]=Badalada emitida nunha sesión sen o foco. -Comment[ia]=Sono de campana emittite intra un session non focalisate Comment[id]=Bel terbunyikan dengan sebuah sesi nonfokus Comment[is]=Bjallan hringdi í óvirkri setu Comment[it]=Campanella emessa all'interno di una sessione non visibile @@ -258,7 +254,6 @@ Name[fi]=Aktiivisuutta tarkkailtavassa kohdistamattomassa istunnossa Name[fr]=Activité dans la session surveillée non-sélectionnée Name[gl]=Actividade nunha sesión monitorizada sen o foco -Name[ia]=Activitate in session monitorate non focalisate Name[id]=Aktivitas dalam Sesi Nonfokus Terpantau Name[is]=Virkni í óvirkri setu sem fylgst er með Name[it]=Attività in sessione non visibile sorvegliata @@ -294,7 +289,6 @@ Comment[fi]=Aktiivisuutta havaittu tarkkailtavassa kohdistamattomassa istunnossa Comment[fr]=Activité détectée dans une session surveillée non-sélectionnée Comment[gl]=Detectouse actividade nunha sesión monitorizada sen o foco. -Comment[ia]=Activitate relevate in un session monitorate non focalisate Comment[id]=Aktifitas dideteksi dalam sebuah sesi nonfokus terpantau Comment[is]=Eitthvað er að gerast í óvirkri setu sem fylgst er með Comment[it]=Attività rilevata in una sessione non visibile sorvegliata @@ -500,7 +494,6 @@ Name[fi]=Hiljaisuutta valvotussa kohdistamattomassa istunnossa Name[fr]=Inactivité dans une session surveillée non-sélectionnée Name[gl]=Silencio nunha sesión monitorizada sen o foco -Name[ia]=Silentio in session monitorate non focalisate Name[id]=Senyap dalam Sesi Nonfokus Terpantau Name[is]=Þögn í óvirkri setu sem fylgst er með Name[it]=Silenzio in una sessione non visibile sorvegliata @@ -536,7 +529,6 @@ Comment[fi]=Hiljaisuutta havaittu tarkkailtavassa kohdistamattomassa istunnossa Comment[fr]=Inactivité détectée dans une session surveillée non-sélectionnée Comment[gl]=Detectouse silencio nunha sesión monitorizada sen o foco. -Comment[ia]=Silentio relevate in un session monitorate non focalisate Comment[id]=Senyap terdeteksi dalam sesi nonfokus terpantau Comment[is]=Ekkert er að gerast í óvirkri setu sem fylgst er með Comment[it]=Silenzio rilevato in una sessione non visibile sorvegliata diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/desktop/org.kde.konsole.appdata.xml konsole-19.08.3+git201912032047~ubuntu18.04.2/desktop/org.kde.konsole.appdata.xml --- konsole-19.12.0+git201912271003~ubuntu18.04.1/desktop/org.kde.konsole.appdata.xml 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/desktop/org.kde.konsole.appdata.xml 2019-12-03 20:47:14.000000000 +0000 @@ -26,7 +26,6 @@ Konsole Konsole Konsolė - കൺസോൾ Konsole Konsole Konsole @@ -70,7 +69,6 @@ Terminale 터미널 Terminalas - ടെർമിനൽ Terminal Terminal Terminal @@ -105,11 +103,9 @@

Konsole on pääte komentotulkkia varten. Se tarjoaa komentorivikäyttöliittymän tietokoneen hallitsemiseksi.

Konsole est un terminal pour lancer une invite de commande. Il fournit une interface de ligne de commande pour contrôler directement votre ordinateur.

Konsole é un terminal para executar un intérprete de ordes. Fornece unha interface de liña de ordes para controlar directamente o computador.

-

Konsole es un terminal pro executar un shell de commando. Illo provide un interfacie de linea de commando pro controlar directemente tu computator.

Konsole adalah sebuah terminal untuk menjalankan shell perintah. Ini menyediakan antarmuka baris perintah untuk secara langsung mengendalikan komputermu.

Konsole è un terminale per eseguire una shell di comandi. Fornisce un'interfaccia a riga di comando per controllare direttamente il tuo computer.

Konsole은 흔히 터미널, 혹은 셸이라고 불리는 X 터미널 에뮬레이터입니다. 텍스트 창에서 컴퓨터를 직접 재현하는 명령행 인터페이스를 재현합니다.

-

കൺസോൾ എന്നത് ആജ്ഞ ഷെൽ റൺ ചെയ്യുന്നതിനുള്ള ഒരു ടെർമിനലാണ്. ഇത് കമ്പ്യൂട്ടറിനെ നേരിട്ട് നിയന്ത്രിക്കുന്നതിനുള്ള ഒരു ആജ്ഞാസ്ഥാനം നല്‍കുന്നു.

Konsole is een terminal om een opdrachtshell uit te voeren. Het biedt een interface voor een opdrachtregel voor directe besturing van uw computer.

Konsole er ein terminal for å køyra kommandolinjeprogram. Han gjev altså eit tekstbasert grensesnitt til datamaskina.

Konsola jest terminalem do wykonywania poleceń powłoki. Zapewnia interfejs wiersza poleceń do bezpośredniego sterowania komputerem.

@@ -145,7 +141,6 @@

Funzionalità:

기능:

Ypatybės:

-

വിശേഷതകൾ:

Funksjoner:

Mogelijkheden:

Funksjonar:

@@ -190,7 +185,6 @@
  • Schede
  • 탭
  • Kortelės
    • -
  • ടാബുകൾ
  • Faner
  • Tabbladen
  • Faner
    • @@ -233,7 +227,6 @@
  • Profili multipli
  • 다중 프로필
  • Daugybė profilių
    • -
  • അനേക രൂപങ്ങൾ
  • Flere profiler
  • Meerdere profielen
  • Fleire profilar
    • @@ -275,7 +268,6 @@
  • Pemantauan Diam dan Aktivitas
  • Monitoraggio del silenzio e dell'attività
  • 침묵 및 활동 모니터링
    • -
  • നിശ്ശബ്ദതയും പ്രവൃത്തി നിരീക്ഷണവും
  • Overvåking av stillhet og aktivitet
  • Monitoring van stilte en activiteit
  • Overvaking av aktivitet og inaktivitet
    • @@ -317,7 +309,6 @@
  • Dukungan markah
  • Supporto dei segnalibri
  • 책갈피 지원
    • -
  • ഓര്‍മ്മക്കുറിപ്പു് സംവിദാനം
  • Støtte for bokmerker
  • Ondersteuning van bladwijzers
  • Bokmerkestøtte
    • @@ -360,7 +351,6 @@
  • Ricerca
  • 찾기
  • Paieška
    • -
  • തിരയൽ
  • Søking
  • Zoeken
  • Søkjestøtte
    • @@ -403,7 +393,6 @@
  • Salvataggio del risultato
  • 출력 저장
  • Išvesties įrašymas
    • -
  • ഫലം സൂക്ഷിക്കുക
  • Lagrer utdata
  • Opslaan van uitvoer
  • Lagring av utdata
    • @@ -452,7 +441,6 @@ Konsole adalah wujud yang digunakan sebagai emulator terminal Konsole utilizzata come un emulatore di terminale 터미널 에뮬레이터로 사용 중인 Konsole - കൺസോൾ നിലവിൽ ടെർമിനൽ അനുകരിക്കുന്നതിനായി ഉപയോഗിക്കുന്നു Konsole wordt gebruikt als een terminalemulator Konsole brukt som ein terminalemulator. Konsole używana jako emulator terminala diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/doc/manual/index.docbook konsole-19.08.3+git201912032047~ubuntu18.04.2/doc/manual/index.docbook --- konsole-19.12.0+git201912271003~ubuntu18.04.1/doc/manual/index.docbook 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/doc/manual/index.docbook 2019-12-03 20:47:14.000000000 +0000 @@ -1509,7 +1509,7 @@ \xHH : where HH are two hex digits -This can be used to send &ASCII; control characters, ⪚ \x00 which is the NUL character +This can be used to send ASCII control characters, ⪚ \x00 which is the NUL character diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Application.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Application.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Application.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Application.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -141,7 +141,7 @@ QStringList Application::getCustomCommand(QStringList &args) { - int i = args.indexOf(QStringLiteral("-e")); + int i = args.indexOf(QLatin1String("-e")); QStringList customCommand; if ((0 < i) && (i < (args.size() - 1))) { // -e was specified with at least one extra argument @@ -311,8 +311,8 @@ lineTokens[key] = value; } // should contain at least one of 'command' and 'profile' - if (lineTokens.contains(QStringLiteral("command")) - || lineTokens.contains(QStringLiteral("profile"))) { + if (lineTokens.contains(QLatin1String("command")) + || lineTokens.contains(QLatin1String("profile"))) { createTabFromArgs(window, lineTokens); sessions++; } else { diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Application.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Application.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Application.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Application.h 2019-12-03 20:47:14.000000000 +0000 @@ -55,7 +55,7 @@ static void populateCommandLineParser(QCommandLineParser *parser); static QStringList getCustomCommand(QStringList &args); - ~Application() override; + ~Application() Q_DECL_OVERRIDE; /** Creates a new main window and opens a default terminal session */ int newInstance(); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/autotests/KeyboardTranslatorTest.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/autotests/KeyboardTranslatorTest.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/autotests/KeyboardTranslatorTest.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/autotests/KeyboardTranslatorTest.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -106,7 +106,7 @@ auto entries = fallback->entries(); QCOMPARE(1, entries.size()); - auto entry = fallback->findEntry(Qt::Key_Tab, Qt::NoModifier); + auto entry = fallback->findEntry(Qt::Key_Tab, nullptr); QVERIFY(!entry.isNull()); QCOMPARE(FallbackKeyboardTranslator::Command::NoCommand, entry.command()); QCOMPARE(int(Qt::Key_Tab), entry.keyCode()); @@ -118,7 +118,7 @@ QCOMPARE(QStringLiteral("Tab"), entry.conditionToString()); QCOMPARE(QStringLiteral("\\t"), entry.resultToString()); QVERIFY(entry.matches(Qt::Key_Tab, Qt::NoModifier, KeyboardTranslator::NoState)); - QVERIFY(entry == fallback->findEntry(Qt::Key_Tab, Qt::NoModifier)); + QVERIFY(entry == fallback->findEntry(Qt::Key_Tab, nullptr)); delete fallback; } @@ -146,7 +146,7 @@ QCOMPARE(QStringLiteral("testtranslator"), translator->name()); QCOMPARE(QString(), translator->description()); - auto entry = translator->findEntry(Qt::Key_Backspace, Qt::NoModifier); + auto entry = translator->findEntry(Qt::Key_Backspace, nullptr); QVERIFY(!entry.isNull()); QCOMPARE(FallbackKeyboardTranslator::Command::NoCommand, entry.command()); QCOMPARE(int(Qt::Key_Backspace), entry.keyCode()); @@ -158,9 +158,9 @@ QCOMPARE(QStringLiteral("Backspace"), entry.conditionToString()); QCOMPARE(QStringLiteral("\\x7f"), entry.resultToString()); QVERIFY(entry.matches(Qt::Key_Backspace, Qt::NoModifier, KeyboardTranslator::NoState)); - QVERIFY(entry == translator->findEntry(Qt::Key_Backspace, Qt::NoModifier)); + QVERIFY(entry == translator->findEntry(Qt::Key_Backspace, nullptr)); - entry = translator->findEntry(Qt::Key_Delete, Qt::NoModifier); + entry = translator->findEntry(Qt::Key_Delete, nullptr); QVERIFY(!entry.isNull()); QCOMPARE(FallbackKeyboardTranslator::Command::NoCommand, entry.command()); QCOMPARE(int(Qt::Key_Delete), entry.keyCode()); @@ -173,9 +173,9 @@ QCOMPARE(QStringLiteral("\\b"), entry.resultToString()); QVERIFY(entry.matches(Qt::Key_Delete, Qt::NoModifier, KeyboardTranslator::NoState)); QVERIFY(!entry.matches(Qt::Key_Backspace, Qt::NoModifier, KeyboardTranslator::NoState)); - QVERIFY(!(entry == translator->findEntry(Qt::Key_Backspace, Qt::NoModifier))); + QVERIFY(!(entry == translator->findEntry(Qt::Key_Backspace, nullptr))); - entry = translator->findEntry(Qt::Key_Space, Qt::NoModifier); + entry = translator->findEntry(Qt::Key_Space, nullptr); QVERIFY(!entry.isNull()); QCOMPARE(FallbackKeyboardTranslator::Command::NoCommand, entry.command()); QCOMPARE(int(Qt::Key_Space), entry.keyCode()); @@ -188,9 +188,9 @@ QCOMPARE(QStringLiteral("Space"), entry.conditionToString()); QCOMPARE(QStringLiteral("\\x00"), entry.resultToString()); QVERIFY(entry.matches(Qt::Key_Space, Qt::NoModifier, KeyboardTranslator::NoState)); - QVERIFY(entry == translator->findEntry(Qt::Key_Space, Qt::NoModifier)); + QVERIFY(entry == translator->findEntry(Qt::Key_Space, nullptr)); QVERIFY(!entry.matches(Qt::Key_Backspace, Qt::NoModifier, KeyboardTranslator::NoState)); - QVERIFY(!(entry == translator->findEntry(Qt::Key_Backspace, Qt::NoModifier))); + QVERIFY(!(entry == translator->findEntry(Qt::Key_Backspace, nullptr))); delete translator; } diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/autotests/PartTest.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/autotests/PartTest.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/autotests/PartTest.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/autotests/PartTest.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -51,7 +51,7 @@ auto buildPath = libraryPaths.last(); QCoreApplication::removeLibraryPath(buildPath); // konsolepart.so is in ../autotests/ - if (buildPath.endsWith(QStringLiteral("/autotests"))) { + if (buildPath.endsWith(QLatin1String("/autotests"))) { buildPath.chop(10); } QCoreApplication::addLibraryPath(buildPath); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/autotests/ShellCommandTest.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/autotests/ShellCommandTest.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/autotests/ShellCommandTest.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/autotests/ShellCommandTest.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -54,7 +54,7 @@ ShellCommand shellCommand(command, arguments); QCOMPARE(shellCommand.command(), command); QCOMPARE(shellCommand.arguments(), arguments); - QCOMPARE(shellCommand.fullCommand(), arguments.join(QLatin1String(" "))); + QCOMPARE(shellCommand.fullCommand(), arguments.join(QLatin1Char(' '))); } void ShellCommandTest::testExpandEnvironmentVariable() diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/autotests/TerminalInterfaceTest.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/autotests/TerminalInterfaceTest.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/autotests/TerminalInterfaceTest.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/autotests/TerminalInterfaceTest.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -57,7 +57,7 @@ auto buildPath = libraryPaths.last(); QCoreApplication::removeLibraryPath(buildPath); // konsolepart.so is in ../autotests/ - if (buildPath.endsWith(QStringLiteral("/autotests"))) { + if (buildPath.endsWith(QLatin1String("/autotests"))) { buildPath.chop(10); } QCoreApplication::addLibraryPath(buildPath); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/BookmarkHandler.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/BookmarkHandler.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/BookmarkHandler.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/BookmarkHandler.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -144,24 +144,6 @@ return {}; } -QList BookmarkHandler::currentBookmarkList() const -{ - QList list; - list.reserve(_views.size()); - - const QList views = _views; - for (ViewProperties* view : views) { - list << KBookmarkOwner::FutureBookmark(titleForView(view), urlForView(view), iconForView(view)); - } - - return list; -} - -bool BookmarkHandler::supportsTabs() const -{ - return true; -} - void BookmarkHandler::setViews(const QList &views) { _views = views; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/BookmarkHandler.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/BookmarkHandler.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/BookmarkHandler.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/BookmarkHandler.h 2019-12-03 20:47:14.000000000 +0000 @@ -62,15 +62,13 @@ * @param parent The parent object */ BookmarkHandler(KActionCollection *collection, QMenu *menu, bool toplevel, QObject *parent); - ~BookmarkHandler() override; + ~BookmarkHandler() Q_DECL_OVERRIDE; - QUrl currentUrl() const override; - QString currentTitle() const override; - QString currentIcon() const override; - bool enableOption(BookmarkOption option) const override; - bool supportsTabs() const override; - QList currentBookmarkList() const override; - void openFolderinTabs(const KBookmarkGroup &group) override; + QUrl currentUrl() const Q_DECL_OVERRIDE; + QString currentTitle() const Q_DECL_OVERRIDE; + QString currentIcon() const Q_DECL_OVERRIDE; + bool enableOption(BookmarkOption option) const Q_DECL_OVERRIDE; + void openFolderinTabs(const KBookmarkGroup &group) Q_DECL_OVERRIDE; /** * Returns the menu which this bookmark handler inserts its actions into. @@ -109,7 +107,7 @@ void openUrls(const QList &urls); private Q_SLOTS: - void openBookmark(const KBookmark &bm, Qt::MouseButtons, Qt::KeyboardModifiers) override; + void openBookmark(const KBookmark &bm, Qt::MouseButtons, Qt::KeyboardModifiers) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(BookmarkHandler) diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/CharacterColor.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/CharacterColor.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/CharacterColor.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/CharacterColor.h 2019-12-03 20:47:14.000000000 +0000 @@ -159,7 +159,7 @@ } } - quint8 colorSpace() const { return _colorSpace; } + quint8 colorSpace() { return _colorSpace; } void termColor(int *u, int *v, int *w) { *u = _u; *v = _v; *w = _w; } /** diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/CMakeLists.txt konsole-19.08.3+git201912032047~ubuntu18.04.2/src/CMakeLists.txt --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/CMakeLists.txt 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/CMakeLists.txt 2019-12-03 20:47:14.000000000 +0000 @@ -202,9 +202,9 @@ MACOSX_BUNDLE_BUNDLE_NAME "Konsole" MACOSX_BUNDLE_DISPLAY_NAME "Konsole" MACOSX_BUNDLE_INFO_STRING "Konsole, the KDE terminal emulator" - MACOSX_BUNDLE_LONG_VERSION_STRING "Konsole ${RELEASE_SERVICE_VERSION}" - MACOSX_BUNDLE_SHORT_VERSION_STRING "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}" - MACOSX_BUNDLE_BUNDLE_VERSION "${RELEASE_SERVICE_VERSION}" + MACOSX_BUNDLE_LONG_VERSION_STRING "Konsole ${KDE_APPLICATIONS_VERSION}" + MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}" + MACOSX_BUNDLE_BUNDLE_VERSION "${KDE_APPLICATIONS_VERSION}" MACOSX_BUNDLE_COPYRIGHT "1997-2016 The Konsole Developers") endif() diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ColorScheme.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ColorScheme.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ColorScheme.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ColorScheme.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -310,13 +310,12 @@ const double maxLightness = qMin(baseLightness + range.lightness / 2.0, MaxLightness); // Use triangular distribution with peak at L=50.0. // Dark and very light colors are less distinguishable. + const auto lightnessIntervals = (minLightness < 50.0 && 50.0 < maxLightness) + ? std::initializer_list{minLightness, 50.0, maxLightness} + : std::initializer_list{minLightness, maxLightness}; static const auto lightnessWeightsFunc = [](double v) { return 50.0 - qAbs(v - 50.0); }; - std::piecewise_linear_distribution<> lightnessDistribution; - if (minLightness < 50.0 && 50.0 < maxLightness) { - lightnessDistribution = std::piecewise_linear_distribution<>({minLightness, 50.0, maxLightness}, lightnessWeightsFunc); - } else { - lightnessDistribution = std::piecewise_linear_distribution<>({minLightness, maxLightness}, lightnessWeightsFunc); - } + std::piecewise_linear_distribution<> lightnessDistribution(lightnessIntervals, + lightnessWeightsFunc); const double lightness = qFuzzyCompare(minLightness, maxLightness) ? baseLightness : lightnessDistribution(randomEngine); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ColorSchemeEditor.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ColorSchemeEditor.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ColorSchemeEditor.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ColorSchemeEditor.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -203,7 +203,7 @@ for (const QByteArray &mime : mimeTypes) { fileFormats += QStringLiteral("*.%1 ").arg(QLatin1String(mime)); } - fileFormats += QLatin1String(")"); + fileFormats += QLatin1Char(')'); const QString fileName = QFileDialog::getOpenFileName(this, i18nc("@title:window", diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ColorSchemeEditor.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ColorSchemeEditor.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ColorSchemeEditor.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ColorSchemeEditor.h 2019-12-03 20:47:14.000000000 +0000 @@ -57,7 +57,7 @@ public: /** Constructs a new color scheme editor with the specified parent. */ explicit ColorSchemeEditor(QWidget *parent = nullptr); - ~ColorSchemeEditor() override; + ~ColorSchemeEditor() Q_DECL_OVERRIDE; /** Initializes the dialog with the properties of the specified color scheme. */ void setup(const ColorScheme *scheme, bool isNewScheme); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ColorSchemeManager.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ColorSchemeManager.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ColorSchemeManager.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ColorSchemeManager.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -55,11 +55,14 @@ void ColorSchemeManager::loadAllColorSchemes() { + int success = 0; int failed = 0; const QStringList nativeColorSchemes = listColorSchemes(); for (const QString &colorScheme : nativeColorSchemes) { - if (!loadColorScheme(colorScheme)) { + if (loadColorScheme(colorScheme)) { + success++; + } else { failed++; } } @@ -218,7 +221,7 @@ QString ColorSchemeManager::findColorSchemePath(const QString &name) const { - QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("konsole/") + name + QStringLiteral(".colorscheme")); + QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("konsole/") + name + QLatin1String(".colorscheme")); if (!path.isEmpty()) { return path; @@ -244,7 +247,7 @@ bool ColorSchemeManager::canResetColorScheme(const QString &name) { - const QStringList paths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("konsole/") + name + QStringLiteral(".colorscheme")); + const QStringList paths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("konsole/") + name + QLatin1String(".colorscheme")); // if the colorscheme exists in both a writable location under the // user's home dir and a system-wide location, then it's possible diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/config-konsole.h.cmake konsole-19.08.3+git201912032047~ubuntu18.04.2/src/config-konsole.h.cmake --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/config-konsole.h.cmake 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/config-konsole.h.cmake 2019-12-03 20:47:14.000000000 +0000 @@ -1,4 +1,4 @@ -#define KONSOLE_VERSION "${RELEASE_SERVICE_VERSION}" +#define KONSOLE_VERSION "${KDE_APPLICATIONS_VERSION}" /* Defined if on DragonFly BSD */ #cmakedefine HAVE_OS_DRAGONFLYBSD 1 diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/CopyInputDialog.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/CopyInputDialog.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/CopyInputDialog.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/CopyInputDialog.h 2019-12-03 20:47:14.000000000 +0000 @@ -51,7 +51,7 @@ public: explicit CopyInputDialog(QWidget *parent = nullptr); - ~CopyInputDialog() override; + ~CopyInputDialog() Q_DECL_OVERRIDE; /** * Sets the 'source' session whose input will be copied to * other sessions. This session is displayed grayed out in the list @@ -117,12 +117,12 @@ QSet checkedSessions() const; // reimplemented from QAbstractItemModel - Qt::ItemFlags flags(const QModelIndex &index) const override; - QVariant data(const QModelIndex &index, int role) const override; - bool setData(const QModelIndex &index, const QVariant &value, int role) override; + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; + bool setData(const QModelIndex &index, const QVariant &value, int role) Q_DECL_OVERRIDE; protected: - void sessionRemoved(Session *) override; + void sessionRemoved(Session *) Q_DECL_OVERRIDE; private: QSet _checkedSessions; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/EditProfileDialog.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/EditProfileDialog.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/EditProfileDialog.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/EditProfileDialog.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -507,7 +507,7 @@ QString text = QInputDialog::getMultiLineText(this, i18n("Edit Environment"), i18n("One environment variable per line"), - currentEnvironment.join(QStringLiteral("\n")), + currentEnvironment.join(QLatin1Char('\n')), &ok); QStringList newEnvironment; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/EditProfileDialog.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/EditProfileDialog.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/EditProfileDialog.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/EditProfileDialog.h 2019-12-03 20:47:14.000000000 +0000 @@ -74,7 +74,7 @@ public: /** Constructs a new dialog with the specified parent. */ explicit EditProfileDialog(QWidget *parent = nullptr); - ~EditProfileDialog() override; + ~EditProfileDialog() Q_DECL_OVERRIDE; /** * Initializes the dialog with the settings for the specified session @@ -98,14 +98,14 @@ public Q_SLOTS: // reimplemented - void accept() override; + void accept() Q_DECL_OVERRIDE; // reimplemented - void reject() override; + void reject() Q_DECL_OVERRIDE; void apply(); protected: - bool eventFilter(QObject *watched, QEvent *event) override; + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; private Q_SLOTS: QSize sizeHint() const override; @@ -359,9 +359,9 @@ // reimplemented void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const override; + const QModelIndex &index) const Q_DECL_OVERRIDE; QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const override; + const QModelIndex &index) const Q_DECL_OVERRIDE; }; /** diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Emulation.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Emulation.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Emulation.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Emulation.h 2019-12-03 20:47:14.000000000 +0000 @@ -121,7 +121,7 @@ public: /** Constructs a new terminal emulation */ Emulation(); - ~Emulation() override; + ~Emulation() Q_DECL_OVERRIDE; /** * Creates a new window onto the output from this emulation. The contents diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Filter.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Filter.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Filter.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Filter.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -487,14 +487,10 @@ if (kind == StandardUrl) { openAction->setText(i18n("Open Link")); - openAction->setIcon(QIcon::fromTheme(QStringLiteral("internet-services"))); copyAction->setText(i18n("Copy Link Address")); - copyAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy-url"))); } else if (kind == Email) { openAction->setText(i18n("Send Email To...")); - openAction->setIcon(QIcon::fromTheme(QStringLiteral("mail-send"))); copyAction->setText(i18n("Copy Email Address")); - copyAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy-mail"))); } // object names are set here so that the hotspot performs the diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Filter.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Filter.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Filter.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Filter.h 2019-12-03 20:47:14.000000000 +0000 @@ -192,7 +192,7 @@ public: HotSpot(int startLine, int startColumn, int endLine, int endColumn, const QStringList &capturedTexts); - void activate(QObject *object = nullptr) override; + void activate(QObject *object = nullptr) Q_DECL_OVERRIDE; /** Returns the texts found by the filter when matching the filter's regular expression */ QStringList capturedTexts() const; @@ -219,7 +219,7 @@ * If regexp matches the empty string, then process() will return immediately * without finding results. */ - void process() override; + void process() Q_DECL_OVERRIDE; protected: /** @@ -248,15 +248,15 @@ public: HotSpot(int startLine, int startColumn, int endLine, int endColumn, const QStringList &capturedTexts); - ~HotSpot() override; + ~HotSpot() Q_DECL_OVERRIDE; - QList actions() override; + QList actions() Q_DECL_OVERRIDE; /** * Open a web browser at the current URL. The url itself can be determined using * the capturedTexts() method. */ - void activate(QObject *object = nullptr) override; + void activate(QObject *object = nullptr) Q_DECL_OVERRIDE; private: enum UrlType { @@ -272,7 +272,7 @@ UrlFilter(); protected: - RegExpFilter::HotSpot *newHotSpot(int, int, int, int, const QStringList &) override; + RegExpFilter::HotSpot *newHotSpot(int, int, int, int, const QStringList &) Q_DECL_OVERRIDE; private: static const QRegularExpression FullUrlRegExp; @@ -297,14 +297,14 @@ public: HotSpot(int startLine, int startColumn, int endLine, int endColumn, const QStringList &capturedTexts, const QString &filePath); - ~HotSpot() override; + ~HotSpot() Q_DECL_OVERRIDE; - QList actions() override; + QList actions() Q_DECL_OVERRIDE; /** * Opens kate for editing the file. */ - void activate(QObject *object = nullptr) override; + void activate(QObject *object = nullptr) Q_DECL_OVERRIDE; private: FilterObject *_fileObject; @@ -313,10 +313,10 @@ explicit FileFilter(Session *session); - void process() override; + void process() Q_DECL_OVERRIDE; protected: - RegExpFilter::HotSpot *newHotSpot(int, int, int, int, const QStringList &) override; + RegExpFilter::HotSpot *newHotSpot(int, int, int, int, const QStringList &) Q_DECL_OVERRIDE; private: QPointer _session; @@ -390,7 +390,7 @@ { public: TerminalImageFilterChain(); - ~TerminalImageFilterChain() override; + ~TerminalImageFilterChain() Q_DECL_OVERRIDE; /** * Set the current terminal image to @p image. diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/History.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/History.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/History.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/History.h 2019-12-03 20:47:14.000000000 +0000 @@ -125,15 +125,15 @@ { public: explicit HistoryScrollFile(); - ~HistoryScrollFile() override; + ~HistoryScrollFile() Q_DECL_OVERRIDE; - int getLines() override; - int getLineLen(int lineno) override; - void getCells(int lineno, int colno, int count, Character res[]) override; - bool isWrappedLine(int lineno) override; + int getLines() Q_DECL_OVERRIDE; + int getLineLen(int lineno) Q_DECL_OVERRIDE; + void getCells(int lineno, int colno, int count, Character res[]) Q_DECL_OVERRIDE; + bool isWrappedLine(int lineno) Q_DECL_OVERRIDE; - void addCells(const Character text[], int count) override; - void addLine(bool previousWrapped = false) override; + void addCells(const Character text[], int count) Q_DECL_OVERRIDE; + void addLine(bool previousWrapped = false) Q_DECL_OVERRIDE; private: qint64 startOfLine(int lineno); @@ -150,17 +150,17 @@ { public: HistoryScrollNone(); - ~HistoryScrollNone() override; + ~HistoryScrollNone() Q_DECL_OVERRIDE; - bool hasScroll() override; + bool hasScroll() Q_DECL_OVERRIDE; - int getLines() override; - int getLineLen(int lineno) override; - void getCells(int lineno, int colno, int count, Character res[]) override; - bool isWrappedLine(int lineno) override; + int getLines() Q_DECL_OVERRIDE; + int getLineLen(int lineno) Q_DECL_OVERRIDE; + void getCells(int lineno, int colno, int count, Character res[]) Q_DECL_OVERRIDE; + bool isWrappedLine(int lineno) Q_DECL_OVERRIDE; - void addCells(const Character a[], int count) override; - void addLine(bool previousWrapped = false) override; + void addCells(const Character a[], int count) Q_DECL_OVERRIDE; + void addLine(bool previousWrapped = false) Q_DECL_OVERRIDE; }; ////////////////////////////////////////////////////////////////////// @@ -315,16 +315,16 @@ public: explicit CompactHistoryScroll(unsigned int maxLineCount = 1000); - ~CompactHistoryScroll() override; + ~CompactHistoryScroll() Q_DECL_OVERRIDE; - int getLines() override; - int getLineLen(int lineNumber) override; - void getCells(int lineNumber, int startColumn, int count, Character buffer[]) override; - bool isWrappedLine(int lineNumber) override; - - void addCells(const Character a[], int count) override; - void addCellsVector(const TextLine &cells) override; - void addLine(bool previousWrapped = false) override; + int getLines() Q_DECL_OVERRIDE; + int getLineLen(int lineNumber) Q_DECL_OVERRIDE; + void getCells(int lineNumber, int startColumn, int count, Character buffer[]) Q_DECL_OVERRIDE; + bool isWrappedLine(int lineNumber) Q_DECL_OVERRIDE; + + void addCells(const Character a[], int count) Q_DECL_OVERRIDE; + void addCellsVector(const TextLine &cells) Q_DECL_OVERRIDE; + void addLine(bool previousWrapped = false) Q_DECL_OVERRIDE; void setMaxNbLines(unsigned int lineCount); @@ -375,10 +375,10 @@ public: HistoryTypeNone(); - bool isEnabled() const override; - int maximumLineCount() const override; + bool isEnabled() const Q_DECL_OVERRIDE; + int maximumLineCount() const Q_DECL_OVERRIDE; - HistoryScroll *scroll(HistoryScroll *) const override; + HistoryScroll *scroll(HistoryScroll *) const Q_DECL_OVERRIDE; }; class KONSOLEPRIVATE_EXPORT HistoryTypeFile : public HistoryType @@ -386,10 +386,10 @@ public: explicit HistoryTypeFile(); - bool isEnabled() const override; - int maximumLineCount() const override; + bool isEnabled() const Q_DECL_OVERRIDE; + int maximumLineCount() const Q_DECL_OVERRIDE; - HistoryScroll *scroll(HistoryScroll *) const override; + HistoryScroll *scroll(HistoryScroll *) const Q_DECL_OVERRIDE; }; class KONSOLEPRIVATE_EXPORT CompactHistoryType : public HistoryType @@ -397,10 +397,10 @@ public: explicit CompactHistoryType(unsigned int nbLines); - bool isEnabled() const override; - int maximumLineCount() const override; + bool isEnabled() const Q_DECL_OVERRIDE; + int maximumLineCount() const Q_DECL_OVERRIDE; - HistoryScroll *scroll(HistoryScroll *) const override; + HistoryScroll *scroll(HistoryScroll *) const Q_DECL_OVERRIDE; protected: unsigned int _maxLines; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/HistorySizeDialog.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/HistorySizeDialog.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/HistorySizeDialog.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/HistorySizeDialog.h 2019-12-03 20:47:14.000000000 +0000 @@ -38,7 +38,7 @@ public: explicit HistorySizeDialog(QWidget *parent = nullptr); - ~HistorySizeDialog() override; + ~HistorySizeDialog() Q_DECL_OVERRIDE; /** See HistorySizeWidget::setMode. */ void setMode(Enum::HistoryModeEnum aMode); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/HistorySizeWidget.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/HistorySizeWidget.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/HistorySizeWidget.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/HistorySizeWidget.h 2019-12-03 20:47:14.000000000 +0000 @@ -43,7 +43,7 @@ public: explicit HistorySizeWidget(QWidget *parent); - ~HistorySizeWidget() override; + ~HistorySizeWidget() Q_DECL_OVERRIDE; /** Specifies the history mode. */ void setMode(Enum::HistoryModeEnum aMode); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/IncrementalSearchBar.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/IncrementalSearchBar.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/IncrementalSearchBar.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/IncrementalSearchBar.h 2019-12-03 20:47:14.000000000 +0000 @@ -101,7 +101,7 @@ void setOptions(); // reimplemented - void setVisible(bool visible) override; + void setVisible(bool visible) Q_DECL_OVERRIDE; Q_SIGNALS: /** Emitted when the text entered in the search box is altered */ void searchChanged(const QString &text); @@ -136,8 +136,8 @@ void unhandledMovementKeyPressed(QKeyEvent *event); protected: - bool eventFilter(QObject *watched, QEvent *event) override; - void keyPressEvent(QKeyEvent *event) override; + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; public Q_SLOTS: void clearLineEdit(); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/KeyBindingEditor.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/KeyBindingEditor.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/KeyBindingEditor.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/KeyBindingEditor.h 2019-12-03 20:47:14.000000000 +0000 @@ -55,7 +55,7 @@ public: /** Constructs a new key bindings editor with the specified parent. */ explicit KeyBindingEditor(QWidget *parent = nullptr); - ~KeyBindingEditor() override; + ~KeyBindingEditor() Q_DECL_OVERRIDE; /** * Initializes the dialog with the bindings and other settings @@ -86,7 +86,7 @@ QString description() const; // reimplemented to handle test area input - bool eventFilter(QObject *watched, QEvent *event) override; + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; Q_SIGNALS: /** @@ -111,7 +111,7 @@ private Q_SLOTS: // reimplemented - void accept() override; + void accept() Q_DECL_OVERRIDE; void setTranslatorDescription(const QString &description); void bindingTableItemChanged(QTableWidgetItem *item); @@ -142,7 +142,7 @@ // Sets the size hint of the dialog to be slightly smaller than the // size of EditProfileDialog - QSize sizeHint() const override; + QSize sizeHint() const Q_DECL_OVERRIDE; }; } diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/KeyboardTranslatorManager.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/KeyboardTranslatorManager.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/KeyboardTranslatorManager.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/KeyboardTranslatorManager.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -85,7 +85,7 @@ bool KeyboardTranslatorManager::isTranslatorResettable(const QString &name) const { - const QStringList &paths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("konsole/") + name + QStringLiteral(".keytab")); + const QStringList &paths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("konsole/") + name + QLatin1String(".keytab")); return (paths.count() > 1); } diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/main.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/main.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/main.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/main.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -281,13 +281,13 @@ // if users have explictly requested starting a new process // Support --nofork to retain argument compatibility with older // versions. - if (arguments.contains(QStringLiteral("--separate")) - || arguments.contains(QStringLiteral("--nofork"))) { + if (arguments.contains(QLatin1String("--separate")) + || arguments.contains(QLatin1String("--nofork"))) { return true; } // the only way to create new tab is to reuse existing Konsole process. - if (arguments.contains(QStringLiteral("--new-tab"))) { + if (arguments.contains(QLatin1String("--new-tab"))) { return false; } diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/MainWindow.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/MainWindow.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/MainWindow.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/MainWindow.h 2019-12-03 20:47:14.000000000 +0000 @@ -126,18 +126,18 @@ protected: // Reimplemented for internal reasons. - void showEvent(QShowEvent *event) override; - bool eventFilter(QObject *obj, QEvent *event) override; + void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE; // reimplemented from KMainWindow - bool queryClose() override; - void saveProperties(KConfigGroup &group) override; - void readProperties(const KConfigGroup &group) override; - void saveGlobalProperties(KConfig *config) override; - void readGlobalProperties(KConfig *config) override; + bool queryClose() Q_DECL_OVERRIDE; + void saveProperties(KConfigGroup &group) Q_DECL_OVERRIDE; + void readProperties(const KConfigGroup &group) Q_DECL_OVERRIDE; + void saveGlobalProperties(KConfig *config) Q_DECL_OVERRIDE; + void readGlobalProperties(KConfig *config) Q_DECL_OVERRIDE; // reimplemented from QWidget - bool focusNextPrevChild(bool next) override; + bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; private Q_SLOTS: void newTab(); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Part.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Part.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Part.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Part.h 2019-12-03 20:47:14.000000000 +0000 @@ -58,7 +58,7 @@ public: /** Constructs a new Konsole part with the specified parent. */ explicit Part(QWidget *parentWidget, QObject *parent, const QVariantList &); - ~Part() override; + ~Part() Q_DECL_OVERRIDE; /** Reimplemented from TerminalInterface. */ void startProgram(const QString &program, const QStringList &arguments) override; @@ -199,8 +199,8 @@ protected: /** Reimplemented from KParts::PartBase. */ - bool openFile() override; - bool openUrl(const QUrl &url) override; + bool openFile() Q_DECL_OVERRIDE; + bool openUrl(const QUrl &url) Q_DECL_OVERRIDE; private Q_SLOTS: void activeViewChanged(SessionController *controller); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/PrintOptions.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/PrintOptions.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/PrintOptions.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/PrintOptions.h 2019-12-03 20:47:14.000000000 +0000 @@ -30,7 +30,7 @@ public: explicit PrintOptions(QWidget *parent = nullptr); - ~PrintOptions() override; + ~PrintOptions() Q_DECL_OVERRIDE; public Q_SLOTS: void saveSettings(); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ProcessInfo.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ProcessInfo.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ProcessInfo.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ProcessInfo.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -141,7 +141,7 @@ QString ProcessInfo::formatShortDir(const QString &input) const { - if(input == QStringLiteral("/")) { + if(input == QLatin1String("/")) { return QStringLiteral("/"); } @@ -428,7 +428,7 @@ } protected: - bool readCurrentDir(int pid) override + bool readCurrentDir(int pid) Q_DECL_OVERRIDE { char path_buffer[MAXPATHLEN + 1]; path_buffer[MAXPATHLEN] = 0; @@ -447,7 +447,7 @@ } private: - bool readProcInfo(int pid) override + bool readProcInfo(int pid) Q_DECL_OVERRIDE { // indicies of various fields within the process status file which // contain various information about the process @@ -569,7 +569,7 @@ return ok; } - bool readArguments(int pid) override + bool readArguments(int pid) Q_DECL_OVERRIDE { // read command-line arguments file found at /proc//cmdline // the expected format is a list of strings delimited by null characters, @@ -605,7 +605,7 @@ } protected: - bool readCurrentDir(int pid) override + bool readCurrentDir(int pid) Q_DECL_OVERRIDE { #if defined(HAVE_OS_DRAGONFLYBSD) char buf[PATH_MAX]; @@ -650,7 +650,7 @@ } private: - bool readProcInfo(int pid) override + bool readProcInfo(int pid) Q_DECL_OVERRIDE { int managementInfoBase[4]; size_t mibLength; @@ -692,7 +692,7 @@ return true; } - bool readArguments(int pid) override + bool readArguments(int pid) Q_DECL_OVERRIDE { char args[ARG_MAX]; int managementInfoBase[4]; @@ -730,7 +730,7 @@ } protected: - bool readCurrentDir(int pid) override + bool readCurrentDir(int pid) Q_DECL_OVERRIDE { char buf[PATH_MAX]; int managementInfoBase[3]; @@ -751,7 +751,7 @@ } private: - bool readProcInfo(int pid) override + bool readProcInfo(int pid) Q_DECL_OVERRIDE { int managementInfoBase[6]; size_t mibLength; @@ -821,7 +821,7 @@ return (char **)buf; } - bool readArguments(int pid) override + bool readArguments(int pid) Q_DECL_OVERRIDE { char **argv; @@ -848,7 +848,7 @@ } protected: - bool readCurrentDir(int pid) override + bool readCurrentDir(int pid) Q_DECL_OVERRIDE { struct proc_vnodepathinfo vpi; const int nb = proc_pidinfo(pid, PROC_PIDVNODEPATHINFO, 0, &vpi, sizeof(vpi)); @@ -860,7 +860,7 @@ } private: - bool readProcInfo(int pid) override + bool readProcInfo(int pid) Q_DECL_OVERRIDE { int managementInfoBase[4]; size_t mibLength; @@ -921,7 +921,7 @@ return true; } - bool readArguments(int pid) override + bool readArguments(int pid) Q_DECL_OVERRIDE { Q_UNUSED(pid); return false; @@ -951,7 +951,7 @@ protected: // FIXME: This will have the same issues as BKO 251351; the Linux // version uses readlink. - bool readCurrentDir(int pid) override + bool readCurrentDir(int pid) Q_DECL_OVERRIDE { QFileInfo info(QString("/proc/%1/path/cwd").arg(pid)); const bool readable = info.isReadable(); @@ -971,7 +971,7 @@ } private: - bool readProcInfo(int pid) override + bool readProcInfo(int pid) Q_DECL_OVERRIDE { QFile psinfo(QString("/proc/%1/psinfo").arg(pid)); if (psinfo.open(QIODevice::ReadOnly)) { @@ -992,7 +992,7 @@ return true; } - bool readArguments(int /*pid*/) override + bool readArguments(int /*pid*/) Q_DECL_OVERRIDE { // Handled in readProcInfo() return false; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ProcessInfo.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ProcessInfo.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ProcessInfo.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ProcessInfo.h 2019-12-03 20:47:14.000000000 +0000 @@ -304,9 +304,9 @@ */ explicit NullProcessInfo(int pid); protected: - void readProcessInfo(int pid) override; - bool readCurrentDir(int pid) override; - void readUserName(void) override; + void readProcessInfo(int pid) Q_DECL_OVERRIDE; + bool readCurrentDir(int pid) Q_DECL_OVERRIDE; + void readUserName(void) Q_DECL_OVERRIDE; }; #if !defined(Q_OS_WIN) @@ -328,9 +328,9 @@ * Implementation of ProcessInfo::readProcessInfo(); calls the * four private methods below in turn. */ - void readProcessInfo(int pid) override; + void readProcessInfo(int pid) Q_DECL_OVERRIDE; - void readUserName(void) override; + void readUserName(void) Q_DECL_OVERRIDE; private: /** diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Profile.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Profile.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Profile.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Profile.h 2019-12-03 20:47:14.000000000 +0000 @@ -751,7 +751,7 @@ /** Sets the value of @p property in each of the group's profiles to * @p value. */ - void setProperty(Property p, const QVariant &value) override; + void setProperty(Property p, const QVariant &value) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(ProfileGroup) diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ProfileManager.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ProfileManager.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ProfileManager.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ProfileManager.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -100,7 +100,7 @@ _defaultProfile = _fallbackProfile; if (!defaultProfileFileName.isEmpty()) { // load the default profile - const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("konsole/") + defaultProfileFileName); + const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("konsole/") + defaultProfileFileName); if (!path.isEmpty()) { Profile::Ptr profile = loadProfile(path); @@ -146,7 +146,7 @@ if (fileInfo.suffix() != QLatin1String("profile")) { path.append(QLatin1String(".profile")); } - if (fileInfo.path().isEmpty() || fileInfo.path() == QLatin1String(".")) { + if (fileInfo.path().isEmpty() || fileInfo.path() == QLatin1Char('.')) { path.prepend(QLatin1String("konsole") + QDir::separator()); } @@ -380,7 +380,7 @@ QString newName; QString newTranslatedName; do { - newName = QStringLiteral("Profile ") + QString::number(nameSuffix); + newName = QLatin1String("Profile ") + QString::number(nameSuffix); newTranslatedName = i18nc("The default name of a profile", "Profile #%1", nameSuffix); // TODO: remove the # above and below - too many issues newTranslatedName.remove(QLatin1Char('#')); @@ -564,7 +564,7 @@ // if the file is not an absolute path, look it up QFileInfo fileInfo(profilePath); if (!fileInfo.isAbsolute()) { - profilePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("konsole/") + profilePath); + profilePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("konsole/") + profilePath); } data.profilePath = profilePath; @@ -663,6 +663,28 @@ _loadedFavorites = true; } +QList ProfileManager::shortcuts() +{ + return _shortcuts.keys(); +} + +Profile::Ptr ProfileManager::findByShortcut(const QKeySequence& shortcut) +{ + Q_ASSERT(_shortcuts.contains(shortcut)); + + if (!_shortcuts[shortcut].profileKey) { + Profile::Ptr key = loadProfile(_shortcuts[shortcut].profilePath); + if (!key) { + _shortcuts.remove(shortcut); + return Profile::Ptr(); + } + _shortcuts[shortcut].profileKey = key; + } + + return _shortcuts[shortcut].profileKey; +} + + QKeySequence ProfileManager::shortcut(Profile::Ptr profile) const { QMapIterator iter(_shortcuts); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ProfileManager.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ProfileManager.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ProfileManager.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ProfileManager.h 2019-12-03 20:47:14.000000000 +0000 @@ -58,7 +58,7 @@ /** * Destroys the ProfileManager. */ - ~ProfileManager() override; + ~ProfileManager() Q_DECL_OVERRIDE; /** * Returns the profile manager instance. @@ -194,6 +194,23 @@ /** Returns the shortcut associated with a particular profile. */ QKeySequence shortcut(Profile::Ptr profile) const; + /** + * Returns the list of shortcut key sequences which + * can be used to create new sessions based on + * existing profiles + * + * When one of the shortcuts is activated, + * use findByShortcut() to load the profile associated + * with the shortcut. + */ + QList shortcuts(); + + /** + * Finds and loads the profile associated with + * the specified @p shortcut key sequence and returns a pointer to it. + */ + Profile::Ptr findByShortcut(const QKeySequence &shortcut); + Q_SIGNALS: /** Emitted when a profile is added to the manager. */ diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Pty.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Pty.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Pty.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Pty.h 2019-12-03 20:47:14.000000000 +0000 @@ -70,7 +70,7 @@ */ explicit Pty(int ptyMasterFd, QObject *parent = nullptr); - ~Pty() override; + ~Pty() Q_DECL_OVERRIDE; /** * Starts the terminal process. @@ -167,7 +167,7 @@ void receivedData(const char *buffer, int length); protected: - void setupChildProcess() override; + void setupChildProcess() Q_DECL_OVERRIDE; private Q_SLOTS: // called when data is received from the terminal process diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/RenameTabDialog.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/RenameTabDialog.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/RenameTabDialog.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/RenameTabDialog.h 2019-12-03 20:47:14.000000000 +0000 @@ -34,7 +34,7 @@ public: explicit RenameTabDialog(QWidget *parent = nullptr); - ~RenameTabDialog() override; + ~RenameTabDialog() Q_DECL_OVERRIDE; QString tabTitleText() const; QString remoteTabTitleText() const; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/RenameTabWidget.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/RenameTabWidget.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/RenameTabWidget.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/RenameTabWidget.h 2019-12-03 20:47:14.000000000 +0000 @@ -34,7 +34,7 @@ public: explicit RenameTabWidget(QWidget *parent = nullptr); - ~RenameTabWidget() override; + ~RenameTabWidget() Q_DECL_OVERRIDE; QString tabTitleText() const; QString remoteTabTitleText() const; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/SaveHistoryTask.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/SaveHistoryTask.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/SaveHistoryTask.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/SaveHistoryTask.h 2019-12-03 20:47:14.000000000 +0000 @@ -40,7 +40,7 @@ public: /** Constructs a new task to save session output to URLs */ explicit SaveHistoryTask(QObject *parent = nullptr); - ~SaveHistoryTask() override; + ~SaveHistoryTask() Q_DECL_OVERRIDE; /** * Opens a save file dialog for each session in the group and begins saving @@ -48,7 +48,7 @@ * * The data transfer is performed asynchronously and will continue after execute() returns. */ - void execute() override; + void execute() Q_DECL_OVERRIDE; private Q_SLOTS: void jobDataRequested(KIO::Job *job, QByteArray &data); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Screen.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Screen.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Screen.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Screen.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -1227,6 +1227,15 @@ return _selTopLeft >= 0 && _selBottomRight >= 0; } +void Screen::writeSelectionToStream(TerminalCharacterDecoder* decoder , + const DecodingOptions options) const +{ + if (!isSelectionValid()) { + return; + } + writeToStream(decoder, _selTopLeft, _selBottomRight, options); +} + void Screen::writeToStream(TerminalCharacterDecoder* decoder, int startIndex, int endIndex, const DecodingOptions options) const diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Screen.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Screen.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Screen.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Screen.h 2019-12-03 20:47:14.000000000 +0000 @@ -484,6 +484,17 @@ void writeLinesToStream(TerminalCharacterDecoder *decoder, int fromLine, int toLine) const; /** + * Copies the selected characters, set using @see setSelBeginXY and @see setSelExtentXY + * into a stream. + * + * @param decoder A decoder which converts terminal characters into text. + * PlainTextDecoder is the most commonly used decoder which converts characters + * into plain text with no formatting. + * @param options See Screen::DecodingOptions + */ + void writeSelectionToStream(TerminalCharacterDecoder *decoder, const DecodingOptions options) const; + + /** * Checks if the text between from and to is inside the current * selection. If this is the case, the selection is cleared. The * from and to are coordinates in the current viewable window. diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ScreenWindow.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ScreenWindow.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ScreenWindow.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ScreenWindow.h 2019-12-03 20:47:14.000000000 +0000 @@ -63,7 +63,7 @@ * between all views on a session. */ explicit ScreenWindow(Screen *screen, QObject *parent = nullptr); - ~ScreenWindow() override; + ~ScreenWindow() Q_DECL_OVERRIDE; /** Sets the screen which this window looks onto */ void setScreen(Screen *screen); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/SearchHistoryTask.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/SearchHistoryTask.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/SearchHistoryTask.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/SearchHistoryTask.h 2019-12-03 20:47:14.000000000 +0000 @@ -84,7 +84,7 @@ * * To continue the search looking for further matches, call execute() again. */ - void execute() override; + void execute() Q_DECL_OVERRIDE; private: using ScreenWindowPtr = QPointer; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/SessionController.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/SessionController.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/SessionController.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/SessionController.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -1558,7 +1558,7 @@ { // If the default profile icon is being used, don't put it on the tab // Only show the icon if the user specifically chose one - if (_session->iconName() == QStringLiteral("utilities-terminal")) { + if (_session->iconName() == QLatin1String("utilities-terminal")) { _sessionIconName = QString(); } else { _sessionIconName = _session->iconName(); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/SessionController.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/SessionController.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/SessionController.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/SessionController.h 2019-12-03 20:47:14.000000000 +0000 @@ -92,7 +92,7 @@ * Constructs a new SessionController which operates on @p session and @p view. */ SessionController(Session *session, TerminalDisplay *view, QObject *parent); - ~SessionController() override; + ~SessionController() Q_DECL_OVERRIDE; /** Returns the session associated with this controller */ QPointer session() @@ -135,14 +135,14 @@ EditProfileDialog *profileDialogPointer(); // reimplemented - QUrl url() const override; - QString currentDir() const override; - void rename() override; - bool confirmClose() const override; + QUrl url() const Q_DECL_OVERRIDE; + QString currentDir() const Q_DECL_OVERRIDE; + void rename() Q_DECL_OVERRIDE; + bool confirmClose() const Q_DECL_OVERRIDE; virtual bool confirmForceClose() const; // Reimplemented to watch for events happening to the view - bool eventFilter(QObject *watched, QEvent *event) override; + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; /** Returns the set of all controllers that exist. */ static QSet allControllers() diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Session.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Session.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Session.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Session.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -495,7 +495,7 @@ int result = _shellProcess->start(exec, arguments, _environment); if (result < 0) { - terminalWarning(i18n("Could not start program '%1' with arguments '%2'.", exec, arguments.join(QLatin1String(" ")))); + terminalWarning(i18n("Could not start program '%1' with arguments '%2'.", exec, arguments.join(QLatin1Char(' ')))); terminalWarning(_shellProcess->errorString()); return; } @@ -1717,10 +1717,18 @@ } SessionGroup::~SessionGroup() = default; +int SessionGroup::masterMode() const +{ + return _masterMode; +} QList SessionGroup::sessions() const { return _sessions.keys(); } +bool SessionGroup::masterStatus(Session* session) const +{ + return _sessions[session]; +} void SessionGroup::addSession(Session* session) { @@ -1743,7 +1751,10 @@ { _masterMode = mode; } - +QList SessionGroup::masters() const +{ + return _sessions.keys(true); +} void SessionGroup::setMasterStatus(Session* session , bool master) { const bool wasMaster = _sessions[session]; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Session.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Session.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Session.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Session.h 2019-12-03 20:47:14.000000000 +0000 @@ -85,7 +85,7 @@ * variable. */ explicit Session(QObject *parent = nullptr); - ~Session() override; + ~Session() Q_DECL_OVERRIDE; /** * Connect to an existing terminal. When a new Session() is constructed it @@ -840,7 +840,7 @@ /** Constructs an empty session group. */ explicit SessionGroup(QObject *parent); /** Destroys the session group and removes all connections between master and slave sessions. */ - ~SessionGroup() override; + ~SessionGroup() Q_DECL_OVERRIDE; /** Adds a session to the group. */ void addSession(Session *session); @@ -859,6 +859,8 @@ * @param master True to make this session a master or false otherwise */ void setMasterStatus(Session *session, bool master); + /** Returns the master status of a session. See setMasterStatus() */ + bool masterStatus(Session *session) const; /** * This enum describes the options for propagating certain activity or @@ -879,12 +881,19 @@ * @param mode A bitwise OR of MasterMode flags. */ void setMasterMode(int mode); + /** + * Returns a bitwise OR of the active MasterMode flags for this group. + * See setMasterMode() + */ + int masterMode() const; private Q_SLOTS: void sessionFinished(); void forwardData(const QByteArray &data); private: + QList masters() const; + // maps sessions to their master status QHash _sessions; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/SessionListModel.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/SessionListModel.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/SessionListModel.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/SessionListModel.h 2019-12-03 20:47:14.000000000 +0000 @@ -53,12 +53,12 @@ void setSessions(const QList &sessions); // reimplemented from QAbstractItemModel - QModelIndex index(int row, int column, const QModelIndex &parent) const override; - QVariant data(const QModelIndex &index, int role) const override; - QVariant headerData(int section, Qt::Orientation orientation, int role) const override; - int columnCount(const QModelIndex &parent) const override; - int rowCount(const QModelIndex &parent) const override; - QModelIndex parent(const QModelIndex &index) const override; + QModelIndex index(int row, int column, const QModelIndex &parent) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; protected: virtual void sessionRemoved(Session *) diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/SessionManager.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/SessionManager.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/SessionManager.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/SessionManager.h 2019-12-03 20:47:14.000000000 +0000 @@ -52,7 +52,7 @@ * Destroys the SessionManager. All running sessions should be closed * (via closeAllSessions()) before the SessionManager is destroyed. */ - ~SessionManager() override; + ~SessionManager() Q_DECL_OVERRIDE; /** * Returns the session manager instance. diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/settings/ConfigurationDialog.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/settings/ConfigurationDialog.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/settings/ConfigurationDialog.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/settings/ConfigurationDialog.h 2019-12-03 20:47:14.000000000 +0000 @@ -119,9 +119,9 @@ bool hasChanged() const { for(const QButtonGroup *group: qAsConst(_groups)) { int value = buttonToEnumValue(group->checkedButton()); - const auto *enumItem = groupToConfigItemEnum(group); + const auto enumItem = groupToConfigItemEnum(group); - if(enumItem != nullptr && !enumItem->isEqual(value)) { + if(!enumItem->isEqual(value)) { return true; } } diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/settings/GeneralSettings.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/settings/GeneralSettings.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/settings/GeneralSettings.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/settings/GeneralSettings.h 2019-12-03 20:47:14.000000000 +0000 @@ -30,7 +30,7 @@ public: explicit GeneralSettings(QWidget *aParent = nullptr); - ~GeneralSettings() override; + ~GeneralSettings() Q_DECL_OVERRIDE; public Q_SLOTS: void slotEnableAllMessages(); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/settings/PartInfo.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/settings/PartInfo.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/settings/PartInfo.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/settings/PartInfo.h 2019-12-03 20:47:14.000000000 +0000 @@ -30,7 +30,7 @@ public: explicit PartInfoSettings(QWidget *parent = nullptr); - ~PartInfoSettings() override; + ~PartInfoSettings() Q_DECL_OVERRIDE; }; } diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/settings/ProfileSettings.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/settings/ProfileSettings.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/settings/ProfileSettings.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/settings/ProfileSettings.h 2019-12-03 20:47:14.000000000 +0000 @@ -50,7 +50,7 @@ public: /** Constructs a new profile type with the specified parent. */ explicit ProfileSettings(QWidget *parent = nullptr); - ~ProfileSettings() override; + ~ProfileSettings() Q_DECL_OVERRIDE; /** * Specifies whether the shortcut editor should be show. @@ -132,7 +132,7 @@ explicit FilteredKeySequenceEdit(QWidget *parent = nullptr): QKeySequenceEdit(parent) {} protected: - void keyPressEvent(QKeyEvent *event) override; + void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; }; class ShortcutItemDelegate : public QStyledItemDelegate @@ -143,14 +143,14 @@ explicit ShortcutItemDelegate(QObject *parent = nullptr); void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const override; - QWidget *createEditor(QWidget *aParent, const QStyleOptionViewItem &option, - const QModelIndex &index) const override; + const QModelIndex &index) const Q_DECL_OVERRIDE; + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, + const QModelIndex &index) const Q_DECL_OVERRIDE; void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const override; + const QModelIndex &index) const Q_DECL_OVERRIDE; QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const override; - void destroyEditor(QWidget *editor, const QModelIndex &index) const override; + const QModelIndex &index) const Q_DECL_OVERRIDE; + void destroyEditor(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE; private Q_SLOTS: void editorModified(); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/settings/TabBarSettings.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/settings/TabBarSettings.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/settings/TabBarSettings.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/settings/TabBarSettings.h 2019-12-03 20:47:14.000000000 +0000 @@ -30,7 +30,7 @@ public: explicit TabBarSettings(QWidget *parent = nullptr); - ~TabBarSettings() override; + ~TabBarSettings() Q_DECL_OVERRIDE; }; } diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/TabTitleFormatButton.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/TabTitleFormatButton.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/TabTitleFormatButton.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/TabTitleFormatButton.h 2019-12-03 20:47:14.000000000 +0000 @@ -34,7 +34,7 @@ public: explicit TabTitleFormatButton(QWidget *parent); - ~TabTitleFormatButton() override; + ~TabTitleFormatButton() Q_DECL_OVERRIDE; void setContext(Session::TabTitleContext titleContext); Session::TabTitleContext context() const; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/TerminalCharacterDecoder.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/TerminalCharacterDecoder.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/TerminalCharacterDecoder.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/TerminalCharacterDecoder.h 2019-12-03 20:47:14.000000000 +0000 @@ -96,11 +96,11 @@ /** Enables recording of character positions at which new lines are added. See linePositions() */ void setRecordLinePositions(bool record); - void begin(QTextStream *output) override; - void end() override; + void begin(QTextStream *output) Q_DECL_OVERRIDE; + void end() Q_DECL_OVERRIDE; void decodeLine(const Character * const characters, int count, - LineProperty properties) override; + LineProperty properties) Q_DECL_OVERRIDE; private: QTextStream *_output; @@ -123,10 +123,10 @@ explicit HTMLDecoder(const Profile::Ptr &profile = Profile::Ptr()); void decodeLine(const Character * const characters, int count, - LineProperty properties) override; + LineProperty properties) Q_DECL_OVERRIDE; - void begin(QTextStream *output) override; - void end() override; + void begin(QTextStream *output) Q_DECL_OVERRIDE; + void end() Q_DECL_OVERRIDE; private: void openSpan(QString &text, const QString &style); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/TerminalDisplay.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/TerminalDisplay.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/TerminalDisplay.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/TerminalDisplay.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -626,6 +626,10 @@ { _cursorShape = shape; } +Enum::CursorShapeEnum TerminalDisplay::keyboardCursorShape() const +{ + return _cursorShape; +} void TerminalDisplay::setCursorStyle(Enum::CursorShapeEnum shape, bool isBlinking) { @@ -661,6 +665,10 @@ { _cursorColor = color; } +QColor TerminalDisplay::keyboardCursorColor() const +{ + return _cursorColor; +} void TerminalDisplay::setOpacity(qreal opacity) { diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/TerminalDisplay.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/TerminalDisplay.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/TerminalDisplay.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/TerminalDisplay.h 2019-12-03 20:47:14.000000000 +0000 @@ -72,9 +72,9 @@ public: /** Constructs a new terminal display widget with the specified parent. */ explicit TerminalDisplay(QWidget *parent = nullptr); - ~TerminalDisplay() override; + ~TerminalDisplay() Q_DECL_OVERRIDE; - void showDragTarget(const QPoint& cursorPos); + void showDragTarget(const QPoint& pos); void hideDragTarget(); void applyProfile(const Profile::Ptr& profile); @@ -174,6 +174,10 @@ * Defaults to BlockCursor */ void setKeyboardCursorShape(Enum::CursorShapeEnum shape); + /** + * Returns the shape of the keyboard cursor. See setKeyboardCursorShape() + */ + Enum::CursorShapeEnum keyboardCursorShape() const; /** * Sets the Cursor Style (DECSCUSR) via escape sequences @@ -203,6 +207,13 @@ void setKeyboardCursorColor(const QColor &color); /** + * Returns the color of the keyboard cursor, or an invalid color if the keyboard + * cursor color is set to change according to the foreground color of the character + * underneath it. + */ + QColor keyboardCursorColor() const; + + /** * Returns the number of lines of text which can be displayed in the widget. * * This will depend upon the height of the widget and the current font. @@ -245,7 +256,7 @@ void setSize(int columns, int lines); // reimplemented - QSize sizeHint() const override; + QSize sizeHint() const Q_DECL_OVERRIDE; /** * Sets which characters, in addition to letters and numbers, @@ -529,30 +540,30 @@ protected: // events - bool event(QEvent *event) override; - void paintEvent(QPaintEvent *pe) override; - void showEvent(QShowEvent *event) override; - void hideEvent(QHideEvent *event) override; - void resizeEvent(QResizeEvent *event) override; - void contextMenuEvent(QContextMenuEvent *event) override; - void focusInEvent(QFocusEvent *event) override; - void focusOutEvent(QFocusEvent *event) override; - void keyPressEvent(QKeyEvent *event) override; - void keyReleaseEvent(QKeyEvent *event) override; - void leaveEvent(QEvent *event) override; - void mouseDoubleClickEvent(QMouseEvent *ev) override; - void mousePressEvent(QMouseEvent *ev) override; - void mouseReleaseEvent(QMouseEvent *ev) override; - void mouseMoveEvent(QMouseEvent *ev) override; - void wheelEvent(QWheelEvent *ev) override; - bool focusNextPrevChild(bool next) override; + bool event(QEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *pe) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void leaveEvent(QEvent *event) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *ev) Q_DECL_OVERRIDE; + bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; void fontChange(const QFont &); void extendSelection(const QPoint &position); // drag and drop - void dragEnterEvent(QDragEnterEvent *event) override; - void dropEvent(QDropEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; + void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; void doDrag(); enum DragState { diNone, diPending, diDragging @@ -578,8 +589,8 @@ void selectLine(QPoint pos, bool entireLine); // reimplemented - void inputMethodEvent(QInputMethodEvent *event) override; - QVariant inputMethodQuery(Qt::InputMethodQuery query) const override; + void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; + QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; void onColorsChanged(); @@ -863,8 +874,8 @@ public: explicit AutoScrollHandler(QWidget *parent); protected: - void timerEvent(QTimerEvent *event) override; - bool eventFilter(QObject *watched, QEvent *event) override; + void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; private: QWidget *widget() const { diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/TerminalHeaderBar.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/TerminalHeaderBar.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/TerminalHeaderBar.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/TerminalHeaderBar.h 2019-12-03 20:47:14.000000000 +0000 @@ -43,7 +43,7 @@ void terminalFocusOut(); protected: - void paintEvent(QPaintEvent* paintEvent) override; + void paintEvent(QPaintEvent* ev) override; void mousePressEvent(QMouseEvent *ev) override; void mouseReleaseEvent(QMouseEvent *ev) override; void mouseMoveEvent(QMouseEvent *ev) override; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ViewContainer.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ViewContainer.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ViewContainer.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ViewContainer.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -98,7 +98,7 @@ connect(_contextPopupMenu, &QMenu::aboutToHide, this, [this]() { // Remove the read-only action when the popup closes for (auto &action : _contextPopupMenu->actions()) { - if (action->objectName() == QStringLiteral("view-readonly")) { + if (action->objectName() == QLatin1String("view-readonly")) { _contextPopupMenu->removeAction(action); break; } @@ -476,7 +476,7 @@ //TODO: add a countChanged signal so we can remove this for. // Detaching in mac causes crashes. for(auto action : _contextPopupMenu->actions()) { - if (action->objectName() == QStringLiteral("tab-detach")) { + if (action->objectName() == QLatin1String("tab-detach")) { action->setEnabled(count() > 1); } } @@ -499,7 +499,7 @@ // Disable tab rename for (auto &action : _contextPopupMenu->actions()) { - if (action->objectName() == QStringLiteral("edit-rename")) { + if (action->objectName() == QLatin1String("edit-rename")) { action->setEnabled(!sessionController->isReadOnly()); break; } diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ViewContainer.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ViewContainer.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ViewContainer.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ViewContainer.h 2019-12-03 20:47:14.000000000 +0000 @@ -68,7 +68,7 @@ * subclasses, use object->deleteLater() to delete any widgets or other objects * instead of 'delete object'. */ - ~TabbedViewContainer() override; + ~TabbedViewContainer() Q_DECL_OVERRIDE; /** Adds a new view to the container widget */ void addView(TerminalDisplay *view); @@ -141,8 +141,8 @@ */ ViewSplitter *viewSplitterAt(int index); - void connectTerminalDisplay(TerminalDisplay *display); - void disconnectTerminalDisplay(TerminalDisplay *display); + void connectTerminalDisplay(TerminalDisplay *view); + void disconnectTerminalDisplay(TerminalDisplay *view); void moveTabLeft(); void moveTabRight(); @@ -201,7 +201,7 @@ // close tabs and unregister void closeTerminalTab(int idx); - void keyReleaseEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; private Q_SLOTS: void viewDestroyed(QObject *view); void konsoleConfigChanged(); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ViewManager.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ViewManager.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ViewManager.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ViewManager.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -920,7 +920,7 @@ ViewSplitter *restoreSessionsSplitterRecurse(const QJsonObject& jsonSplitter, ViewManager *manager) { const QJsonArray splitterWidgets = jsonSplitter[QStringLiteral("Widgets")].toArray(); - auto orientation = (jsonSplitter[QStringLiteral("Orientation")].toString() == QStringLiteral("Horizontal")) + auto orientation = (jsonSplitter[QStringLiteral("Orientation")].toString() == QLatin1String("Horizontal")) ? Qt::Horizontal : Qt::Vertical; auto *currentSplitter = new ViewSplitter(); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ViewManager.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ViewManager.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ViewManager.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ViewManager.h 2019-12-03 20:47:14.000000000 +0000 @@ -72,7 +72,7 @@ * and added to the specified @p collection. */ ViewManager(QObject *parent, KActionCollection *collection); - ~ViewManager() override; + ~ViewManager() Q_DECL_OVERRIDE; /** * Creates a new view to display the output from and deliver input to @p session. diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ViewProperties.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ViewProperties.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/ViewProperties.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/ViewProperties.h 2019-12-03 20:47:14.000000000 +0000 @@ -43,7 +43,7 @@ public: explicit ViewProperties(QObject *parent); - ~ViewProperties() override; + ~ViewProperties() Q_DECL_OVERRIDE; /** Returns the icon associated with a view */ QIcon icon() const; diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Vt102Emulation.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Vt102Emulation.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Vt102Emulation.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Vt102Emulation.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -1503,8 +1503,8 @@ { KeyboardTranslator::Entry entry = _keyTranslator->findEntry( Qt::Key_Backspace, - Qt::NoModifier, - KeyboardTranslator::NoState); + nullptr, + nullptr); if (entry.text().count() > 0) { return entry.text().at(0); } else { diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Vt102Emulation.h konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Vt102Emulation.h --- konsole-19.12.0+git201912271003~ubuntu18.04.1/src/Vt102Emulation.h 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/src/Vt102Emulation.h 2019-12-03 20:47:14.000000000 +0000 @@ -69,7 +69,7 @@ * * In addition, various additional xterm escape sequences are supported to provide * features such as mouse input handling. - * See https://invisible-island.net/xterm/ctlseqs/ctlseqs.html for a description of xterm's escape + * See http://rtfm.etla.org/xterm/ctlseq.html for a description of xterm's escape * sequences. * */ @@ -80,27 +80,27 @@ public: /** Constructs a new emulation */ Vt102Emulation(); - ~Vt102Emulation() override; + ~Vt102Emulation() Q_DECL_OVERRIDE; // reimplemented from Emulation - void clearEntireScreen() override; - void reset() override; - char eraseChar() const override; + void clearEntireScreen() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + char eraseChar() const Q_DECL_OVERRIDE; public Q_SLOTS: // reimplemented from Emulation - void sendString(const QByteArray &string) override; - void sendText(const QString &text) override; - void sendKeyEvent(QKeyEvent *) override; - void sendMouseEvent(int buttons, int column, int line, int eventType) override; - void focusLost() override; - void focusGained() override; + void sendString(const QByteArray &string) Q_DECL_OVERRIDE; + void sendText(const QString &text) Q_DECL_OVERRIDE; + void sendKeyEvent(QKeyEvent *) Q_DECL_OVERRIDE; + void sendMouseEvent(int buttons, int column, int line, int eventType) Q_DECL_OVERRIDE; + void focusLost() Q_DECL_OVERRIDE; + void focusGained() Q_DECL_OVERRIDE; protected: // reimplemented from Emulation - void setMode(int mode) override; - void resetMode(int mode) override; - void receiveChar(uint cc) override; + void setMode(int mode) Q_DECL_OVERRIDE; + void resetMode(int mode) Q_DECL_OVERRIDE; + void receiveChar(uint cc) Q_DECL_OVERRIDE; private Q_SLOTS: // Causes sessionAttributeChanged() to be emitted for each (int,QString) diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/tools/uni2characterwidth/template.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/tools/uni2characterwidth/template.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/tools/uni2characterwidth/template.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/tools/uni2characterwidth/template.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -124,7 +124,7 @@ void Template::executeCommand(Element &element, const Template::Element &childStub, const QStringList &argv) { // Insert content N times - if(argv[0] == QStringLiteral("repeat")) { + if(argv[0] == QLatin1String("repeat")) { bool ok; unsigned count = argv.value(1).toInt(&ok); if(!ok || count < 1) { @@ -148,7 +148,7 @@ } // Set printf-like format (with leading %) applied for strings and numbers // inside the group - } else if(argv[0] == QStringLiteral("fmt")) { + } else if(argv[0] == QLatin1String("fmt")) { static const QRegularExpression FMT_RE(QStringLiteral(R":(^%[-0 +#]?(?:[1-9][0-9]*)?\.?[0-9]*[diouxXs]$):"), QRegularExpression::OptimizeOnFirstUsageOption); const auto match = FMT_RE.match(argv.value(1)); diff -Nru konsole-19.12.0+git201912271003~ubuntu18.04.1/tools/uni2characterwidth/uni2characterwidth.cpp konsole-19.08.3+git201912032047~ubuntu18.04.2/tools/uni2characterwidth/uni2characterwidth.cpp --- konsole-19.12.0+git201912271003~ubuntu18.04.1/tools/uni2characterwidth/uni2characterwidth.cpp 2019-12-27 10:02:53.000000000 +0000 +++ konsole-19.08.3+git201912032047~ubuntu18.04.2/tools/uni2characterwidth/uni2characterwidth.cpp 2019-12-03 20:47:14.000000000 +0000 @@ -119,7 +119,7 @@ continue; } if(!match.captured(QStringLiteral("udRangeInd")).isNull()) { - if(match.captured(QStringLiteral("udRangeInd")) == QStringLiteral("First")) { + if(match.captured(QStringLiteral("udRangeInd")) == QLatin1String("First")) { // Fetch next valid line, as it pairs with the current one to form a range QRegularExpressionMatch nlMatch; int firstLineNo = _lineNo; @@ -914,20 +914,20 @@ {EmojiOpt, EmojiProperty::EmojiPresentation}, }; - if(emojiStr == QStringLiteral("presentation")) + if(emojiStr == QLatin1String("presentation")) convertOpts[EmojiOpt] = EmojiProperty::EmojiPresentation; - else if(emojiStr == QStringLiteral("all")) + else if(emojiStr == QLatin1String("all")) convertOpts[EmojiOpt] = EmojiProperty::Emoji; else { convertOpts[EmojiOpt] = EmojiProperty::EmojiPresentation; qWarning() << QStringLiteral("invalid emoji option value: %1. Assuming \"presentation\".").arg(emojiStr); } - if(ambiguousWidthStr == QStringLiteral("separate")) + if(ambiguousWidthStr == QLatin1String("separate")) convertOpts[AmbiguousWidthOpt] = CharacterWidth::Ambiguous; - else if(ambiguousWidthStr == QStringLiteral("1")) + else if(ambiguousWidthStr == QLatin1Char('1')) convertOpts[AmbiguousWidthOpt] = 1; - else if(ambiguousWidthStr == QStringLiteral("2")) + else if(ambiguousWidthStr == QLatin1Char('2')) convertOpts[AmbiguousWidthOpt] = 2; else { convertOpts[AmbiguousWidthOpt] = CharacterWidth::Ambiguous; @@ -940,7 +940,7 @@ if(!GENERATOR_FUNCS_MAP.contains(generatorName)) { int status = 0; - if(generatorName != QStringLiteral("-")) { + if(generatorName != QLatin1String("-")) { status = 1; eout << QStringLiteral("Invalid output generator. Available generators:") << endl; }