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/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