Changeset 561 for trunk/demos/pathstroke

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/pathstroke/main.cpp (modified) (5 diffs)
• demos/pathstroke/pathstroke.cpp (modified) (9 diffs)
• demos/pathstroke/pathstroke.h (modified) (5 diffs)
• demos/pathstroke/pathstroke.pro (modified) (1 diff)

trunk/demos/pathstroke/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 demonstration 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -58 +58 @@
     pathStrokeWidget.setStyle(arthurStyle);
     QList<QWidget *> widgets = qFindChildren<QWidget *>(&pathStrokeWidget);
-    foreach (QWidget *w, widgets)
+    foreach (QWidget *w, widgets)
         w->setStyle(arthurStyle);
+
+
 
     if (smallScreen)
@@ -66 +68 @@
         pathStrokeWidget.show();
 
+
+
+
     return app.exec();
 }

trunk/demos/pathstroke/pathstroke.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 demonstration 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -403 +403 @@
     m_wasAnimated = true;
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
 }
 
@@ -511 +512 @@
     Q_ASSERT(m_points.size() == m_vectors.size());
     for (int i=0; i<m_points.size(); ++i) {
-
-        if (i == m_activePoint)
-            continue;
-
         QPointF pos = m_points.at(i);
         QPointF vec = m_vectors.at(i);
@@ -533 +530 @@
 void PathStrokeRenderer::mousePressEvent(QMouseEvent *e)
 {
+
+
     setDescriptionEnabled(false);
     m_activePoint = -1;
@@ -557 +556 @@
 void PathStrokeRenderer::mouseMoveEvent(QMouseEvent *e)
 {
+
+
     // If we've moved more then 25 pixels, assume user is dragging
     if (!m_mouseDrag && QPoint(m_mousePress - e->pos()).manhattanLength() > 25)
@@ -569 +570 @@
 void PathStrokeRenderer::mouseReleaseEvent(QMouseEvent *)
 {
+
+
     m_activePoint = -1;
     setAnimation(m_wasAnimated);
@@ -587 +590 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void PathStrokeRenderer::setAnimation(bool animation)
 {

trunk/demos/pathstroke/pathstroke.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 demonstration 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -61 +61 @@
     void mouseReleaseEvent(QMouseEvent *e);
     void timerEvent(QTimerEvent *e);
+
 
     QSize sizeHint() const { return QSize(500, 500); }
@@ -119 +120 @@
     QPoint m_mousePress;
     bool m_mouseDrag;
+
+
 };
 

trunk/demos/pathstroke/pathstroke.pro

@@ -19 +19 @@
 INSTALLS += target sources
 
+
+
+
+