Mercurial > hg > octave-jordi

changeset 17827:2de613986374

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
include Qt files with <QFoo> instead of <QtGui/QFoo> (bug #40252) * CharacterColor.h, Emulation.cpp, Emulation.h, Filter.cpp, Filter.h, KeyboardTranslator.h, TerminalModel.cpp, TerminalView.cpp, TerminalView.h, Vt102Emulation.cpp, Vt102Emulation.h, main-window.h: Include Qt files with <QFoo> instead of <QtGui/QFoo>.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Nov 2013 15:54:19 -0400
parents 574ab045f70c
children 6b787e274eb1
files libgui/qterminal/libqterminal/unix/CharacterColor.h libgui/qterminal/libqterminal/unix/Emulation.cpp libgui/qterminal/libqterminal/unix/Emulation.h libgui/qterminal/libqterminal/unix/Filter.cpp libgui/qterminal/libqterminal/unix/Filter.h libgui/qterminal/libqterminal/unix/KeyboardTranslator.h libgui/qterminal/libqterminal/unix/TerminalModel.cpp 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/src/main-window.h
diffstat 12 files changed, 27 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/CharacterColor.h
+++ b/libgui/qterminal/libqterminal/unix/CharacterColor.h
@@ -26,7 +26,7 @@
 #define CHARACTERCOLOR_H
 
 // Qt
-#include <QtGui/QColor>
+#include <QColor>
 
 /** 
  * An entry in a terminal display's color palette. 
--- a/libgui/qterminal/libqterminal/unix/Emulation.cpp
+++ b/libgui/qterminal/libqterminal/unix/Emulation.cpp
@@ -33,10 +33,10 @@
 #include <unistd.h>
 
 // Qt
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
+#include <QApplication>
+#include <QClipboard>
 #include <QtCore/QHash>
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 #include <QtCore/QRegExp>
 #include <QtCore/QTextStream>
 #include <QtCore/QThread>
--- a/libgui/qterminal/libqterminal/unix/Emulation.h
+++ b/libgui/qterminal/libqterminal/unix/Emulation.h
@@ -29,7 +29,7 @@
 #include <stdio.h>
 
 // Qt 
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 
 #include <QtCore/QTextCodec>
 #include <QtCore/QTextStream>
--- a/libgui/qterminal/libqterminal/unix/Filter.cpp
+++ b/libgui/qterminal/libqterminal/unix/Filter.cpp
@@ -26,9 +26,9 @@
 #include <iostream>
 
 // Qt
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
 #include <QtCore/QString>
 
 #include <QtCore/QSharedData>
--- a/libgui/qterminal/libqterminal/unix/Filter.h
+++ b/libgui/qterminal/libqterminal/unix/Filter.h
@@ -23,7 +23,7 @@
 #define FILTER_H
 
 // Qt
-#include <QtGui/QAction>
+#include <QAction>
 #include <QtCore/QList>
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
--- a/libgui/qterminal/libqterminal/unix/KeyboardTranslator.h
+++ b/libgui/qterminal/libqterminal/unix/KeyboardTranslator.h
@@ -27,7 +27,7 @@
 // Qt
 #include <QtCore/QHash>
 #include <QtCore/QList>
-#include <QtGui/QKeySequence>
+#include <QKeySequence>
 #include <QtCore/QMetaType>
 #include <QtCore/QVarLengthArray>
 #include <QtCore>
--- a/libgui/qterminal/libqterminal/unix/TerminalModel.cpp
+++ b/libgui/qterminal/libqterminal/unix/TerminalModel.cpp
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 
 // Qt
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QtCore/QByteRef>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
--- a/libgui/qterminal/libqterminal/unix/TerminalView.cpp
+++ b/libgui/qterminal/libqterminal/unix/TerminalView.cpp
@@ -27,20 +27,20 @@
 #include "unix/TerminalView.h"
 
 // Qt
-#include <QtGui/QApplication>
-#include <QtGui/QBoxLayout>
-#include <QtGui/QClipboard>
-#include <QtGui/QKeyEvent>
+#include <QApplication>
+#include <QBoxLayout>
+#include <QClipboard>
+#include <QKeyEvent>
 #include <QtCore/QEvent>
 #include <QtCore/QTime>
 #include <QtCore/QFile>
-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtGui/QScrollBar>
-#include <QtGui/QStyle>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLayout>
+#include <QPainter>
+#include <QPixmap>
+#include <QScrollBar>
+#include <QStyle>
 #include <QtCore>
 #include <QtGui>
 
--- a/libgui/qterminal/libqterminal/unix/TerminalView.h
+++ b/libgui/qterminal/libqterminal/unix/TerminalView.h
@@ -25,9 +25,9 @@
 #define TERMINALVIEW_H
 
 // Qt
-#include <QtGui/QColor>
+#include <QColor>
 #include <QtCore/QPointer>
-#include <QtGui/QWidget>
+#include <QWidget>
 
 // Konsole
 #include "unix/Filter.h"
--- a/libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp
+++ b/libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp
@@ -40,7 +40,7 @@
 
 // Qt
 #include <QtCore/QEvent>
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 #include <QtCore/QByteRef>
 
 // Konsole
--- a/libgui/qterminal/libqterminal/unix/Vt102Emulation.h
+++ b/libgui/qterminal/libqterminal/unix/Vt102Emulation.h
@@ -29,7 +29,7 @@
 #include <stdio.h>
 
 // Qt 
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 #include <QtCore/QHash>
 #include <QtCore/QTimer>
 
--- a/libgui/src/main-window.h
+++ b/libgui/src/main-window.h
@@ -25,7 +25,7 @@
 #define octave_main_window_h 1
 
 // Qt includes
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 #include <QThread>
 #include <QTabWidget>
 #include <QMdiArea>