From 488a4affd3a0e9a396cf7e9295795a43ef567e5c Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 10 Jul 2013 09:59:14 -0700 Subject: [PATCH] fix member variable initialization order to remove warnings --- interface/src/Swatch.cpp | 4 ++-- interface/src/Tool.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Swatch.cpp b/interface/src/Swatch.cpp index ad0e3e420a..ea8516e9a8 100644 --- a/interface/src/Swatch.cpp +++ b/interface/src/Swatch.cpp @@ -3,8 +3,8 @@ Swatch::Swatch(QAction* action) : Tool(action, 0, -1, -1), - _selected(1), - _textRenderer(MONO_FONT_FAMILY, 10, 100) { + _textRenderer(MONO_FONT_FAMILY, 10, 100), + _selected(1) { } void Swatch::reset() { diff --git a/interface/src/Tool.cpp b/interface/src/Tool.cpp index 3ad5a648e5..ccb42381dd 100644 --- a/interface/src/Tool.cpp +++ b/interface/src/Tool.cpp @@ -5,8 +5,8 @@ #include Tool::Tool(QAction *action, GLuint texture, int x, int y) : - _texture(texture), _action(action), + _texture(texture), _x(x), _y(y) { }