mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 13:06:59 -04:00
Remove DECLARE_TYPEOF
It is no longer needed since C++11
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user