From 1ef780c6cb7ea1b5858f0a71576947ce0ef5bcee Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 6 Mar 2014 16:24:58 -0800 Subject: [PATCH] make headers coding standard compliant --- interface/src/Environment.cpp | 4 +++- interface/src/Environment.h | 2 -- interface/src/ImportDialog.cpp | 4 +++- interface/src/renderer/AmbientOcclusionEffect.cpp | 3 ++- interface/src/ui/LogDialog.cpp | 4 +++- interface/src/ui/RearMirrorTools.cpp | 4 +++- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/interface/src/Environment.cpp b/interface/src/Environment.cpp index 4378af827a..9efaa274c0 100644 --- a/interface/src/Environment.cpp +++ b/interface/src/Environment.cpp @@ -5,7 +5,7 @@ // Created by Andrzej Kapolka on 5/6/13. // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. -#include "Environment.h" +#include "InterfaceConfig.h" #include #include @@ -20,6 +20,8 @@ #include "renderer/ProgramObject.h" #include "world.h" +#include "Environment.h" + uint qHash(const HifiSockAddr& sockAddr) { if (sockAddr.getAddress().isNull()) { return 0; // shouldn't happen, but if it does, zero is a perfectly valid hash diff --git a/interface/src/Environment.h b/interface/src/Environment.h index 8f9522cd8e..1c9ee578c3 100644 --- a/interface/src/Environment.h +++ b/interface/src/Environment.h @@ -9,8 +9,6 @@ #ifndef __interface__Environment__ #define __interface__Environment__ -#include "InterfaceConfig.h" - #include #include diff --git a/interface/src/ImportDialog.cpp b/interface/src/ImportDialog.cpp index b18dd77bb7..2741fada0a 100644 --- a/interface/src/ImportDialog.cpp +++ b/interface/src/ImportDialog.cpp @@ -6,7 +6,7 @@ // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // -#include "ImportDialog.h" +#include "InterfaceConfig.h" #include #include @@ -17,6 +17,8 @@ #include "Application.h" +#include "ImportDialog.h" + const QString WINDOW_NAME = QObject::tr("Import Voxels"); const QString IMPORT_BUTTON_NAME = QObject::tr("Import Voxels"); const QString LOADING_BUTTON_NAME = QObject::tr("Loading ..."); diff --git a/interface/src/renderer/AmbientOcclusionEffect.cpp b/interface/src/renderer/AmbientOcclusionEffect.cpp index 8a150a3eba..a492552e7c 100644 --- a/interface/src/renderer/AmbientOcclusionEffect.cpp +++ b/interface/src/renderer/AmbientOcclusionEffect.cpp @@ -15,11 +15,12 @@ #include -#include "AmbientOcclusionEffect.h" #include "Application.h" #include "ProgramObject.h" #include "RenderUtil.h" +#include "AmbientOcclusionEffect.h" + const int ROTATION_WIDTH = 4; const int ROTATION_HEIGHT = 4; diff --git a/interface/src/ui/LogDialog.cpp b/interface/src/ui/LogDialog.cpp index 129c77af01..d219c08698 100644 --- a/interface/src/ui/LogDialog.cpp +++ b/interface/src/ui/LogDialog.cpp @@ -6,7 +6,7 @@ // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // -#include "ui/LogDialog.h" +#include "InterfaceConfig.h" #include #include @@ -16,6 +16,8 @@ #include "Application.h" +#include "ui/LogDialog.h" + const int TOP_BAR_HEIGHT = 46; const int INITIAL_WIDTH = 720; const int MINIMAL_WIDTH = 570; diff --git a/interface/src/ui/RearMirrorTools.cpp b/interface/src/ui/RearMirrorTools.cpp index 084528d408..314fd7157b 100644 --- a/interface/src/ui/RearMirrorTools.cpp +++ b/interface/src/ui/RearMirrorTools.cpp @@ -5,7 +5,7 @@ // Created by stojce on 23.10.2013. // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. -#include "RearMirrorTools.h" +#include "InterfaceConfig.h" #include @@ -14,6 +14,8 @@ #include "Application.h" #include "Util.h" +#include "RearMirrorTools.h" + const char SETTINGS_GROUP_NAME[] = "Rear View Tools"; const char ZOOM_LEVEL_SETTINGS[] = "ZoomLevel"; const int ICON_SIZE = 20;