Skip to content

Commit

Permalink
Merge pull request #1113 from mrousavy/fix/system-headeres
Browse files Browse the repository at this point in the history
fix: Replace all `<angled>` user header imports with correct `"quotes"` syntax
  • Loading branch information
chrfalch authored Nov 27, 2022
2 parents 7408a44 + c9288cc commit 9aa784d
Show file tree
Hide file tree
Showing 52 changed files with 121 additions and 120 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkCanvas.h>
#include <SkSurface.h>
#include "SkCanvas.h"
#include "SkSurface.h"

#pragma clang diagnostic pop

Expand Down
4 changes: 2 additions & 2 deletions package/android/cpp/rnskia-android/RNSkOpenGLCanvasProvider.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <RNSkJsView.h>

#include <SkiaOpenGLRenderer.h>
#include "SkiaOpenGLRenderer.h"
#include <android/native_window.h>

namespace RNSkia {
Expand Down Expand Up @@ -39,4 +39,4 @@ class RNSkOpenGLCanvasProvider
float _width = -1;
float _height = -1;
};
} // namespace RNSkia
} // namespace RNSkia
10 changes: 5 additions & 5 deletions package/android/cpp/rnskia-android/SkiaOpenGLRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

#include "include/gpu/GrDirectContext.h"
#include "include/gpu/gl/GrGLInterface.h"
#include <SkCanvas.h>
#include <SkColorSpace.h>
#include <SkPicture.h>
#include <SkSurface.h>
#include "SkCanvas.h"
#include "SkColorSpace.h"
#include "SkPicture.h"
#include "SkSurface.h"

#pragma clang diagnostic pop

Expand Down Expand Up @@ -127,4 +127,4 @@ class SkiaOpenGLRenderer {

std::atomic<RenderState> _renderState = {RenderState::Initializing};
};
} // namespace RNSkia
} // namespace RNSkia
16 changes: 8 additions & 8 deletions package/cpp/api/JsiSkCanvas.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkCanvas.h>
#include <SkFont.h>
#include <SkPaint.h>
#include <SkPath.h>
#include <SkPicture.h>
#include <SkRegion.h>
#include <SkSurface.h>
#include <SkTypeface.h>
#include "SkCanvas.h"
#include "SkFont.h"
#include "SkPaint.h"
#include "SkPath.h"
#include "SkPicture.h"
#include "SkRegion.h"
#include "SkSurface.h"
#include "SkTypeface.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkColor.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkColor.h>
#include "SkColor.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkColorFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkColorFilter.h>
#include "SkColorFilter.h"

#pragma clang diagnostic pop

Expand Down
4 changes: 2 additions & 2 deletions package/cpp/api/JsiSkColorFilterFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkColorFilter.h>
#include <SkLumaColorFilter.h>
#include "SkColorFilter.h"
#include "SkLumaColorFilter.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkContourMeasure.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkContourMeasure.h>
#include "SkContourMeasure.h"

#include "JsiSkPath.h"

Expand Down
4 changes: 2 additions & 2 deletions package/cpp/api/JsiSkContourMeasureIter.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkContourMeasure.h>
#include "SkContourMeasure.h"

#include "JsiSkPath.h"

Expand Down Expand Up @@ -80,4 +80,4 @@ class JsiSkContourMeasureIter
};
}
};
} // namespace RNSkia
} // namespace RNSkia
4 changes: 2 additions & 2 deletions package/cpp/api/JsiSkData.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkFont.h>
#include <SkStream.h>
#include "SkFont.h"
#include "SkStream.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkDataFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <ReactCommon/TurboModuleUtils.h>
#include <jsi/jsi.h>

#include <SkBase64.h>
#include "SkBase64.h"

#include "JsiSkData.h"

Expand Down
4 changes: 2 additions & 2 deletions package/cpp/api/JsiSkFont.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkFont.h>
#include <SkFontMetrics.h>
#include "SkFont.h"
#include "SkFontMetrics.h"

#pragma clang diagnostic pop

Expand Down
6 changes: 3 additions & 3 deletions package/cpp/api/JsiSkImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkBase64.h>
#include <SkImage.h>
#include <SkStream.h>
#include "SkBase64.h"
#include "SkImage.h"
#include "SkStream.h"
#include <include/codec/SkCodec.h>

