Fix Qt6 build

nyalldawson · nyalldawson · commit b7a1f76dd7b8 · 2021-11-03T13:55:23.000+11:00
diff --git a/src/app/3d/qgsrulebased3drendererwidget.cpp b/src/app/3d/qgsrulebased3drendererwidget.cpp
@@ -265,7 +265,7 @@ QVariant QgsRuleBased3DRendererModel::data( const QModelIndex &index, int role )
   }
   else if ( role == Qt::TextAlignmentRole )
   {
-    return Qt::AlignLeft;
+    return static_cast<Qt::Alignment::Int>( Qt::AlignLeft );
   }
   else if ( role == Qt::FontRole && index.column() == 1 )
   {
diff --git a/src/app/layout/qgsreportsectionmodel.cpp b/src/app/layout/qgsreportsectionmodel.cpp
@@ -90,7 +90,7 @@ QVariant QgsReportSectionModel::data( const QModelIndex &index, int role ) const
 
     case Qt::TextAlignmentRole:
     {
-      return ( index.column() == 2 || index.column() == 3 ) ? Qt::AlignRight : Qt::AlignLeft;
+      return ( index.column() == 2 || index.column() == 3 ) ? static_cast<Qt::Alignment::Int>( Qt::AlignRight ) : static_cast<Qt::Alignment::Int>( Qt::AlignLeft );
     }
 
     case Qt::EditRole:
diff --git a/src/app/locator/qgslocatoroptionswidget.cpp b/src/app/locator/qgslocatoroptionswidget.cpp
@@ -196,7 +196,7 @@ QVariant QgsLocatorFiltersModel::data( const QModelIndex &index, int role ) cons
 
     case Qt::TextAlignmentRole:
       if ( index.column() == Config )
-        return Qt::AlignCenter;
+        return static_cast<Qt::Alignment::Int>( Qt::AlignCenter );
       break;
 
   }
