generic: cleanup headers inclusions

This commit is contained in:
Ivailo Monev 2015-09-24 17:34:26 +00:00
parent 407170de3d
commit 7e6bd222da
56 changed files with 47 additions and 102 deletions

View file

@ -32,6 +32,7 @@
#include <unistd.h> #include <unistd.h>
#include <QtCore/QStack>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QRegExp> #include <QtCore/QRegExp>
#include <QtCore/QTimer> #include <QtCore/QTimer>

View file

@ -22,7 +22,6 @@
#define KDIROPERATOR_H_ #define KDIROPERATOR_H_
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtCore/QStack>
#include <QtGui/qstyleoption.h> #include <QtGui/qstyleoption.h>
#include <ktoggleaction.h> #include <ktoggleaction.h>

View file

@ -21,9 +21,6 @@
#define KFILEFILTERCOMBO_H #define KFILEFILTERCOMBO_H
#include <kfile_export.h> #include <kfile_export.h>
#include <QtCore/QStringList>
#include <kcombobox.h> #include <kcombobox.h>
class KFILE_EXPORT KFileFilterCombo : public KComboBox class KFILE_EXPORT KFileFilterCombo : public KComboBox

View file

@ -21,10 +21,10 @@
#define KFILEPLACESITEM_P_H #define KFILEPLACESITEM_P_H
#include <QtCore/QObject> #include <QtCore/qobject.h>
#include <QtCore/QPointer> #include <QtCore/qpointer.h>
#include <QtCore/qabstractitemmodel.h> #include <QtCore/qabstractitemmodel.h>
#include <QtCore/QStringList> #include <QtCore/qstringlist.h>
#include <kbookmark.h> #include <kbookmark.h>
#include <solid/device.h> #include <solid/device.h>

View file

