project: Fix include ordering and reapply formatting

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-04-05 18:51:35 +02:00 committed by Michael Fabian Dirks
parent c49bbfc1d0
commit 6a9921c9ce
5 changed files with 13 additions and 7 deletions

View file

@ -21,11 +21,17 @@ NamespaceIndentation: All
#IncludeBlocks: Regroup #IncludeBlocks: Regroup
IncludeCategories: IncludeCategories:
- Regex: '^(<|")(common.hpp|strings.hpp|version.hpp|obs.h)("|>)' - Regex: '^(<|")(common.hpp|strings.hpp|version.hpp|obs.h)("|>)'
Priority: 0 Priority: 100
- Regex: '^<obs-'
Priority: 150
- Regex: '^<' - Regex: '^<'
Priority: 10 Priority: 200
- Regex: '^<Q'
Priority: 250
- Regex: '^"' - Regex: '^"'
Priority: 20 Priority: 300
- Regex: '.moc"$'
Priority: 300
SortIncludes: true SortIncludes: true
# Alignment # Alignment

View file

@ -35,12 +35,12 @@
extern "C" { extern "C" {
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
#include <obs-avc.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavutil/dict.h> #include <libavutil/dict.h>
#include <libavutil/frame.h> #include <libavutil/frame.h>
#include <libavutil/opt.h> #include <libavutil/opt.h>
#include <libavutil/pixdesc.h> #include <libavutil/pixdesc.h>
#include <obs-avc.h>
#pragma warning(pop) #pragma warning(pop)
} }

View file

@ -38,9 +38,9 @@ extern "C" {
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 4242 4244 4365) #pragma warning(disable : 4242 4244 4365)
#endif #endif
#include <obs-properties.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavutil/frame.h> #include <libavutil/frame.h>
#include <obs-properties.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#endif #endif

View file

@ -33,8 +33,8 @@ extern "C" {
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 4242 4244 4365) #pragma warning(disable : 4242 4244 4365)
#endif #endif
#include <libavutil/opt.h>
#include <obs-module.h> #include <obs-module.h>
#include <libavutil/opt.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#endif #endif

View file

@ -17,9 +17,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "transition-shader.hpp"
#include "strings.hpp" #include "strings.hpp"
#include <stdexcept> #include <stdexcept>
#include "transition-shader.hpp"
#include "utility.hpp" #include "utility.hpp"
#define ST "Transition.Shader" #define ST "Transition.Shader"