gplugin/gplugin

Fix gplugin vs gplugin-gtk order
bugfix/clang-format-tweaks
2020-02-26, Richard Laager
72df99d32fa7
Parents 2afe9b045950
Children c509c17e68e3
Fix gplugin vs gplugin-gtk order
2 files changed, 7 insertions(+), 2 deletions(-)
  • +6 -1
    .clang-format
  • +1 -1
    gplugin-gtk-viewer/gplugin-gtk-viewer.c
    • --- a/.clang-format Wed Feb 26 13:56:30 2020 -0600
    +++ b/.clang-format Wed Feb 26 14:02:30 2020 -0600
    @@ -97,7 +97,7 @@
    # gplugin headers
    - Regex: '^<gplugin\.h>'
    Priority: 50
    - - Regex: '^<gplugin-'
    + - Regex: '^<gplugin-[^/]+\.h>'
    # With clang-format-11, change:
    Priority: 51
    #Priority: 50
    @@ -107,6 +107,11 @@
    Priority: 52
    #Priority: 50
    #SortPriority: 52
    + - Regex: '^<gplugin-gtk/'
    + # With clang-format-11, change:
    + Priority: 53
    + #Priority: 50
    + #SortPriority: 53
    # Other libraries' headers
    - Regex: '^<'
    Priority: 60
    --- a/gplugin-gtk-viewer/gplugin-gtk-viewer.c Wed Feb 26 13:56:30 2020 -0600
    +++ b/gplugin-gtk-viewer/gplugin-gtk-viewer.c Wed Feb 26 14:02:30 2020 -0600
    @@ -20,8 +20,8 @@
    #include <gtk/gtk.h>
    +#include <gplugin/gplugin.h>
    #include <gplugin-gtk/gplugin-gtk.h>
    -#include <gplugin/gplugin.h>
    /******************************************************************************
    * Globals