Merge of tanderson-viewoverride4 branch

This commit is contained in:
Yorik van Havre 2014-01-16 10:26:31 -02:00
parent 46c1f7835c
commit 0972be8e72

View File

@ -363,13 +363,6 @@ private:
SbBool redirected;
SbBool allowredir;
void setCursorRepresentation(int mode);
public:
void addFlag(Flag*, FlagLayout::Position);
private:
QPointer<FlagLayout> _flaglayout;
std::string overrideMode;
// friends