Skip to content

Commit

Permalink
Sort Includes (#170)
Browse files Browse the repository at this point in the history
* Fixing issues from sortincludes

* Change clang-format to sort includes

* Applying clang-format
  • Loading branch information
maddimax authored and gitoby committed Feb 15, 2019
1 parent f96b127 commit 15f6b55
Show file tree
Hide file tree
Showing 234 changed files with 503 additions and 501 deletions.
2 changes: 1 addition & 1 deletion .clang-format
@@ -1,7 +1,7 @@
---
BasedOnStyle: LLVM

SortIncludes: false
SortIncludes: true

BreakBeforeBraces: Custom
BraceWrapping:
Expand Down
2 changes: 1 addition & 1 deletion bauer/templates/app/source/AppController.h
@@ -1,7 +1,7 @@
#pragma once

#include <bdn/UIAppControllerBase.h>
#include "MainViewController.h"
#include <bdn/UIAppControllerBase.h>

using namespace bdn;

Expand Down
4 changes: 2 additions & 2 deletions examples/reddit/src/reddit.cpp
@@ -1,7 +1,7 @@
#include <bdn/foundation.h>
#include <bdn/ui.h>
#include <bdn/net.h>
#include <bdn/log.h>
#include <bdn/net.h>
#include <bdn/ui.h>

#include <nlohmann/json.hpp>

Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/AbortedError.h
@@ -1,7 +1,7 @@
#pragma once

#include <stdexcept>
#include <bdn/String.h>
#include <stdexcept>

namespace bdn
{
Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/AppLaunchInfo.h
Expand Up @@ -2,8 +2,8 @@

#include <vector>

#include <bdn/String.h>
#include <bdn/Base.h>
#include <bdn/String.h>

namespace bdn
{
Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/AppRunnerBase.h
@@ -1,7 +1,7 @@
#pragma once

#include <bdn/AppLaunchInfo.h>
#include <bdn/AppControllerBase.h>
#include <bdn/AppLaunchInfo.h>
#include <bdn/IDispatcher.h>

#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/Base.h
@@ -1,7 +1,7 @@
#pragma once

#include <memory>
#include <atomic>
#include <memory>

namespace bdn
{
Expand Down
3 changes: 2 additions & 1 deletion framework/foundation/include/bdn/Dip.h
Expand Up @@ -2,8 +2,9 @@

#include <map>

#include <bdn/round.h>
#include <bdn/Base.h>
#include <bdn/Rect.h>
#include <bdn/round.h>

namespace bdn
{
Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/Factory.h
Expand Up @@ -2,8 +2,8 @@

#include <bdn/String.h>

#include <map>
#include <functional>
#include <map>
#include <optional>

namespace bdn
Expand Down
6 changes: 3 additions & 3 deletions framework/foundation/include/bdn/GenericDispatcher.h
@@ -1,13 +1,13 @@
#pragma once

#include <bdn/Base.h>
#include <bdn/AppRunnerBase.h>
#include <bdn/Base.h>
#include <bdn/DanglingFunctionError.h>
#include <bdn/IDispatcher.h>
#include <bdn/InvalidArgumentError.h>
#include <bdn/Signal.h>
#include <bdn/ThreadRunnableBase.h>
#include <bdn/log.h>
#include <bdn/InvalidArgumentError.h>
#include <bdn/DanglingFunctionError.h>

#include <chrono>
#include <functional>
Expand Down
4 changes: 2 additions & 2 deletions framework/foundation/include/bdn/IAsyncOp.h
@@ -1,9 +1,9 @@
#pragma once

#include <bdn/UnfinishedError.h>
#include <bdn/AbortedError.h>
#include <bdn/OneShotStateNotifier.h>
#include <bdn/IAsyncNotifier.h>
#include <bdn/OneShotStateNotifier.h>
#include <bdn/UnfinishedError.h>

namespace bdn
{
Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/IDispatcher.h
@@ -1,7 +1,7 @@
#pragma once

#include <map>
#include <chrono>
#include <map>

namespace bdn
{
Expand Down
2 changes: 2 additions & 0 deletions framework/foundation/include/bdn/Margin.h
@@ -1,5 +1,7 @@
#pragma once

#include <ostream>

namespace bdn
{

Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/NotifierBase.h
@@ -1,8 +1,8 @@
#pragma once

#include <bdn/DanglingFunctionError.h>
#include <bdn/IAsyncNotifier.h>
#include <bdn/ISyncNotifier.h>
#include <bdn/DanglingFunctionError.h>

#include <functional>
#include <map>
Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/Number.h
Expand Up @@ -3,8 +3,8 @@
#include <bdn/config.h>

// needed so that we can provide specializations for std::hash
#include <functional>
#include <cmath>
#include <functional>

namespace bdn
{
Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/ProgrammingError.h
@@ -1,7 +1,7 @@
#pragma once

#include <stdexcept>
#include <bdn/String.h>
#include <stdexcept>

namespace bdn
{
Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/Rect.h
@@ -1,8 +1,8 @@
#pragma once

#include <bdn/Margin.h>
#include <bdn/Size.h>
#include <bdn/Point.h>
#include <bdn/Size.h>

namespace bdn
{
Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/Size.h
Expand Up @@ -2,8 +2,8 @@

#include <bdn/Margin.h>

#include <limits>
#include <cmath>
#include <limits>

namespace bdn
{
Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/StopWatch.h
@@ -1,7 +1,7 @@
#pragma once

#include <chrono>
#include <bdn/IDispatcher.h>
#include <chrono>

namespace bdn
{
Expand Down
6 changes: 3 additions & 3 deletions framework/foundation/include/bdn/String.h
@@ -1,10 +1,10 @@
#pragma once

#include <string>
#include <locale>
#include <codecvt>
#include <algorithm>
#include <cctype>
#include <codecvt>
#include <locale>
#include <string>

namespace bdn
{
Expand Down
4 changes: 2 additions & 2 deletions framework/foundation/include/bdn/Switch.h
@@ -1,9 +1,9 @@
#pragma once

#include <bdn/TriState.h>
#include <bdn/ClickEvent.h>
#include <bdn/SwitchCore.h>
#include <bdn/TriState.h>
#include <bdn/View.h>
#include <bdn/ClickEvent.h>

#include <bdn/SimpleNotifier.h>

Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/config.h
@@ -1,8 +1,8 @@
#pragma once

#include <cstdint>
#include <climits>
#include <cstddef>
#include <cstdint>
#include <ostream>

#include <bdn/platform.h>
Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/errno.h
@@ -1,7 +1,7 @@
#pragma once

#include <bdn/SystemError.h>
#include <bdn/ErrorFields.h>
#include <bdn/SystemError.h>
#include <bdn/config.h>

#include <cerrno>
Expand Down
2 changes: 1 addition & 1 deletion framework/foundation/include/bdn/func.h
@@ -1,7 +1,7 @@
#pragma once

#include <utility>
#include <functional>
#include <utility>

#include <bdn/DanglingFunctionError.h>

Expand Down
6 changes: 3 additions & 3 deletions framework/foundation/include/bdn/mainThread.h
@@ -1,9 +1,9 @@
#pragma once

#include <bdn/ISimpleCallable.h>
#include <bdn/IDispatcher.h>
#include <bdn/DanglingFunctionError.h>
#include <bdn/AppRunnerBase.h>
#include <bdn/DanglingFunctionError.h>
#include <bdn/IDispatcher.h>
#include <bdn/ISimpleCallable.h>

#include <future>

Expand Down
7 changes: 3 additions & 4 deletions framework/foundation/include/bdn/property/Backing.h
@@ -1,13 +1,12 @@
#pragma once

#include <bdn/property/Property.h>
#include <bdn/property/IValueAccessor.h>
#include <bdn/SimpleNotifier.h>

#include <bdn/property/IValueAccessor.h>
#include <memory>

namespace bdn
{
template <class ValType> class Property;

template <class ValType> class Backing : virtual public IValueAccessor<ValType>
{
Expand Down Expand Up @@ -57,4 +56,4 @@ namespace bdn
protected:
mutable notifier_t_ptr _pOnChange;
};
}
}
8 changes: 4 additions & 4 deletions framework/foundation/include/bdn/property/Property.h
Expand Up @@ -3,12 +3,12 @@
#include <bdn/NotifierBase.h>
#include <bdn/property/IValueAccessor.h>

#include <bdn/property/property_forward_decl.h>
#include <bdn/property/InternalValueBacking.h>
#include <bdn/property/GetterSetterBacking.h>
#include <bdn/property/GetterSetter.h>
#include <bdn/property/SetterBacking.h>
#include <bdn/property/GetterSetterBacking.h>
#include <bdn/property/InternalValueBacking.h>
#include <bdn/property/Setter.h>
#include <bdn/property/SetterBacking.h>
#include <bdn/property/property_forward_decl.h>

#include <bdn/func.h>

Expand Down
Expand Up @@ -2,8 +2,8 @@

#include <bdn/IDispatcher.h>

#include <bdn/android/JNativeDispatcher.h>
#include <bdn/android/JLooper.h>
#include <bdn/android/JNativeDispatcher.h>

namespace bdn
{
Expand Down
@@ -1,8 +1,8 @@
#pragma once

#include <bdn/java/ArrayOfObjects.h>
#include <bdn/java/JObject.h>
#include <bdn/java/JString.h>
#include <bdn/java/ArrayOfObjects.h>

namespace bdn
{
Expand Down
@@ -1,8 +1,8 @@
#pragma once

#include <bdn/java/JObject.h>
#include <bdn/android/JResources.h>
#include <bdn/android/JIntent.h>
#include <bdn/android/JResources.h>
#include <bdn/java/JObject.h>

namespace bdn
{
Expand Down
@@ -1,8 +1,8 @@
#pragma once

#include <bdn/java/JObject.h>
#include <bdn/android/JBundle.h>
#include <bdn/android/JUri.h>
#include <bdn/java/JObject.h>

namespace bdn
{
Expand All @@ -23,10 +23,10 @@ namespace bdn
return javaClass().newInstance_(constructorId, string, uri);
}

JIntent(String string, JUri uri) : JTObject(createIntentInstance(string, uri)) {}
JIntent(String string, JUri uri) : JTObject<kIntentClassName>(createIntentInstance(string, uri)) {}

public:
using java::JTObject<kIntentClassName>::JTObject;
using JTObject<kIntentClassName>::JTObject;

java::Method<String()> getAction{this, "getAction"};
java::Method<JBundle()> getExtras{this, "getExtras"};
Expand Down
@@ -1,7 +1,7 @@
#pragma once

#include <bdn/java/JObject.h>
#include <bdn/android/JConfiguration.h>
#include <bdn/java/JObject.h>

namespace bdn
{
Expand Down
@@ -1,7 +1,7 @@
#pragma once

#include <bdn/java/JObject.h>
#include <bdn/java/Env.h>
#include <bdn/java/JObject.h>

namespace bdn
{
Expand Down
@@ -1,8 +1,8 @@
#pragma once

#include <bdn/java/FieldAccessor.h>
#include <bdn/java/Reference.h>
#include <bdn/java/ObjectFieldKind.h>
#include <bdn/java/Reference.h>
#include <bdn/java/StaticFieldKind.h>

namespace bdn
Expand Down
@@ -1,7 +1,7 @@
#pragma once

#include <bdn/java/JObject.h>
#include <bdn/java/Env.h>
#include <bdn/java/JObject.h>

namespace bdn
{
Expand Down

0 comments on commit 15f6b55

Please sign in to comment.