[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source solenv/clang-format

Philipp Hofer (via logerrit) logerrit at kemper.freedesktop.org
Thu Nov 19 09:44:28 UTC 2020


 libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx |   10 +++----
 libreofficekit/qa/unit/compile_test.c                    |    5 ---
 libreofficekit/source/gtk/tilebuffer.hxx                 |   21 +++++++++------
 solenv/clang-format/excludelist                          |    3 --
 4 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit 39821e7d24deffa72bd9254414d4b58f22be2fca
Author:     Philipp Hofer <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 13:05:19 2020 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Nov 19 10:43:43 2020 +0100

    tdf#123936 Formatting files in module libreofficekit with clang-format
    
    Change-Id: I3f086de3a49181d32e54d7d58e1206615a9371e3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105687
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx
index bddf5c29e625..a441d4e13bf5 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx
@@ -22,19 +22,19 @@ void createView(GtkWidget* pButton, gpointer /*pItem*/);
 
 void getRulerState(GtkWidget* pButton, gpointer /*pItem*/);
 
-void recentUnoChanged( GtkWidget* pSelector, gpointer /* pItem */ );
+void recentUnoChanged(GtkWidget* pSelector, gpointer /* pItem */);
 
 void unoCommandDebugger(GtkWidget* pButton, gpointer /* pItem */);
 
 void toggleEditing(GtkWidget* pButton, gpointer /*pItem*/);
 
-void changePartMode( GtkWidget* pSelector, gpointer /* pItem */ );
+void changePartMode(GtkWidget* pSelector, gpointer /* pItem */);
 
-void changePart( GtkWidget* pSelector, gpointer /*pItem*/ );
+void changePart(GtkWidget* pSelector, gpointer /*pItem*/);
 
-void openLokDialog( GtkWidget* pSelector, gpointer /*pItem*/ );
+void openLokDialog(GtkWidget* pSelector, gpointer /*pItem*/);
 
-void changeZoom( GtkWidget* pButton, gpointer /* pItem */ );
+void changeZoom(GtkWidget* pButton, gpointer /* pItem */);
 
 void toggleFindbar(GtkWidget* pButton, gpointer /*pItem*/);
 
diff --git a/libreofficekit/qa/unit/compile_test.c b/libreofficekit/qa/unit/compile_test.c
index bf0b1e5f1824..650718efaab2 100644
--- a/libreofficekit/qa/unit/compile_test.c
+++ b/libreofficekit/qa/unit/compile_test.c
@@ -15,9 +15,6 @@
 #include "test.h"
 
 // just make sure this stuff compiles from a plain C file
-LibreOfficeKit* compile_test(void)
-{
-    return lok_init("install/path");
-}
+LibreOfficeKit* compile_test(void) { return lok_init("install/path"); }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/libreofficekit/source/gtk/tilebuffer.hxx b/libreofficekit/source/gtk/tilebuffer.hxx
index 9e7203b3bd69..79fa48c555db 100644
--- a/libreofficekit/source/gtk/tilebuffer.hxx
+++ b/libreofficekit/source/gtk/tilebuffer.hxx
@@ -54,8 +54,12 @@ GQuark LOKTileBufferErrorQuark(void);
 */
 class Tile
 {
- public:
-    Tile() : valid(false), m_pBuffer(nullptr) {}
+public:
+    Tile()
+        : valid(false)
+        , m_pBuffer(nullptr)
+    {
+    }
     ~Tile()
     {
         if (m_pBuffer)
@@ -75,7 +79,7 @@ class Tile
 
 private:
     /// Pixel buffer data for this tile
-    cairo_surface_t *m_pBuffer;
+    cairo_surface_t* m_pBuffer;
 };
 
 /**
@@ -87,11 +91,12 @@ private:
 */
 class TileBuffer
 {
- public:
- TileBuffer(int columns = 0, int scale = 1)
-     : m_nWidth(columns)
+public:
+    TileBuffer(int columns = 0, int scale = 1)
+        : m_nWidth(columns)
     {
-        cairo_surface_t *pSurface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, nTileSizePixels * scale, nTileSizePixels * scale);
+        cairo_surface_t* pSurface = cairo_image_surface_create(
+            CAIRO_FORMAT_ARGB32, nTileSizePixels * scale, nTileSizePixels * scale);
         m_DummyTile.setSurface(pSurface);
         cairo_surface_destroy(pSurface);
     }
@@ -118,7 +123,7 @@ class TileBuffer
     /*
       Takes ownership of the surface and sets it on a tile at a given location
     */
-    void  setTile(int x, int y, cairo_surface_t *surface);
+    void setTile(int x, int y, cairo_surface_t* surface);
 
     /// Returns true if a valid tile exists at this location
     bool hasValidTile(int x, int y);
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index ec3e954aacd4..c5a0601d11ba 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7282,13 +7282,10 @@ libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx
 libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
-libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx
 libreofficekit/qa/tilebench/tilebench.cxx
-libreofficekit/qa/unit/compile_test.c
 libreofficekit/qa/unit/tiledrendering.cxx
 libreofficekit/source/gtk/lokdocview.cxx
 libreofficekit/source/gtk/tilebuffer.cxx
-libreofficekit/source/gtk/tilebuffer.hxx
 lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
 lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
 lingucomponent/source/languageguessing/guess.cxx


More information about the Libreoffice-commits mailing list