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/cli/cli_main.cpp
-3
View File
@@ -16,8 +16,6 @@
#include <wx/process.h>
#include <wx/wfstream.h>
DECLARE_TYPEOF_COLLECTION(ScriptParseError);
String read_utf8_line(wxInputStream& input, bool until_eof = false);
// ----------------------------------------------------------------------------- : Command line interface
@@ -242,7 +240,6 @@ void CLISetInterface::handleCommand(const String& command) {
}
#if USE_SCRIPT_PROFILING
DECLARE_TYPEOF_COLLECTION(FunctionProfileP);
void CLISetInterface::showProfilingStats(const FunctionProfile& item, int level) {
// show parent
if (level == 0) {
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
src/gui/auto_replace_window.cpp
-2
View File
@@ -17,8 +17,6 @@
#include <util/window_id.hpp>
#include <util/error.hpp>
DECLARE_TYPEOF_COLLECTION(AutoReplaceP);
// ----------------------------------------------------------------------------- : AutoReplaceList
DECLARE_EVENT_TYPE(EVENT_ITEM_SELECT, <not used>)
src/gui/card_select_window.cpp
-3
View File
@@ -12,9 +12,6 @@
#include <util/window_id.hpp>
#include <wx/statline.h>
DECLARE_TYPEOF_COLLECTION(CardP);
DECLARE_TYPEOF_COLLECTION(ExportCardSelectionChoiceP);
// ----------------------------------------------------------------------------- : ExportCardSelectionChoice
ExportCardSelectionChoice::ExportCardSelectionChoice()
src/gui/control/card_editor.cpp
-3
View File
@@ -17,9 +17,6 @@
#include <util/window_id.hpp>
#include <wx/caret.h>
DECLARE_TYPEOF_COLLECTION(ValueViewerP);
DECLARE_TYPEOF_COLLECTION(ValueViewer*);
// ----------------------------------------------------------------------------- : DataEditor
DataEditor::DataEditor(Window* parent, int id, long style)
src/gui/control/card_list.cpp
-5
View File
@@ -23,12 +23,7 @@
#include <util/window_id.hpp>
#include <wx/clipbrd.h>
DECLARE_TYPEOF_COLLECTION(CardP);
DECLARE_TYPEOF_COLLECTION(FieldP);
DECLARE_POINTER_TYPE(ChoiceValue);
DECLARE_TYPEOF(map<int COMMA FieldP>);
DECLARE_TYPEOF_NO_REV(IndexMap<FieldP COMMA StyleP>);
DECLARE_TYPEOF_COLLECTION(CardListBase*);
// ----------------------------------------------------------------------------- : Events
src/gui/control/card_list_column_select.cpp
-3
View File
@@ -12,9 +12,6 @@
#include <data/field.hpp>
#include <util/window_id.hpp>
DECLARE_TYPEOF_COLLECTION(FieldP);
DECLARE_TYPEOF_COLLECTION(CardListColumnSelectDialog::ColumnSettingsF);
// ----------------------------------------------------------------------------- : CardListColumnSelectDialog
CardListColumnSelectDialog::CardListColumnSelectDialog(Window* parent, const GameP& game)
src/gui/control/filtered_card_list.cpp
-2
View File
@@ -9,8 +9,6 @@
#include <util/prec.hpp>
#include <gui/control/filtered_card_list.hpp>
DECLARE_TYPEOF_COLLECTION(CardP);
// ----------------------------------------------------------------------------- : FilteredCardList
FilteredCardList::FilteredCardList(Window* parent, int id, long additional_style)
src/gui/control/gallery_list.cpp
-2
View File
@@ -12,8 +12,6 @@
#include <gfx/gfx.hpp>
#include <wx/dcbuffer.h>
DECLARE_TYPEOF_COLLECTION(GalleryList::SubColumn_for_typeof);
// ----------------------------------------------------------------------------- : Events
DEFINE_EVENT_TYPE(EVENT_GALLERY_SELECT);
src/gui/control/graph.cpp
-12
View File
@@ -13,17 +13,6 @@
#include <wx/dcbuffer.h>
#include <wx/tooltip.h>
DECLARE_TYPEOF_COLLECTION(GraphAxisP);
DECLARE_TYPEOF_COLLECTION(GraphElementP);
DECLARE_TYPEOF_COLLECTION(GraphGroup);
DECLARE_TYPEOF_COLLECTION(GraphDataElement*);
DECLARE_TYPEOF_COLLECTION(GraphP);
DECLARE_TYPEOF_COLLECTION(int);
DECLARE_TYPEOF_COLLECTION(vector<int>);
DECLARE_TYPEOF_COLLECTION(String);
DECLARE_TYPEOF_COLLECTION(UInt);
DECLARE_TYPEOF_COLLECTION(pair<String COMMA String>);
template <typename T> inline T sgn(T v) { return v < 0 ? -1 : 1; }
// ----------------------------------------------------------------------------- : Events
@@ -74,7 +63,6 @@ void GraphDataPre::splitList(size_t axis) {
struct SmartLess{
inline bool operator () (const String& a, const String& b) const { return smart_less(a,b); }
};
DECLARE_TYPEOF(map<String COMMA UInt COMMA SmartLess>);
String to_bin(double value, double bin_size) {
if (bin_size <= 0 || value == 0) {
src/gui/control/image_card_list.cpp
-2
View File
@@ -16,8 +16,6 @@
#include <wx/imaglist.h>
#include <gui/util.hpp>
DECLARE_TYPEOF_COLLECTION(FieldP);
// ----------------------------------------------------------------------------- : ImageCardList
ImageCardList::ImageCardList(Window* parent, int id, long additional_style)
src/gui/control/keyword_list.cpp
-3
View File
@@ -21,9 +21,6 @@
#include <gfx/color.hpp>
#include <wx/clipbrd.h>
DECLARE_TYPEOF_COLLECTION(KeywordP);
DECLARE_TYPEOF_COLLECTION(CardP);
// ----------------------------------------------------------------------------- : Events
DEFINE_EVENT_TYPE(EVENT_KEYWORD_SELECT);
src/gui/control/native_look_editor.cpp
-3
View File
@@ -14,9 +14,6 @@
#include <data/export_template.hpp>
#include <data/settings.hpp>
DECLARE_TYPEOF_COLLECTION(ValueViewerP);
DECLARE_TYPEOF_NO_REV(IndexMap<FieldP COMMA StyleP>);
// ----------------------------------------------------------------------------- : NativeLookEditor
NativeLookEditor::NativeLookEditor(Window* parent, int id, long style)
src/gui/control/package_list.cpp
-2
View File
@@ -13,8 +13,6 @@
#include <script/profiler.hpp>
#include <gui/util.hpp>
DECLARE_TYPEOF_COLLECTION(PackagedP);
// ----------------------------------------------------------------------------- : PackageList
PackageList::PackageList(Window* parent, int id, int direction, bool always_focused)
src/gui/control/select_card_list.cpp
-2
View File
@@ -12,8 +12,6 @@
#include <data/card.hpp>
#include <wx/imaglist.h>
DECLARE_TYPEOF_COLLECTION(CardP);
// ----------------------------------------------------------------------------- : SelectCardList
SelectCardList::SelectCardList(Window* parent, int id, long additional_style)
src/gui/control/text_ctrl.cpp
-2
View File
@@ -13,8 +13,6 @@
#include <data/field/text.hpp>
#include <data/action/value.hpp>
DECLARE_TYPEOF_COLLECTION(ValueViewerP);
// ----------------------------------------------------------------------------- : TextCtrl
TextCtrl::TextCtrl(Window* parent, int id, bool multi_line, long style)
src/gui/control/tree_list.cpp
-2
View File
@@ -12,8 +12,6 @@
#include <wx/renderer.h>
#include <wx/dcbuffer.h>
DECLARE_TYPEOF_COLLECTION(TreeList::ItemP);
// ----------------------------------------------------------------------------- : TreeList : item managment
void TreeList::rebuild(bool full) {
src/gui/images_export_window.cpp
-2
View File
@@ -17,8 +17,6 @@
#include <util/tagged_string.hpp>
#include <wx/filename.h>
DECLARE_TYPEOF_COLLECTION(CardP);
// ----------------------------------------------------------------------------- : ImagesExportWindow
ImagesExportWindow::ImagesExportWindow(Window* parent, const SetP& set, const ExportCardSelectionChoices& choices)
src/gui/package_update_list.cpp
-5
View File
@@ -13,11 +13,6 @@
#include <gfx/gfx.hpp>
#include <wx/url.h>
DECLARE_TYPEOF_COLLECTION(InstallablePackageP);
DECLARE_TYPEOF_COLLECTION(PackageUpdateList::TreeItemP);
DECLARE_TYPEOF_COLLECTION(TreeList::ItemP);
// ----------------------------------------------------------------------------- : PackageUpdateList::TreeItem
void PackageUpdateList::TreeItem::add(const InstallablePackageP& package, const String& path, int level) {
src/gui/packages_window.cpp
-4
View File
@@ -25,10 +25,6 @@
DECLARE_POINTER_TYPE(Installer);
DECLARE_TYPEOF_COLLECTION(PackageDependencyP);
DECLARE_TYPEOF_COLLECTION(InstallablePackageP);
DECLARE_TYPEOF_COLLECTION(DownloadableInstallerP);
// ----------------------------------------------------------------------------- : TODO: MOVE
/*
src/gui/preferences_window.cpp
-2
View File
@@ -16,8 +16,6 @@
#include <wx/filename.h>
#include <wx/notebook.h>
DECLARE_TYPEOF_COLLECTION(PackagedP);
// use a combo box for the zoom choices instead of a spin control
#define USE_ZOOM_COMBOBOX 1
src/gui/print_window.cpp
-1
View File
@@ -16,7 +16,6 @@
#include <render/card/viewer.hpp>
#include <wx/print.h>
DECLARE_TYPEOF_COLLECTION(CardP);
DECLARE_POINTER_TYPE(PageLayout);
// ----------------------------------------------------------------------------- : Layout
src/gui/profiler_window.cpp
-2
View File
@@ -12,8 +12,6 @@
#if USE_SCRIPT_PROFILING
DECLARE_TYPEOF_COLLECTION(FunctionProfileP);
// -----------------------------------------------------------------------------
// Profiler Panel : class
// -----------------------------------------------------------------------------
src/gui/set/cards_panel.cpp
-2
View File
@@ -27,8 +27,6 @@
#include <util/window_id.hpp>
#include <wx/splitter.h>
DECLARE_TYPEOF_COLLECTION(AddCardsScriptP);
#ifdef EVT_TOOL_DROPDOWN
// This is only available after patching wx or in version 2.10
// see http://trac.wxwidgets.org/ticket/8556
src/gui/set/console_panel.cpp
-2
View File
@@ -18,8 +18,6 @@
#include <wx/clipbrd.h>
DECLARE_POINTER_TYPE(ConsoleMessage);
DECLARE_TYPEOF_COLLECTION(ScriptParseError);
DECLARE_TYPEOF_COLLECTION(ConsoleMessageP);
// ----------------------------------------------------------------------------- : MessageControl
src/gui/set/keywords_panel.cpp
-4
View File
@@ -23,10 +23,6 @@
#include <wx/statline.h>
#include <wx/artprov.h>
DECLARE_TYPEOF_COLLECTION(ParamReferenceTypeP);
DECLARE_TYPEOF_COLLECTION(KeywordParamP);
DECLARE_TYPEOF_COLLECTION(KeywordModeP);
// ----------------------------------------------------------------------------- : KeywordsPanel
KeywordsPanel::KeywordsPanel(Window* parent, int id)
src/gui/set/random_pack_panel.cpp
-5
View File
@@ -20,11 +20,6 @@
#include <wx/spinctrl.h>
#include <wx/dcbuffer.h>
DECLARE_TYPEOF_COLLECTION(PackTypeP);
DECLARE_TYPEOF_COLLECTION(PackItemP);
DECLARE_TYPEOF_COLLECTION(CardP);
DECLARE_TYPEOF_COLLECTION(PackAmountPicker);
// ----------------------------------------------------------------------------- : RandomCardList
/// A card list that contains the
src/gui/set/stats_panel.cpp
-7
View File
@@ -22,13 +22,6 @@
#include <gfx/gfx.hpp>
#include <wx/splitter.h>
DECLARE_TYPEOF_COLLECTION(StatsDimensionP);
DECLARE_TYPEOF_COLLECTION(String);
DECLARE_TYPEOF_COLLECTION(size_t);
DECLARE_TYPEOF_COLLECTION(CardP);
typedef pair<StatsDimensionP,String> pair_StatsDimensionP_String;
DECLARE_TYPEOF_COLLECTION(pair_StatsDimensionP_String);
// ----------------------------------------------------------------------------- : StatCategoryList
#if !USE_DIMENSION_LISTS
src/gui/set/style_panel.cpp
-2
View File
@@ -21,8 +21,6 @@
#include <data/action/set.hpp>
#include <data/action/value.hpp>
DECLARE_TYPEOF_COLLECTION(FieldP);
// ----------------------------------------------------------------------------- : StylePanel : initialization
StylePanel::StylePanel(Window* parent, int id)
src/gui/set/window.cpp
-4
View File
@@ -40,10 +40,6 @@
#include <data/action/value.hpp>
#include <data/action/set.hpp>
DECLARE_TYPEOF_COLLECTION(SetWindowPanel*);
DECLARE_TYPEOF_COLLECTION(SetWindow*);
DECLARE_TYPEOF_COLLECTION(String);
// ----------------------------------------------------------------------------- : Constructor
SetWindow::SetWindow(Window* parent, const SetP& set)
src/gui/symbol/part_list.cpp
-2
View File
@@ -18,8 +18,6 @@
#include <wx/dcbuffer.h>
#include <wx/caret.h>
DECLARE_TYPEOF_COLLECTION(SymbolPartP);
// ----------------------------------------------------------------------------- : Events
DEFINE_EVENT_TYPE(EVENT_PART_SELECT);
src/gui/symbol/point_editor.cpp
-2
View File
@@ -16,8 +16,6 @@
#include <util/window_id.hpp>
#include <util/error.hpp>
DECLARE_TYPEOF_COLLECTION(ControlPointP);
// ----------------------------------------------------------------------------- : SymbolPointEditor
SymbolPointEditor::SymbolPointEditor(SymbolControl* control, const SymbolShapeP& part)
src/gui/symbol/select_editor.cpp
-2
View File
@@ -16,8 +16,6 @@
#include <util/error.hpp>
#include <gfx/gfx.hpp>
DECLARE_TYPEOF_COLLECTION(SymbolPartP);
// ----------------------------------------------------------------------------- : SymbolSelectEditor
SymbolSelectEditor::SymbolSelectEditor(SymbolControl* control, bool rotate)
src/gui/symbol/selection.cpp
-2
View File
@@ -11,8 +11,6 @@
#include <data/symbol.hpp>
#include <gfx/bezier.hpp>
DECLARE_TYPEOF_COLLECTION(SymbolPartP);
// ----------------------------------------------------------------------------- : Selection
void SymbolPartsSelection::setSymbol(const SymbolP& symbol) {
src/gui/thumbnail_thread.cpp
-3
View File
@@ -12,9 +12,6 @@
#include <util/error.hpp>
#include <wx/thread.h>
typedef pair<ThumbnailRequestP,Image> pair_ThumbnailRequestP_Image;
DECLARE_TYPEOF_COLLECTION(pair_ThumbnailRequestP_Image);
// ----------------------------------------------------------------------------- : Image Cache
String user_settings_dir();
src/gui/update_checker.cpp
-1
View File
@@ -20,7 +20,6 @@
#include <wx/url.h>
DECLARE_POINTER_TYPE(VersionData);
DECLARE_TYPEOF_COLLECTION(PackageDependencyP);
// ----------------------------------------------------------------------------- : Update data
src/gui/value/choice.cpp
-2
View File
@@ -14,8 +14,6 @@
#include <script/image.hpp>
#include <wx/imaglist.h>
DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
// ----------------------------------------------------------------------------- : ChoiceThumbnailRequest
class ChoiceThumbnailRequest : public ThumbnailRequest {
src/gui/value/color.cpp
-2
View File
@@ -13,8 +13,6 @@
#include <data/action/value.hpp>
#include <wx/colordlg.h>
DECLARE_TYPEOF_COLLECTION(ColorField::ChoiceP);
// ----------------------------------------------------------------------------- : DropDownColorList
// A drop down list of color choices
src/gui/value/package_choice.cpp
-2
View File
@@ -12,8 +12,6 @@
#include <gui/util.hpp>
#include <data/action/value.hpp>
DECLARE_TYPEOF_COLLECTION(PackageChoiceValueViewer::Item);
// ----------------------------------------------------------------------------- : DropDownPackageChoiceList
/// A drop down list of color choices
src/gui/value/text.cpp
-7
View File
@@ -25,13 +25,6 @@
#undef small // some evil windows header defines this
DECLARE_SHARED_POINTER_TYPE(DropDownList);
DECLARE_TYPEOF_COLLECTION(WordListP);
DECLARE_TYPEOF_COLLECTION(WordListWordP);
DECLARE_TYPEOF_COLLECTION(WordListPosP);
DECLARE_TYPEOF_COLLECTION(AutoReplaceP);
struct DropDownWordListItem;
DECLARE_TYPEOF_COLLECTION(DropDownWordListItem);
DECLARE_TYPEOF_COLLECTION(String);
// ----------------------------------------------------------------------------- : TextValueEditorScrollBar
src/render/card/viewer.cpp
-3
View File
@@ -18,9 +18,6 @@
#include <data/action/set.hpp>
#include <gui/util.hpp> // clearDC
DECLARE_TYPEOF_COLLECTION(ValueViewerP);
DECLARE_TYPEOF_NO_REV(IndexMap<FieldP COMMA StyleP>);
// ----------------------------------------------------------------------------- : DataViewer
DataViewer::DataViewer() {}
src/render/symbol/viewer.cpp
-2
View File
@@ -11,8 +11,6 @@
#include <util/error.hpp> // clearDC_black
#include <gui/util.hpp> // clearDC_black
DECLARE_TYPEOF_COLLECTION(SymbolPartP);
// ----------------------------------------------------------------------------- : Simple rendering
Image render_symbol(const SymbolP& symbol, double border_radius, int width, int height, bool editing_hints, bool allow_smaller) {
src/render/text/element.cpp
-1
View File
@@ -12,7 +12,6 @@
#include <data/field/text.hpp>
#include <gfx/color.hpp>
DECLARE_TYPEOF_COLLECTION(TextElementP);
DECLARE_POINTER_TYPE(FontTextElement);
// ----------------------------------------------------------------------------- : TextElements
src/render/text/viewer.cpp
-3
View File
@@ -10,9 +10,6 @@
#include <render/text/viewer.hpp>
#include <algorithm>
DECLARE_TYPEOF_COLLECTION(TextViewer::Line);
DECLARE_TYPEOF_COLLECTION(double);
// ----------------------------------------------------------------------------- : Line
struct TextViewer::Line {
src/render/value/color.cpp
-2
View File
@@ -10,8 +10,6 @@
#include <render/value/color.hpp>
#include <render/card/viewer.hpp>
DECLARE_TYPEOF_COLLECTION(ColorField::ChoiceP);
// ----------------------------------------------------------------------------- : ColorValueViewer
IMPLEMENT_VALUE_VIEWER(Color);
src/render/value/multiple_choice.cpp
-2
View File
@@ -12,8 +12,6 @@
#include <render/card/viewer.hpp>
#include <gui/util.hpp>
DECLARE_TYPEOF_COLLECTION(String);
// ----------------------------------------------------------------------------- : MultipleChoiceValueViewer
IMPLEMENT_VALUE_VIEWER(MultipleChoice);
src/render/value/package_choice.cpp
-3
View File
@@ -11,9 +11,6 @@
#include <util/io/package_manager.hpp>
#include <gui/util.hpp>
DECLARE_TYPEOF_COLLECTION(PackagedP);
DECLARE_TYPEOF_COLLECTION(PackageChoiceValueViewer::Item);
// ----------------------------------------------------------------------------- : PackageChoiceValueViewer
IMPLEMENT_VALUE_VIEWER(PackageChoice);
src/render/value/symbol.cpp
-2
View File
@@ -14,8 +14,6 @@
#include <gui/util.hpp> // draw_checker
#include <util/error.hpp>
DECLARE_TYPEOF_COLLECTION(SymbolVariationP);
// ----------------------------------------------------------------------------- : SymbolValueViewer
IMPLEMENT_VALUE_VIEWER(Symbol);
src/render/value/viewer.cpp
-2
View File
@@ -10,8 +10,6 @@
#include <render/value/viewer.hpp>
#include <render/card/viewer.hpp>
DECLARE_TYPEOF_COLLECTION(wxPoint);
// ----------------------------------------------------------------------------- : ValueViewer
ValueViewer::ValueViewer(DataViewer& parent, const StyleP& style)
src/script/dependency.cpp
-3
View File
@@ -12,9 +12,6 @@
#include <util/error.hpp>
#include <queue>
DECLARE_TYPEOF_COLLECTION(ScriptValueP);
DECLARE_TYPEOF_COLLECTION(Context::Binding);
// NOTE: dependency.cpp has nothing to do with dependency.hpp, the latter defines the dependency
// type, which is used here as an abstract type. The header for this source file is context.hpp
src/script/functions/basic.cpp
-2
View File
@@ -18,8 +18,6 @@
#include <data/game.hpp>
#include <random>
DECLARE_TYPEOF_COLLECTION(pair<String COMMA ScriptValueP>);
// ----------------------------------------------------------------------------- : Debugging
SCRIPT_FUNCTION(trace) {
src/script/functions/editor.cpp
-6
View File
@@ -19,12 +19,6 @@
#include <data/field/multiple_choice.hpp>
#include <data/action/value.hpp>
DECLARE_TYPEOF_COLLECTION(FieldP);
DECLARE_TYPEOF_COLLECTION(TextValue*);
DECLARE_TYPEOF_COLLECTION(String);
DECLARE_TYPEOF_COLLECTION(pair<String COMMA bool>);
DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
// ----------------------------------------------------------------------------- : Combined editor
// Combining multiple (text) values into a single one
src/script/functions/export.cpp
-4
View File
@@ -21,8 +21,6 @@
#include <wx/wfstream.h>
#include <wx/filename.h>
DECLARE_TYPEOF_COLLECTION(SymbolFont::DrawableSymbol);
// ----------------------------------------------------------------------------- : Utility
// Make sure we can export files to a data directory
@@ -87,8 +85,6 @@ struct NegTag {
NegTag(Tag* tag, bool neg) : tag(tag), neg(neg) {}
};
DECLARE_TYPEOF_COLLECTION(NegTag);
/// A stack of opened HTML tags
class TagStack {
public:
src/script/functions/image.cpp
-2
View File
@@ -19,8 +19,6 @@
#include <gfx/generated_image.hpp>
#include <render/symbol/filter.hpp>
DECLARE_TYPEOF_COLLECTION(SymbolVariationP);
void parse_enum(const String&, ImageCombine& out);
// ----------------------------------------------------------------------------- : Utility
src/script/functions/regex.cpp
-1
View File
@@ -13,7 +13,6 @@
#include <util/error.hpp>
DECLARE_POINTER_TYPE(ScriptRegex);
DECLARE_TYPEOF_COLLECTION(pair<Variable COMMA ScriptValueP>);
// ----------------------------------------------------------------------------- : Regex type
src/script/parser.cpp
-2
View File
@@ -14,8 +14,6 @@
#include <util/io/package_manager.hpp> // for "include file" semi hack
#include <stack>
DECLARE_TYPEOF_COLLECTION(Variable);
#ifdef __WXMSW__
#define TokenType TokenType_ // some stupid windows header uses our name
#endif
src/script/profiler.cpp
-2
View File
@@ -16,8 +16,6 @@
#error "It looks like you are building the final release; disable USE_SCRIPT_PROFILING!"
#endif
DECLARE_TYPEOF(map<size_t COMMA FunctionProfileP>);
// ----------------------------------------------------------------------------- : Timer
Timer::Timer() {
src/script/script.cpp
-3
View File
@@ -16,7 +16,6 @@
typedef map<String, Variable> Variables;
Variables variables;
DECLARE_TYPEOF(Variables);
#ifdef _DEBUG
vector<String> variable_names;
#endif
@@ -148,8 +147,6 @@ unsigned int Script::getLabel() const {
return (unsigned int)instructions.size();
}
DECLARE_TYPEOF_COLLECTION(Instruction);
#ifdef _DEBUG // debugging
String Script::dumpScript() const {
src/script/scriptable.cpp
-2
View File
@@ -17,8 +17,6 @@
Alignment from_string(const String&);
void parse_enum(const String&,Direction&);
DECLARE_TYPEOF_COLLECTION(ScriptParseError);
// ----------------------------------------------------------------------------- : Store
void store(const ScriptValueP& val, String& var) { var = val->toString(); }
src/script/value.cpp
-2
View File
@@ -14,8 +14,6 @@
#include <util/error.hpp>
#include <boost/pool/singleton_pool.hpp>
DECLARE_TYPEOF_COLLECTION(pair<Variable COMMA ScriptValueP>);
// ----------------------------------------------------------------------------- : ScriptValue
// Base cases
src/util/action_stack.cpp
-3
View File
@@ -13,9 +13,6 @@
// ----------------------------------------------------------------------------- : Action stack
DECLARE_TYPEOF_COLLECTION(Action*);
DECLARE_TYPEOF_COLLECTION(ActionListener*);
ActionStack::ActionStack()
: save_point(nullptr)
, last_was_add(false)
src/util/error.cpp
-2
View File
@@ -15,8 +15,6 @@
#endif
#include <queue>
DECLARE_TYPEOF_COLLECTION(ScriptParseError);
// ----------------------------------------------------------------------------- : Debug utilities
#if defined(_MSC_VER) && defined(_DEBUG) && defined(_CRT_WIDE)
src/util/file_utils.cpp
-2
View File
@@ -13,8 +13,6 @@
#include <errno.h>
#include <sys/stat.h>
DECLARE_TYPEOF_COLLECTION(String);
// ----------------------------------------------------------------------------- : File names
String normalize_filename(const String& name) {
src/util/for_each.hpp
-14
View File
@@ -18,12 +18,6 @@
// ----------------------------------------------------------------------------- : Typeof magic
// GCC has a buildin typeof function, so it doesn't need (as much) hacks
#define DECLARE_TYPEOF(T)
#define DECLARE_TYPEOF_NO_REV(T)
#define DECLARE_TYPEOF_CONST(T)
#define DECLARE_TYPEOF_COLLECTION(T)
#define TYPEOF(Value) decltype(Value)
#define TYPEOF_IT(Value) decltype((Value).begin())
#define TYPEOF_CIT(Value) decltype((Value).begin())
@@ -32,14 +26,6 @@
#define TYPEOF_REF(Value) decltype(*(Value).begin())&
#define TYPEOF_CREF(Value) decltype(*(Value).begin())&
/// Use for template classes
/** i.e.
* DECLARE_TYPEOF(pair<a COMMA b>);
* instead of
* DECLARE_TYPEOF(pair<a,b>);
*/
#define COMMA ,
// ----------------------------------------------------------------------------- : Looping macros with iterators
/// Iterate over a collection, using an iterator it of type Type
src/util/io/package.cpp
-3
View File
@@ -16,9 +16,6 @@
#include <wx/zipstrm.h>
#include <wx/dir.h>
DECLARE_TYPEOF(Package::FileInfos);
DECLARE_TYPEOF_COLLECTION(PackageDependencyP);
// ----------------------------------------------------------------------------- : Package : outside
IMPLEMENT_DYNAMIC_ARG(Package*, writing_package, nullptr);
src/util/io/package.hpp
-1
View File
@@ -175,7 +175,6 @@ class Package : public IntrusivePtrVirtualBase {
public:
/// Information on files in the package
/** Note: must be public for DECLARE_TYPEOF to work */
typedef map<String, FileInfo> FileInfos;
inline const FileInfos& getFileInfos() const { return files; }
/// When was a file last modified?
src/util/io/package_manager.cpp
-4
View File
@@ -19,10 +19,6 @@
#include <wx/stdpaths.h>
#include <wx/wfstream.h>
DECLARE_TYPEOF_COLLECTION(InstallablePackageP);
DECLARE_TYPEOF_COLLECTION(PackageVersionP);
DECLARE_TYPEOF_COLLECTION(PackageVersion::FileInfo);
// ----------------------------------------------------------------------------- : PackageManager : in memory
PackageManager package_manager;
src/util/string.hpp
-2
View File
@@ -26,8 +26,6 @@ class wxTextOutputStream;
/// The string type used throughout MSE
typedef wxString String;
DECLARE_TYPEOF_NO_REV(String); // iterating over characters in a string
inline wxStdString const& toStdString(String const& s) {
#if wxUSE_UNICODE_WCHAR
return s.ToStdWstring();