Changeset 561 for trunk/examples/tools/regexp

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)
• examples/tools/regexp/main.cpp (modified) (3 diffs)
• examples/tools/regexp/regexp.pro (modified) (1 diff)
• examples/tools/regexp/regexpdialog.cpp (modified) (6 diffs)
• examples/tools/regexp/regexpdialog.h (modified) (3 diffs)

trunk/examples/tools/regexp/main.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 examples 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$
 **

trunk/examples/tools/regexp/regexp.pro

@@ -8 +8 @@
 sources.path = $$[QT_INSTALL_EXAMPLES]/tools/regexp
 INSTALLS += target sources
+
+

trunk/examples/tools/regexp/regexpdialog.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 examples 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$
 **
@@ -70 +70 @@
     syntaxComboBox->addItem(tr("Wildcard"), QRegExp::Wildcard);
     syntaxComboBox->addItem(tr("Fixed string"), QRegExp::FixedString);
+
 
     syntaxLabel = new QLabel(tr("&Pattern Syntax:"));
@@ -126 +127 @@
     setLayout(mainLayout);
 
-    connect(patternComboBox, SIGNAL(editTextChanged(const QString &)),
+    connect(patternComboBox, SIGNAL(editTextChanged()),
             this, SLOT(refresh()));
-    connect(textComboBox, SIGNAL(editTextChanged(const QString &)),
+    connect(textComboBox, SIGNAL(editTextChanged()),
             this, SLOT(refresh()));
     connect(caseSensitiveCheckBox, SIGNAL(toggled(bool)),
@@ -180 +181 @@
     matchedLengthEdit->setText(QString::number(rx.matchedLength()));
     for (int i = 0; i < MaxCaptures; ++i) {
-        captureLabels[i]->setEnabled(i <= rx.numCaptures());
-        captureEdits[i]->setEnabled(i <= rx.numCaptures());
+        captureLabels[i]->setEnabled(i <= rx.());
+        captureEdits[i]->setEnabled(i <= rx.());
         captureEdits[i]->setText(rx.cap(i));
     }

trunk/examples/tools/regexp/regexpdialog.h

@@ -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 examples 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$
 **