diff --git a/src/app/pointcloud/qgspointcloudlayerproperties.cpp b/src/app/pointcloud/qgspointcloudlayerproperties.cpp
@@ -488,13 +488,13 @@ QVariant QgsPointCloudAttributeStatisticsModel::data( const QModelIndex &index,
       switch ( index.column() )
       {
         case Name:
-          return QVariant( Qt::AlignLeft | Qt::AlignVCenter );
+          return static_cast<Qt::Alignment::Int>( Qt::AlignLeft | Qt::AlignVCenter );
 
         case Min:
         case Max:
         case Mean:
         case StDev:
-          return QVariant( Qt::AlignRight | Qt::AlignVCenter );
+          return static_cast<Qt::Alignment::Int>( Qt::AlignRight | Qt::AlignVCenter );
 
       }
       return QVariant();
diff --git a/src/core/layout/qgslayoutmodel.cpp b/src/core/layout/qgslayoutmodel.cpp
@@ -173,7 +173,7 @@ QVariant QgsLayoutModel::data( const QModelIndex &index, int role ) const
       return QVariant::fromValue( qobject_cast<QObject *>( item ) );
 
     case Qt::TextAlignmentRole:
-      return Qt::AlignLeft & Qt::AlignVCenter;
+      return static_cast<Qt::Alignment::Int>( Qt::AlignLeft & Qt::AlignVCenter );
 
     case Qt::CheckStateRole:
       switch ( index.column() )
@@ -255,7 +255,7 @@ QVariant QgsLayoutModel::headerData( int section, Qt::Orientation orientation, i
     }
 
     case Qt::TextAlignmentRole:
-      return Qt::AlignLeft & Qt::AlignVCenter;
+      return static_cast<Qt::Alignment::Int>( Qt::AlignLeft & Qt::AlignVCenter );
 
     default:
       return QAbstractItemModel::headerData( section, orientation, role );
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -687,7 +687,7 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons
 
   if ( role == Qt::TextAlignmentRole )
   {
-    return QVariant( mFieldFormatters.at( index.column() )->alignmentFlag( mLayer, fieldId, mWidgetConfigs.at( index.column() ) ) | Qt::AlignVCenter );
+    return static_cast<Qt::Alignment::Int>( mFieldFormatters.at( index.column() )->alignmentFlag( mLayer, fieldId, mWidgetConfigs.at( index.column() ) ) | Qt::AlignVCenter );
   }
 
   if ( mFeat.id() != rowId || !mFeat.isValid() )
diff --git a/src/gui/attributetable/qgsfeaturelistmodel.cpp b/src/gui/attributetable/qgsfeaturelistmodel.cpp
@@ -116,7 +116,7 @@ QVariant QgsFeatureListModel::data( const QModelIndex &index, int role ) const
   }
   else if ( role == Qt::TextAlignmentRole )
   {
-    return Qt::AlignLeft;
+    return static_cast<Qt::Alignment::Int>( Qt::AlignLeft );
   }
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
diff --git a/src/gui/labeling/qgsrulebasedlabelingwidget.cpp b/src/gui/labeling/qgsrulebasedlabelingwidget.cpp
@@ -296,7 +296,7 @@ QVariant QgsRuleBasedLabelingModel::data( const QModelIndex &index, int role ) c
   }
   else if ( role == Qt::TextAlignmentRole )
   {
-    return ( index.column() == 2 || index.column() == 3 ) ? Qt::AlignRight : Qt::AlignLeft;
+    return ( index.column() == 2 || index.column() == 3 ) ? static_cast<Qt::Alignment::Int>( Qt::AlignRight ) : static_cast<Qt::Alignment::Int>( Qt::AlignLeft );
   }
   else if ( role == Qt::FontRole && index.column() == 1 )
   {
diff --git a/src/gui/pointcloud/qgspointcloudclassifiedrendererwidget.cpp b/src/gui/pointcloud/qgspointcloudclassifiedrendererwidget.cpp
@@ -144,7 +144,7 @@ QVariant QgsPointCloudClassifiedRendererModel::data( const QModelIndex &index, i
 
     case Qt::TextAlignmentRole:
     {
-      return ( index.column() == 0 ) ? Qt::AlignHCenter : Qt::AlignLeft;
+      return ( index.column() == 0 ) ? static_cast<Qt::Alignment::Int>( Qt::AlignHCenter ) : static_cast<Qt::Alignment::Int>( Qt::AlignLeft );
     }
 
     case Qt::EditRole:
diff --git a/src/gui/qgscolorschemelist.cpp b/src/gui/qgscolorschemelist.cpp
@@ -382,7 +382,7 @@ QVariant QgsColorSchemeModel::data( const QModelIndex &index, int role ) const
       }
 
     case Qt::TextAlignmentRole:
-      return QVariant( Qt::AlignLeft | Qt::AlignVCenter );
+      return static_cast<Qt::Alignment::Int>( Qt::AlignLeft | Qt::AlignVCenter );
 
     default:
       return QVariant();
@@ -465,9 +465,9 @@ QVariant QgsColorSchemeModel::headerData( int section, Qt::Orientation orientati
       switch ( section )
       {
         case ColorSwatch:
-          return QVariant( Qt::AlignHCenter | Qt::AlignVCenter );
+          return static_cast<Qt::Alignment::Int>( Qt::AlignHCenter | Qt::AlignVCenter );
         case ColorLabel:
-          return QVariant( Qt::AlignLeft | Qt::AlignVCenter );
+          return static_cast<Qt::Alignment::Int>( Qt::AlignLeft | Qt::AlignVCenter );
         default:
           return QVariant();
       }
diff --git a/src/gui/qgsnewvectortabledialog.cpp b/src/gui/qgsnewvectortabledialog.cpp
@@ -587,7 +587,7 @@ QVariant QgsNewVectorTableFieldModel::data( const QModelIndex &index, int role )
           case ColumnHeaders::Precision:
           case ColumnHeaders::Length:
           {
-            return Qt::AlignmentFlag::AlignVCenter + Qt::AlignmentFlag::AlignHCenter;
+            return static_cast<Qt::Alignment::Int>( Qt::AlignmentFlag::AlignVCenter | Qt::AlignmentFlag::AlignHCenter );
           }
           default:
             break;
@@ -654,11 +654,11 @@ QVariant QgsNewVectorTableFieldModel::headerData( int section, Qt::Orientation o
           case ColumnHeaders::Type:
           case ColumnHeaders::ProviderType:
           {
-            return Qt::AlignmentFlag::AlignVCenter + Qt::AlignmentFlag::AlignLeft;
+            return static_cast<Qt::Alignment::Int>( Qt::AlignmentFlag::AlignVCenter | Qt::AlignmentFlag::AlignLeft );
           }
           default:
           {
-            return Qt::AlignmentFlag::AlignVCenter + Qt::AlignmentFlag::AlignHCenter;
+            return static_cast<Qt::Alignment::Int>( Qt::AlignmentFlag::AlignVCenter | Qt::AlignmentFlag::AlignHCenter );
           }
         }
         break;
diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp
@@ -220,7 +220,7 @@ QVariant QgsCategorizedSymbolRendererModel::data( const QModelIndex &index, int
 
     case Qt::TextAlignmentRole:
     {
-      return ( index.column() == 0 ) ? Qt::AlignHCenter : Qt::AlignLeft;
+      return ( index.column() == 0 ) ? static_cast<Qt::Alignment::Int>( Qt::AlignHCenter ) : static_cast<Qt::Alignment::Int>( Qt::AlignLeft );
     }
 
     case Qt::EditRole:
diff --git a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp
@@ -181,7 +181,7 @@ QVariant QgsGraduatedSymbolRendererModel::data( const QModelIndex &index, int ro
   }
   else if ( role == Qt::TextAlignmentRole )
   {
-    return ( index.column() == 0 ) ? Qt::AlignHCenter : Qt::AlignLeft;
+    return ( index.column() == 0 ) ? static_cast<Qt::Alignment::Int>( Qt::AlignHCenter ) : static_cast<Qt::Alignment::Int>( Qt::AlignLeft );
   }
   else if ( role == Qt::EditRole )
   {
diff --git a/src/gui/symbology/qgsrulebasedrendererwidget.cpp b/src/gui/symbology/qgsrulebasedrendererwidget.cpp
@@ -1006,7 +1006,7 @@ QVariant QgsRuleBasedRendererModel::data( const QModelIndex &index, int role ) c
   }
   else if ( role == Qt::TextAlignmentRole )
   {
-    return ( index.column() == 2 || index.column() == 3 ) ? Qt::AlignRight : Qt::AlignLeft;
+    return ( index.column() == 2 || index.column() == 3 ) ? static_cast<Qt::Alignment::Int>( Qt::AlignRight ) : static_cast<Qt::Alignment::Int>( Qt::AlignLeft );
   }
   else if ( role == Qt::FontRole && index.column() == 1 )
   {
diff --git a/src/plugins/topology/dockModel.cpp b/src/plugins/topology/dockModel.cpp
@@ -70,9 +70,9 @@ QVariant DockModel::data( const QModelIndex &index, int role ) const
   if ( role == Qt::TextAlignmentRole )
   {
     if ( column )
-      return QVariant( Qt::AlignRight );
+      return static_cast<Qt::Alignment::Int>( Qt::AlignRight );
     else
-      return QVariant( Qt::AlignLeft );
+      return static_cast<Qt::Alignment::Int>( Qt::AlignLeft );
   }
 
   QVariant val;

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ QVariant QgsRuleBased3DRendererModel::data( const QModelIndex &index, int role )`
`265`	`265`	`}`
`266`	`266`	`else if ( role == Qt::TextAlignmentRole )`
`267`	`267`	`{`
`268`		`- return Qt::AlignLeft;`
	`268`	`+ return static_cast<Qt::Alignment::Int>( Qt::AlignLeft );`
`269`	`269`	`}`
`270`	`270`	`else if ( role == Qt::FontRole && index.column() == 1 )`
`271`	`271`	`{`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ QVariant QgsReportSectionModel::data( const QModelIndex &index, int role ) const`
`90`	`90`
`91`	`91`	`case Qt::TextAlignmentRole:`
`92`	`92`	`{`
`93`		`- return ( index.column() == 2 \|\| index.column() == 3 ) ? Qt::AlignRight : Qt::AlignLeft;`
	`93`	`+ return ( index.column() == 2 \|\| index.column() == 3 ) ? static_cast<Qt::Alignment::Int>( Qt::AlignRight ) : static_cast<Qt::Alignment::Int>( Qt::AlignLeft );`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`case Qt::EditRole:`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ QVariant QgsLocatorFiltersModel::data( const QModelIndex &index, int role ) cons`
`196`	`196`
`197`	`197`	`case Qt::TextAlignmentRole:`
`198`	`198`	`if ( index.column() == Config )`
`199`		`- return Qt::AlignCenter;`
	`199`	`+ return static_cast<Qt::Alignment::Int>( Qt::AlignCenter );`
`200`	`200`	`break;`
`201`	`201`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -488,13 +488,13 @@ QVariant QgsPointCloudAttributeStatisticsModel::data( const QModelIndex &index,`
`488`	`488`	`switch ( index.column() )`
`489`	`489`	`{`
`490`	`490`	`case Name:`
`491`		`- return QVariant( Qt::AlignLeft \| Qt::AlignVCenter );`
	`491`	`+ return static_cast<Qt::Alignment::Int>( Qt::AlignLeft \| Qt::AlignVCenter );`
`492`	`492`
`493`	`493`	`case Min:`
`494`	`494`	`case Max:`
`495`	`495`	`case Mean:`
`496`	`496`	`case StDev:`
`497`		`- return QVariant( Qt::AlignRight \| Qt::AlignVCenter );`
	`497`	`+ return static_cast<Qt::Alignment::Int>( Qt::AlignRight \| Qt::AlignVCenter );`
`498`	`498`
`499`	`499`	`}`
`500`	`500`	`return QVariant();`
Original file line number	Diff line number	Diff line change
`@@ -687,7 +687,7 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons`
`687`	`687`
`688`	`688`	`if ( role == Qt::TextAlignmentRole )`
`689`	`689`	`{`
`690`		`- return QVariant( mFieldFormatters.at( index.column() )->alignmentFlag( mLayer, fieldId, mWidgetConfigs.at( index.column() ) ) \| Qt::AlignVCenter );`
	`690`	`+ return static_cast<Qt::Alignment::Int>( mFieldFormatters.at( index.column() )->alignmentFlag( mLayer, fieldId, mWidgetConfigs.at( index.column() ) ) \| Qt::AlignVCenter );`
`691`	`691`	`}`
`692`	`692`
`693`	`693`	`if ( mFeat.id() != rowId \|\| !mFeat.isValid() )`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ QVariant QgsFeatureListModel::data( const QModelIndex &index, int role ) const`
`116`	`116`	`}`
`117`	`117`	`else if ( role == Qt::TextAlignmentRole )`
`118`	`118`	`{`
`119`		`- return Qt::AlignLeft;`
	`119`	`+ return static_cast<Qt::Alignment::Int>( Qt::AlignLeft );`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ QVariant QgsRuleBasedLabelingModel::data( const QModelIndex &index, int role ) c`
`296`	`296`	`}`
`297`	`297`	`else if ( role == Qt::TextAlignmentRole )`
`298`	`298`	`{`
`299`		`- return ( index.column() == 2 \|\| index.column() == 3 ) ? Qt::AlignRight : Qt::AlignLeft;`
	`299`	`+ return ( index.column() == 2 \|\| index.column() == 3 ) ? static_cast<Qt::Alignment::Int>( Qt::AlignRight ) : static_cast<Qt::Alignment::Int>( Qt::AlignLeft );`
`300`	`300`	`}`
`301`	`301`	`else if ( role == Qt::FontRole && index.column() == 1 )`
`302`	`302`	`{`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ QVariant QgsPointCloudClassifiedRendererModel::data( const QModelIndex &index, i`
`144`	`144`
`145`	`145`	`case Qt::TextAlignmentRole:`
`146`	`146`	`{`
`147`		`- return ( index.column() == 0 ) ? Qt::AlignHCenter : Qt::AlignLeft;`
	`147`	`+ return ( index.column() == 0 ) ? static_cast<Qt::Alignment::Int>( Qt::AlignHCenter ) : static_cast<Qt::Alignment::Int>( Qt::AlignLeft );`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`case Qt::EditRole:`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ QVariant QgsColorSchemeModel::data( const QModelIndex &index, int role ) const`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`case Qt::TextAlignmentRole:`
`385`		`- return QVariant( Qt::AlignLeft \| Qt::AlignVCenter );`
	`385`	`+ return static_cast<Qt::Alignment::Int>( Qt::AlignLeft \| Qt::AlignVCenter );`
`386`	`386`
`387`	`387`	`default:`
`388`	`388`	`return QVariant();`
`@@ -465,9 +465,9 @@ QVariant QgsColorSchemeModel::headerData( int section, Qt::Orientation orientati`
`465`	`465`	`switch ( section )`
`466`	`466`	`{`
`467`	`467`	`case ColorSwatch:`
`468`		`- return QVariant( Qt::AlignHCenter \| Qt::AlignVCenter );`
	`468`	`+ return static_cast<Qt::Alignment::Int>( Qt::AlignHCenter \| Qt::AlignVCenter );`
`469`	`469`	`case ColorLabel:`
`470`		`- return QVariant( Qt::AlignLeft \| Qt::AlignVCenter );`
	`470`	`+ return static_cast<Qt::Alignment::Int>( Qt::AlignLeft \| Qt::AlignVCenter );`
`471`	`471`	`default:`
`472`	`472`	`return QVariant();`
`473`	`473`	`}`
Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ QVariant QgsNewVectorTableFieldModel::data( const QModelIndex &index, int role )`
`587`	`587`	`case ColumnHeaders::Precision:`
`588`	`588`	`case ColumnHeaders::Length:`
`589`	`589`	`{`
`590`		`- return Qt::AlignmentFlag::AlignVCenter + Qt::AlignmentFlag::AlignHCenter;`
	`590`	`+ return static_cast<Qt::Alignment::Int>( Qt::AlignmentFlag::AlignVCenter \| Qt::AlignmentFlag::AlignHCenter );`
`591`	`591`	`}`
`592`	`592`	`default:`
`593`	`593`	`break;`
`@@ -654,11 +654,11 @@ QVariant QgsNewVectorTableFieldModel::headerData( int section, Qt::Orientation o`
`654`	`654`	`case ColumnHeaders::Type:`
`655`	`655`	`case ColumnHeaders::ProviderType:`
`656`	`656`	`{`
`657`		`- return Qt::AlignmentFlag::AlignVCenter + Qt::AlignmentFlag::AlignLeft;`
	`657`	`+ return static_cast<Qt::Alignment::Int>( Qt::AlignmentFlag::AlignVCenter \| Qt::AlignmentFlag::AlignLeft );`
`658`	`658`	`}`
`659`	`659`	`default:`
`660`	`660`	`{`
`661`		`- return Qt::AlignmentFlag::AlignVCenter + Qt::AlignmentFlag::AlignHCenter;`
	`661`	`+ return static_cast<Qt::Alignment::Int>( Qt::AlignmentFlag::AlignVCenter \| Qt::AlignmentFlag::AlignHCenter );`
`662`	`662`	`}`
`663`	`663`	`}`
`664`	`664`	`break;`