summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-06-19 12:44:56 +0200
committerMartin Smith <msmith@trolltech.com>2009-06-19 12:45:41 +0200
commitfbe0edc109a252efb6f2f53d04537c33f2e91fba (patch)
tree471c1f83dedf4efc1afc09eaa35b1fcc3b744a40 /src/gui
parent500a851bb363567effca6d78b14a755bf56e37f1 (diff)
Changed enum Qt::Uninitialized to enum Qt::Initialization
enum Qt::Uninitialized contains one value, which is also called Uninitialized. Because the type and the value used the same name, wherever the type Qt::Uninitialized was used in a function signature, you had to include the enum keyword. But qdoc's preprocessor doesn't like that, so you have to take the enum keyword out of the signatures. But then the compiler complains because the type and the value look the same. So I had to change the enum type name to Initialization, so the compiler can distinguish it from the value name. And qdoc likes that too.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/painting/qmatrix.cpp2
-rw-r--r--src/gui/painting/qmatrix.h2
-rw-r--r--src/gui/painting/qtransform.cpp2
-rw-r--r--src/gui/painting/qtransform.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index 62addd37b5..221267f0b4 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -198,7 +198,7 @@ QT_BEGIN_NAMESPACE
QMatrix member functions
*****************************************************************************/
/*!
- \fn QMatrix::QMatrix(Qt::Uninitialized)
+ \fn QMatrix::QMatrix(Qt::Initialization)
\internal
*/
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h
index b2e5d70abe..aa4177cc5b 100644
--- a/src/gui/painting/qmatrix.h
+++ b/src/gui/painting/qmatrix.h
@@ -61,7 +61,7 @@ class QVariant;
class Q_GUI_EXPORT QMatrix // 2D transform matrix
{
public:
- inline explicit QMatrix(enum Qt::Uninitialized) {}
+ inline explicit QMatrix(Qt::Initialization) {}
QMatrix();
QMatrix(qreal m11, qreal m12, qreal m21, qreal m22,
qreal dx, qreal dy);
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 85adb27f16..f0b2351975 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -232,7 +232,7 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \fn QTransform::QTransform(Qt::Uninitialized)
+ \fn QTransform::QTransform(Qt::Initialization)
\internal
*/
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h
index f99b0e7f90..291d35c734 100644
--- a/src/gui/painting/qtransform.h
+++ b/src/gui/painting/qtransform.h
@@ -71,7 +71,7 @@ public:
TxProject = 0x10
};
- inline explicit QTransform(enum Qt::Uninitialized) : affine(Qt::Uninitialized) {}
+ inline explicit QTransform(Qt::Initialization) : affine(Qt::Uninitialized) {}
QTransform();
QTransform(qreal h11, qreal h12, qreal h13,
qreal h21, qreal h22, qreal h23,