summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Sorvig <morten.sorvig@nokia.com>2011-09-28 10:35:17 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-03 09:56:09 +0200
commit7f57f2912569cb6e728cc14afae71923f83ad663 (patch)
treec42c9e6982e53be84e59911f787ff2a87bfd3b08
parenta7b92e8401e04dc0506819f4521adb936bb0e5ea (diff)
Cocoa: Fix spelling errors in comments.
This could be the basis for a "english spelling for norwegians" course. Change-Id: I1d6de11b6673ec0a8ba3c2ff12dd8472fb467703 Reviewed-on: http://codereview.qt-project.org/5691 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
-rw-r--r--src/plugins/platforms/cocoa/qcocoaapplication.mm2
-rw-r--r--src/plugins/platforms/cocoa/qcocoahelpers.mm2
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.mm8
-rw-r--r--src/plugins/platforms/cocoa/qmultitouch_mac.mm4
-rw-r--r--src/plugins/platforms/cocoa/qnsview.mm2
5 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaapplication.mm b/src/plugins/platforms/cocoa/qcocoaapplication.mm
index 2adf6a57f0..22c5624896 100644
--- a/src/plugins/platforms/cocoa/qcocoaapplication.mm
+++ b/src/plugins/platforms/cocoa/qcocoaapplication.mm
@@ -189,7 +189,7 @@ QT_USE_NAMESPACE
- (void)qtDispatcherToQAction:(id)sender
{
- // Forward actions sendt from the menu bar (e.g. quit) to the menu loader.
+ // Forward actions sent from the menu bar (e.g. quit) to the menu loader.
// Having this method here means that we are the last stop in the responder
// chain, and that we are able to handle menu actions even when no window is
// visible on screen. Note: If Qt is used as a plugin, Qt will not use a
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
index 03e83f1130..7e82405ce3 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -238,7 +238,7 @@ static const KeyPair * const end = entries + NumEntries;
QChar qt_mac_qtKey2CocoaKey(Qt::Key key)
{
// The first time this function is called, create a reverse
- // looup table sorted on Qt Key rather than Cocoa key:
+ // lookup table sorted on Qt Key rather than Cocoa key:
static QVector<KeyPair> rev_entries(NumEntries);
static bool mustInit = true;
if (mustInit){
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 6d4f940cb9..081476af73 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -287,7 +287,7 @@ void QCocoaWindow::determineWindowClass()
QNSWindow * QCocoaWindow::createWindow()
{
// Determine if we need to add in our "custom window" attribute. Cocoa is rather clever
- // in deciding if we need the maximize button or not (i.e., it's resizeable, so you
+ // in deciding if we need the maximize button or not (i.e., it's resizable, so you
// must need a maximize button). So, the only buttons we have control over are the
// close and minimize buttons. If someone wants to customize and NOT have the maximize
// button, then we have to do our hack. We only do it for these cases because otherwise
@@ -368,8 +368,8 @@ NSRect QCocoaWindow::globalGeometry(const QRect localGeometry) const
// Qt child window geometry assumes that the origin is at the
// top-left of the content area of the parent window. The title
- // bar is not a part of this contet area, but is still included
- // in the NSWindow height. Move the child window down to acccount
+ // bar is not a part of this content area, but is still included
+ // in the NSWindow height. Move the child window down to account
// for this if the parent window has a title bar.
const int titlebarHeight = 22;
if (!(window()->windowFlags() & Qt::FramelessWindowHint))
@@ -382,7 +382,7 @@ NSRect QCocoaWindow::globalGeometry(const QRect localGeometry) const
return NSMakeRect(finalGeometry.x(), flippedY, finalGeometry.width(), finalGeometry.height());
}
-// Returns the current global screen geometry for the nswindow accociated with this window.
+// Returns the current global screen geometry for the nswindow associated with this window.
QRect QCocoaWindow::windowGeometry() const
{
NSRect rect = [m_nsWindow frame];
diff --git a/src/plugins/platforms/cocoa/qmultitouch_mac.mm b/src/plugins/platforms/cocoa/qmultitouch_mac.mm
index 88c583cc7a..855bfc2a06 100644
--- a/src/plugins/platforms/cocoa/qmultitouch_mac.mm
+++ b/src/plugins/platforms/cocoa/qmultitouch_mac.mm
@@ -197,14 +197,14 @@ QCocoaTouch::getCurrentTouchPointList(NSEvent *event, bool acceptSingleTouch)
}
// Finally: If this call _started_ to reject single
- // touches, we need to fake a relase for the remaining
+ // touches, we need to fake a release for the remaining
// touch now (and refake a begin for it later, if needed).
if (_updateInternalStateOnly && !wasUpdateInternalStateOnly && !_currentTouches.isEmpty()) {
QCocoaTouch *qcocoaTouch = _currentTouches.values().first();
qcocoaTouch->_touchPoint.state = Qt::TouchPointReleased;
touchPoints.insert(qcocoaTouch->_touchPoint.id, qcocoaTouch->_touchPoint);
- // Since this last touch also will end up beeing the first
+ // Since this last touch also will end up being the first
// touch (if the user adds a second finger without lifting
// the first), we promote it to be the primary touch:
qcocoaTouch->_touchPoint.id = 0;
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index f215c9df95..ea1180fae4 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -270,7 +270,7 @@
const bool scrollEvent = carbonEventKind == kEventMouseScroll;
if (scrollEvent) {
- // The mouse device containts pixel scroll wheel support (Mighty Mouse, Trackpad).
+ // The mouse device contains pixel scroll wheel support (Mighty Mouse, Trackpad).
// Since deviceDelta is delivered as pixels rather than degrees, we need to
// convert from pixels to degrees in a sensible manner.
// It looks like 1/4 degrees per pixel behaves most native.