Changeset 43407 in vbox

Timestamp:

Sep 22, 2012 2:19:26 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80893

Message:

Additions/haiku: cleanup.

Location:

trunk/src/VBox/Additions/haiku/VBoxTray

Files:

• VBoxGuestApplication.cpp (modified) (5 diffs)
• VBoxGuestApplication.h (modified) (2 diffs)
• VBoxGuestDeskbarView.cpp (modified) (15 diffs)
• VBoxServiceDescriptor.h (modified) (1 diff)

trunk/src/VBox/Additions/haiku/VBoxTray/VBoxGuestApplication.cpp

@@ -48 +48 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#include <iprt/log.h>
+
 #include <errno.h>
-#define DEBUG 1
 #include <Alert.h>
 #include <Debug.h>
@@ -62 +63 @@
      : BApplication(VBOX_GUEST_APP_SIG)
 {
-    PRINT(("%s()\n", __FUNCTION__));
 }
 
@@ -68 +68 @@
 VBoxGuestApplication::~VBoxGuestApplication()
 {
-    PRINT(("%s()\n", __FUNCTION__));
 }
 
@@ -77 +76 @@
 
     err = VBoxGuestDeskbarView::AddToDeskbar();
-    PRINT(("%s: VBoxGuestDeskbarView::AddToDeskbar: 0x%08lx\n", __FUNCTION__, err));
-
+    LogFlow(("VBoxGuestDeskbarView::ReadyToRun: AddToDeskbar returned 0x%08lx\n", err));
     exit(0);
 }
@@ -88 +86 @@
     be_app->Run();
     delete be_app;
-
-/*    int rc = RTR3Init();
-    if (RT_SUCCESS(rc))
-    {
-        rc = VbglR3Init();
-        if (RT_SUCCESS(rc))
-            rc = vboxOpenBaseDriver();
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        Log(("VBoxGuestApp: Init successful\n"));
-
-        new VBoxGuestApplication(gVBoxDriverFD);
-        be_app->Run();
-        delete be_app;
-
-    }
-
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("VBoxGuestApp: Error while starting, rc=%Rrc\n", rc));
-    }
-    LogRel(("VBoxGuestApp: Ended\n"));
-
-    vboxCloseBaseDriver();
-
-    VbglR3Term();*/
-
     return 0;
 }

trunk/src/VBox/Additions/haiku/VBoxTray/VBoxGuestApplication.h

@@ -48 +48 @@
 #define __VBOXGUESTAPPLICATION__H
 
+/** @todo r=ramshankar; why are we including all the headers here!?? Do it in
+ *        the .cpp please. */
 #include <Application.h>
 
@@ -62 +64 @@
 class VBoxClipboardService;
 
