Changeset 6649 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 31, 2008 11:11:03 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Minor style corrections.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFrameBuffer.h (modified) (3 diffs)
• src/VBoxConsoleView.cpp (modified) (10 diffs)
• src/VBoxConsoleWnd.cpp (modified) (10 diffs)
• src/VBoxFBQuartz2D.cpp (modified) (14 diffs)
• src/darwin/VBoxUtils-darwin.cpp (modified) (12 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h

@@ -464 +464 @@
 
 #include <Carbon/Carbon.h>
+
 class VBoxQuartz2DFrameBuffer : public VBoxFrameBuffer
 {
@@ -476 +477 @@
     STDMETHOD (SetVisibleRegion) (BYTE *aRectangles, ULONG aCount);
 
-    uchar *address () { return mDataAddress; }
-    ulong bitsPerPixel () { return CGImageGetBitsPerPixel (mImage); }
-    ulong bytesPerLine () { return CGImageGetBytesPerRow (mImage); }
-    ulong pixelFormat () { return mPixelFormat; };
-    bool usesGuestVRAM () { return mBitmapData == NULL; }
-
-    const CGImageRef imageRef () const { return mImage; }
+    uchar *address() { return mDataAddress; }
+    ulong bitsPerPixel() { return CGImageGetBitsPerPixel (mImage); }
+    ulong bytesPerLine() { return CGImageGetBytesPerRow (mImage); }
+    ulong pixelFormat() { return mPixelFormat; };
+    bool usesGuestVRAM() { return mBitmapData == NULL; }
+
+    const CGImageRef imageRef() const { return mImage; }
 
     void paintEvent (QPaintEvent *pe);
@@ -488 +489 @@
 
 private:
+
     inline CGRect QRectToCGRect (const QRect &aRect) const
     {
-        return CGRectMake (aRect.x (), aRect.y (), aRect.width (), aRect.height ());
-    } 
+        return CGRectMake (aRect.x(), aRect.y(), aRect.width(), aRect.height());
+    }
+
     inline QRect mapYOrigin (const QRect &aRect, int aHeight) const
     {
-        /* The cgcontext has a fliped y-coord relative to the 
+        /* The cgcontext has a fliped y-coord relative to the
          * qt coord system. So we need some mapping here */
-        return QRect (aRect.x (), aHeight - (aRect.y () + aRect.height ()), aRect.width (), aRect.height ());
-    }
-    void clean ();
-
-    uchar *mDataAddress; 
+        return QRect (aRect.x(), aHeight - (aRect.y() + aRect.height()),
+                      aRect.width(), aRect.height());
+    }
+
+    void clean();
+
+    uchar *mDataAddress;
     void *mBitmapData;
     ulong mPixelFormat;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -721 +721 @@
 
 #if defined (VBOX_GUI_USE_DDRAW)
-    if (!mFrameBuf || mFrameBuf->address () == NULL)
+    if (!mFrameBuf || mFrameBuf->address() == NULL)
     {
         if (mFrameBuf)
@@ -1208 +1208 @@
                  *  destroyed widgets.
                  */
-                QWidgetList *list = QApplication::topLevelWidgets ();
+                QWidgetList *list = QApplication::topLevelWidgets();
                 bool destroyed = list->find (mMainWnd) < 0;
                 delete list;
@@ -1769 +1769 @@
         case XFocusOut:
         case XFocusIn:
-            if (isRunning ())
+            if (isRunning())
                 focusEvent (event->type == XFocusIn);
             return false;
@@ -1966 +1966 @@
     else
     {
-        ::DarwinReleaseKeyboard ();
+        ::DarwinReleaseKeyboard();
 #ifndef VBOX_WITH_HACKED_QT
         if (mDarwinEventHandlerRef)
@@ -2812 +2812 @@
 #ifdef Q_WS_MAC
             /* Update the dock icon if we are in the running state */
-            if (isRunning ())
+            if (isRunning())
             {
 # if defined (VBOX_GUI_USE_QUARTZ2D)
                 if (mode == VBoxDefs::Quartz2DMode)
                 {
-                    /* If the render mode is Quartz2D we could use the CGImageRef of the framebuffer 
-                     * for the dock icon creation. This saves some conversation time. */
-                    CGImageRef ir = static_cast<VBoxQuartz2DFrameBuffer*>(mFrameBuf)->imageRef ();
-                    SetApplicationDockTileImage (::DarwinCreateDockPreview (ir, mMainWnd->dockImageState ()));
-                }else
+                    /* If the render mode is Quartz2D we could use the
+                     * CGImageRef of the framebuffer for the dock icon creation.
+                     * This saves some conversation time.*/
+                    CGImageRef ir =
+                        static_cast <VBoxQuartz2DFrameBuffer *> (mFrameBuf)->imageRef();
+                    SetApplicationDockTileImage (
+                        ::DarwinCreateDockPreview (ir, mMainWnd->dockImageState()));
+                }
+                else
 # endif
-                    SetApplicationDockTileImage (::DarwinCreateDockPreview (mFrameBuf, mMainWnd->dockImageState ()));
+                    SetApplicationDockTileImage (
+                        ::DarwinCreateDockPreview (mFrameBuf, mMainWnd->dockImageState()));
             }
 #endif
@@ -2897 +2902 @@
 
     if (aEmitSignal)
-        emitKeyboardStateChanged ();
+        emitKeyboardStateChanged();
 }
 
