Changeset 561 for trunk/src/qt3support/widgets/q3mainwindow.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/qt3support/widgets/q3mainwindow.cpp (modified) (8 diffs)

trunk/src/qt3support/widgets/q3mainwindow.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the Qt3Support module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -1043 +1043 @@
 {
     Q_D(Q3MainWindow);
-#ifdef Q_WS_MAC
+#if defined (Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
     extern WindowPtr qt_mac_window_for(const QWidget*); //qwidget_mac.cpp
     if(isWindow() && edge == Qt::DockTop) {
@@ -1218 +1218 @@
     Q_D(Q3MainWindow);
 
-#ifdef Q_WS_MAC
+#if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
     extern WindowPtr qt_mac_window_for(const QWidget*); //qwidget_mac.cpp
     if(isWindow() && dockWindow->area() == topDock() && !dockWindows(Qt::DockTop).count())
@@ -2262 +2262 @@
         Q3DockWindow *dw = l.at(i);
         ts << QString(dw->windowTitle());
-        ts << ",";
+        ts << ',';
     }
     ts << endl;
@@ -2288 +2288 @@
         Q3DockWindow *dw = l.at(i);
         ts << dw->windowTitle();
-        ts << ",";
+        ts << ',';
     }
     ts << endl;
@@ -2296 +2296 @@
         Q3DockWindow *dw = l.at(i);
         ts << dw->windowTitle();
-        ts << ",";
+        ts << ',';
     }
     ts << endl;
     for (int i = 0; i < l.size(); ++i) {
         Q3DockWindow *dw = l.at(i);
-        ts << "[" << dw->windowTitle() << ","
-           << (int)dw->geometry().x() << ","
-           << (int)dw->geometry().y() << ","
-           << (int)dw->geometry().width() << ","
-           << (int)dw->geometry().height() << ","
-           << (int)dw->isVisible() << "]";
+        ts << '[' << dw->windowTitle() << ','
+           << (int)dw->geometry().x() << ','
+           << (int)dw->geometry().y() << ','
+           << (int)dw->geometry().width() << ','
+           << (int)dw->geometry().height() << ','
+           << (int)dw->isVisible() << ']';
     }
     ts << endl;