Merge branch 'master' of https://github.com/mmMayrhofer/libsigcplusplus

mmMayrhofer · mmMayrhofer · commit 830e57ec3cd7 · 2020-04-27T13:45:32.000+02:00
diff --git a/.github/workflows/autotools-clang-10.yml b/.github/workflows/autotools-clang-10.yml
@@ -0,0 +1,28 @@
+name: "CI: autotools: clang 10"
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    container: ubuntu:20.04
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Build
+      run: |
+        # Prevent blocking the install on a question during configuring of tzdata.
+        export ENV DEBIAN_FRONTEND=noninteractive
+        apt update
+        apt install build-essential mm-common clang-10 --yes
+        export CXX=clang++-10
+        ./autogen.sh --enable-warnings=fatal
+        make
+    - name: Test
+      run: make check
+    - name: Distcheck
+      run: |
+        # distcheck runs configure again so we need to specify CXX again.
+        export CXX=clang++-10
+        make distcheck
diff --git a/examples/qt_with_qmake/exampleclass.h b/examples/qt_with_qmake/exampleclass.h
@@ -9,28 +9,28 @@
 
 class ExampleClass : public QObject
 {
-    Q_OBJECT
+  Q_OBJECT
 public:
-    explicit ExampleClass(QObject *parent = nullptr);
+  explicit ExampleClass(QObject* parent = nullptr);
 
-/* Instead of using the keyword 'signals', use the 'Q_SIGNALS' macro */
+  /* Instead of using the keyword 'signals', use the 'Q_SIGNALS' macro */
 Q_SIGNALS:
-    void example_signal();
+  void example_signal();
 
-/* Instead of using the keyword 'slots', use the 'Q_SLOTS' macro */
+  /* Instead of using the keyword 'slots', use the 'Q_SLOTS' macro */
 public Q_SLOTS:
-    void timer_slot();
+  void timer_slot();
 
-    /**
-     * This slot is called using libsigc++, however since it is defined under Q_SLOTS
-     * it could also be used with the Qt signals/slots
-     */
-    void example_slot();
+  /**
+   * This slot is called using libsigc++, however since it is defined under Q_SLOTS
+   * it could also be used with the Qt signals/slots
+   */
+  void example_slot();
 
 private:
-    sigc::slot<void()> m_sigc_slot;
-    sigc::signal<void()> m_sigc_signal;
-    QTimer m_timer;
+  sigc::slot<void()> m_sigc_slot;
+  sigc::signal<void()> m_sigc_signal;
+  QTimer m_timer;
 };
 
 #endif // EXAMPLECLASS_H
