mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-10 12:03:25 -08:00
Apply typedef across the tree (#7880)
This commit is contained in:
parent
de2ca8d56b
commit
12884c94dc
7 changed files with 19 additions and 19 deletions
|
|
@ -18,7 +18,7 @@ class QMediaPlayer;
|
|||
|
||||
inline Q_LOGGING_CATEGORY(SoundEngineLog, "sound_engine");
|
||||
|
||||
typedef QMap<QString, QString> QStringMap;
|
||||
using QStringMap = QMap<QString, QString>;
|
||||
|
||||
class SoundEngine : public QObject
|
||||
{
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ struct DeckSearchData
|
|||
QString relativeFilePath; ///< File path relative to the deck folder.
|
||||
};
|
||||
|
||||
typedef std::function<bool(const DeckSearchData &data)> DeckFilter;
|
||||
using DeckFilter = std::function<bool(const DeckSearchData &data)>;
|
||||
|
||||
class DeckFilterString
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
|
||||
inline Q_LOGGING_CATEGORY(ThemeManagerLog, "theme_manager");
|
||||
|
||||
typedef QMap<QString, QString> QStringMap;
|
||||
typedef QMap<int, QBrush> QBrushMap;
|
||||
using QStringMap = QMap<QString, QString>;
|
||||
using QBrushMap = QMap<int, QBrush>;
|
||||
|
||||
class ThemeManager : public QObject
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
|
||||
#include <QMap>
|
||||
|
||||
typedef QMap<int, QString> GameTypeMap;
|
||||
using GameTypeMap = QMap<int, QString>;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@ class CardInfo;
|
|||
class CardSet;
|
||||
class CardRelation;
|
||||
|
||||
typedef QSharedPointer<CardInfo> CardInfoPtr;
|
||||
typedef QSharedPointer<CardSet> CardSetPtr;
|
||||
typedef QSharedPointer<FormatRules> FormatRulesPtr;
|
||||
typedef QMap<QString, QList<PrintingInfo>> SetToPrintingsMap;
|
||||
using CardInfoPtr = QSharedPointer<CardInfo>;
|
||||
using CardSetPtr = QSharedPointer<CardSet>;
|
||||
using FormatRulesPtr = QSharedPointer<FormatRules>;
|
||||
using SetToPrintingsMap = QMap<QString, QList<PrintingInfo>>;
|
||||
|
||||
typedef QHash<QString, CardInfoPtr> CardNameMap;
|
||||
typedef QHash<QString, CardSetPtr> SetNameMap;
|
||||
typedef QHash<QString, FormatRulesPtr> FormatRulesNameMap;
|
||||
using CardNameMap = QHash<QString, CardInfoPtr>;
|
||||
using SetNameMap = QHash<QString, CardSetPtr>;
|
||||
using FormatRulesNameMap = QHash<QString, FormatRulesPtr>;
|
||||
|
||||
Q_DECLARE_METATYPE(CardInfoPtr)
|
||||
|
||||
|
|
|
|||
|
|
@ -18,18 +18,18 @@ struct CardSearchLanguage;
|
|||
|
||||
inline Q_LOGGING_CATEGORY(FilterStringLog, "filter_string");
|
||||
|
||||
typedef CardInfoPtr CardData;
|
||||
typedef std::function<bool(const CardData &)> Filter;
|
||||
typedef std::function<bool(const QString &)> StringMatcher;
|
||||
typedef std::function<bool(int)> NumberMatcher;
|
||||
typedef std::function<bool(int, int)> NumberComparer;
|
||||
using CardData = CardInfoPtr;
|
||||
using Filter = std::function<bool(const CardData &)>;
|
||||
using StringMatcher = std::function<bool(const QString &)>;
|
||||
using NumberMatcher = std::function<bool(int)>;
|
||||
using NumberComparer = std::function<bool(int, int)>;
|
||||
|
||||
namespace peg
|
||||
{
|
||||
template <typename Annotation> struct AstBase;
|
||||
struct EmptyType;
|
||||
|
||||
typedef AstBase<EmptyType> Ast;
|
||||
using Ast = AstBase<EmptyType>;
|
||||
} // namespace peg
|
||||
|
||||
class FilterString
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace peg
|
|||
{
|
||||
template <typename Annotation> struct AstBase;
|
||||
struct EmptyType;
|
||||
typedef AstBase<EmptyType> Ast;
|
||||
using Ast = AstBase<EmptyType>;
|
||||
} // namespace peg
|
||||
|
||||
class Expression
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue