Changeset 52562 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

Timestamp:

Sep 2, 2014 6:28:04 AM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: clean-up and some C++ to C conversion.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -278 +278 @@
 }
 
-class ClipboardService : public VBoxClient::Service
-{
-public:
-    virtual const char *getPidFilePath()
-    {
-        return ".vboxclient-clipboard.pid";
-    }
-    virtual int run(bool fDaemonised /* = false */)
-    {
-        int rc = vboxClipboardConnect();
-        if (RT_SUCCESS(rc))
-            rc = vboxClipboardMain();
-        if (RT_FAILURE(rc))
-            LogRelFunc(("guest clipboard service terminated abnormally: return code %Rrc\n", rc));
-        return rc;
-    }
-    virtual void cleanup()
-    {
-        /* Nothing to do. */
-    }
+static const char *getPidFilePath()
+{
+    return ".vboxclient-clipboard.pid";
+}
+
+static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
+{
+    int rc = vboxClipboardConnect();
+
+    NOREF(ppInterface);
+    if (RT_SUCCESS(rc))
+        rc = vboxClipboardMain();
+    if (RT_FAILURE(rc))
+        LogRelFunc(("guest clipboard service terminated abnormally: return code %Rrc\n", rc));
+    return rc;
+}
+
+struct VBCLSERVICE vbclClipboardInterface =
+{
+    getPidFilePath,
+    VBClServiceDefaultHandler, /* init */
+    run,
+    VBClServiceDefaultHandler, /* pause */
+    VBClServiceDefaultHandler, /* resume */
+    VBClServiceDefaultCleanup    
 };
 
-VBoxClient::Service *VBoxClient::GetClipboardService()
-{
-    return new ClipboardService;
-}
+struct CLIPBOARDSERVICE
+{
+    struct VBCLSERVICE *pInterface;
+};
+
+struct VBCLSERVICE **VBClGetClipboardService()
+{
+    struct CLIPBOARDSERVICE *pService =
+        (struct CLIPBOARDSERVICE *)RTMemAlloc(sizeof(*pService));
+
+    if (!pService)
+        VBClFatalError(("Out of memory\n"));
+    pService->pInterface = &vbclClipboardInterface;
+    return &pService->pInterface;
+}