mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 21:06:59 -04:00
Clean up old style angle brackets in nested templates
This commit is contained in:
@@ -32,7 +32,7 @@ public:
|
||||
if (hasFilter()) {
|
||||
return make_intrusive<QuickFilter<T>>(getFilterString());
|
||||
} else {
|
||||
return intrusive_ptr<Filter<T> >();
|
||||
return intrusive_ptr<Filter<T>>();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <gui/control/card_list.hpp>
|
||||
#include <data/filter.hpp>
|
||||
|
||||
typedef intrusive_ptr<Filter<Card> > CardListFilterP;
|
||||
typedef intrusive_ptr<Filter<Card>> CardListFilterP;
|
||||
|
||||
// ----------------------------------------------------------------------------- : FilteredCardList
|
||||
|
||||
|
||||
@@ -263,7 +263,7 @@ private:
|
||||
mutable RealSize size, item_size;
|
||||
mutable double label_width;
|
||||
Alignment alignment;
|
||||
vector<pair<String,String> > values;
|
||||
vector<pair<String,String>> values;
|
||||
};
|
||||
|
||||
//class GraphTable {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <data/filter.hpp>
|
||||
#include <data/set.hpp>
|
||||
|
||||
typedef intrusive_ptr<Filter<Keyword> > KeywordListFilterP;
|
||||
typedef intrusive_ptr<Filter<Keyword>> KeywordListFilterP;
|
||||
|
||||
// ----------------------------------------------------------------------------- : Events
|
||||
|
||||
|
||||
@@ -168,7 +168,7 @@ void ThumbnailThread::request(const ThumbnailRequestP& request) {
|
||||
bool ThumbnailThread::done(void* owner) {
|
||||
assert(wxThread::IsMain());
|
||||
// find finished requests
|
||||
vector<pair<ThumbnailRequestP,Image> > finished;
|
||||
vector<pair<ThumbnailRequestP,Image>> finished;
|
||||
{
|
||||
wxMutexLocker lock(mutex);
|
||||
for (size_t i = 0 ; i < closed_requests.size() ; ) {
|
||||
|
||||
@@ -70,7 +70,7 @@ private:
|
||||
wxCondition completed; ///< Event signaled when a request is completed
|
||||
|
||||
deque<ThumbnailRequestP> open_requests; ///< Requests on which work hasn't finished
|
||||
vector<pair<ThumbnailRequestP,Image> > closed_requests; ///< Requests for which work is completed
|
||||
vector<pair<ThumbnailRequestP,Image>> closed_requests; ///< Requests for which work is completed
|
||||
set<ThumbnailRequestP> request_names; ///< Requests that haven't been stored yet, to prevent duplicates
|
||||
friend class ThumbnailThreadWorker;
|
||||
ThumbnailThreadWorker* worker; ///< The worker thread. invariant: no requests ==> worker==nullptr
|
||||
|
||||
Reference in New Issue
Block a user