Replace QStack with std::stack

This commit is contained in:
Jonas Kulla 2013-12-27 20:10:01 +01:00
parent 922a16a013
commit 99866fb84c
2 changed files with 5 additions and 4 deletions

View File

@ -23,7 +23,8 @@
#define GLSTATE_H #define GLSTATE_H
#include "etc.h" #include "etc.h"
#include <QStack>
#include <stack>
template<typename T> template<typename T>
struct GLProperty struct GLProperty
@ -35,7 +36,7 @@ struct GLProperty
} }
void push() { stack.push(current); } void push() { stack.push(current); }
void pop() { set(stack.pop()); } void pop() { set(stack.top()); stack.pop(); }
T &get() { return current; } T &get() { return current; }
void set(const T &value) void set(const T &value)
{ {
@ -55,7 +56,7 @@ private:
virtual void apply(const T &value) = 0; virtual void apply(const T &value) = 0;
T current; T current;
QStack<T> stack; std::stack<T> stack;
}; };
// Not needed // Not needed

View File

@ -89,7 +89,7 @@ struct ColorQuadArray
shState->ensureQuadIBO(quadCount); shState->ensureQuadIBO(quadCount);
} }
void draw(uint offset, uint count) void draw(size_t offset, size_t count)
{ {
VAO::bind(vao); VAO::bind(vao);