Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

various cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-07-26 03:02:11 +00:00
parent a1d5f5c776
commit 9069f13ef6
23 changed files with 37 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/io/qdatastream.h
View file

@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE
class QByteArray;
class QIODevice;
template <typename T> class QList;
template <typename T> class QLinkedList;

3
src/core/io/qfile_p.h
View file

@ -54,7 +54,8 @@
//
#include "QtCore/qabstractfileengine.h"
#include "qiodevice_p.h"
#include "QtCore/qiodevice_p.h"
#include "QtCore/qringbuffer_p.h"
QT_BEGIN_NAMESPACE

1
src/core/io/qiodevice_p.h
View file

@ -57,7 +57,6 @@
#include "QtCore/qbytearray.h"
#include "QtCore/qobjectdefs.h"
#include "QtCore/qstring.h"
#include "qringbuffer_p.h"
#ifndef QT_NO_QOBJECT
#include "qobject_p.h"
#endif

1
src/core/io/qprocess.h
View file

@ -42,7 +42,6 @@
#ifndef QPROCESS_H
#define QPROCESS_H
#include <QtCore/qiodevice.h>
#include <QtCore/qstringlist.h>
#include <QtCore/qshareddata.h>

1
src/core/io/qprocess_p.h
View file

@ -55,6 +55,7 @@
#include "QtCore/qprocess.h"
#include "QtCore/qiodevice_p.h"
#include "QtCore/qringbuffer_p.h"
#ifdef Q_OS_UNIX
#include <qorderedmutexlocker_p.h>
#endif

3
src/core/plugin/qlibrary_p.h
View file

@ -57,8 +57,6 @@
# include "QtCore/qt_windows.h"
#endif
#include "QtCore/qlibrary.h"
#include "QtCore/qpointer.h"
#include "QtCore/qstringlist.h"
#include "QtCore/qplugin.h"
#include "QtCore/qsharedpointer.h"
@ -114,7 +112,6 @@ private:
QAtomicInt libraryUnloadCount;
enum {IsAPlugin, IsNotAPlugin, MightBeAPlugin } pluginState;
friend class QLibraryPrivateHasFriends;
};
QT_END_NAMESPACE

3
src/core/plugin/qlibrary_unix.cpp
View file

@ -42,7 +42,8 @@
#include "qplatformdefs.h"
#include <qfile.h>
#include "qlibrary_p.h"
#include <qstringlist.h>
#include <qlibrary_p.h>
#include <qcoreapplication.h>
#include <qfilesystementry_p.h>

1
src/core/plugin/qplugin.h
View file

@ -42,7 +42,6 @@
#ifndef QPLUGIN_H
#define QPLUGIN_H
#include <QtCore/qobject.h>
#include <QtCore/qpointer.h>
QT_BEGIN_HEADER

1
src/core/thread/qmutex_p.h
View file

@ -54,7 +54,6 @@
// We mean it.
//
#include <QtCore/qglobal.h>
#include <QtCore/qnamespace.h>
#include <QtCore/qmutex.h>

1
src/core/thread/qreadwritelock_p.h
View file

@ -53,7 +53,6 @@
// We mean it.
//
#include <QtCore/qglobal.h>
#include <QtCore/qhash.h>
#ifndef QT_NO_THREAD

1
src/core/tools/qringbuffer_p.h
View file

@ -54,7 +54,6 @@
//
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
QT_BEGIN_NAMESPACE

1
src/core/tools/qstringlist.h
View file

@ -42,7 +42,6 @@
#ifndef QSTRINGLIST_H
#define QSTRINGLIST_H
#include <QtCore/qalgorithms.h>
#include <QtCore/qdatastream.h>
#include <QtCore/qlist.h>
#include <QtCore/qregexp.h>

6
src/gui/kernel/qcocoaapplicationdelegate_mac.mm
View file

@ -76,9 +76,9 @@
#include "qmacdefines_mac.h"
#ifdef QT_MAC_USE_COCOA
#import <private/qcocoaapplicationdelegate_mac_p.h>
#import <private/qcocoamenuloader_mac_p.h>
#import <private/qcocoaapplication_mac_p.h>
#import <qcocoaapplicationdelegate_mac_p.h>
#import <qcocoamenuloader_mac_p.h>
#import <qcocoaapplication_mac_p.h>
#include <qapplication_p.h>
#include <qt_mac_p.h>
#include <qt_cocoa_helpers_mac_p.h>

22
src/gui/kernel/qcocoapanel_mac.mm
View file

