AFBClient: fix some clang-tidy issues

[staging/windowmanager.git] / AFBClient.h

diff --git a/AFBClient.h b/AFBClient.h
index 6625c44..964e2b0 100644 (file)
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -3,15 +3,7 @@
 
 #include <functional>
 
-extern "C"
-{
-   struct json_object;
-   struct afb_wsj1;
-   struct sd_event;
-}
-
-class AFBClient
-{
+class AFBClient {
     AFBClient();
     ~AFBClient();
 
@@ -19,19 +11,23 @@ class AFBClient
     AFBClient &operator=(const AFBClient &) = delete;
 
 public:
+    using handler_fun = std::function<void(const char *)>;
+
     enum EventType {
-       Event_Active = 1,
-       Event_Inactive,
-       Event_Visible,
-       Event_Invisible,
-       Event_SyncDraw,
-       Event_FlushDraw,
+        Event_Active = 1,
+        Event_Inactive,
+
+        Event_Visible,
+        Event_Invisible,
+
+        Event_SyncDraw,
+        Event_FlushDraw,
     };
 
     static AFBClient &instance();
 
     int init(int port, char const *token);
-    int dispatch(uint64_t timeout);
+    int dispatch();
 
     // WM API
     int requestSurface(const char *label);
@@ -39,11 +35,11 @@ public:
     int deactivateSurface(const char *label);
     int endDraw(const char *label);
 
-    void set_event_handler(enum EventType et,
-          std::function<void(char const *label)> f);
+    void set_event_handler(enum EventType et, handler_fun f);
+
+    struct Impl;
 
 private:
-    struct afb_wsj1 *wsj1;
-    struct sd_event *loop;
+    Impl *d;
 };
 #endif // AFBCLIENT_H