Mercurial > octave

changeset 32013:398cba1c3971

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compatibility of libqterminal/unix with Qt6. * libgui/qterminal/libqterminal/unix/Character.h, libgui/qterminal/libqterminal/unix/Emulation.h, libgui/qterminal/libqterminal/unix/Filter.cpp, libgui/qterminal/libqterminal/unix/History.h, libgui/qterminal/libqterminal/unix/KeyboardTranslator.h, libgui/qterminal/libqterminal/unix/konsole_wcwidth.h, libgui/qterminal/libqterminal/unix/kpty_p.h, libgui/qterminal/libqterminal/unix/Screen.cpp, libgui/qterminal/libqterminal/unix/Screen.h, libgui/qterminal/libqterminal/unix/ScreenWindow.h, libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp, libgui/qterminal/libqterminal/unix/TerminalModel.cpp, libgui/qterminal/libqterminal/unix/TerminalModel.h, libgui/qterminal/libqterminal/unix/TerminalView.h, libgui/qterminal/libqterminal/unix/TerminalModel.h, libgui/qterminal/libqterminal/unix/Vt102Emulation.h: Don't use folders to include Qt headers. Sort alphabetically. Remove some unused headers. * libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp (KeyboardTranslator::Entry::unescape): Avoid QByteRef. * libgui/qterminal/libqterminal/unix/TerminalView.cpp: Fix includes. Use QLayout::setContentsMargins in place of QLayout::setMargin. * libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp: Fix includes. Avoid ambiguous assignment to QChar.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 14 Apr 2023 11:31:29 +0200
parents a00c7e103041
children e2ad5720b29e
files libgui/qterminal/libqterminal/unix/Character.h libgui/qterminal/libqterminal/unix/Emulation.h libgui/qterminal/libqterminal/unix/Filter.cpp libgui/qterminal/libqterminal/unix/History.h libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp libgui/qterminal/libqterminal/unix/KeyboardTranslator.h libgui/qterminal/libqterminal/unix/Screen.cpp libgui/qterminal/libqterminal/unix/Screen.h libgui/qterminal/libqterminal/unix/ScreenWindow.h libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp libgui/qterminal/libqterminal/unix/TerminalModel.cpp libgui/qterminal/libqterminal/unix/TerminalModel.h libgui/qterminal/libqterminal/unix/TerminalView.cpp libgui/qterminal/libqterminal/unix/TerminalView.h libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp libgui/qterminal/libqterminal/unix/Vt102Emulation.h libgui/qterminal/libqterminal/unix/konsole_wcwidth.h libgui/qterminal/libqterminal/unix/kpty_p.h
diffstat 18 files changed, 51 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/Character.h	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/Character.h	Fri Apr 14 11:31:29 2023 +0200
@@ -26,7 +26,7 @@
 #define CHARACTER_H
 
 // Qt
-#include <QtCore/QHash>
+#include <QHash>
 
 // Local
 #include "unix/CharacterColor.h"
--- a/libgui/qterminal/libqterminal/unix/Emulation.h	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/Emulation.h	Fri Apr 14 11:31:29 2023 +0200
@@ -30,10 +30,9 @@
 
 // Qt
 #include <QKeyEvent>
-
-#include <QtCore/QTextCodec>
-#include <QtCore/QTextStream>
-#include <QtCore/QTimer>
+#include <QTextCodec>
+#include <QTextStream>
+#include <QTimer>
 
 class KeyboardTranslator;
 class HistoryType;
--- a/libgui/qterminal/libqterminal/unix/Filter.cpp	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/Filter.cpp	Fri Apr 14 11:31:29 2023 +0200
@@ -24,15 +24,15 @@
 #include "unix/Filter.h"
 
 // Qt
-#include <QDesktopServices>
+#include <QtCore>
+
 #include <QAction>
 #include <QApplication>
 #include <QClipboard>
+#include <QDesktopServices>
+#include <QSharedData>
 #include <QString>
 
-#include <QSharedData>
-#include <QtCore>
-
 // Konsole
 #include "unix/TerminalCharacterDecoder.h"
 
--- a/libgui/qterminal/libqterminal/unix/History.h	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/History.h	Fri Apr 14 11:31:29 2023 +0200
@@ -24,10 +24,11 @@
 #define HISTORY_H
 
 // Qt
