Commit 9ea32273 authored by Dirk Mueller's avatar Dirk Mueller

include cleanup

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=663054
parent 33c91338
......@@ -25,7 +25,7 @@
#include "BookmarkHandler.h"
// Qt
#include <QFile>
#include <QtCore/QFile>
// KDE
#include <kshell.h>
......
......@@ -23,7 +23,7 @@
#define KONSOLEBOOKMARKHANDLER_H
// Qt
#include <QMenu>
#include <QtGui/QMenu>
// KDE
#include <KBookmarkManager>
......
......@@ -23,8 +23,8 @@
#include "ColorScheme.h"
// Qt
#include <QFile>
#include <QFileInfo>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
// KDE
#include <KConfig>
......
......@@ -23,11 +23,11 @@
#define COLORSCHEME_H
// Qt
#include <QHash>
#include <QList>
#include <QMetaType>
#include <QIODevice>
#include <QSet>
#include <QtCore/QHash>
#include <QtCore/QList>
#include <QtCore/QMetaType>
#include <QtCore/QIODevice>
#include <QtCore/QSet>
// Konsole
#include "TECommon.h"
......
......@@ -21,12 +21,11 @@
#include "ColorSchemeEditor.h"
// Qt
#include <QBrush>
#include <QFontMetrics>
#include <QHeaderView>
#include <QItemDelegate>
#include <QItemEditorCreatorBase>
#include <QItemEditorFactory>
#include <QtGui/QBrush>
#include <QtGui/QFontMetrics>
#include <QtGui/QHeaderView>
#include <QtGui/QItemDelegate>
#include <QtGui/QItemEditorCreator>
// KDE
#include <KColorDialog>
......
......@@ -21,7 +21,7 @@
#define COLORSCHEMEEDITOR_H
// Qt
#include <QWidget>
#include <QtGui/QWidget>
// Konsole
#include "ColorScheme.h"
......
......@@ -21,11 +21,11 @@
#include "EditProfileDialog.h"
// Qt
#include <QHideEvent>
#include <QLinearGradient>
#include <QPainter>
#include <QStandardItemModel>
#include <QtDebug>
#include <QtGui/QKeyEvent>
#include <QtGui/QBrush>
#include <QtGui/QPainter>
#include <QtGui/QStandardItem>
#include <QtCore/QDebug>
// KDE
#include <KFontDialog>
......
......@@ -21,10 +21,10 @@
#define EDITSESSIONDIALOG_H
// Qt
#include <QAbstractItemDelegate>
#include <QPair>
#include <QHash>
#include <QSet>
#include <QtGui/QAbstractItemDelegate>
#include <QtCore/QPair>
#include <QtCore/QHash>
#include <QtCore/QSet>
// KDE
#include <KDialog>
......
......@@ -75,13 +75,13 @@
#include <unistd.h>
// Qt
#include <QApplication>
#include <QClipboard>
#include <QHashIterator>
#include <QKeyEvent>
#include <QRegExp>
#include <QTextStream>
#include <QThread>
#include <QtGui/QApplication>
#include <QtGui/QClipboard>
#include <QtCore/QHash>
#include <QtGui/QKeyEvent>
#include <QtCore/QRegExp>
#include <QtCore/QTextStream>
#include <QtCore/QThread>
// KDE
#include <kdebug.h>
......
......@@ -25,11 +25,11 @@
#include <stdio.h>
// Qt
#include <QKeyEvent>
#include <QtGui/QKeyEvent>
//#include <QPointer>
#include <QTextCodec>
#include <QTextStream>
#include <QTimer>
#include <QtCore/QTextCodec>
#include <QtCore/QTextStream>
#include <QtCore/QTimer>
class KeyTrans;
......
......@@ -24,13 +24,13 @@
#include <iostream>
// Qt
#include <QAction>
#include <QApplication>
#include <QClipboard>
#include <QString>
#include <QtDebug>
#include <QSharedData>
#include <QFile>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QClipboard>
#include <QtCore/QString>
#include <QtCore/QDebug>
#include <QtCore/QSharedData>
#include <QtCore/QFile>
// KDE
#include <KLocale>
......
......@@ -21,12 +21,12 @@
#define FILTER_H
// Qt
#include <QAction>
#include <QList>
#include <QObject>
#include <QStringList>
#include <QMultiHash>
#include <QRegExp>
#include <QtGui/QAction>
#include <QtCore/QList>
#include <QtCore/QObject>
#include <QtCore/QStringList>
#include <QtCore/QHash>
#include <QtCore/QRegExp>
namespace Konsole
{
......@@ -297,7 +297,7 @@ class FilterObject : public QObject
{
Q_OBJECT
public:
FilterObject(Filter::HotSpot* filter) : _filter(filter) {};
FilterObject(Filter::HotSpot* filter) : _filter(filter) {}
private slots:
void activated();
private:
......
......@@ -22,9 +22,9 @@
#define TEHISTORY_H
// Qt
#include <QBitArray>
#include <QHash>
#include <QVector>
#include <QtCore/QBitRef>
#include <QtCore/QHash>
#include <QtCore/QVector>
// KDE
#include <ktemporaryfile.h>
......
......@@ -21,13 +21,12 @@
#include "HistorySizeDialog.h"
// Qt
#include <QButtonGroup>
#include <QHBoxLayout>
#include <QLabel>
#include <QRadioButton>
#include <QSpinBox>
#include <QVBoxLayout>
#include <QWidget>
#include <QtGui/QButtonGroup>
#include <QtGui/QBoxLayout>
#include <QtGui/QLabel>
#include <QtGui/QRadioButton>
#include <QtGui/QSpinBox>
#include <QtGui/QWidget>
// KDE
#include <KLocalizedString>
......
......@@ -21,14 +21,14 @@
#include "IncrementalSearchBar.h"
// Qt
#include <QCheckBox>
#include <QHBoxLayout>
#include <QLabel>
#include <QLineEdit>
#include <QProgressBar>
#include <QShowEvent>
#include <QTimer>
#include <QToolButton>
#include <QtGui/QCheckBox>
#include <QtGui/QBoxLayout>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#include <QtGui/QProgressBar>
#include <QtGui/QKeyEvent>
#include <QtCore/QTimer>
#include <QtGui/QToolButton>
// KDE
#include <KLocale>
......
......@@ -21,7 +21,7 @@
#define INCREMENTALSEARCHBAR_H
// Qt
#include <QWidget>
#include <QtGui/QWidget>
class QCheckBox;
class QLabel;
......
......@@ -21,7 +21,7 @@
#include "KeyBindingEditor.h"
// Qt
#include <QHeaderView>
#include <QtGui/QHeaderView>
// Konsole
#include "ui_KeyBindingEditor.h"
......
......@@ -21,7 +21,7 @@
#define KEYBINDINGEDITOR_H
// Qt
#include <QWidget>
#include <QtGui/QWidget>
namespace Ui
{
......
......@@ -33,10 +33,10 @@
#include <stddef.h>
// Qt
#include <QBuffer>
#include <QHash>
#include <QObject>
#include <QFile>
#include <QtCore/QBuffer>
#include <QtCore/QHash>
#include <QtCore/QObject>
#include <QtCore/QFile>
// KDE
#include <kstandarddirs.h>
......@@ -811,7 +811,6 @@ void test()
// Opening sequence
QCString txt =
#include "default.keytab.h"
;
QBuffer buf(txt);
if (0) TestTokenizer(buf);
......
......@@ -21,9 +21,9 @@
#ifndef KEYTRANS_H
#define KEYTRANS_H
#include <QList>
#include <QString>
#include <QIODevice>
#include <QtCore/QList>
#include <QtCore/QString>
#include <QtCore/QIODevice>
#define BITS_NewLine 0
#define BITS_BsHack 1
......
......@@ -26,11 +26,11 @@
#include <stdio.h>
// Qt
#include <QFile>
#include <QFileInfo>
#include <QKeySequence>
#include <QTextStream>
#include <QtDebug>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtGui/QKeySequence>
#include <QtCore/QTextStream>
#include <QtCore/QDebug>
// KDE
#include <KStandardDirs>
......
......@@ -23,11 +23,11 @@
#define KEYBOARDTRANSLATOR_H
// Qt
#include <QMultiHash>
#include <QList>
#include <QKeySequence>
#include <QMetaType>
#include <QVarLengthArray>
#include <QtCore/QHash>
#include <QtCore/QList>
#include <QtGui/QKeySequence>
#include <QtCore/QMetaType>
#include <QtCore/QVarLengthArray>
class QIODevice;
......
......@@ -21,8 +21,8 @@
#include "MainWindow.h"
// Qt
#include <QApplication>
#include <QVBoxLayout>
#include <QtGui/QApplication>
#include <QtGui/QBoxLayout>
// KDE
#include <KAction>
......
......@@ -21,7 +21,7 @@
#define KONSOLEMAINWINDOW_H
// Qt
#include <QPointer>
#include <QtCore/QPointer>
// KDE
#include <KXmlGuiWindow>
......
......@@ -21,14 +21,13 @@
#include "ManageProfilesDialog.h"
// Qt
#include <QCheckBox>
#include <QHeaderView>
#include <QItemDelegate>
#include <QItemEditorFactory>
#include <QMetaProperty>
#include <QStandardItemEditorCreator>
#include <QScrollBar>
#include <QStandardItemModel>
#include <QtGui/QCheckBox>
#include <QtGui/QHeaderView>
#include <QtGui/QItemDelegate>
#include <QtGui/QItemEditorCreator>
#include <QtCore/QMetaEnum>
#include <QtGui/QScrollBar>
#include <QtGui/QStandardItem>
// Konsole
#include "EditProfileDialog.h"
......
......@@ -21,7 +21,7 @@
#define SESSIONTYPEDIALOG_H
// Qt
#include <QItemDelegate>
#include <QtGui/QItemDelegate>
// KDE
#include <KDialog>
......
......@@ -22,8 +22,8 @@
#include "OverlayFrame.h"
// Qt
#include <QApplication>
#include <QPainter>
#include <QtGui/QApplication>
#include <QtGui/QPainter>
using namespace Konsole;
......
......@@ -21,8 +21,8 @@
#ifndef OVERLAY_FRAME_H
#define OVERLAY_FRAME_H
#include <QFrame>
#include <QTimer>
#include <QtGui/QFrame>
#include <QtCore/QTimer>
namespace Konsole
{
......
......@@ -21,7 +21,7 @@
#include "Part.h"
// Qt
#include <QStringList>
#include <QtCore/QStringList>
// KDE
#include <KMenuBar>
......
......@@ -22,9 +22,9 @@
#include "PrintSettings.h"
// Qt
#include <QCheckBox>
#include <QLayout>
#include <QVBoxLayout>
#include <QtGui/QCheckBox>
#include <QtGui/QLayout>
#include <QtGui/QBoxLayout>
// KDE
#include <klocale.h>
......
......@@ -21,12 +21,12 @@
#include "ProcessInfo.h"
// Qt
#include <QDebug>
#include <QFile>
#include <QFileInfo>
#include <QRegExp>
#include <QTextStream>
#include <QStringList>
#include <QtCore/QDebug>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QRegExp>
#include <QtCore/QTextStream>
#include <QtCore/QStringList>
using namespace Konsole;
......
......@@ -21,9 +21,9 @@
#define PROCESSINFO_H
// Qt
#include <QMap>
#include <QString>
#include <QVector>
#include <QtCore/QMap>
#include <QtCore/QString>
#include <QtCore/QVector>
namespace Konsole
{
......@@ -98,7 +98,7 @@ public:
* a suitable ProcessInfo instance for the current platform.
*/
explicit ProcessInfo(int pid , bool readEnvironment = false);
virtual ~ProcessInfo() {};
virtual ~ProcessInfo() {}
/**
* Updates the information about the process. This must
......
......@@ -21,9 +21,9 @@
#include "ProfileList.h"
// Qt
#include <QAction>
#include <QActionGroup>
#include <QtDebug>
#include <QtGui/QAction>
#include <QtGui/QActionGroup>
#include <QtCore/QDebug>
// KDE
#include <KIcon>
......
......@@ -20,8 +20,8 @@
#ifndef SESSIONLIST_H
#define SESSIONLIST_H
#include <QList>
#include <QObject>
#include <QtCore/QList>
#include <QtCore/QObject>
class QAction;
class QActionGroup;
......
......@@ -21,11 +21,10 @@
#include "ProfileListWidget.h"
// Qt
#include <QtDebug>
#include <QDrag>
#include <QDragEnterEvent>
#include <QDropEvent>
#include <QMimeData>
#include <QtCore/QDebug>
#include <QtGui/QDrag>
#include <QtGui/QKeyEvent>
#include <QtCore/QMimeData>
static const char* konsoleSessionMimeFormat = "konsole/session";
......
......@@ -21,7 +21,7 @@
#define SESSIONLISTWIDGET_H
// Qt
#include <QListWidget>
#include <QtGui/QListWidget>
class ProfileListWidget : public QListWidget
{
......
......@@ -82,7 +82,7 @@
#include <termios.h>
// Qt
#include <QStringList>
#include <QtCore/QStringList>
// KDE
#include <KStandardDirs>
......
......@@ -22,10 +22,10 @@
#define TE_PTY_H
// Qt
#include <QSocketNotifier>
#include <QStringList>
#include <QVector>
#include <QList>
#include <QtCore/QSocketNotifier>
#include <QtCore/QStringList>
#include <QtCore/QVector>
#include <QtCore/QList>
// KDE
#include <K3Process>
......
......@@ -21,7 +21,7 @@
#include "RemoteConnectionDialog.h"
// Qt
#include <QtDebug>
#include <QtCore/QDebug>
// KDE
#include <KLocale>
......
......@@ -30,8 +30,8 @@
#include <ctype.h>
// Qt
#include <QTextStream>
#include <QTime>
#include <QtCore/QTextStream>
#include <QtCore/QDate>
// KDE
#include <kdebug.h>
......
......@@ -22,8 +22,8 @@
#define TESCREEN_H
// Qt
#include <QTextStream>
#include <QVarLengthArray>
#include <QtCore/QTextStream>
#include <QtCore/QVarLengthArray>
// Konsole
#include "TECommon.h"
......
......@@ -21,7 +21,7 @@
#include "ScreenWindow.h"
// Qt
#include <QtDebug>
#include <QtCore/QDebug>
// Konsole
#include "Screen.h"
......
......@@ -21,7 +21,7 @@
#define SCREENWINDOW_H
// Qt
#include <QObject>
#include <QtCore/QObject>
// Konsole
#include "TECommon.h"
......
......@@ -28,14 +28,14 @@
#include <stdlib.h>
// Qt
#include <QApplication>
#include <QByteArray>
#include <QDir>
#include <QFile>
#include <QRegExp>
#include <QStringList>
#include <QtGui/QApplication>
#include <QtCore/QByteRef>
#include <QtCore/QDir>
#include <QtCore/QFile>
#include <QtCore/QRegExp>
#include <QtCore/QStringList>
#include <QtDBus/QtDBus>
#include <QTime>
#include <QtCore/QDate>
// KDE
#include <KDebug>
......
......@@ -22,8 +22,8 @@
#define SESSION_H
// Qt
#include <QStringList>
#include <QByteArray>
#include <QtCore/QStringList>
#include <QtCore/QByteRef>
// KDE
#include <KApplication>
......
......@@ -21,11 +21,11 @@
#define SESSIONCONTROLLER_H
// Qt
#include <QIcon>
#include <QList>
#include <QPointer>
#include <QString>
#include <QThread>
#include <QtGui/QIcon>
#include <QtCore/QList>
#include <QtCore/QPointer>
#include <QtCore/QString>
#include <QtCore/QThread>
// KDE
#include <KActionCollection>
......
......@@ -23,9 +23,9 @@
#include "SessionManager.h"
// Qt
#include <QFileInfo>
#include <QList>
#include <QString>
#include <QtCore/QFileInfo>
#include <QtCore/QList>
#include <QtCore/QString>
// KDE
#include <klocale.h>
......
......@@ -23,14 +23,14 @@
#define SESSIONMANAGER_H
// Qt
#include <QFont>
#include <QHash>
#include <QList>
#include <QSet>
#include <QStringList>
#include <QPair>
#include <QPointer>