amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove DECLARE_TYPEOF

Browse Source 
It is no longer needed since C++11
This commit is contained in:
Twan van Laarhoven
2020-04-26 00:51:16 +02:00
parent 5e92d9455c
commit 4327abb803
92 changed files with 0 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/action/keyword.cpp
-2
View File
@@ -15,8 +15,6 @@
#include <util/tagged_string.hpp>
#include <util/error.hpp>
DECLARE_TYPEOF_COLLECTION(KeywordModeP);
// ----------------------------------------------------------------------------- : Add Keyword
AddKeywordAction::AddKeywordAction(Set& set)
src/data/action/keyword.hpp
-1
View File
@@ -22,7 +22,6 @@
class Set;
DECLARE_POINTER_TYPE(Keyword);
DECLARE_TYPEOF_COLLECTION(GenericAddAction<KeywordP>::Step);
// ----------------------------------------------------------------------------- : Add Keyword
src/data/action/set.cpp
-5
View File
@@ -14,11 +14,6 @@
#include <data/stylesheet.hpp>
#include <util/error.hpp>
DECLARE_TYPEOF_COLLECTION(IndexMap<FieldP COMMA ValueP>);
DECLARE_TYPEOF_COLLECTION(CardP);
DECLARE_TYPEOF_COLLECTION(PackTypeP);
DECLARE_TYPEOF_COLLECTION(int);
// ----------------------------------------------------------------------------- : Add card
AddCardAction::AddCardAction(Set& set)
src/data/action/set.hpp
-2
View File
@@ -24,8 +24,6 @@ DECLARE_POINTER_TYPE(StyleSheet);
DECLARE_POINTER_TYPE(Field);
DECLARE_POINTER_TYPE(Value);
DECLARE_POINTER_TYPE(PackType);
DECLARE_TYPEOF_COLLECTION(GenericAddAction<CardP>::Step);
DECLARE_TYPEOF_COLLECTION(GenericAddAction<PackTypeP>::Step);
// ----------------------------------------------------------------------------- : Add card
src/data/action/symbol.cpp
-6
View File
@@ -11,12 +11,6 @@
#include <data/action/symbol_part.hpp>
#include <util/error.hpp>
DECLARE_TYPEOF_COLLECTION(pair<SymbolShapeP COMMA SymbolShapeCombine>);
DECLARE_TYPEOF_COLLECTION(pair<SymbolPartP COMMA size_t >);
DECLARE_TYPEOF_COLLECTION(RemoveSymbolPartsAction::Removal);
DECLARE_TYPEOF_COLLECTION(SymbolPartP);
DECLARE_TYPEOF_COLLECTION(ControlPointP);
// ----------------------------------------------------------------------------- : Utility
String action_name_for(const set<SymbolPartP>& parts, const String& action) {
src/data/action/symbol_part.cpp
-4
View File
@@ -10,9 +10,6 @@
#include <data/action/symbol_part.hpp>
#include <gfx/bezier.hpp>
DECLARE_TYPEOF_COLLECTION(Vector2D);
DECLARE_TYPEOF_COLLECTION(ControlPointP);
// ----------------------------------------------------------------------------- : Utility
inline double sgn(double v) { return v > 0 ? 1 : -1; }
@@ -384,7 +381,6 @@ void SinglePointRemoveAction::perform(bool to_undo) {
}
DECLARE_POINTER_TYPE(SinglePointRemoveAction);
DECLARE_TYPEOF_COLLECTION(SinglePointRemoveActionP);
// Remove a set of points from a symbol shape.
src/data/card.cpp
-3
View File
@@ -15,9 +15,6 @@
#include <util/reflect.hpp>
#include <util/delayed_index_maps.hpp>
DECLARE_TYPEOF_COLLECTION(FieldP);
DECLARE_TYPEOF_NO_REV(IndexMap<FieldP COMMA ValueP>);
// ----------------------------------------------------------------------------- : Card
Card::Card()
src/data/field.cpp
-2
View File
@@ -19,8 +19,6 @@
#include <data/field/package_choice.hpp>
#include <util/error.hpp>
DECLARE_TYPEOF_COLLECTION(StyleListener*);
// ----------------------------------------------------------------------------- : Field
Field::Field()
src/data/field/choice.cpp
-3
View File
@@ -12,9 +12,6 @@
#include <util/defaultable.hpp>
#include <wx/imaglist.h>
DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
DECLARE_TYPEOF(map<String COMMA ScriptableImage>);
// ----------------------------------------------------------------------------- : ChoiceField
ChoiceField::ChoiceField()
src/data/field/color.cpp
-2
View File
@@ -10,8 +10,6 @@
#include <data/field/color.hpp>
#include <script/script.hpp>
DECLARE_TYPEOF_COLLECTION(ColorField::ChoiceP);
// ----------------------------------------------------------------------------- : ColorField
ColorField::ColorField()
src/data/format/apprentice.cpp
-9
View File
@@ -21,10 +21,6 @@
#include <wx/datstrm.h>
#include <wx/filename.h>
DECLARE_TYPEOF_COLLECTION(String);
DECLARE_TYPEOF_COLLECTION(CardP);
DECLARE_TYPEOF(map<String COMMA String>);
String card_rarity_code(const String& rarity);
// ----------------------------------------------------------------------------- : Generic export dialog
@@ -190,8 +186,6 @@ class ApprFormat {
String name, sets;
};
DECLARE_TYPEOF_COLLECTION(ApprFormat);
/// An Apprentice format database (Format.dat)
class ApprFormatDatabase : public ApprDatabase {
public:
@@ -276,8 +270,6 @@ class ApprDistro {
void writeD(wxTextOutputStream& tout, const String& name, int c, int u, int r);
};
DECLARE_TYPEOF(map<String COMMA ApprDistro>);
/// An Apprentice distribution database (Distro.dat)
class ApprDistroDatabase : public ApprDatabase {
public:
@@ -362,7 +354,6 @@ String untag_appr(const String& s) {
}
DECLARE_POINTER_TYPE(ApprCardRecord);
DECLARE_TYPEOF_COLLECTION(ApprCardRecordP);
/// An Apprentice card database (cardinfo.dat)
class ApprCardDatabase : public ApprDatabase {
src/data/format/image.cpp
-2
View File
@@ -16,8 +16,6 @@
#include <render/card/viewer.hpp>
#include <wx/filename.h>
DECLARE_TYPEOF_COLLECTION(CardP);
// ----------------------------------------------------------------------------- : Single card export
void export_image(const SetP& set, const CardP& card, const String& filename) {
src/data/format/image_to_symbol.cpp
-3
View File
@@ -19,9 +19,6 @@
#include <util/error.hpp>
#include <util/platform.hpp>
DECLARE_TYPEOF_COLLECTION(ControlPointP);
DECLARE_TYPEOF_COLLECTION(SymbolPartP);
// ----------------------------------------------------------------------------- : Image preprocessing
enum ImageMarker
src/data/format/mtg_editor.cpp
-2
View File
@@ -18,8 +18,6 @@
#include <util/tagged_string.hpp>
#include <wx/wfstream.h>
DECLARE_TYPEOF_COLLECTION(CardP);
// ----------------------------------------------------------------------------- : MtgEditorFileFormat
/// The file format of Mtg Editor files
src/data/format/mws.cpp
-2
View File
@@ -17,8 +17,6 @@
#include <util/tagged_string.hpp>
#include <wx/wfstream.h>
DECLARE_TYPEOF_COLLECTION(CardP);
// ----------------------------------------------------------------------------- : Utilities
/// Convert a tagged string to MWS format: \t\t before each line beyond the first
src/data/game.cpp
-3
View File
@@ -18,9 +18,6 @@
#include <util/io/package_manager.hpp>
#include <script/script.hpp>
DECLARE_TYPEOF_COLLECTION(FieldP);
DECLARE_TYPEOF_COLLECTION(StatsDimensionP);
// ----------------------------------------------------------------------------- : Game
IMPLEMENT_DYNAMIC_ARG(Game*, game_for_reading, nullptr);
src/data/keyword.cpp
-6
View File
@@ -11,12 +11,6 @@
#include <util/tagged_string.hpp>
class KeywordTrie;
DECLARE_TYPEOF(map<Char COMMA KeywordTrie*>);
DECLARE_TYPEOF_COLLECTION(KeywordTrie*);
DECLARE_TYPEOF_COLLECTION(KeywordP);
DECLARE_TYPEOF_COLLECTION(KeywordModeP);
DECLARE_TYPEOF_COLLECTION(KeywordParamP);
DECLARE_TYPEOF_COLLECTION(const Keyword*);
DECLARE_POINTER_TYPE(KeywordParamValue);
class Value;
DECLARE_DYNAMIC_ARG(Value*, value_being_updated);
src/data/locale.cpp
-2
View File
@@ -21,8 +21,6 @@
#include <wx/mstream.h>
#endif
DECLARE_TYPEOF(map<String COMMA SubLocaleP>);
// ----------------------------------------------------------------------------- : Locale class
// when reading, ignore "#_ADD" start of line pragmas
src/data/pack.cpp
-5
View File
@@ -14,11 +14,6 @@
#include <queue>
using boost::indeterminate;
DECLARE_TYPEOF_COLLECTION(PackTypeP);
DECLARE_TYPEOF_COLLECTION(PackItemP);
DECLARE_TYPEOF_COLLECTION(CardP);
DECLARE_TYPEOF_CONST(map<String COMMA PackInstanceP>);
// ----------------------------------------------------------------------------- : PackType
src/data/set.cpp
-3
View File
@@ -23,9 +23,6 @@
#include <script/profiler.hpp>
#include <wx/sstream.h>
DECLARE_TYPEOF_COLLECTION(CardP);
DECLARE_TYPEOF_NO_REV(IndexMap<FieldP COMMA ValueP>);
// ----------------------------------------------------------------------------- : Set
Set::Set()
src/data/settings.cpp
-2
View File
@@ -23,8 +23,6 @@
#include <wx/wfstream.h>
#include <wx/stdpaths.h>
DECLARE_TYPEOF_COLLECTION(AutoReplaceP);
// ----------------------------------------------------------------------------- : Extra types
IMPLEMENT_REFLECTION_ENUM(CheckUpdates) {
src/data/statistics.cpp
-4
View File
@@ -11,10 +11,6 @@
#include <data/field.hpp>
#include <data/field/choice.hpp>
DECLARE_TYPEOF_COLLECTION(String);
DECLARE_TYPEOF_COLLECTION(StatsDimensionP);
DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
extern ScriptValueP script_primary_choice;
// ----------------------------------------------------------------------------- : Statistics dimension
src/data/stylesheet.cpp
-3
View File
@@ -13,9 +13,6 @@
#include <util/io/package_manager.hpp>
#include <gui/new_window.hpp> // for selecting stylesheets on load error
DECLARE_TYPEOF_COLLECTION(StyleSheet*);
DECLARE_TYPEOF_COLLECTION(FieldP);
// ----------------------------------------------------------------------------- : StyleSheet
IMPLEMENT_DYNAMIC_ARG(StyleSheet*, stylesheet_for_reading, nullptr);
src/data/symbol.cpp
-3
View File
@@ -12,9 +12,6 @@
#include <script/to_value.hpp>
#include <gfx/bezier.hpp>
DECLARE_TYPEOF_COLLECTION(ControlPointP);
DECLARE_TYPEOF_COLLECTION(SymbolPartP);
// ----------------------------------------------------------------------------- : ControlPoint
IMPLEMENT_REFLECTION_ENUM(LockMode) {
src/data/symbol_font.cpp
-4
View File
@@ -17,10 +17,6 @@
#include <render/text/element.hpp> // fot CharInfo
#include <script/image.hpp>
DECLARE_TYPEOF_COLLECTION(SymbolFont::DrawableSymbol);
DECLARE_TYPEOF_COLLECTION(SymbolInFontP);
DECLARE_TYPEOF_COLLECTION(InsertSymbolMenuP);
// ----------------------------------------------------------------------------- : SymbolFont
// SymbolFont that is used for SymbolInFonts constructed with the default constructor