Commit bbf5ddd4 authored by Davide Gianforte's avatar Davide Gianforte
Browse files

[Header Files] Changed header files to Qt5/KF5

All header files should refer only to qt5 or kf5; I used full path to have a better
view of the package containing the single header; at compile time both include flags
should be given.

Marked as TODO all header files from KDE4LibsSupport, many of this classes have
deprecated methods that should be changed with the new from Qt (KUrl -> Qurl and so on).

For a better readability, I ordered header files in system, then qt, then kde.
parent ab55297d
......@@ -32,11 +32,12 @@
#include <QtCore/QDir>
#include <QtCore/QByteArray>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <kde_file.h>
#include <KUrl>
#include <KDebug>
#include <KComponentData>
#include <KMimeType>
#include <KDE/KUrl>
#include <KDE/KDebug>
#include <KDE/KComponentData>
#include <KDE/KMimeType>
#include "libisofs/iso_fs.h"
#include "kiso.h"
......
......@@ -22,11 +22,12 @@
#ifndef ISO_H
#define ISO_H
#include <QByteArray>
#include <kio/slavebase.h>
#include <sys/types.h>
#include <QtCore/QByteArray>
#include <KIO/SlaveBase>
#include "kisofile.h"
class KIso;
......
......@@ -34,14 +34,16 @@
#include <QtCore/QDir>
#include <QtCore/QFile>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <kde_file.h>
#include <KDebug>
#include <KUrl>
#include <KMimeType>
#include <KConfig>
#include <KConfigGroup>
#include <KFilterBase>
#include <KFilterDev>
#include <KDE/KDebug>
#include <KDE/KUrl>
#include <KDE/KMimeType>
#include <KConfigCore/KConfig>
#include <KConfigCore/KConfigGroup>
#include <KArchive/KFilterBase>
#include <KArchive/KFilterDev>
#include "libisofs/isofs.h"
#include "qfilehack.h"
......
......@@ -20,7 +20,8 @@
#define KISODIRECTORY_H
#include <QtCore/QString>
#include <karchive.h>
#include <KArchive/KArchive>
class KIsoDirectory : public KArchiveDirectory
{
......
......@@ -17,7 +17,9 @@
*****************************************************************************/
#include "kisofile.h"
#include <kdebug.h>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KDebug>
KIsoFile::KIsoFile(KArchive* archive, const QString& name, int access,
int date, int adate, int cdate, const QString& user, const QString& group,
......
......@@ -20,7 +20,8 @@
#define KISOFILE_H
#include <QtCore/QString>
#include <karchive.h>
#include <KArchive/KArchive>
class KIsoFile : public KArchiveFile
{
......
......@@ -29,22 +29,24 @@
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QRegExp>
#include <QByteArray>
#include <QTextCodec>
#include <kfileitem.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <kcomponentdata.h>
#include <klocale.h>
#include <kurl.h>
#include <ktemporaryfile.h>
#include <QtCore/QByteArray>
#include <QtCore/QTextCodec>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KDebug>
#include <KDE/KUrl>
#include <KDE/KComponentData>
#include <KDE/KLocale>
#include <KDE/KTemporaryFile>
#include <kde_file.h>
#include <kstandarddirs.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <ktar.h>
#include <kprocess.h>
#include <KDE/KStandardDirs>
#include <KIO/KFileItem>
#include <KWidgetsAddons/KMessageBox>
#include <KIO/Job>
#include <KIO/JobClasses>
#include <KArchive/KTar>
#include <KCoreAddons/KProcess>
#define MAX_IPC_SIZE (1024*32)
#define TRIES_WITH_PASSWORDS 3
......
......@@ -17,16 +17,19 @@
#ifndef KRARC_H
#define KRARC_H
#include <sys/types.h>
#include <QtCore/QString>
#include <QtCore/QHash>
#include <QtCore/QFile>
#include <sys/types.h>
#include <kurl.h>
#include <kio/global.h>
#include <kio/slavebase.h>
#include <kprocess.h>
#include <kconfiggroup.h>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KUrl>
#include <KIO/Global>
#include <KIO/SlaveBase>
#include <KCoreAddons/KProcess>
#include <KConfigCore/KConfigGroup>
class KFileItem;
class QByteArray;
......
......@@ -18,8 +18,10 @@
#include "actionman.h"
#include <klocale.h>
#include <kmessagebox.h>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KLocale>
#include <KWidgetsAddons/KMessageBox>
#include "useractionpage.h"
#include "../krusader.h"
......
......@@ -19,7 +19,8 @@
#ifndef ACTIONMAN_H
#define ACTIONMAN_H
#include <kdialog.h>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KDialog>
class UserActionPage;
......
......@@ -24,21 +24,24 @@
#include "../krusader.h"
#include "../krglobal.h"
#include <kactioncollection.h>
#include <QtGui/QToolButton>
#include <QtGui/QCheckBox>
#include <QtGui/QRadioButton>
#include <klocale.h>
#include <kfiledialog.h>
#include <klineedit.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <kinputdialog.h>
#include <kkeysequencewidget.h>
#include <kcombobox.h>
#include <kicondialog.h>
#include <ktextedit.h>
#include <kiconloader.h>
#include <QtWidgets/QToolButton>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QRadioButton>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KLocale>
#include <KDE/KFileDialog>
#include <KDE/KDebug>
#include <KDE/KInputDialog>
#include <KXmlGui/KActionCollection>
#include <KXmlGui/KKeySequenceWidget>
#include <KCompletion/KComboBox>
#include <KCompletion/KLineEdit>
#include <KWidgetsAddons/KMessageBox>
#include <KIconThemes/KIconDialog>
#include <KIconThemes/KIconLoader>
#include <KTextWidgets/KTextEdit>
#define ICON(N) KIconLoader::global()->loadIcon(N, KIconLoader::Small)
......
......@@ -21,30 +21,30 @@
#include "addplaceholderpopup.h"
#include "../UserAction/expander.h"
#include <klocale.h>
#include <kfiledialog.h>
#include <kmessagebox.h>
// for ParameterDialog
#include "../krglobal.h" // for konfig-access
#include "../BookMan/krbookmarkbutton.h"
#include "../GUI/profilemanager.h"
#include <QtGui/QLayout>
#include <QtGui/QLabel>
#include <QtGui/QToolButton>
#include <QHBoxLayout>
#include <QFrame>
#include <QVBoxLayout>
#include <klineedit.h>
#include <QtGui/QCheckBox>
#include <kiconloader.h>
#include <kcombobox.h>
#include <kurlcompletion.h>
#include <knuminput.h>
#include <kdebug.h>
#include <QtWidgets/QLayout>
#include <QtWidgets/QToolButton>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QLabel>
#include <QtWidgets/QFrame>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KLocale>
#include <KDE/KFileDialog>
#include <KDE/KDebug>
#include <KDE/KNumInput>
#include <KWidgetsAddons/KMessageBox>
#include <KCompletion/KLineEdit>
#include <KCompletion/KComboBox>
#include <KIconThemes/KIconLoader>
#include <KIOWidgets/KUrlCompletion>
#define ACTIVE_MASK 0x0100
#define OTHER_MASK 0x0200
......
......@@ -21,10 +21,13 @@
#ifndef ADDPLACEHOLDERPOPUP_H
#define ADDPLACEHOLDERPOPUP_H
#include <kmenu.h>
#include <kdialog.h>
#include <QtCore/QList>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KDialog>
#include <KDE/KMenu>
#include "../UserAction/expander.h"
#include <QList>
class QString;
class KLineEdit;
......
......@@ -18,9 +18,12 @@
#include "useractionlistview.h"
#include <klocale.h>
#include <kiconloader.h>
#include <qdom.h>
#include <QDom/QDomEntity>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KLocale>
#include <KIconThemes/KIconLoader>
#include "../krglobal.h"
#include "../UserAction/kraction.h"
......
......@@ -19,18 +19,21 @@
#include "useractionpage.h"
#include <kstandardguiitem.h>
#include <QtGui/QSplitter>
#include <QtGui/QLayout>
#include <QtGui/QToolButton>
#include <QtWidgets/QSplitter>
#include <QtWidgets/QLayout>
#include <QtWidgets/QToolButton>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QVBoxLayout>
#include <QtGui/QClipboard>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <klineedit.h>
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <kiconloader.h>
#include <klocale.h>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KLocale>
#include <KDE/KFileDialog>
#include <KWidgetsAddons/KStandardGuiItem>
#include <KCompletion/KLineEdit>
#include <KWidgetsAddons/KMessageBox>
#include <KIconThemes/KIconLoader>
#include "actionproperty.h"
#include "useractionlistview.h"
......
......@@ -20,7 +20,7 @@
#ifndef USERACTIONPAGE_H
#define USERACTIONPAGE_H
#include <qwidget.h>
#include <QtWidgets/QWidget>
class UserActionListView;
class ActionProperty;
......
......@@ -20,14 +20,18 @@
#include "kraddbookmarkdlg.h"
#include "../krglobal.h"
#include "krbookmarkhandler.h"
#include <klocale.h>
#include <qheaderview.h>
#include <QtGui/QLayout>
#include <QtGui/QLabel>
#include <QGridLayout>
#include <kinputdialog.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <QtWidgets/QLayout>
#include <QtWidgets/QLabel>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QGridLayout>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KLocale>
#include <KDE/KInputDialog>
#include <KDE/KDebug>
#include <KIconThemes/KIconLoader>
KrAddBookmarkDlg::KrAddBookmarkDlg(QWidget *parent, KUrl url):
KDialog(parent)
......
......@@ -23,11 +23,15 @@
#include "krbookmark.h"
#include "../VFS/vfs.h"
#include "../GUI/krtreewidget.h"
#include <kdialog.h>
#include <kurl.h>
#include <klineedit.h>
#include <qmap.h>
#include <QtGui/QToolButton>
#include <QtWidgets/QToolButton>
#include <QtCore/QMap>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KDialog>
#include <KDE/KUrl>
#include <KCompletion/KLineEdit>
class KrAddBookmarkDlg: public KDialog
{
......
......@@ -20,12 +20,15 @@
#include "krbookmark.h"
#include "../krglobal.h"
#include "../VFS/krarchandler.h"
#include <kactioncollection.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kdebug.h>
#include "../krtrashhandler.h"
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KLocale>
#include <KDE/KDebug>
#include <KIconThemes/KIconLoader>
#include <KXmlGui/KActionCollection>
#define BM_NAME(X) (QString("Bookmark:")+X)
static const char* NAME_TRASH = I18N_NOOP("Trash bin");
......
......@@ -20,9 +20,11 @@
#ifndef KRBOOKMARK_H
#define KRBOOKMARK_H
#include <kaction.h>
#include <QtCore/QList>
#include <kurl.h>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KUrl>
#include <KDE/KAction>
class KActionCollection;
......
......@@ -20,12 +20,16 @@
#include "krbookmarkbutton.h"
#include "krbookmarkhandler.h"
#include "../krglobal.h"
#include <QtGui/QPixmap>
#include <kiconloader.h>
#include <kaction.h>
#include <klocale.h>
#include <kmenu.h>
#include <kdebug.h>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KAction>
#include <KDE/KLocale>
#include <KDE/KMenu>
#include <KDE/KDebug>
#include <KIconThemes/KIconLoader>
KrBookmarkButton::KrBookmarkButton(QWidget *parent): QToolButton(parent)
{
......
......@@ -20,9 +20,9 @@
#ifndef KRBOOKMARKBUTTON_H
#define KRBOOKMARKBUTTON_H
#include <QtGui/QToolButton>
#include <QtWidgets/QToolButton>
#include <kactionmenu.h>
#include <KWidgetsAddons/KActionMenu>
#include "krbookmarkhandler.h"
......
......@@ -26,19 +26,23 @@
#include "../VFS/vfs.h"
#include "../Panel/krpanel.h"
#include "../Panel/listpanelactions.h"
#include <kiconloader.h>
#include <kmessagebox.h>
#include <QtCore/QTextStream>
#include <QMouseEvent>
#include <QEvent>
#include <kactioncollection.h>
#include <klocale.h>
#include <kdebug.h>
#include <kbookmarkmanager.h>
#include <kstandarddirs.h>
#include <QtCore/QFile>
#include <QtCore/QMouseEvent>
#include <QtCore/QEvent>
#include <QtGui/QCursor>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KLocale>
#include <KDE/KDebug>
#include <KDE/KStandardDirs>
#include <KIconThemes/KIconLoader>
#include <KWidgetsAddons/KMessageBox>
#include <KXmlGui/KActionCollection>
#include <KBookmarks/KBookmarkManager>
#define SPECIAL_BOOKMARKS true
// ------------------------ for internal use
......
......@@ -22,12 +22,13 @@
#include <QtCore/QObject>
#include <QtCore/QPointer>
#include <QEvent>
#include <qdom.h>
#include <qmap.h>
#include <QtCore/QEvent>
#include <QtCore/QMap>
#include <QtXml/QDomEntity>
#include <kmenu.h>
#include <kurl.h>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KMenu>
#include <KDE/KUrl>
#include "krbookmark.h"
......
......@@ -23,30 +23,36 @@
#include "../krglobal.h"
#include "../GUI/krlistwidget.h"
#include "../GUI/krtreewidget.h"
#include <klocale.h>
#include <kprocess.h>
#include <QtGui/QLayout>
#include <QtGui/QLabel>
#include <QtGui/QCheckBox>
#include <QHBoxLayout>
#include <QGridLayout>
#include <klineedit.h>
#include <QtGui/QPixmap>
#include <kcursor.h>
#include <kmessagebox.h>
#include <unistd.h> // for usleep
#include <QtCore/QFile>
#include <QtCore/QTextStream>
#include <kfiledialog.h>
#include <kiconloader.h>
#include <kcombobox.h>
#include <QtCore/QFileInfo>
#include <kurlrequester.h>
#include "../krservices.h"
#include <QtCore/QList>
#include <qmap.h>
#include <ktemporaryfile.h>
#include <kstandarddirs.h>
#include <unistd.h> // for usleep
#include <QtCore/QMap>
#include <QtGui/QPixmap>
#include <QtWidgets/QLayout>
#include <QtWidgets/QLabel>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QGridLayout>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KLocale>
#include <KDE/KFileDialog>
#include <KDE/KTemporaryFile>
#include <KDE/KStandardDirs>
#include <KCoreAddons/KProcess>
#include <KCompletion/KLineEdit>
#include <KWidgetsAddons/KCursor>
#include <KWidgetsAddons/KMessageBox>
#include <KIconThemes/KIconLoader>
#include <KCompletion/KComboBox>
#include <KIOWidgets/KUrlRequester>
#include "../krservices.h"
class CS_Tool; // forward
typedef void PREPARE_PROC_FUNC(KProcess& proc, CS_Tool *self, const QStringList& files,
......
......@@ -21,7 +21,8 @@
#ifndef CHECKSUMDLG_H
#define CHECKSUMDLG_H
#include <kdialog.h>
// TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
#include <KDE/KDialog>
class KTemporaryFile;
class KUrlRequester;
......
......@@ -19,25 +19,27 @@
#include "krdialogs.h"
#include <QtGui/QMessageBox>
#include <qwidget.h>
#include <QtGui/QApplication>
#include <QtGui/QFontMetrics>
#include <QFrame>
#include <QLabel>
#include <QVBoxLayout>
#include <QtCore/QDir>