review qnamespace header style and replace Qt::AlignmentFlag synonyms while at it

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/global/qnamespace.h b/src/core/global/qnamespace.h
index e889fcf..1e43d44 100644 (file)
--- a/src/core/global/qnamespace.h
+++ b/src/core/global/qnamespace.h
@@ -353,8 +353,7 @@ public:
         WA_AttributeCount
     };
 
-    enum ApplicationAttribute
-    {
+    enum ApplicationAttribute {
         AA_ImmediateWidgetCreation = 0,
         AA_DontShowIconsInMenus = 1,
         AA_NativeWindows = 2,
@@ -1287,8 +1286,7 @@ public:
     Q_DECLARE_FLAGS(TouchPointStates, TouchPointState)
 
 #ifndef QT_NO_GESTURES
-    enum GestureState
-    {
+    enum GestureState {
         NoGesture,
         GestureStarted  = 1,
         GestureUpdated  = 2,
@@ -1296,8 +1294,7 @@ public:
         GestureCanceled = 4
     };
 
-    enum GestureType
-    {
+    enum GestureType {
         TapGesture        = 1,
         TapAndHoldGesture = 2,
         PanGesture        = 3,
@@ -1307,8 +1304,7 @@ public:
         CustomGesture     = 0x0100,
     };
 
-    enum GestureFlag
-    {
+    enum GestureFlag {
         DontStartGestureOnChildren = 0x01,
         ReceivePartialGestures     = 0x02,
         IgnoredGesturesPropagateToParent = 0x04

diff --git a/src/gui/dialogs/qpagesetupwidget.ui b/src/gui/dialogs/qpagesetupwidget.ui
index ace2ab8..73902a8 100644 (file)
--- a/src/gui/dialogs/qpagesetupwidget.ui
+++ b/src/gui/dialogs/qpagesetupwidget.ui
@@ -195,7 +195,7 @@
            <string>top margin</string>
           </property>
           <property name="alignment" >
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignRight|Qt::AlignVCenter</set>
           </property>
           <property name="maximum" >
            <double>999.990000000000009</double>
@@ -226,7 +226,7 @@
              <string>left margin</string>
             </property>
             <property name="alignment" >
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             <set>Qt::AlignRight|Qt::AlignVCenter</set>
             </property>
             <property name="maximum" >
              <double>999.990000000000009</double>
@@ -258,7 +258,7 @@
              <string>right margin</string>
             </property>
             <property name="alignment" >
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             <set>Qt::AlignRight|Qt::AlignVCenter</set>
             </property>
             <property name="maximum" >
              <double>999.990000000000009</double>
@@ -289,7 +289,7 @@
            <string>bottom margin</string>
           </property>
           <property name="alignment" >
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignRight|Qt::AlignVCenter</set>
           </property>
           <property name="maximum" >
            <double>999.990000000000009</double>

diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 9b48a05..5997f53 100644 (file)
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -4817,7 +4817,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget
         break;
 
     case SH_ItemView_EllipsisLocation:
-        ret = Qt::AlignTrailing;
+        ret = Qt::AlignRight;
         break;
 
     case SH_ItemView_ShowDecorationSelected:

diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index 02a13e5..0e436c3 100644 (file)
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -437,23 +437,20 @@ void QTextOdfWriter::writeBlockFormat(QXmlStreamWriter &writer, QTextBlockFormat
 
     if (format.hasProperty(QTextFormat::BlockAlignment)) {
         const Qt::Alignment alignment = format.alignment() & Qt::AlignHorizontal_Mask;
-        QString value;
-        if (alignment == Qt::AlignLeading)
-            value = QString::fromLatin1("start");
-        else if (alignment == Qt::AlignTrailing)
-            value = QString::fromLatin1("end");
+        if (alignment == Qt::AlignLeft)
+            writer.writeAttribute(foNS, QString::fromLatin1("text-align"), QString::fromLatin1("start"));
+        else if (alignment == Qt::AlignRight)
+            writer.writeAttribute(foNS, QString::fromLatin1("text-align"), QString::fromLatin1("end"));
         else if (alignment == (Qt::AlignLeft | Qt::AlignAbsolute))
-            value = QString::fromLatin1("left");
+            writer.writeAttribute(foNS, QString::fromLatin1("text-align"), QString::fromLatin1("left"));
         else if (alignment == (Qt::AlignRight | Qt::AlignAbsolute))
-            value = QString::fromLatin1("right");
+            writer.writeAttribute(foNS, QString::fromLatin1("text-align"), QString::fromLatin1("right"));
         else if (alignment == Qt::AlignHCenter)
-            value = QString::fromLatin1("center");
+            writer.writeAttribute(foNS, QString::fromLatin1("text-align"), QString::fromLatin1("center"));
         else if (alignment == Qt::AlignJustify)
-            value = QString::fromLatin1("justify");
+            writer.writeAttribute(foNS, QString::fromLatin1("text-align"), QString::fromLatin1("justify"));
         else
             qWarning() << "QTextOdfWriter: unsupported paragraph alignment; " << format.alignment();
-        if (! value.isNull())
-            writer.writeAttribute(foNS, QString::fromLatin1("text-align"), value);
     }
 
     if (format.hasProperty(QTextFormat::BlockTopMargin))

diff --git a/src/gui/widgets/qfontcombobox.cpp b/src/gui/widgets/qfontcombobox.cpp
index 9372793..bc87e76 100644 (file)
--- a/src/gui/widgets/qfontcombobox.cpp
+++ b/src/gui/widgets/qfontcombobox.cpp
@@ -114,7 +114,7 @@ void QFontFamilyDelegate::paint(QPainter *painter,
         QRectF tbr = fontMetrics.tightBoundingRect(text);
         painter->drawText(r.x(), r.y() + (r.height() + tbr.height()) / 2.0, text);
     } else {
-        painter->drawText(r, Qt::AlignVCenter|Qt::AlignLeading|Qt::TextSingleLine, text);
+        painter->drawText(r, Qt::AlignVCenter|Qt::AlignLeft|Qt::TextSingleLine, text);
     }
 
     painter->setFont(old);

diff --git a/src/gui/widgets/qlineedit_p.h b/src/gui/widgets/qlineedit_p.h
index 422c127..cf4546b 100644 (file)
--- a/src/gui/widgets/qlineedit_p.h
+++ b/src/gui/widgets/qlineedit_p.h
@@ -68,7 +68,7 @@ public:
     QLineEditPrivate()
         : control(0), frame(true), contextMenuEnabled(true), cursorVisible(false),
         dragEnabled(false), clickCausedFocus(false), hscroll(0), vscroll(0),
-        alignment(Qt::AlignLeading | Qt::AlignVCenter),
+        alignment(Qt::AlignLeft | Qt::AlignVCenter),
         leftTextMargin(0), topTextMargin(0), rightTextMargin(0), bottomTextMargin(0)
     {
     }

diff --git a/src/gui/widgets/qstatusbar.cpp b/src/gui/widgets/qstatusbar.cpp
index b95041e..dac41bd 100644 (file)
--- a/src/gui/widgets/qstatusbar.cpp
+++ b/src/gui/widgets/qstatusbar.cpp
@@ -686,7 +686,7 @@ void QStatusBar::paintEvent(QPaintEvent *event)
     }
     if (haveMessage) {
         p.setPen(palette().foreground().color());
-        p.drawText(d->messageRect(), Qt::AlignLeading | Qt::AlignVCenter | Qt::TextSingleLine, d->tempItem);
+        p.drawText(d->messageRect(), Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine, d->tempItem);
     }
 }
 

diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
index 6fdd398..dc52859 100644 (file)
--- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
@@ -161,7 +161,7 @@ QScriptDebuggerCodeFinderWidget::QScriptDebuggerCodeFinderWidget(QWidget *parent
     d->labelWrapped->setMaximumSize(QSize(115, 20));
     d->labelWrapped->setTextFormat(Qt::RichText);
     d->labelWrapped->setScaledContents(true);
-    d->labelWrapped->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
+    d->labelWrapped->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
     d->labelWrapped->setText(tr("<img src=\":/qt/scripttools/debugging/images/wrap.png\">&nbsp;Search wrapped"));
     hboxLayout->addWidget(d->labelWrapped);
 

diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp
index 23436dd..57b5ca9 100644 (file)
--- a/src/shared/findwidget/abstractfindwidget.cpp
+++ b/src/shared/findwidget/abstractfindwidget.cpp
@@ -159,8 +159,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent)
 
     m_labelWrapped = new QLabel(this);
     m_labelWrapped->setTextFormat(Qt::RichText);
-    m_labelWrapped->setAlignment(
-            Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter);
+    m_labelWrapped->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
     m_labelWrapped->setText(
             tr("<img src=\":/trolltech/shared/images/wrap.png\">"
                 "&nbsp;Search wrapped"));