@@ -2949 +2954 @@
 
     if (aEmitSignal)
-        emitMouseStateChanged ();
+        emitMouseStateChanged();
 }
 
@@ -3068 +3073 @@
 #endif
 
-    emitKeyboardStateChanged ();
+    emitKeyboardStateChanged();
 }
 
@@ -3132 +3137 @@
 void VBoxConsoleView::setPointerShape (MousePointerChangeEvent *me)
 {
-    if (me->shapeData () != NULL)
+    if (me->shapeData() != NULL)
     {
         bool ok = false;
@@ -3368 +3373 @@
          * We did not get any shape data
          */
-        if (me->isVisible ())
+        if (me->isVisible())
         {
             /*

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1909 +1909 @@
             vmDisableMouseIntegrAction->setEnabled (false);
     }
+
 #ifdef Q_WS_MAC
-        SetApplicationDockTileImage (dockImgOS);
-        CGImageRef img = dockImageState ();
-        if (img)
-            OverlayApplicationDockTileImage (img);
+    SetApplicationDockTileImage (dockImgOS);
+    CGImageRef img = dockImageState();
+    if (img)
+        OverlayApplicationDockTileImage (img);
 #endif
 }
@@ -2103 +2104 @@
             Assert (status == noErr);
             /* For now disable the shadow of the window. This feature cause errors
-             * if a window in vbox looses focus, is reselected and than moved. 
+             * if a window in vbox looses focus, is reselected and than moved.
              * todo: Search for an option to enable this again. A shadow on every
              * window has a big coolness factor. */
@@ -2186 +2187 @@
 
 #ifdef Q_WS_MAC
-CGImageRef VBoxConsoleWnd::dockImageState () const
+CGImageRef VBoxConsoleWnd::dockImageState() const
 {
     CGImageRef img;
@@ -2201 +2202 @@
     return img;
 }
-#endif 
+#endif
 
 //
@@ -2213 +2214 @@
          * we requested. So after all the resizing stuff set the clipping
          * mask and the spacing shifter to the corresponding values. */
-        QDesktopWidget *dtw = QApplication::desktop ();
+        QDesktopWidget *dtw = QApplication::desktop();
         QRect sRect = dtw->screenGeometry (this);
         QRect aRect (aTargetRect);
@@ -2307 +2308 @@
         CKeyboard keyboard  = console->console().GetKeyboard();
         Assert (!keyboard.isNull());
-        static LONG cadSequence[] = {
+        static LONG sSequence[] =
+        {
             0x1d, // Ctrl down
             0x38, // Alt down
@@ -2315 +2317 @@
             0x9d  // Ctrl up
         };
-        keyboard.PutScancodes (cadSequence, ELEMENTS (cadSequence));
+        keyboard.PutScancodes (sSequence, ELEMENTS (sSequence));
         AssertWrapperOk (keyboard);
     }
@@ -2636 +2638 @@
     region.translate (mMaskShift.width(), mMaskShift.height());
     /* Restrict the drawing to the available space on the screen.
-     * (The &operator is better than the previous used -operator, 
-     * because this excludes space around the real screen also. 
+     * (The &operator is better than the previous used -operator,
+     * because this excludes space around the real screen also.
      * This is necessary for the mac.) */
     region &= mStrictedRegion;
@@ -2674 +2676 @@
     if (vboxGlobal().vmRenderMode() == VBoxDefs::Quartz2DMode)
     {
-        /* If we are using the Quartz2D backend we have to trigger 
-         * an repaint only. All the magic clipping stuff is done 
+        /* If we are using the Quartz2D backend we have to trigger
+         * an repaint only. All the magic clipping stuff is done
          * in the paint engine. */
-        repaint ();
-//        qApp->processEvents ();
+        repaint();
+//        qApp->processEvents();
     }
     else
 # endif
     {
-        /* This is necessary to avoid the flicker by an mask update. 
+        /* This is necessary to avoid the flicker by an mask update.
          * See http://lists.apple.com/archives/Carbon-development/2001/Apr/msg01651.html
          * for the hint.
          * There *must* be a better solution. */
-        if (!region.isEmpty ())
+        if (!region.isEmpty())
             region |= QRect (0, 0, 1, 1);
         /* Save the current region for later processing in the darwin event handler. */
@@ -2695 +2697 @@
          * mask is set. This leads into a missplaced drawing of the content. Currently
          * no alternative to this and also this is not 100% perfect. */
-        repaint ();
-        qApp->processEvents ();
+        repaint();
+        qApp->processEvents();
         /* Now force the reshaping of the window. This is definitly necessary. */
-        ReshapeCustomWindow (reinterpret_cast<WindowPtr>(winId()));
+        ReshapeCustomWindow (reinterpret_cast <WindowPtr> (winId()));
     }
 #else

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBQuartz2D.cpp

@@ -50 +50 @@
 }
 
-VBoxQuartz2DFrameBuffer::~VBoxQuartz2DFrameBuffer ()
+VBoxQuartz2DFrameBuffer::~VBoxQuartz2DFrameBuffer()
 {
     Log (("Quartz2D: Deleting\n"));
-    clean ();
+    clean();
 }
 
@@ -84 +84 @@
     QRegion reg;
 //    printf ("Region rects follow...\n");
-    QRect vmScreenRect (0, 0, width (), height ());
+    QRect vmScreenRect (0, 0, width(), height());
     for (ULONG ind = 0; ind < aCount; ++ ind)
     {
@@ -100 +100 @@
         /* todo: Test if the other framebuffer implementation have the same
          * problem with invalid rects (In Linux/Windows) */
-        if (rect.isValid () && 
-           rect.width () > 0 && rect.height () > 0)
+        if (rect.isValid() &&
+           rect.width() > 0 && rect.height() > 0)
             reg += rect;
         else
             continue;
 
-        mRegionRects[mRegionCount].origin.x = rect.x ();
-        mRegionRects[mRegionCount].origin.y = rect.y ();
-        mRegionRects[mRegionCount].size.width = rect.width ();
-        mRegionRects[mRegionCount].size.height = rect.height ();
-//        printf ("Region rect[%d - %d]: %d %d %d %d\n", mRegionCount, aCount, rect.x (), rect.y (), rect.height (), rect.width ());
+        mRegionRects[mRegionCount].origin.x = rect.x();
+        mRegionRects[mRegionCount].origin.y = rect.y();
+        mRegionRects[mRegionCount].size.width = rect.width();
+        mRegionRects[mRegionCount].size.height = rect.height();
+//        printf ("Region rect[%d - %d]: %d %d %d %d\n", mRegionCount, aCount, rect.x(), rect.y(), rect.height(), rect.width());
         ++mRegionCount;
     }
@@ -146 +146 @@
 {
     /* Some general hints at the beginning:
-     * The console is not a real sub window of the main window. There is 
+     * The console is not a real sub window of the main window. There is
      * one real mac window only. This means all the drawing on the context has
-     * to pay attention to the statusbar, the scrollbars, the shifting spacers 
+     * to pay attention to the statusbar, the scrollbars, the shifting spacers
      * and any frame borders.
-     * Secondly the origin of the coordinate system is differently defined in 
-     * Qt and Quartz2D. In Qt the point (0, 0) means top/left where this is 
-     * bottom/left in Quartz2D. Use mapYOrigin to map from Qt to Quartz2D. 
+     * Secondly the origin of the coordinate system is differently defined in
+     * Qt and Quartz2D. In Qt the point (0, 0) means top/left where this is
+     * bottom/left in Quartz2D. Use mapYOrigin to map from Qt to Quartz2D.
      *
      * For debugging /Developer/Applications/Performance Tools/Quartz Debug.app
@@ -159 +159 @@
     Assert (mImage);
 
-    QWidget *pMain = qApp->mainWidget ();
+    QWidget *pMain = qApp->mainWidget();
     Assert (pMain);
     /* Calculate the view rect to draw in */
     QPoint p = mView->viewport()->mapTo (pMain, QPoint (0, 0));
-    QRect Q2DViewRect = mapYOrigin (QRect (p.x (), p.y (), mView->width (), mView->height ()), pMain->height ());
+    QRect Q2DViewRect = mapYOrigin (QRect (p.x(), p.y(), mView->width(), mView->height()), pMain->height());
     /* We have to pay special attention to the scrollbars */
-    if (mView->horizontalScrollBar ()->isVisible ())
-        Q2DViewRect.setY (Q2DViewRect.y () + (mView->horizontalScrollBar ()->frameSize ().height () + 2));
-    if (mView->verticalScrollBar ()->isVisible ())
-        Q2DViewRect.setWidth (Q2DViewRect.width () - (mView->verticalScrollBar ()->frameSize ().width () + 2));
+    if (mView->horizontalScrollBar()->isVisible())
+        Q2DViewRect.setY (Q2DViewRect.y() + (mView->horizontalScrollBar()->frameSize().height() + 2));
+    if (mView->verticalScrollBar()->isVisible())
+        Q2DViewRect.setWidth (Q2DViewRect.width() - (mView->verticalScrollBar()->frameSize().width() + 2));
 
     /* Create the context to draw on */
-    WindowPtr window = static_cast<WindowPtr>(mView->viewport ()->handle ());
+    WindowPtr window = static_cast<WindowPtr>(mView->viewport()->handle());
     SetPortWindowPort (window);
     CGContextRef ctx;
     QDBeginCGContext (GetWindowPort (window), &ctx);
     /* We handle the seamless mode as a special case. */
-    if (static_cast<VBoxConsoleWnd*>(pMain)->isTrueSeamless ())
-    {
-        /* Here we paint the windows without any wallpaper. 
+    if (static_cast<VBoxConsoleWnd*>(pMain)->isTrueSeamless())
+    {
+        /* Here we paint the windows without any wallpaper.
          * So the background would be set transparently. */
 
         /* Create a subimage of the current view.
          * Currently this subimage is the whole screen. */
-        CGImageRef subImage = CGImageCreateWithImageInRect (mImage, CGRectMake (mView->contentsX (), mView->contentsY (), mView->visibleWidth (), mView->visibleHeight ()));
+        CGImageRef subImage = CGImageCreateWithImageInRect (mImage, CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
         Assert (subImage);
         /* Clear the background (Make the rect fully transparent) */
@@ -195 +195 @@
             /* Flip the y-coord */
             CGContextScaleCTM (ctx, 1.0, -1.0);
-            CGContextTranslateCTM (ctx, Q2DViewRect.x (), -Q2DViewRect.height () - Q2DViewRect.y ());
+            CGContextTranslateCTM (ctx, Q2DViewRect.x(), -Q2DViewRect.height() - Q2DViewRect.y());
             /* Add the clipping rects all at once. They are defined in
              * SetVisibleRegion. */
@@ -216 +216 @@
         /* Create a subimage of the current view in the size
          * of the bounding box of the current paint event */
-        QRect ir = pe->rect ();
-        QRect is = QRect (ir.x () + mView->contentsX (), ir.y () + mView->contentsY (), ir.width (), ir.height ());
+        QRect ir = pe->rect();
+        QRect is = QRect (ir.x() + mView->contentsX(), ir.y() + mView->contentsY(), ir.width(), ir.height());
         CGImageRef subImage = CGImageCreateWithImageInRect (mImage, QRectToCGRect (is));
         Assert (subImage);
@@ -223 +223 @@
         /* Ok, for more performance we set a clipping path of the
          * regions given by this paint event. */
-        QMemArray<QRect> a = pe->region ().rects ();
-        if (a.size () > 0)
+        QMemArray<QRect> a = pe->region().rects();
+        if (a.size() > 0)
         {
             /* Save state for display fliping */
@@ -230 +230 @@
             /* Flip the y-coord */
             CGContextScaleCTM (ctx, 1.0, -1.0);
-            CGContextTranslateCTM (ctx, Q2DViewRect.x (), -Q2DViewRect.height () - Q2DViewRect.y ());
+            CGContextTranslateCTM (ctx, Q2DViewRect.x(), -Q2DViewRect.height() - Q2DViewRect.y());
             CGContextBeginPath (ctx);
             /* Add all region rects to the current context as path components */
-            for (unsigned int i = 0; i < a.size (); ++i)
+            for (unsigned int i = 0; i < a.size(); ++i)
                 CGContextAddRect (ctx, QRectToCGRect (a[i]));
             CGContextRestoreGState (ctx);
@@ -243 +243 @@
         CGContextClipToRect (ctx, QRectToCGRect (Q2DViewRect));
         /* Draw the sub image to the right position */
-        QPoint p = mView->viewport ()->mapTo (pMain, QPoint (ir.x (), ir.y ()));
-        QRect cr = mapYOrigin (QRect (p.x (), p.y (), ir.width (), ir.height ()), pMain->height ());
+        QPoint p = mView->viewport()->mapTo (pMain, QPoint (ir.x(), ir.y()));
+        QRect cr = mapYOrigin (QRect (p.x(), p.y(), ir.width(), ir.height()), pMain->height());
         CGContextDrawImage (ctx, QRectToCGRect (cr), subImage);
     }
@@ -254 +254 @@
 //        CGContextSetShadow (myContext, CGSizeMake (10, 5), 1);
 //        CGContextClipToRect (myContext, rect);
-//        QRect ir = pe->rect ();
-//        CGContextClipToRect (myContext, CGRectMake (ir.y (), ir.x (), ir.width (), ir.height ()));
+//        QRect ir = pe->rect();
+//        CGContextClipToRect (myContext, CGRectMake (ir.y(), ir.x(), ir.width(), ir.height()));
 //        CGContextEndTransparencyLayer (myContext);
 
@@ -262 +262 @@
 #if 0
     printf ("fmt=%lu, vram=%X, bpp=%lu, bpl=%lu, width=%lu, height=%lu\n",
-           re->pixelFormat (), (unsigned int)re->VRAM (),
-           re->bitsPerPixel (), re->bytesPerLine (),
-           re->width (), re->height ());
+           re->pixelFormat(), (unsigned int)re->VRAM(),
+           re->bitsPerPixel(), re->bytesPerLine(),
+           re->width(), re->height());
 #endif
 
     /* Clean out old stuff */
-    clean ();
-
-    mWdt = re->width ();
-    mHgt = re->height ();
+    clean();
+
+    mWdt = re->width();
+    mHgt = re->height();
 
     /* We need a color space in any case */
-    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB ();
-    /* Check if we support the pixel format/colordepth and can use the guest VRAM directly. 
+    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
+    /* Check if we support the pixel format/colordepth and can use the guest VRAM directly.
      * Mac OS X supports 16 bit also but not in the 565 mode. So we could use
      * 32 bit only. */
-    if (re->pixelFormat () == FramebufferPixelFormat_FOURCC_RGB &&
-        re->bitsPerPixel () == 32)
+    if (re->pixelFormat() == FramebufferPixelFormat_FOURCC_RGB &&
+        re->bitsPerPixel() == 32)
     {
 //        printf ("VRAM\n");
-        CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB ();
+        CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
         /* Create the image copy of the framebuffer */
-        CGDataProviderRef dp = CGDataProviderCreateWithData (NULL, re->VRAM (), re->bitsPerPixel () / 8 * mWdt * mHgt, NULL);
-        mImage = CGImageCreate (mWdt, mHgt, 8, re->bitsPerPixel (), re->bytesPerLine (), cs,
-                                kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little, dp, 0, false, 
+        CGDataProviderRef dp = CGDataProviderCreateWithData (NULL, re->VRAM(), re->bitsPerPixel() / 8 * mWdt * mHgt, NULL);
+        mImage = CGImageCreate (mWdt, mHgt, 8, re->bitsPerPixel(), re->bytesPerLine(), cs,
+                                kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little, dp, 0, false,
                                 kCGRenderingIntentDefault);
-        mDataAddress = re->VRAM ();
+        mDataAddress = re->VRAM();
         CGDataProviderRelease (dp);
     }
@@ -300 +300 @@
         CGDataProviderRef dp = CGDataProviderCreateWithData (NULL, mBitmapData, bitmapByteCount, NULL);
         mImage = CGImageCreate (mWdt, mHgt, 8, 32, bitmapBytesPerRow, cs,
-                               kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little, dp, 0, false, 
+                               kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little, dp, 0, false,
                                kCGRenderingIntentDefault);
         mDataAddress = static_cast<uchar*>(mBitmapData);
@@ -308 +308 @@
 }
 
-void VBoxQuartz2DFrameBuffer::clean ()
+void VBoxQuartz2DFrameBuffer::clean()
 {
     if (mImage)

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin.cpp

@@ -49 +49 @@
     QImage *imageCopy = new QImage (*aImage);
     /** @todo this code assumes 32-bit image input, the lazy bird convert image to 32-bit method is anything but optimal... */
-    if (imageCopy->depth () != 32)
+    if (imageCopy->depth() != 32)
         *imageCopy = imageCopy->convertDepth (32);
-    Assert (!imageCopy->isNull ());
-
-    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB ();
-    CGDataProviderRef dp = CGDataProviderCreateWithData (imageCopy, aImage->bits (), aImage->numBytes (), darwinDataProviderReleaseQImage);
-
-    CGBitmapInfo bmpInfo = imageCopy->hasAlphaBuffer () ? kCGImageAlphaFirst : kCGImageAlphaNoneSkipFirst;
+    Assert (!imageCopy->isNull());
+
+    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
+    CGDataProviderRef dp = CGDataProviderCreateWithData (imageCopy, aImage->bits(), aImage->numBytes(), darwinDataProviderReleaseQImage);
+
+    CGBitmapInfo bmpInfo = imageCopy->hasAlphaBuffer() ? kCGImageAlphaFirst : kCGImageAlphaNoneSkipFirst;
     bmpInfo |= kCGBitmapByteOrder32Host;
-    CGImageRef ir = CGImageCreate (imageCopy->width (), imageCopy->height (), 8, 32, imageCopy->bytesPerLine (), cs,
+    CGImageRef ir = CGImageCreate (imageCopy->width(), imageCopy->height(), 8, 32, imageCopy->bytesPerLine(), cs,
                                    bmpInfo, dp, 0 /*decode */, 0 /* shouldInterpolate */,
                                    kCGRenderingIntentDefault);
@@ -76 +76 @@
 CGImageRef DarwinQPixmapToCGImage (const QPixmap *aPixmap)
 {
-    QImage qimg = aPixmap->convertToImage ();
-    Assert (!qimg.isNull ());
+    QImage qimg = aPixmap->convertToImage();
+    Assert (!qimg.isNull());
     return DarwinQImageToCGImage (&qimg);
 }
@@ -90 +90 @@
 {
     QPixmap qpm = QPixmap::fromMimeSource (aSource);
-    Assert (!qpm.isNull ());
+    Assert (!qpm.isNull());
     return DarwinQPixmapToCGImage (&qpm);
 }
@@ -108 +108 @@
        just created one that I can load. The Qt gurus can fix this if they like :-) */
     QPixmap back (QPixmap::fromMimeSource ("dock_128x128_transparent.png"));
-    Assert (!back.isNull ());
-    Assert (back.width () == 128 && back.height () == 128);
+    Assert (!back.isNull());
+    Assert (back.width() == 128 && back.height() == 128);
 
     /* load the badge */
     QPixmap badge = QPixmap::fromMimeSource (aSource);
-    Assert (!badge.isNull ());
+    Assert (!badge.isNull());
 
     /* resize it and copy it onto the background. */
-    if (badge.width () < 32)
-        badge = badge.convertToImage ().smoothScale (32, 32);
-    copyBlt (&back, back.width () - badge.width (), back.height () - badge.height (),
+    if (badge.width() < 32)
+        badge = badge.convertToImage().smoothScale (32, 32);
+    copyBlt (&back, back.width() - badge.width(), back.height() - badge.height(),
              &badge, 0, 0,
-             badge.width (), badge.height ());
-    Assert (!back.isNull ());
-    Assert (back.width () == 128 && back.height () == 128);
+             badge.width(), badge.height());
+    Assert (!back.isNull());
+    Assert (back.width() == 128 && back.height() == 128);
 
     /* Convert it to a CGImage. */
@@ -142 +142 @@
     Assert (aVMImage);
 
-    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB ();
+    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
     Assert (cs);
 
@@ -150 +150 @@
     int scaledWidth;
     int scaledHeight;
-    float aspect = static_cast<float>(CGImageGetWidth (aVMImage)) / CGImageGetHeight (aVMImage);
+    float aspect = static_cast <float> (CGImageGetWidth (aVMImage)) / CGImageGetHeight (aVMImage);
     if (aspect > 1.0)
     {
@@ -161 +161 @@
         scaledHeight = targetHeight;
     }
-    CGRect iconRect = CGRectMake ((targetWidth - scaledWidth) / 2.0, 
-                                  (targetHeight - scaledHeight) / 2.0, 
+    CGRect iconRect = CGRectMake ((targetWidth - scaledWidth) / 2.0,
+                                  (targetHeight - scaledHeight) / 2.0,
                                   scaledWidth, scaledHeight);
     /* Create a bitmap context to draw on */
@@ -218 +218 @@
 CGImageRef DarwinCreateDockPreview (VBoxFrameBuffer *aFrameBuffer, CGImageRef aOverlayImage)
 {
-    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB ();
+    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
     Assert (cs);
     /* Create the image copy of the framebuffer */
-    CGDataProviderRef dp = CGDataProviderCreateWithData (aFrameBuffer, aFrameBuffer->address (), aFrameBuffer->bitsPerPixel () / 8 * aFrameBuffer->width () * aFrameBuffer->height (), NULL);
+    CGDataProviderRef dp = CGDataProviderCreateWithData (aFrameBuffer, aFrameBuffer->address(), aFrameBuffer->bitsPerPixel() / 8 * aFrameBuffer->width() * aFrameBuffer->height(), NULL);
     Assert (dp);
-    CGImageRef ir = CGImageCreate (aFrameBuffer->width (), aFrameBuffer->height (), 8, 32, aFrameBuffer->bytesPerLine (), cs,
+    CGImageRef ir = CGImageCreate (aFrameBuffer->width(), aFrameBuffer->height(), 8, 32, aFrameBuffer->bytesPerLine(), cs,
                                    kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host, dp, 0, false,
                                    kCGRenderingIntentDefault);
@@ -241 +241 @@
 
     OSStatus status = eventNotHandledErr;
-    
+
     switch (GetEventKind (aInEvent))
     {
@@ -248 +248 @@
             WindowRegionCode code;
             RgnHandle rgn;
-            
+
             /* which region code is being queried? */
             GetEventParameter (aInEvent, kEventParamWindowRegionCode, typeWindowRegionCode, NULL, sizeof (code), NULL, &code);
@@ -264 +264 @@
                 GetEventParameter (aInEvent, kEventParamRgnHandle, typeQDRgnHandle, NULL, sizeof (rgn), NULL, &rgn);
                 QRegion *pRegion = static_cast <QRegion*> (aInUserData);
-                if (!pRegion->isNull () && pRegion)
+                if (!pRegion->isNull() && pRegion)
                 {
-                    CopyRgn (pRegion->handle (), rgn);
+                    CopyRgn (pRegion->handle(), rgn);
                     status = noErr;
                 }
@@ -273 +273 @@
         }
     }
-    
+
     return status;
 }