Changeset 561 for trunk/tools/activeqt/testcon/mainwindow.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)
• tools/activeqt/testcon/mainwindow.cpp (modified) (6 diffs)

trunk/tools/activeqt/testcon/mainwindow.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 tools applications 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$
 **
@@ -205 +205 @@
     if (!dlgProperties) {
         dlgProperties = new ChangeProperties(this);
-        connect(container, SIGNAL(propertyChanged(const QString&)), dlgProperties, SLOT(updateProperties()));
+        connect(container, SIGNAL(propertyChanged(QString)), dlgProperties, SLOT(updateProperties()));
     }
     dlgProperties->setControl(container);
@@ -337 +337 @@
     QAxScript *script = scripts->load(file, file);
     if (script) {
-        connect(script, SIGNAL(error(int, const QString&, int, const QString&)),
-                this,   SLOT(logMacro(int,  const QString&, int, const QString&)));
+        connect(script, SIGNAL(error(int,QString,int,QString)),
+                this,   SLOT(logMacro(int,QString,int,QString)));
         actionScriptingRun->setEnabled(true);
     }
@@ -375 +375 @@
         QAxWidget *ax = qobject_cast<QAxWidget*>(container);
         if (ax) {
-            container->disconnect(SIGNAL(signal(const QString&, int, void*)));
+            container->disconnect(SIGNAL(signal(QString,int,void*)));
             if (actionLogSignals->isChecked())
-                connect(container, SIGNAL(signal(const QString&, int, void*)), this, SLOT(logSignal(const QString&, int, void*)));
-
-            container->disconnect(SIGNAL(exception(int,const QString&,const QString&,const QString&)));
-            connect(container, SIGNAL(exception(int,const QString&,const QString&,const QString&)),
-                this, SLOT(logException(int,const QString&,const QString&,const QString&)));
-
-            container->disconnect(SIGNAL(propertyChanged(const QString&)));
+                connect(container, SIGNAL(signal(QString,int,void*)), this, SLOT(logSignal(QString,int,void*)));
+
+            container->disconnect(SIGNAL(exception(int,QString,QString,QString)));
+            connect(container, SIGNAL(exception(int,QString,QString,QString)),
+                this, SLOT(logException(int,QString,QString,QString)));
+
+            container->disconnect(SIGNAL(propertyChanged(QString)));
             if (actionLogProperties->isChecked()) 
-                connect(container, SIGNAL(propertyChanged(const QString&)), this, SLOT(logPropertyChanged(const QString&)));
+                connect(container, SIGNAL(propertyChanged(QString)), this, SLOT(logPropertyChanged(QString)));
             container->blockSignals(actionFreezeEvents->isChecked());
         }