gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-07 06:39:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: remove excessive templating in favour of a single const_cast.

Browse Source 
The const_cast will be removed again in a later commit.
This commit is contained in:
frosch 2021-05-09 18:35:49 +02:00 committed by frosch
parent 95abdfdef9
commit aba239479b
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/window_gui.h
View File

@ -813,65 +813,59 @@ public:
/** /**
* Iterator to iterate all valid Windows * Iterator to iterate all valid Windows
* @tparam T Type of the class/struct that is going to be iterated
* @tparam Tfront Wether we iterate from front * @tparam Tfront Wether we iterate from front
*/ */
template <class T, bool Tfront> template <bool Tfront>
struct WindowIterator { struct WindowIterator {
typedef T value_type; typedef Window *value_type;
typedef T *pointer; typedef value_type *pointer;
typedef T &reference; typedef value_type &reference;
typedef size_t difference_type; typedef size_t difference_type;
typedef std::forward_iterator_tag iterator_category; typedef std::forward_iterator_tag iterator_category;
explicit WindowIterator(T *start) : w(start) explicit WindowIterator(const Window *start) : w(const_cast<Window *>(start))
{ {
this->Validate(); this->Validate();
} }
bool operator==(const WindowIterator &other) const { return this->w == other.w; } bool operator==(const WindowIterator &other) const { return this->w == other.w; }
bool operator!=(const WindowIterator &other) const { return !(*this == other); } bool operator!=(const WindowIterator &other) const { return !(*this == other); }
T * operator*() const { return this->w; } Window * operator*() const { return this->w; }
WindowIterator & operator++() { this->Next(); this->Validate(); return *this; } WindowIterator & operator++() { this->Next(); this->Validate(); return *this; }
private: private:
T *w; Window *w;
void Validate() { while (this->w != nullptr && this->w->window_class == WC_INVALID) this->Next(); } void Validate() { while (this->w != nullptr && this->w->window_class == WC_INVALID) this->Next(); }
void Next() { if (this->w != nullptr) this->w = Tfront ? this->w->z_back : this->w->z_front; } void Next() { if (this->w != nullptr) this->w = Tfront ? this->w->z_back : this->w->z_front; }
}; };
/** /**
* Iterable ensemble of all valid Windows * Iterable ensemble of all valid Windows
* @tparam T Type of the class/struct that is going to be iterated
* @tparam Tfront Wether we iterate from front * @tparam Tfront Wether we iterate from front
*/ */
template <class T, bool Tfront> template <bool Tfront>
struct Iterate { struct Iterate {
Iterate(T *from) : from(from) {} Iterate(const Window *from) : from(from) {}
WindowIterator<T, Tfront> begin() { return WindowIterator<T, Tfront>(this->from); } WindowIterator<Tfront> begin() { return WindowIterator<Tfront>(this->from); }
WindowIterator<T, Tfront> end() { return WindowIterator<T, Tfront>(nullptr); } WindowIterator<Tfront> end() { return WindowIterator<Tfront>(nullptr); }
bool empty() { return this->begin() == this->end(); } bool empty() { return this->begin() == this->end(); }
private: private:
T *from; const Window *from;
}; };
/** /**
* Returns an iterable ensemble of all valid Window from back to front * Returns an iterable ensemble of all valid Window from back to front
* @tparam T Type of the class/struct that is going to be iterated
* @param from index of the first Window to consider * @param from index of the first Window to consider
* @return an iterable ensemble of all valid Window * @return an iterable ensemble of all valid Window
*/ */
template <class T = Window> static Iterate<false> IterateFromBack(const Window *from = _z_back_window) { return Iterate<false>(from); }
static Iterate<T, false> IterateFromBack(T *from = _z_back_window) { return Iterate<T, false>(from); }
/** /**
* Returns an iterable ensemble of all valid Window from front to back * Returns an iterable ensemble of all valid Window from front to back
* @tparam T Type of the class/struct that is going to be iterated
* @param from index of the first Window to consider * @param from index of the first Window to consider
* @return an iterable ensemble of all valid Window * @return an iterable ensemble of all valid Window
*/ */
template <class T = Window> static Iterate<true> IterateFromFront(const Window *from = _z_front_window) { return Iterate<true>(from); }
static Iterate<T, true> IterateFromFront(T *from = _z_front_window) { return Iterate<T, true>(from); }
}; };
/** /**