From 3fe5af1505bde2c9ca8eff6d57b6854250b97af8 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 9 Apr 2014 15:08:56 -0700 Subject: [PATCH] update boilerplate and include guards for other new files --- domain-server/src/DTLSServerSession.h | 6 +++--- libraries/shared/src/DTLSClientSession.h | 6 +++--- libraries/shared/src/DTLSSession.h | 6 +++--- libraries/shared/src/DomainHandler.cpp | 7 +++++-- libraries/shared/src/DomainHandler.h | 13 ++++++++----- libraries/shared/src/DummyDTLSSession.h | 6 +++--- libraries/shared/src/HifiConfigVariantMap.cpp | 7 +++++-- libraries/shared/src/HifiConfigVariantMap.h | 13 ++++++++----- libraries/shared/src/LimitedNodeList.cpp | 7 +++++-- libraries/shared/src/LimitedNodeList.h | 13 ++++++++----- 10 files changed, 51 insertions(+), 33 deletions(-) diff --git a/domain-server/src/DTLSServerSession.h b/domain-server/src/DTLSServerSession.h index cc94c9dc2e..5fdc602df7 100644 --- a/domain-server/src/DTLSServerSession.h +++ b/domain-server/src/DTLSServerSession.h @@ -9,8 +9,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef __hifi__DTLSServerSession__ -#define __hifi__DTLSServerSession__ +#ifndef hifi_DTLSServerSession_h +#define hifi_DTLSServerSession_h #include @@ -21,4 +21,4 @@ public: DTLSServerSession(QUdpSocket& dtlsSocket, HifiSockAddr& destinationSocket); }; -#endif /* defined(__hifi__DTLSServerSession__) */ +#endif // hifi_DTLSServerSession_h diff --git a/libraries/shared/src/DTLSClientSession.h b/libraries/shared/src/DTLSClientSession.h index 8dece76a5c..fcd5a3b5e9 100644 --- a/libraries/shared/src/DTLSClientSession.h +++ b/libraries/shared/src/DTLSClientSession.h @@ -9,8 +9,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef __hifi__DTLSClientSession__ -#define __hifi__DTLSClientSession__ +#ifndef hifi_DTLSClientSession_h +#define hifi_DTLSClientSession_h #include "DTLSSession.h" @@ -27,4 +27,4 @@ public: static bool _wasGloballyInitialized; }; -#endif /* defined(__hifi__DTLSClientSession__) */ +#endif // hifi_DTLSClientSession_h diff --git a/libraries/shared/src/DTLSSession.h b/libraries/shared/src/DTLSSession.h index f7849999ae..4b69f13c78 100644 --- a/libraries/shared/src/DTLSSession.h +++ b/libraries/shared/src/DTLSSession.h @@ -9,8 +9,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef __hifi__DTLSSession__ -#define __hifi__DTLSSession__ +#ifndef hifi_DTLSSession_h +#define hifi_DTLSSession_h #include @@ -41,4 +41,4 @@ protected: bool _completedHandshake; }; -#endif /* defined(__hifi__DTLSSession__) */ +#endif // hifi_DTLSSession_h diff --git a/libraries/shared/src/DomainHandler.cpp b/libraries/shared/src/DomainHandler.cpp index 4773a368a4..85c452f01c 100644 --- a/libraries/shared/src/DomainHandler.cpp +++ b/libraries/shared/src/DomainHandler.cpp @@ -1,9 +1,12 @@ // // DomainHandler.cpp -// hifi +// libraries/shared/src // // Created by Stephen Birarda on 2/18/2014. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // #include diff --git a/libraries/shared/src/DomainHandler.h b/libraries/shared/src/DomainHandler.h index 106eff67f1..f31e2a6817 100644 --- a/libraries/shared/src/DomainHandler.h +++ b/libraries/shared/src/DomainHandler.h @@ -1,13 +1,16 @@ // // DomainHandler.h -// hifi +// libraries/shared/src // // Created by Stephen Birarda on 2/18/2014. -// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. +// Copyright 2014 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef __hifi__DomainHandler__ -#define __hifi__DomainHandler__ +#ifndef hifi_DomainHandler_h +#define hifi_DomainHandler_h #include #include @@ -76,4 +79,4 @@ private: QTimer* _handshakeTimer; }; -#endif /* defined(__hifi__DomainHandler__) */ +#endif // hifi_DomainHandler_h diff --git a/libraries/shared/src/DummyDTLSSession.h b/libraries/shared/src/DummyDTLSSession.h index 336d473c63..e13686ac51 100644 --- a/libraries/shared/src/DummyDTLSSession.h +++ b/libraries/shared/src/DummyDTLSSession.h @@ -9,8 +9,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef __hifi__DummyDTLSSession__ -#define __hifi__DummyDTLSSession__ +#ifndef hifi_DummyDTLSSession_h +#define hifi_DummyDTLSSession_h #include @@ -31,4 +31,4 @@ protected: HifiSockAddr _destinationSocket; }; -#endif /* defined(__hifi__DummyDTLSSession__) */ +#endif // hifi_DummyDTLSSession_h diff --git a/libraries/shared/src/HifiConfigVariantMap.cpp b/libraries/shared/src/HifiConfigVariantMap.cpp index f68c64581b..d20f4276f1 100644 --- a/libraries/shared/src/HifiConfigVariantMap.cpp +++ b/libraries/shared/src/HifiConfigVariantMap.cpp @@ -1,9 +1,12 @@ // // HifiConfigVariantMap.cpp -// hifi +// libraries/shared/src // // Created by Stephen Birarda on 2014-04-08. -// Copyright (c) 2014 High Fidelity, Inc. All rights reserved. +// Copyright 2014 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // #include diff --git a/libraries/shared/src/HifiConfigVariantMap.h b/libraries/shared/src/HifiConfigVariantMap.h index c652278b0d..378aa749c5 100644 --- a/libraries/shared/src/HifiConfigVariantMap.h +++ b/libraries/shared/src/HifiConfigVariantMap.h @@ -1,13 +1,16 @@ // // HifiConfigVariantMap.h -// hifi +// libraries/shared/src // // Created by Stephen Birarda on 2014-04-08. -// Copyright (c) 2014 High Fidelity, Inc. All rights reserved. +// Copyright 2014 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef __hifi__HifiConfigVariantMap__ -#define __hifi__HifiConfigVariantMap__ +#ifndef hifi_HifiConfigVariantMap_h +#define hifi_HifiConfigVariantMap_h #include @@ -16,4 +19,4 @@ public: static QVariantMap mergeCLParametersWithJSONConfig(const QStringList& argumentList); }; -#endif /* defined(__hifi__HifiConfigVariantMap__) */ +#endif // hifi_HifiConfigVariantMap_h diff --git a/libraries/shared/src/LimitedNodeList.cpp b/libraries/shared/src/LimitedNodeList.cpp index e9fdaa493c..b4a65475d6 100644 --- a/libraries/shared/src/LimitedNodeList.cpp +++ b/libraries/shared/src/LimitedNodeList.cpp @@ -1,9 +1,12 @@ // // LimitedNodeList.cpp -// hifi +// libraries/shared/src // // Created by Stephen Birarda on 2/15/13. -// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. +// Copyright 2013 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // #include diff --git a/libraries/shared/src/LimitedNodeList.h b/libraries/shared/src/LimitedNodeList.h index adbc94e8d2..d428805511 100644 --- a/libraries/shared/src/LimitedNodeList.h +++ b/libraries/shared/src/LimitedNodeList.h @@ -1,13 +1,16 @@ // // LimitedNodeList.h -// hifi +// libraries/shared/src // // Created by Stephen Birarda on 2/15/13. -// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. +// Copyright 2013 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef __hifi__LimitedNodeList__ -#define __hifi__LimitedNodeList__ +#ifndef hifi_LimitedNodeList_h +#define hifi_LimitedNodeList_h #ifdef _WIN32 #include "Syssocket.h" @@ -132,4 +135,4 @@ protected: QElapsedTimer _packetStatTimer; }; -#endif /* defined(__hifi__LimitedNodeList__) */ +#endif // hifi_LimitedNodeList_h