-class VBoxGuestApplication : public BApplication {
-public:
-        VBoxGuestApplication();
-        virtual ~VBoxGuestApplication();
+class VBoxGuestApplication : public BApplication
+{
+    public:
+        VBoxGuestApplication();
+        virtual ~VBoxGuestApplication();
 
-        virtual void ReadyToRun();
+        virtual void ReadyToRun();
 };
 

trunk/src/VBox/Additions/haiku/VBoxTray/VBoxGuestDeskbarView.cpp

@@ -48 +48 @@
 *******************************************************************************/
 #include <errno.h>
-#define DEBUG 1
 #include <Alert.h>
 #include <Roster.h>
@@ -64 +63 @@
 #include "VBoxGuestApplication.h"
 
-#define VIEWNAME "VBoxGuestDeskbarView"
+#define VIEWNAME        "VBoxGuestDeskbarView"
 
 static status_t
@@ -87 +86 @@
        fIcon(NULL), fClipboardService(NULL), fDisplayService(NULL)
 {
-    PRINT(("%s()\n", __FUNCTION__));
     _Init();
 }
@@ -96 +94 @@
        fIcon(NULL)
 {
-    PRINT(("%s()\n", __FUNCTION__));
     archive->PrintToStream();
-
     _Init(archive);
 }
@@ -105 +101 @@
 VBoxGuestDeskbarView::~VBoxGuestDeskbarView()
 {
-    PRINT(("%s()\n", __FUNCTION__));
     delete fIcon;
     if (fClipboardService)
@@ -118 +113 @@
 BArchivable* VBoxGuestDeskbarView::Instantiate(BMessage *data)
 {
-    PRINT(("%s()\n", __FUNCTION__));
     if (!validate_instantiation(data, VIEWNAME))
         return NULL;
@@ -129 +123 @@
 {
     status_t err;
-    PRINT(("%s()\n", __FUNCTION__));
 
     err = BView::Archive(data, false);
     if (err < B_OK)
+    {
+        LogRel(("VBoxGuestDeskbarView::Archive failed.rc=%08lx\n", err));
         return err;
+    }
     data->AddString("add_on", VBOX_GUEST_APP_SIG);
     data->AddString("class", "VBoxGuestDeskbarView");
@@ -156 +152 @@
     }
 
-    if (fClipboardService) // don't repeatedly crash deskbar if vboxdev not loaded
+    if (fClipboardService) /* Don't repeatedly crash deskbar if vboxdev not loaded */
     {
         Looper()->AddHandler(fClipboardService);
@@ -163 +159 @@
 
     if (fDisplayService)
-    {
         fDisplayService->Start();
-    }
 }
 
@@ -179 +173 @@
 void VBoxGuestDeskbarView::MouseDown(BPoint point)
 {
-    printf("MouseDown\n");
     int32 buttons = B_PRIMARY_MOUSE_BUTTON;
     if (Looper() != NULL && Looper()->CurrentMessage() != NULL)
@@ -213 +206 @@
     BDeskbar deskbar;
     status_t err;
-    PRINT(("%s()\n", __FUNCTION__));
 
     if (force)
@@ -222 +214 @@
     app_info info;
     err = be_app->GetAppInfo(&info);
-    PRINT(("%s: be_app->GetAppInfo: 0x%08lx\n", __FUNCTION__, err));
     if (err < B_OK)
         return err;
 
     BPath p(&info.ref);
-    PRINT(("%s: app path: '%s'\n", __FUNCTION__, p.Path()));
-
     return deskbar.AddItem(&info.ref);
 }
@@ -236 +225 @@
 {
     BDeskbar deskbar;
-    PRINT(("%s()\n", __FUNCTION__));
-
     return deskbar.RemoveItem(VIEWNAME);
 }
@@ -275 +262 @@
 
     int rc = RTR3InitDll(0);
-    printf("%d\n", rc);
     if (RT_SUCCESS(rc))
     {
         rc = VbglR3Init();
-    }
-    printf("%d\n", rc);
-    if (RT_SUCCESS(rc))
-    {
-        fClipboardService = new VBoxClipboardService();
-        fDisplayService = new VBoxDisplayService();
-    }
-
+        if (RT_SUCCESS(rc))
+        {
+            fClipboardService = new VBoxClipboardService();
+            fDisplayService = new VBoxDisplayService();
+        }
+        else
+            LogRel(("VBoxGuestDeskbarView::_init VbglR3Init failed. rc=%d\n", rc));
+    }
+    else
+        LogRel(("VBoxGuestDeskbarView::_init RTR3InitDll failed. rc=%d\n", rc));
     return RTErrConvertToErrno(rc);
 }
@@ -293 +281 @@
 RTDECL(BView*) instantiate_deskbar_item()
 {
-    PRINT(("%s()\n", __FUNCTION__));
     return new VBoxGuestDeskbarView();
 }

trunk/src/VBox/Additions/haiku/VBoxTray/VBoxServiceDescriptor.h

@@ -49 +49 @@
 #include <Handler.h>
 
-class VBoxClipboardService : public BHandler {
-public:
-        VBoxClipboardService();
-        virtual ~VBoxClipboardService();
-
-private:
-
+class VBoxClipboardService : public BHandler
+{
+    public:
+        VBoxClipboardService();
+        virtual ~VBoxClipboardService();
 };
 
 /* The shared clipboard service prototypes. */
-int                VBoxClipboardInit    (const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread);
-unsigned __stdcall VBoxClipboardThread  (void *pInstance);
-void               VBoxClipboardDestroy (const VBOXSERVICEENV *pEnv, void *pInstance);
-
+int VBoxClipboardInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread);
+unsigned __stdcall VBoxClipboardThread(void *pInstance);
+void VBoxClipboardDestroy(const VBOXSERVICEENV *pEnv, void *pInstance);
 
 #endif /* __VBOXSERVICESHAREDCLIPLBOARD__H */