@ -39,18 +39,18 @@
**
****************************************************************************/
#import <private/qcocoapanel_mac_p.h>
#import <qcocoapanel_mac_p.h>
#ifdef QT_MAC_USE_COCOA
#import <private/qt_cocoa_helpers_mac_p.h>
#import <private/qcocoawindow_mac_p.h>
#import <private/qcocoawindowdelegate_mac_p.h>
#import <private/qcocoaview_mac_p.h>
#import <private/qcocoawindowcustomthemeframe_mac_p.h>
#import <private/qcocoaapplication_mac_p.h>
#import <private/qmultitouch_mac_p.h>
#import <private/qapplication_p.h>
#import <private/qbackingstore_p.h>
#import <private/qdnd_p.h>
#import <qt_cocoa_helpers_mac_p.h>
#import <qcocoawindow_mac_p.h>
#import <qcocoawindowdelegate_mac_p.h>
#import <qcocoaview_mac_p.h>
#import <qcocoawindowcustomthemeframe_mac_p.h>
#import <qcocoaapplication_mac_p.h>
#import <qmultitouch_mac_p.h>
#import <qapplication_p.h>
#import <qbackingstore_p.h>
#import <qdnd_p.h>
#include <QtGui/QWidget>

2
src/gui/kernel/qcocoaview_mac.mm
View file

@ -39,7 +39,7 @@
**
****************************************************************************/
#include <qconfig.h>
#import <private/qcocoaview_mac_p.h>
#import <qcocoaview_mac_p.h>
#ifdef QT_MAC_USE_COCOA
#include <qwidget_p.h>

16
src/gui/kernel/qcocoawindow_mac.mm
View file

@ -41,14 +41,14 @@
#include "qmacdefines_mac.h"
#ifdef QT_MAC_USE_COCOA
#import <private/qcocoawindow_mac_p.h>
#import <private/qcocoawindowdelegate_mac_p.h>
#import <private/qcocoaview_mac_p.h>
#import <private/qt_cocoa_helpers_mac_p.h>
#import <private/qcocoawindowcustomthemeframe_mac_p.h>
#import <private/qcocoaapplication_mac_p.h>
#import <private/qdnd_p.h>
#import <private/qmultitouch_mac_p.h>
#import <qcocoawindow_mac_p.h>
#import <qcocoawindowdelegate_mac_p.h>
#import <qcocoaview_mac_p.h>
#import <qt_cocoa_helpers_mac_p.h>
#import <qcocoawindowcustomthemeframe_mac_p.h>
#import <qcocoaapplication_mac_p.h>
#import <qdnd_p.h>
#import <qmultitouch_mac_p.h>
#include <QtGui/QWidget>

4
src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm
View file

@ -43,8 +43,8 @@
#ifdef QT_MAC_USE_COCOA
#import "private/qcocoawindowcustomthemeframe_mac_p.h"
#import "private/qcocoawindow_mac_p.h"
#import "qcocoawindowcustomthemeframe_mac_p.h"
#import "qcocoawindow_mac_p.h"
#include "qt_cocoa_helpers_mac_p.h"
#include "qwidget.h"

2
src/gui/kernel/qcocoawindowdelegate_mac.mm
View file

@ -39,7 +39,7 @@
**
****************************************************************************/
#import "private/qcocoawindowdelegate_mac_p.h"
#import "qcocoawindowdelegate_mac_p.h"
#ifdef QT_MAC_USE_COCOA
#include <qwidget_p.h>
#include <qapplication_p.h>

2
src/gui/util/qsystemtrayicon_p.h
View file

@ -66,8 +66,6 @@
QT_BEGIN_NAMESPACE
class QSystemTrayIconSys;
class QToolButton;
class QLabel;
class QSystemTrayIconPrivate : public QObjectPrivate
{

6
src/gui/widgets/qcocoamenu_mac.mm
View file

@ -42,9 +42,9 @@
#include "qmacdefines_mac.h"
#include "qapplication.h"
#ifdef QT_MAC_USE_COCOA
#import <private/qcocoamenu_mac_p.h>
#import <private/qcocoamenuloader_mac_p.h>
#import <private/qcocoaapplication_mac_p.h>
#import <qcocoamenu_mac_p.h>
#import <qcocoamenuloader_mac_p.h>
#import <qcocoaapplication_mac_p.h>
#include <qt_cocoa_helpers_mac_p.h>
#include <qapplication_p.h>
#include <qaction_p.h>

2
src/gui/widgets/qcocoatoolbardelegate_mac.mm
View file

@ -39,7 +39,7 @@
**
****************************************************************************/
#import <private/qcocoatoolbardelegate_mac_p.h>
#import <qcocoatoolbardelegate_mac_p.h>
#ifdef QT_MAC_USE_COCOA
#include <qmainwindowlayout_p.h>
#include <qt_mac_p.h>

2
src/gui/widgets/qmacnativewidget_mac.mm
View file

@ -40,7 +40,7 @@
****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <private/qcocoaview_mac_p.h>
#import <qcocoaview_mac_p.h>
#include "qmacnativewidget_mac.h"
#include <qwidget_p.h>

2
src/gui/widgets/qmainwindowlayout_mac.mm
View file

@ -50,7 +50,7 @@
#else
#include <quuid.h>
#include <qcocoatoolbardelegate_mac_p.h>
#import <private/qcocoawindowdelegate_mac_p.h>
#import <qcocoawindowdelegate_mac_p.h>
#endif
QT_BEGIN_NAMESPACE