Cocoa: silence warnings from QCocoaBackingStore
authorBradley T. Hughes <bradley.hughes@nokia.com>
Tue, 20 Mar 2012 12:30:10 +0000 (13:30 +0100)
committerQt by Nokia <qt-info@nokia.com>
Mon, 26 Mar 2012 12:02:07 +0000 (14:02 +0200)
Remove unused (and misspelled) flipedRect() function, as well as several
unused variables.

Change-Id: I48a5bf2eaad67686f60523a5c22262cad5314128
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
src/plugins/platforms/cocoa/qcocoabackingstore.mm

index 3a55e00..f0ff7ba 100644 (file)
 
 QT_BEGIN_NAMESPACE
 
-QRect flipedRect(const QRect &sourceRect,int height)
-{
-    if (!sourceRect.isValid())
-        return QRect();
-    QRect flippedRect = sourceRect;
-    flippedRect.moveTop(height - sourceRect.y());
-    return flippedRect;
-}
-
 QCocoaBackingStore::QCocoaBackingStore(QWindow *window)
     : QPlatformBackingStore(window)
 {
     m_cocoaWindow = static_cast<QCocoaWindow *>(window->handle());
-
-    const QRect geo = window->geometry();
-    NSRect rect = NSMakeRect(geo.x(),geo.y(),geo.width(),geo.height());
-
     m_image = new QImage(window->geometry().size(),QImage::Format_ARGB32_Premultiplied);
 }
 
@@ -84,7 +71,6 @@ void QCocoaBackingStore::flush(QWindow *widget, const QRegion &region, const QPo
     QCocoaAutoReleasePool pool;
 
     QRect geo = region.boundingRect();
-
     NSRect rect = NSMakeRect(geo.x(), geo.y(), geo.width(), geo.height());
     [m_cocoaWindow->m_contentView displayRect:rect];
 }
@@ -92,8 +78,7 @@ void QCocoaBackingStore::flush(QWindow *widget, const QRegion &region, const QPo
 void QCocoaBackingStore::resize(const QSize &size, const QRegion &)
 {
     delete m_image;
-    m_image = new QImage(size,QImage::Format_ARGB32_Premultiplied);
-    NSSize newSize = NSMakeSize(size.width(),size.height());
+    m_image = new QImage(size, QImage::Format_ARGB32_Premultiplied);
     [static_cast<QNSView *>(m_cocoaWindow->m_contentView) setImage:m_image];
 }