#pragma clang diagnostic pop
Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkImageFilters.h>
#include "SkImageFilters.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkImageFilterFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkImageFilter.h>
#include "SkImageFilter.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkImageInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkImageInfo.h>
#include "SkImageInfo.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkMaskFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkMaskFilter.h>
#include "SkMaskFilter.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkMaskFilterFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkMaskFilter.h>
#include "SkMaskFilter.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkMatrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkMatrix.h>
#include "SkMatrix.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkPaint.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkPaint.h>
#include "SkPaint.h"

#pragma clang diagnostic pop

Expand Down
20 changes: 10 additions & 10 deletions package/cpp/api/JsiSkPath.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkDashPathEffect.h>
#include <SkParsePath.h>
#include <SkPath.h>
#include <SkPathEffect.h>
#include <SkPathOps.h>
#include <SkPathTypes.h>
#include <SkString.h>
#include <SkStrokeRec.h>
#include <SkTextUtils.h>
#include <SkTrimPathEffect.h>
#include "SkDashPathEffect.h"
#include "SkParsePath.h"
#include "SkPath.h"
#include "SkPathEffect.h"
#include "SkPathOps.h"
#include "SkPathTypes.h"
#include "SkString.h"
#include "SkStrokeRec.h"
#include "SkTextUtils.h"
#include "SkTrimPathEffect.h"

#include "JsiSkMatrix.h"

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkPathEffect.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkPathEffect.h>
#include "SkPathEffect.h"

#pragma clang diagnostic pop

Expand Down
8 changes: 4 additions & 4 deletions package/cpp/api/JsiSkPathEffectFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

#include "include/effects/Sk1DPathEffect.h"
#include "include/effects/Sk2DPathEffect.h"
#include <SkCornerPathEffect.h>
#include <SkDashPathEffect.h>
#include <SkDiscretePathEffect.h>
#include <SkPathEffect.h>
#include "SkCornerPathEffect.h"
#include "SkDashPathEffect.h"
#include "SkDiscretePathEffect.h"
#include "SkPathEffect.h"

#pragma clang diagnostic pop

Expand Down
4 changes: 2 additions & 2 deletions package/cpp/api/JsiSkPathFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#pragma clang diagnostic ignored "-Wdocumentation"

#include <RNSkLog.h>
#include <SkPath.h>
#include <SkPathOps.h>
#include "SkPath.h"
#include "SkPathOps.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkPicture.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkPicture.h>
#include "SkPicture.h"

#pragma clang diagnostic pop

Expand Down
4 changes: 2 additions & 2 deletions package/cpp/api/JsiSkPictureFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkData.h>
#include <SkPicture.h>
#include "SkData.h"
#include "SkPicture.h"

#pragma clang diagnostic pop

Expand Down
4 changes: 2 additions & 2 deletions package/cpp/api/JsiSkPictureRecorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkBBHFactory.h>
#include <SkPictureRecorder.h>
#include "SkBBHFactory.h"
#include "SkPictureRecorder.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkPoint.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkPoint.h>
#include "SkPoint.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkRRect.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkRRect.h>
#include "SkRRect.h"

#include "JsiSkRect.h"

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkRSXform.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkRSXform.h>
#include "SkRSXform.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkRect.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkRect.h>
#include "SkRect.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkRuntimeEffect.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkRuntimeEffect.h>
#include "SkRuntimeEffect.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkRuntimeShaderBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#pragma clang diagnostic ignored "-Wdocumentation"

#include "JsiSkRuntimeEffect.h"
#include <SkRuntimeEffect.h>
#include "SkRuntimeEffect.h"

#pragma clang diagnostic pop

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/api/JsiSkSVGFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkStream.h>
#include "SkStream.h"

#pragma clang diagnostic pop

Expand Down
4 changes: 2 additions & 2 deletions package/cpp/api/JsiSkShader.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdocumentation"

#include <SkGradientShader.h>
#include <SkShader.h>
#include "SkGradientShader.h"
#include "SkShader.h"

#pragma clang diagnostic pop

Expand Down
Loading

0 comments on commit 9aa784d

Please sign in to comment.