qt6 and fix build

qgis · Nov 8, 2022 · 65c3472 · 65c3472
1 parent 31a5d63
commit 65c3472
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/core/raster/qgspalettedrasterrenderer.cpp b/src/core/raster/qgspalettedrasterrenderer.cpp
@@ -457,7 +457,7 @@ QgsPalettedRasterRenderer::MultiValueClassData QgsPalettedRasterRenderer::raster
     classData.push_back( { minMaxClass.minMaxValues, minMaxClass.color, minMaxClass.name  } );
   }
 
-  int numClasses { classData.count( ) };
+  int numClasses { static_cast<int>( classData.count( ) ) };
 
   // assign colors from ramp
   if ( ramp && numClasses > 0 )

diff --git a/src/gui/raster/qgsrasterattributetableaddcolumndialog.cpp b/src/gui/raster/qgsrasterattributetableaddcolumndialog.cpp
@@ -169,7 +169,7 @@ void QgsRasterAttributeTableAddColumnDialog::updateDialog()
       mUsage->addItem( QgsRasterAttributeTable::usageName( it.key() ), static_cast<int>( it.key() ) );
     }
   }
-  mUsage->setCurrentIndex( std::clamp( currentUsageIndex, 0,  mUsage->count() - 1 ) );
+  mUsage->setCurrentIndex( std::clamp( currentUsageIndex, 0, static_cast<int>( mUsage->count() - 1 ) ) );
 
   const QList<QgsRasterAttributeTable::Field> fields { mAttributeTable->fields() };
 
@@ -185,7 +185,7 @@ void QgsRasterAttributeTableAddColumnDialog::updateDialog()
   {
     mColumn->addItem( field.name );
   }
-  mColumn->setCurrentIndex( std::clamp( currentIndex, 0, fields.count( ) - 1 ) );
+  mColumn->setCurrentIndex( std::clamp( currentIndex, 0, static_cast<int>( fields.count( ) - 1 ) ) );
 
   if ( ! isValid )
   {

diff --git a/src/gui/raster/qgsrasterattributetablemodel.h b/src/gui/raster/qgsrasterattributetablemodel.h
@@ -16,7 +16,7 @@
 #ifndef QGSRASTERATTRIBUTETABLEMODEL_H
 #define QGSRASTERATTRIBUTETABLEMODEL_H
 
-#include "qgis_core.h"
+#include "qgis_gui.h"
 #include "qgsrasterattributetable.h"
 #include "qgis_sip.h"
 
@@ -28,7 +28,7 @@
  * \brief The QgsRasterAttributeTableModel class manages a QgsRasterAttributeTable
  * \since QGIS 3.30
  */
-class CORE_EXPORT QgsRasterAttributeTableModel : public QAbstractTableModel
+class GUI_EXPORT QgsRasterAttributeTableModel : public QAbstractTableModel
 {
     Q_OBJECT
 

diff --git a/src/gui/raster/qgsrasterattributetablewidget.h b/src/gui/raster/qgsrasterattributetablewidget.h
@@ -87,6 +87,8 @@ class ColorRampDelegate: public QStyledItemDelegate
 class ColorRampAlphaDelegate: public ColorRampDelegate
 {
 
+    Q_OBJECT
+
   public:
 
     ColorRampAlphaDelegate( QObject *parent = nullptr ): ColorRampDelegate( parent ) {};
@@ -105,6 +107,7 @@ class ColorRampAlphaDelegate: public ColorRampDelegate
 class GUI_EXPORT QgsRasterAttributeTableWidget : public QWidget, private Ui::QgsRasterAttributeTableWidgetBase
 {
     Q_OBJECT
+
   public:
 
     /**
@@ -154,8 +157,7 @@ class GUI_EXPORT QgsRasterAttributeTableWidget : public QWidget, private Ui::Qgs
      */
     bool setEditable( bool editable, bool allowCancel = true );
 
-  private slots:
-
+  private:
 
     void classify();
     void addColumn();
@@ -166,8 +168,6 @@ class GUI_EXPORT QgsRasterAttributeTableWidget : public QWidget, private Ui::Qgs
     void notify( const QString &title, const QString &message, Qgis::MessageLevel level = Qgis::MessageLevel::Info );
     void setDelegates( );
 
-  private:
-
     QgsRasterLayer *mRasterLayer = nullptr;
     std::unique_ptr<QgsRasterAttributeTable> mAttributeTableBuffer;
     // Default to invalid (bands are 1-indexed)