@ -25,7 +25,6 @@
#include <QtGui/QTreeView> #include <QtGui/QTreeView>
#include <kurl.h> #include <kurl.h>
#include <kfile_export.h> #include <kfile_export.h>
/** /**

View file

@ -28,9 +28,10 @@
#ifndef KFILEWIDGET_H #ifndef KFILEWIDGET_H
#define KFILEWIDGET_H #define KFILEWIDGET_H
#include <QtGui/qwidget.h>
#include "kfile_export.h" #include "kfile_export.h"
#include "kabstractfilewidget.h" #include "kabstractfilewidget.h"
#include <QtGui/QWidget>
class KJob; class KJob;
class KFileItem; class KFileItem;

View file

@ -23,6 +23,7 @@
#include <kfile_export.h> #include <kfile_export.h>
#include <kdialog.h> #include <kdialog.h>
class KLineEdit; class KLineEdit;
class KUrlRequester; class KUrlRequester;
class KNameAndUrlInputDialogPrivate; class KNameAndUrlInputDialogPrivate;

View file

@ -27,7 +27,6 @@
#include <kurl.h> #include <kurl.h>
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtCore/QByteArray>
class KFilePlacesModel; class KFilePlacesModel;
class KUrlComboBox; class KUrlComboBox;

View file

@ -24,12 +24,11 @@
#include "kurlnavigatorbuttonbase_p.h" #include "kurlnavigatorbuttonbase_p.h"
#include "kurlnavigatormenu_p.h" #include "kurlnavigatormenu_p.h"
#include <QtCore/qpointer.h>
#include <kio/global.h> #include <kio/global.h>
#include <kio/udsentry.h> #include <kio/udsentry.h>
#include <kurl.h> #include <kurl.h>
#include <QPointer>
class KJob; class KJob;
class QDropEvent; class QDropEvent;
class QPaintEvent; class QPaintEvent;

View file

@ -21,8 +21,8 @@
#ifndef KURLNAVIGATORBUTTONBASE_P_H #ifndef KURLNAVIGATORBUTTONBASE_P_H
#define KURLNAVIGATORBUTTONBASE_P_H #define KURLNAVIGATORBUTTONBASE_P_H
#include <QtGui/QColor> #include <QtGui/qcolor.h>
#include <QtGui/QPushButton> #include <QtGui/qpushbutton.h>
class KUrl; class KUrl;
class QEvent; class QEvent;

View file

@ -22,9 +22,9 @@
#define KURLNAVIGATORPLACESSELECTOR_P_H #define KURLNAVIGATORPLACESSELECTOR_P_H
#include "kurlnavigatorbuttonbase_p.h" #include "kurlnavigatorbuttonbase_p.h"
#include <kurl.h>
#include <QtCore/qabstractitemmodel.h> #include <QtCore/qabstractitemmodel.h>
#include <kurl.h>
class KFilePlacesModel; class KFilePlacesModel;
class KMenu; class KMenu;

View file

@ -46,6 +46,7 @@
#endif #endif
#include <assert.h> #include <assert.h>
#include <QtCore/qlinkedlist.h>
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <sys/stat.h> // mode_t #include <sys/stat.h> // mode_t

View file

@ -22,8 +22,6 @@
#ifndef KIO_DELETEJOB_H #ifndef KIO_DELETEJOB_H
#define KIO_DELETEJOB_H #define KIO_DELETEJOB_H
#include <QtCore/QStringList>
#include <kurl.h> #include <kurl.h>
#include "global.h" #include "global.h"

View file

@ -22,7 +22,7 @@
#define FILEUNDOMANAGER_P_H #define FILEUNDOMANAGER_P_H
#include "fileundomanager.h" #include "fileundomanager.h"
#include <QtCore/QStack> #include <QtCore/qstack.h>
#include <QtGui/qundostack.h> #include <QtGui/qundostack.h>
#include <kurl.h> #include <kurl.h>
#include <ctime> #include <ctime>

View file

@ -21,10 +21,6 @@
#include <kio/kio_export.h> #include <kio/kio_export.h>
#include <QtCore/QString>
#include <QtCore/QHash>
#include <QtCore/QMap>
#include <QtCore/QList>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtCore/QFile> // for QFile::Permissions #include <QtCore/QFile> // for QFile::Permissions
@ -36,10 +32,6 @@
#include <kjob.h> #include <kjob.h>
#ifdef Q_CC_MSVC
template class KDE_EXPORT QMap<QString, QString>;
#endif
class KUrl; class KUrl;
class KJobTrackerInterface; class KJobTrackerInterface;

View file

@ -38,6 +38,7 @@ extern "C" {
#include <pwd.h> #include <pwd.h>
#include <grp.h> #include <grp.h>
} }
#include <QtCore/qlinkedlist.h>
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/qbuffer.h> #include <QtCore/qbuffer.h>

View file

@ -29,7 +29,7 @@
#include "jobuidelegate.h" #include "jobuidelegate.h"
#include "kjobtrackerinterface.h" #include "kjobtrackerinterface.h"
#include <QPointer> #include <QtCore/qpointer.h>
#define KIO_ARGS QByteArray packedArgs; QDataStream stream( &packedArgs, QIODevice::WriteOnly ); stream #define KIO_ARGS QByteArray packedArgs; QDataStream stream( &packedArgs, QIODevice::WriteOnly ); stream

View file

@ -23,13 +23,9 @@
#define KIO_JOBCLASSES_H #define KIO_JOBCLASSES_H
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QLinkedList> // KDE5: remove
#include <QtCore/QStringList>
#include <kurl.h> #include <kurl.h>
#include <kio/global.h> #include <kio/global.h>
#include <kio/udsentry.h> #include <kio/udsentry.h>
#include <kcompositejob.h> #include <kcompositejob.h>
namespace KIO { namespace KIO {

View file

@ -20,8 +20,8 @@
#ifndef JOBURLCACHE_H #ifndef JOBURLCACHE_H
#define JOBURLCACHE_H #define JOBURLCACHE_H
#include <QObject> #include <QtCore/qobject.h>
#include <QStringList> #include <QtCore/qstringlist.h>
class JobUrlCache : public QObject class JobUrlCache : public QObject
{ {

View file

@ -24,8 +24,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <kio/global.h> #include <kio/global.h>
#include <QtCore/QPair> #include <QtCore/qpair.h>
#include <QtCore/QList> #include <QtCore/qlist.h>
typedef QPair<QString, unsigned short> ACLUserPermissions; typedef QPair<QString, unsigned short> ACLUserPermissions;

View file

@ -20,8 +20,6 @@
#define KAUTOMOUNT_H #define KAUTOMOUNT_H
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QString>
#include <QtGlobal> #include <QtGlobal>
#include <kio/kio_export.h> #include <kio/kio_export.h>

View file

@ -22,8 +22,6 @@
#define KDATATOOL_H #define KDATATOOL_H
#include <kio/kio_export.h> #include <kio/kio_export.h>
#include <QtCore/QObject>
#include <QtCore/QString>
#include <kaction.h> #include <kaction.h>
#include <kservice.h> #include <kservice.h>

View file

@ -23,10 +23,13 @@
#include "krun.h" #include "krun.h"
#include "kautomount.h" #include "kautomount.h"
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusReply>
#include <kmessageboxwrapper.h> #include <kmessageboxwrapper.h>
#include <kdirnotify.h> #include <kdirnotify.h>
#include <kmountpoint.h> #include <kmountpoint.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <kconfiggroup.h> #include <kconfiggroup.h>

View file

@ -23,6 +23,7 @@
#include <kserviceaction.h> #include <kserviceaction.h>
#include <kio/kio_export.h> #include <kio/kio_export.h>
#include <kurl.h> #include <kurl.h>
class KDesktopFile; class KDesktopFile;
class KService; class KService;

View file

@ -23,6 +23,7 @@
#include "kdirlister.h" #include "kdirlister.h"
#include "kdirlister_p.h" #include "kdirlister_p.h"
#include <QtCore/qlinkedlist.h>
#include <QtCore/QRegExp> #include <QtCore/QRegExp>
#include <QtCore/qcoreapplication.h> #include <QtCore/qcoreapplication.h>

View file

@ -24,9 +24,6 @@
#include "kfileitem.h" #include "kfileitem.h"
#include "kdirnotify.h" #include "kdirnotify.h"
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <kurl.h> #include <kurl.h>
class KJob; class KJob;

View file

@ -22,10 +22,7 @@
#include "kfileitem.h" #include "kfileitem.h"
#include <QtCore/QMap>
#include <QtCore/QHash>
#include <QtCore/QCache> #include <QtCore/QCache>
#include <QtCore/QSet>
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtCore/qfileinfo.h> #include <QtCore/qfileinfo.h>

View file

@ -12,13 +12,11 @@
#define KDIRNOTIFY_H_268161151672021 #define KDIRNOTIFY_H_268161151672021
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QByteArray>
#include <QtCore/QList>
#include <QtCore/QMap>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtDBus/QtDBus> #include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusAbstractInterface>
#include <kio/kio_export.h> #include <kio/kio_export.h>
/** /**

View file

@ -25,12 +25,10 @@
#include <kio/global.h> #include <kio/global.h>
#include <kio/udsentry.h> #include <kio/udsentry.h>
#include <kurl.h> #include <kurl.h>
#include <kacl.h> #include <kacl.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kfilemetainfo.h> #include <kfilemetainfo.h>
#include <kdatetime.h> #include <kdatetime.h>
#include <QtCore/QList>
class KFileItemPrivate; class KFileItemPrivate;

View file

@ -27,7 +27,6 @@
#include <kserviceaction.h> #include <kserviceaction.h>
#include <kservice.h> #include <kservice.h>
#include <QActionGroup> #include <QActionGroup>
#include <QObject>
class KFileItemActions; class KFileItemActions;

View file

@ -26,7 +26,6 @@
#include <QtGui/QTextOption> #include <QtGui/QTextOption>
#include <kio/global.h> #include <kio/global.h>
class QAbstractItemModel; class QAbstractItemModel;
class QAbstractItemView; class QAbstractItemView;
class QHelpEvent; class QHelpEvent;

View file

@ -23,8 +23,7 @@
#include "predicateproperties.h" #include "predicateproperties.h"
#include "kfilemetainfoitem.h" #include "kfilemetainfoitem.h"
#include <QtCore/QList>
#include <QtCore/QStringList>
class KUrl; class KUrl;
typedef QList<KFileMetaInfoItem> KFileMetaInfoItemList; typedef QList<KFileMetaInfoItem> KFileMetaInfoItemList;

View file

@ -25,7 +25,6 @@
#include <config-kio.h> #include <config-kio.h>
#include <predicateproperties.h> #include <predicateproperties.h>
#include <QtCore/QHash>
#include <QtCore/QSharedData> #include <QtCore/QSharedData>
class KFileWritePlugin; class KFileWritePlugin;

View file

@ -21,6 +21,7 @@
#define KFILESHARE_H #define KFILESHARE_H
#include <kio/kio_export.h> #include <kio/kio_export.h>
class QString; class QString;
/** /**

View file

@ -21,6 +21,7 @@
#define KFILESHAREPRIVATE_H #define KFILESHAREPRIVATE_H
#include <QObject> #include <QObject>
class KDirWatch; class KDirWatch;
/** /**

View file

@ -9,7 +9,6 @@
#define KIO_KIMAGEIO_H #define KIO_KIMAGEIO_H
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QString>
#include <kio/kio_export.h> #include <kio/kio_export.h>

View file

@ -18,8 +18,9 @@
#ifndef KMESSAGEBOXWRAPPER_H #ifndef KMESSAGEBOXWRAPPER_H
#define KMESSAGEBOXWRAPPER_H #define KMESSAGEBOXWRAPPER_H
#include <QtGui/qapplication.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <QtGui/QApplication>
#include <kdebug.h> #include <kdebug.h>
/** /**
@ -51,4 +52,5 @@ public:
} }
}; };
#endif #endif

View file

@ -23,7 +23,6 @@
#define KPASSWDSERVERLOOP_P_H #define KPASSWDSERVERLOOP_P_H
#include <kio/authinfo.h> #include <kio/authinfo.h>
#include <QtCore/QByteArray>
#include <QtCore/QEventLoop> #include <QtCore/QEventLoop>
namespace KIO { namespace KIO {

View file

@ -21,8 +21,6 @@
#include <kio/kio_export.h> #include <kio/kio_export.h>
#include <kurl.h> #include <kurl.h>
#include <QtCore/QString>
#include <QtCore/QByteArray>
#include <QtCore/QTextCodec> #include <QtCore/QTextCodec>
class KRemoteEncodingPrivate; class KRemoteEncodingPrivate;

View file

@ -31,6 +31,8 @@
#include <typeinfo> #include <typeinfo>
#include <sys/stat.h> #include <sys/stat.h>
#include <QtCore/QFileInfo>
#include <QtCore/QDir>
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtGui/QLabel> #include <QtGui/QLabel>
#include <QtGui/QVBoxLayout> #include <QtGui/QVBoxLayout>
@ -61,16 +63,9 @@
#include <kprotocolmanager.h> #include <kprotocolmanager.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kprocess.h> #include <kprocess.h>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QTextStream>
#include <QtCore/qdatetime.h>
#include <QtCore/QRegExp>
#include <QDir>
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <kmacroexpander.h> #include <kmacroexpander.h>
#include <kshell.h> #include <kshell.h>
#include <QTextDocument>
#include <kde_file.h> #include <kde_file.h>
#include <kconfiggroup.h> #include <kconfiggroup.h>
#include <kdialog.h> #include <kdialog.h>

View file

@ -21,8 +21,7 @@
#ifndef KSAMBASHARE_P_H #ifndef KSAMBASHARE_P_H
#define KSAMBASHARE_P_H #define KSAMBASHARE_P_H
#include <QtCore/QMap> #include <QtCore/qmap.h>
#include "ksambasharedata.h" #include "ksambasharedata.h"
class QString; class QString;

View file

@ -20,7 +20,6 @@
#ifndef KSHELLCOMPLETION_H #ifndef KSHELLCOMPLETION_H
#define KSHELLCOMPLETION_H #define KSHELLCOMPLETION_H
#include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include "kurlcompletion.h" #include "kurlcompletion.h"

View file

@ -29,8 +29,6 @@
#include <kurl.h> #include <kurl.h>
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QHash>
#include <QtCore/QPair>
#include <QtCore/QStringList> #include <QtCore/QStringList>

View file

@ -25,7 +25,6 @@
#include <kcompletion.h> #include <kcompletion.h>
#include <kio/jobclasses.h> #include <kio/jobclasses.h>
#include <QtCore/QString>
class QStringList; class QStringList;
class KUrl; class KUrl;

View file

@ -24,7 +24,6 @@
#define KIO_NETACCESS_H #define KIO_NETACCESS_H
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QString>
#include <kio/global.h> #include <kio/global.h>
#include <kio/udsentry.h> #include <kio/udsentry.h>
#include <kurl.h> #include <kurl.h>

View file

@ -20,8 +20,8 @@
#define KIO_PASTE_H #define KIO_PASTE_H
#include <kio/kio_export.h> #include <kio/kio_export.h>
#include <QtCore/QString>
#include <kurl.h> #include <kurl.h>
class QWidget; class QWidget;
class QMimeSource; class QMimeSource;

View file

@ -23,6 +23,7 @@
#include <kio/kio_export.h> #include <kio/kio_export.h>
#include <QtCore/QSharedData> #include <QtCore/QSharedData>
#include <QtCore/QVariant> #include <QtCore/QVariant>
class QValidator; class QValidator;
/** /**

View file

@ -25,7 +25,6 @@
#include <ksqueezedtextlabel.h> #include <ksqueezedtextlabel.h>
#include <kurl.h> #include <kurl.h>
#include <QtGui/QDialog> #include <QtGui/QDialog>
#include <QtCore/QString>
#include <sys/types.h> #include <sys/types.h>
#include <kio/global.h> #include <kio/global.h>

View file

@ -29,7 +29,6 @@
#include <kio/renamedialog.h> #include <kio/renamedialog.h>
#include <QtGui/QDialog> #include <QtGui/QDialog>
#include <sys/types.h> #include <sys/types.h>
#include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>

View file

@ -26,7 +26,6 @@
#include <kio/jobclasses.h> // for KIO::JobFlags #include <kio/jobclasses.h> // for KIO::JobFlags
#include <klocale.h> #include <klocale.h>
#include <QtCore/QByteArray>
#include <QtNetwork/QHostInfo> #include <QtNetwork/QHostInfo>
class KConfigGroup; class KConfigGroup;

View file

@ -21,6 +21,7 @@
#include "global.h" #include "global.h"
#include "connection.h" #include "connection.h"
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtCore/QPointer> #include <QtCore/QPointer>

View file

@ -20,12 +20,8 @@
#ifndef KCMODULECONTAINER_H #ifndef KCMODULECONTAINER_H
#define KCMODULECONTAINER_H #define KCMODULECONTAINER_H
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <kcmodule.h> #include <kcmodule.h>
#include <kcmoduleloader.h> #include <kcmoduleloader.h>
#include <QtCore/QList>
class QWidget; class QWidget;

View file

@ -21,9 +21,6 @@
#ifndef KCMUTILS_KCMODULEPROXY_H #ifndef KCMUTILS_KCMODULEPROXY_H
#define KCMUTILS_KCMODULEPROXY_H #define KCMUTILS_KCMODULEPROXY_H
#include <QtGui/QImage>
#include <QtCore/QStringList>
#include <kcmodule.h> #include <kcmodule.h>
#include <kservice.h> #include <kservice.h>
#include <kcmutils_export.h> #include <kcmutils_export.h>

View file

@ -22,8 +22,6 @@
#include "kcmultidialog.h" #include "kcmultidialog.h"
#include <kpagedialog_p.h> #include <kpagedialog_p.h>
#include <QtCore/QList>
#include <QtCore/QStringList>
class KCModuleProxy; class KCModuleProxy;
class KPageWidgetItem; class KPageWidgetItem;

View file

@ -23,8 +23,6 @@
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtCore/QList>
#include <kcmutils_export.h> #include <kcmutils_export.h>
#include <ksharedconfig.h> #include <ksharedconfig.h>

View file

@ -21,9 +21,6 @@
#ifndef KPLUGINSELECTOR_P_H #ifndef KPLUGINSELECTOR_P_H
#define KPLUGINSELECTOR_P_H #define KPLUGINSELECTOR_P_H
#include <QtCore/qabstractitemmodel.h>
#include <QtGui/QAbstractItemDelegate>
#include <kconfiggroup.h> #include <kconfiggroup.h>
#include <kplugininfo.h> #include <kplugininfo.h>
#include <kwidgetitemdelegate.h> #include <kwidgetitemdelegate.h>