mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-06 18:25:37 +08:00
Fix BlackMisc header includes
* Include only what is used * Use forward declaration when possible * Sorted includes refs #630
This commit is contained in:
@@ -7,8 +7,7 @@
|
||||
* contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "actionhotkey.h"
|
||||
#include "variant.h"
|
||||
#include "blackmisc/input/actionhotkey.h"
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
|
||||
@@ -13,10 +13,15 @@
|
||||
#define BLACKMISC_INPUT_ACTIONHOTKEY_H
|
||||
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
#include "blackmisc/propertyindex.h"
|
||||
#include "blackmisc/input/hotkeycombination.h"
|
||||
#include "blackmisc/identifier.h"
|
||||
#include <QStringList>
|
||||
#include "blackmisc/input/hotkeycombination.h"
|
||||
#include "blackmisc/metaclass.h"
|
||||
#include "blackmisc/propertyindex.h"
|
||||
#include "blackmisc/valueobject.h"
|
||||
#include "blackmisc/variant.h"
|
||||
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
|
||||
@@ -9,6 +9,9 @@
|
||||
|
||||
#include "actionhotkeylist.h"
|
||||
|
||||
#include "blackmisc/input/actionhotkeylist.h"
|
||||
#include "blackmisc/input/hotkeycombination.h"
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
namespace Input
|
||||
|
||||
@@ -13,9 +13,15 @@
|
||||
#define BLACKMISC_INPUT_ACTIONHOTKEYLIST_H
|
||||
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
#include "actionhotkey.h"
|
||||
#include "blackmisc/collection.h"
|
||||
#include "blackmisc/input/actionhotkey.h"
|
||||
#include "blackmisc/sequence.h"
|
||||
#include "blackmisc/variant.h"
|
||||
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
#include <initializer_list>
|
||||
#include <tuple>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
|
||||
@@ -8,9 +8,13 @@
|
||||
*/
|
||||
|
||||
#include "blackmisc/input/hotkeycombination.h"
|
||||
#include "blackmisc/propertyindex.h"
|
||||
#include "blackmisc/variant.h"
|
||||
#include "blackmisc/compare.h"
|
||||
#include "blackmisc/iterator.h"
|
||||
|
||||
#include <QStringList>
|
||||
#include <QtGlobal>
|
||||
#include <algorithm>
|
||||
#include <tuple>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
|
||||
@@ -13,10 +13,15 @@
|
||||
#define BLACKMISC_INPUT_HOTKEYCOMBINATION_H
|
||||
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
#include "blackmisc/propertyindex.h"
|
||||
#include "blackmisc/valueobject.h"
|
||||
#include "blackmisc/input/keyboardkeylist.h"
|
||||
#include "blackmisc/input/joystickbutton.h"
|
||||
#include "blackmisc/input/joystickbuttonlist.h"
|
||||
#include "blackmisc/input/keyboardkey.h"
|
||||
#include "blackmisc/input/keyboardkeylist.h"
|
||||
#include "blackmisc/metaclass.h"
|
||||
#include "blackmisc/valueobject.h"
|
||||
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
*/
|
||||
|
||||
#include "blackmisc/input/joystickbutton.h"
|
||||
|
||||
#include "blackmisc/variant.h"
|
||||
#include <QCoreApplication>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
|
||||
@@ -13,8 +13,14 @@
|
||||
#define BLACKMISC_INPUT_JOYSTICKBUTTON_H
|
||||
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
#include "blackmisc/valueobject.h"
|
||||
#include "blackmisc/metaclass.h"
|
||||
#include "blackmisc/propertyindex.h"
|
||||
#include "blackmisc/valueobject.h"
|
||||
#include "blackmisc/variant.h"
|
||||
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
#include <QtGlobal>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
*/
|
||||
|
||||
#include "blackmisc/input/joystickbuttonlist.h"
|
||||
#include "blackmisc/predicates.h"
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
|
||||
@@ -13,9 +13,14 @@
|
||||
#define BLACKMISC_INPUT_JOYSTICKBUTTONLIST_H
|
||||
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
#include "blackmisc/input/joystickbutton.h"
|
||||
#include "blackmisc/collection.h"
|
||||
#include "blackmisc/input/joystickbutton.h"
|
||||
#include "blackmisc/sequence.h"
|
||||
#include "blackmisc/variant.h"
|
||||
|
||||
#include <QMetaType>
|
||||
#include <initializer_list>
|
||||
#include <tuple>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
|
||||
@@ -8,6 +8,12 @@
|
||||
*/
|
||||
|
||||
#include "blackmisc/input/keyboardkey.h"
|
||||
|
||||
#include <QChar>
|
||||
#include <QHash>
|
||||
#include <QtDebug>
|
||||
#include <QtGlobal>
|
||||
|
||||
#include "blackmisc/propertyindex.h"
|
||||
#include "blackmisc/variant.h"
|
||||
|
||||
|
||||
@@ -12,10 +12,16 @@
|
||||
#ifndef BLACKMISC_INPUT_KEYBOARDKEY_H
|
||||
#define BLACKMISC_INPUT_KEYBOARDKEY_H
|
||||
|
||||
#include "keycodes.h"
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
#include "blackmisc/input/keycodes.h"
|
||||
#include "blackmisc/metaclass.h"
|
||||
#include "blackmisc/propertyindex.h"
|
||||
#include "blackmisc/valueobject.h"
|
||||
#include "blackmisc/variant.h"
|
||||
|
||||
#include <QList>
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
* contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "blackmisc/input//keyboardkeylist.h"
|
||||
#include "blackmisc/predicates.h"
|
||||
#include "blackmisc/input/keyboardkeylist.h"
|
||||
#include "blackmisc/input/keycodes.h"
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
|
||||
@@ -13,10 +13,14 @@
|
||||
#define BLACKMISC_INPUT_KEYBOARDKEYLIST_H
|
||||
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
#include "blackmisc/input/keyboardkey.h"
|
||||
#include "blackmisc/collection.h"
|
||||
#include "blackmisc/input/keyboardkey.h"
|
||||
#include "blackmisc/sequence.h"
|
||||
#include <QObject>
|
||||
#include "blackmisc/variant.h"
|
||||
|
||||
#include <QMetaType>
|
||||
#include <initializer_list>
|
||||
#include <tuple>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
#include "registermetadatainput.h"
|
||||
#include "input.h"
|
||||
|
||||
#include <QDBusMetaType>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
namespace Input
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
//! \file
|
||||
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
|
||||
#ifndef BLACKMISC_INPUT_REGISTERMETADATAINPUT_H
|
||||
#define BLACKMISC_INPUT_REGISTERMETADATAINPUT_H
|
||||
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
namespace Input
|
||||
|
||||
Reference in New Issue
Block a user