From 7ef882c525f94b9ff75c1cf6d03ccf63dacc34f8 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 6 Mar 2014 16:14:18 -0800 Subject: [PATCH] make sure InterfaceConfig is included before Qt headers --- interface/src/Environment.cpp | 3 ++- interface/src/ImportDialog.cpp | 3 ++- interface/src/renderer/AmbientOcclusionEffect.h | 2 -- interface/src/ui/LogDialog.cpp | 3 ++- interface/src/ui/RearMirrorTools.cpp | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/interface/src/Environment.cpp b/interface/src/Environment.cpp index 7609608a2a..4378af827a 100644 --- a/interface/src/Environment.cpp +++ b/interface/src/Environment.cpp @@ -5,6 +5,8 @@ // Created by Andrzej Kapolka on 5/6/13. // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. +#include "Environment.h" + #include #include #include @@ -15,7 +17,6 @@ #include "Application.h" #include "Camera.h" -#include "Environment.h" #include "renderer/ProgramObject.h" #include "world.h" diff --git a/interface/src/ImportDialog.cpp b/interface/src/ImportDialog.cpp index aa6d7e003e..b18dd77bb7 100644 --- a/interface/src/ImportDialog.cpp +++ b/interface/src/ImportDialog.cpp @@ -6,6 +6,8 @@ // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // +#include "ImportDialog.h" + #include #include #include @@ -14,7 +16,6 @@ #include #include "Application.h" -#include "ImportDialog.h" const QString WINDOW_NAME = QObject::tr("Import Voxels"); const QString IMPORT_BUTTON_NAME = QObject::tr("Import Voxels"); diff --git a/interface/src/renderer/AmbientOcclusionEffect.h b/interface/src/renderer/AmbientOcclusionEffect.h index dba9a97202..e56164bad4 100644 --- a/interface/src/renderer/AmbientOcclusionEffect.h +++ b/interface/src/renderer/AmbientOcclusionEffect.h @@ -9,8 +9,6 @@ #ifndef __interface__AmbientOcclusionEffect__ #define __interface__AmbientOcclusionEffect__ -#include "InterfaceConfig.h" - class ProgramObject; /// A screen space ambient occlusion effect. See John Chapman's tutorial at diff --git a/interface/src/ui/LogDialog.cpp b/interface/src/ui/LogDialog.cpp index 1cff7b24f0..129c77af01 100644 --- a/interface/src/ui/LogDialog.cpp +++ b/interface/src/ui/LogDialog.cpp @@ -6,6 +6,8 @@ // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // +#include "ui/LogDialog.h" + #include #include #include @@ -13,7 +15,6 @@ #include #include "Application.h" -#include "ui/LogDialog.h" const int TOP_BAR_HEIGHT = 46; const int INITIAL_WIDTH = 720; diff --git a/interface/src/ui/RearMirrorTools.cpp b/interface/src/ui/RearMirrorTools.cpp index 0ea53c0138..084528d408 100644 --- a/interface/src/ui/RearMirrorTools.cpp +++ b/interface/src/ui/RearMirrorTools.cpp @@ -5,12 +5,13 @@ // Created by stojce on 23.10.2013. // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. +#include "RearMirrorTools.h" + #include #include #include "Application.h" -#include "RearMirrorTools.h" #include "Util.h" const char SETTINGS_GROUP_NAME[] = "Rear View Tools";