Changeset 561 for trunk/src/gui/accessible/qaccessibleobject.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/gui/accessible/qaccessibleobject.cpp (modified) (8 diffs)

trunk/src/gui/accessible/qaccessibleobject.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtGui 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -213 +213 @@
 {
     QWidgetList list;
-    const QWidgetList tlw(qApp->topLevelWidgets());
+    const QWidgetList tlw(topLevelWidgets());
     for (int i = 0; i < tlw.count(); ++i) {
         QWidget *w = tlw.at(i);
@@ -309 +309 @@
         break;
     case FocusChild:
-        targetObject = qApp->activeWindow();
+        targetObject = activeWindow();
         break;
     default:
@@ -323 +323 @@
     switch (t) {
     case Name:
-        if (qApp->activeWindow())
-            return qApp->activeWindow()->windowTitle();
+        if (activeWindow())
+            return activeWindow()->windowTitle();
         break;
     case Description:
-        return qApp->applicationFilePath();
+        return applicationFilePath();
     default:
         break;
@@ -343 +343 @@
 QAccessible::State QAccessibleApplication::state(int) const
 {
-    return qApp->activeWindow() ? Focused : Normal;
+    return activeWindow() ? Focused : Normal;
 }
 
@@ -357 +357 @@
     if (action == 0 || action == 1) {
         QWidget *w = 0;
-        w = qApp->activeWindow();
+        w = activeWindow();
         if (!w)
             w = topLevelWidgets().at(0);