From: Bradley T. Hughes <bradley.hughes@nokia.com>
Date: Wed, 21 Mar 2012 09:29:24 +0000 (+0100)
Subject: Cocoa: silence warnings about unused variables
X-Git-Tag: qt-v5.0.0-alpha1~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=155d5ecf34891a0dfbc7afcf9a8a866b8331e3dd;p=profile%2Fivi%2Fqtbase.git

Cocoa: silence warnings about unused variables

Silence warnings about unused function parameters and local variables
while building the Cocoa platform plugin.

Change-Id: I6aedc4cb21c5fb48d2d6e501561473d3f7112aed
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
---

diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
index 02c8d92..3d286c8 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
@@ -98,7 +98,7 @@ public:
     virtual QFixed emSquareSize() const;
 
     virtual QFontEngine *cloneWithSize(qreal pixelSize) const;
-    virtual int glyphMargin(QFontEngineGlyphCache::Type type) { return 0; }
+    virtual int glyphMargin(QFontEngineGlyphCache::Type type) { Q_UNUSED(type); return 0; }
 
     static int antialiasingThreshold;
     static QFontEngineGlyphCache::Type defaultGlyphFormat;
diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
index e405c81..947d910 100644
--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
@@ -172,8 +172,8 @@ static void cleanupCocoaApplicationDelegate()
 // QApplicationPrivate::globalAppleEventProcessor in qapplication_mac.mm
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
-/*
     Q_UNUSED(sender);
+/*
     // The reflection delegate gets precedence
     if (reflectionDelegate
         && [reflectionDelegate respondsToSelector:@selector(applicationShouldTerminate:)]) {
diff --git a/src/plugins/platforms/cocoa/qcocoaclipboard.mm b/src/plugins/platforms/cocoa/qcocoaclipboard.mm
index 87c0854..f76174e 100644
--- a/src/plugins/platforms/cocoa/qcocoaclipboard.mm
+++ b/src/plugins/platforms/cocoa/qcocoaclipboard.mm
@@ -81,6 +81,7 @@ bool QCocoaClipboard::supportsMode(QClipboard::Mode mode) const
 
 bool QCocoaClipboard::ownsMode(QClipboard::Mode mode) const
 {
+    Q_UNUSED(mode);
     return false;
 }
 
diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm
index 56f0dcf..bd8d32b 100644
--- a/src/plugins/platforms/cocoa/qcocoacursor.mm
+++ b/src/plugins/platforms/cocoa/qcocoacursor.mm
@@ -59,6 +59,8 @@ QCocoaCursor::QCocoaCursor()
 
 void QCocoaCursor::changeCursor(QCursor *cursor, QWindow *window)
 {
+    Q_UNUSED(window);
+
     // Check for a suitable built-in NSCursor first:
     switch (cursor->shape()) {
     case Qt::ArrowCursor:
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 2b384a2..e76c027 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -238,6 +238,7 @@ static QTouchDevice *touchDevice = 0;
 
 - (BOOL)acceptsFirstMouse:(NSEvent *)theEvent
 {
+    Q_UNUSED(theEvent);
     return YES;
 }
 
diff --git a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
index d20246d..205a52c 100644
--- a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
+++ b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
@@ -87,7 +87,6 @@
 - (id)accessibilityHitTest:(NSPoint)point {
     if (!m_accessibleRoot)
         return [super accessibilityHitTest:point];
-    NSPoint windowPoint = [[self window] convertScreenToBase:point];
 
     QAccessibleInterface *childInterface = m_accessibleRoot->childAt(point.x, qt_mac_flipYCoordinate(point.y));
     // No child found, meaning we hit the NSView