-#include <QtCore/QBitRef>
-#include <QtCore/QHash>
 #include <QtCore>
 
+#include <QBitRef>
+#include <QHash>
+
 // Konsole
 #include "unix/BlockArray.h"
 #include "unix/Character.h"
--- a/libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp	Fri Apr 14 11:31:29 2023 +0200
@@ -29,12 +29,13 @@
 #include <stdio.h>
 
 // Qt
+#include <QtCore>
+#include <QtGui>
+
 #include <QBuffer>
 #include <QFile>
 #include <QFileInfo>
 #include <QRegularExpression>
-#include <QtCore>
-#include <QtGui>
 
 // FIXME: We should not have a special case for Mac here.  Instead, we
 // should be loading .keytab files at run time, and ideally, allowing
@@ -675,7 +676,7 @@
     for ( int i = 0 ; i < result.count()-1 ; i++ )
     {
 
-        QByteRef ch = result[i];
+        char ch = result[i];
         if ( ch == '\\' )
         {
             char replacement[2] = {0,0};
--- a/libgui/qterminal/libqterminal/unix/KeyboardTranslator.h	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/KeyboardTranslator.h	Fri Apr 14 11:31:29 2023 +0200
@@ -25,13 +25,14 @@
 #define KEYBOARDTRANSLATOR_H
 
 // Qt
-#include <QtCore/QHash>
-#include <QtCore/QMultiHash>
-#include <QtCore/QList>
+#include <QtCore>
+
+#include <QHash>
 #include <QKeySequence>
-#include <QtCore/QMetaType>
-#include <QtCore/QVarLengthArray>
-#include <QtCore>
+#include <QList>
+#include <QMetaType>
+#include <QMultiHash>
+#include <QVarLengthArray>
 
 #if QT_VERSION >= 0x050100
 #  define K_GLOBAL_STATIC Q_GLOBAL_STATIC
--- a/libgui/qterminal/libqterminal/unix/Screen.cpp	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/Screen.cpp	Fri Apr 14 11:31:29 2023 +0200
@@ -32,8 +32,8 @@
 #include <ctype.h>
 
 // Qt
-#include <QtCore/QTextStream>
-#include <QtCore/QDate>
+#include <QDate>
+#include <QTextStream>
 
 // Konsole
 #include "unix/konsole_wcwidth.h"
--- a/libgui/qterminal/libqterminal/unix/Screen.h	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/Screen.h	Fri Apr 14 11:31:29 2023 +0200
@@ -26,9 +26,9 @@
 #define SCREEN_H
 
 // Qt
-#include <QtCore/QRect>
-#include <QtCore/QTextStream>
-#include <QtCore/QVarLengthArray>
+#include <QRect>
+#include <QTextStream>
+#include <QVarLengthArray>
 
 // Konsole
 #include "unix/Character.h"
--- a/libgui/qterminal/libqterminal/unix/ScreenWindow.h	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/ScreenWindow.h	Fri Apr 14 11:31:29 2023 +0200
@@ -23,9 +23,9 @@
 #define SCREENWINDOW_H
 
 // Qt
-#include <QtCore/QObject>
-#include <QtCore/QPoint>
-#include <QtCore/QRect>
+#include <QObject>
+#include <QPoint>
+#include <QRect>
 
 // Konsole
 #include "unix/Character.h"
--- a/libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp	Fri Apr 14 11:31:29 2023 +0200
@@ -25,7 +25,7 @@
 #include "unix/TerminalCharacterDecoder.h"
 
 // Qt
-#include <QtCore/QTextStream>
+#include <QTextStream>
 
 PlainTextDecoder::PlainTextDecoder()
  : _output(nullptr)
--- a/libgui/qterminal/libqterminal/unix/TerminalModel.cpp	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/TerminalModel.cpp	Fri Apr 14 11:31:29 2023 +0200
@@ -31,12 +31,12 @@
 #include <stdlib.h>
 
 // Qt
+#include <QtCore>
+
 #include <QApplication>
-#include <QByteRef>
 #include <QDir>
 #include <QFile>
 #include <QStringList>
-#include <QtCore>
 
 #include "unix/TerminalView.h"
 #include "unix/Vt102Emulation.h"
--- a/libgui/qterminal/libqterminal/unix/TerminalModel.h	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/TerminalModel.h	Fri Apr 14 11:31:29 2023 +0200
@@ -27,8 +27,10 @@
 #define TERMINALMODEL_H
 
 // Qt
-#include <QtCore/QStringList>
 #include <QtCore>
+
+#include <QStringList>
+#include <QTextCodec>
 #include <QWidget>
 
 #include "unix/SelfListener.h"
--- a/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Fri Apr 14 11:31:29 2023 +0200
@@ -33,23 +33,24 @@
 #include "unix/TerminalView.h"
 
 // Qt
+#include <QtCore>
+#include <QtGui>
+
 #include <QApplication>
 #include <QBoxLayout>
 #include <QClipboard>
+#include <QEvent>
+#include <QFile>
+#include <QGridLayout>
 #include <QKeyEvent>
-#include <QtCore/QEvent>
-#include <QtCore/QTime>
-#include <QtCore/QFile>
-#include <QGridLayout>
 #include <QLabel>
 #include <QLayout>
 #include <QPainter>
 #include <QPixmap>
 #include <QScrollBar>
 #include <QStyle>
+#include <QTime>
 #include <QToolTip>
-#include <QtCore>
-#include <QtGui>
 
 #include "unix/Filter.h"
 #include "unix/konsole_wcwidth.h"
@@ -331,7 +332,7 @@
   setAttribute(Qt::WA_OpaquePaintEvent);
 
   _gridLayout = new QGridLayout(this);
-  _gridLayout->setMargin(0);
+  _gridLayout->setContentsMargins (0, 0, 0, 0);
 
   setLayout( _gridLayout );
 }
--- a/libgui/qterminal/libqterminal/unix/TerminalView.h	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/TerminalView.h	Fri Apr 14 11:31:29 2023 +0200
@@ -26,7 +26,7 @@
 
 // Qt
 #include <QColor>
-#include <QtCore/QPointer>
+#include <QPointer>
 #include <QWidget>
 
 // Konsole
--- a/libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp	Fri Apr 14 11:31:29 2023 +0200
@@ -39,9 +39,8 @@
 #include <assert.h>
 
 // Qt
-#include <QtCore/QEvent>
+#include <QEvent>
 #include <QKeyEvent>
-#include <QtCore/QByteRef>
 
 // Konsole
 #include "unix/KeyboardTranslator.h"
@@ -359,7 +358,7 @@
     arg = 10*arg + (pbuf[i]-'0');
   if (pbuf[i] != ';') { ReportErrorToken(); return; }
   QChar *str = new QChar[ppos-i-2];
-  for (int j = 0; j < ppos-i-2; j++) str[j] = pbuf[i+1+j];
+  for (int j = 0; j < ppos-i-2; j++) str[j] = QChar {pbuf[i+1+j]};
   QString unistr(str,ppos-i-2);
 
   // arg == 1 doesn't change the title. In XTerm it only changes the icon name
--- a/libgui/qterminal/libqterminal/unix/Vt102Emulation.h	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/Vt102Emulation.h	Fri Apr 14 11:31:29 2023 +0200
@@ -29,9 +29,9 @@
 #include <stdio.h>
 
 // Qt
+#include <QHash>
 #include <QKeyEvent>
-#include <QtCore/QHash>
-#include <QtCore/QTimer>
+#include <QTimer>
 
 // Konsole
 #include "unix/Emulation.h"
--- a/libgui/qterminal/libqterminal/unix/konsole_wcwidth.h	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/konsole_wcwidth.h	Fri Apr 14 11:31:29 2023 +0200
@@ -11,7 +11,7 @@
 #define	_KONSOLE_WCWIDTH_H_
 
 // Qt
-#include <QtCore/QString>
+#include <QString>
 
 int konsole_wcwidth(quint16 ucs);
 
--- a/libgui/qterminal/libqterminal/unix/kpty_p.h	Thu Apr 13 20:42:42 2023 -0700
+++ b/libgui/qterminal/libqterminal/unix/kpty_p.h	Fri Apr 14 11:31:29 2023 +0200
@@ -25,7 +25,7 @@
 
 #include "unix/kpty.h"
 
-#include <QtCore/QByteArray>
+#include <QByteArray>
 
 struct KPtyPrivate {
     Q_DECLARE_PUBLIC(KPty)