fix windows warnings

Author: jef-n

CMakeLists.txt

@@ -519,13 +519,6 @@ IF (WITH_CORE)
       ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
       ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS)
 
-      IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-        IF (NOT USING_NMAKE AND NOT USING_NINJA)
-          MESSAGE (STATUS "Generating browse files")
-          ADD_DEFINITIONS( /FR )
-        ENDIF (NOT USING_NMAKE AND NOT USING_NINJA)
-      ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-
       IF (INSTALL_DEPS)
         INSTALL(DIRECTORY ${INSTALL_DEPS} DESTINATION .)
       ENDIF (INSTALL_DEPS)

python/server/qgsserver.sip

@@ -70,7 +70,6 @@ Returns a pointer to the server interface
  :rtype: QgsServer
 %End
 };
-
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

src/app/layout/qgslayoutmapwidget.cpp

@@ -1412,7 +1412,6 @@ QgsLayoutItemMapOverview *QgsLayoutMapWidget::currentOverview()
   }
 
   return mMapItem->overviews()->overview( item->data( Qt::UserRole ).toString() );
-  return nullptr;
 }
 
 void QgsLayoutMapWidget::mOverviewListWidget_currentItemChanged( QListWidgetItem *current, QListWidgetItem *previous )

src/app/qgisapp.cpp

@@ -12112,10 +12112,7 @@ void QgisApp::keyPressEvent( QKeyEvent *e )
 #if defined(_MSC_VER) && defined(QGISDEBUG)
   else if ( e->key() == Qt::Key_Backslash && e->modifiers() & Qt::ControlModifier )
   {
-    int *i;
-    *i = 10;
-//      *((int*)0 + 1) = 5;
-//    QgsCrashHandler::handle( 0 );
+    abort();
   }
 #endif
   else

src/app/qgsmaptoollabel.cpp

@@ -146,7 +146,7 @@ QString QgsMapToolLabel::currentLabelText( int trunc )
     if ( trunc > 0 && labelText.length() > trunc )
     {
       labelText.truncate( trunc );
-      labelText += QStringLiteral( "\u2026" );
+      labelText += QChar( 0x2026 );
     }
     return labelText;
   }
@@ -169,7 +169,7 @@ QString QgsMapToolLabel::currentLabelText( int trunc )
         if ( trunc > 0 && labelText.length() > trunc )
         {
           labelText.truncate( trunc );
-          labelText += QStringLiteral( "\u2026" );
+          labelText += QChar( 0x2026 );
         }
         return labelText;
       }

src/app/qgsmaptoolmovelabel.cpp

@@ -54,7 +54,7 @@ void QgsMapToolMoveLabel::canvasPressEvent( QgsMapMouseEvent *e )
     return;
   }
 
-  int xCol, yCol;
+  int xCol = -1, yCol = -1;
 
   if ( !mCurrentLabel.pos.isDiagram &&  !labelMoveable( vlayer, mCurrentLabel.settings, xCol, yCol ) )
   {

src/core/expression/qgsexpression.cpp

@@ -561,7 +561,7 @@ QString QgsExpression::helpText( QString name )
 
         if ( v.mVariableLenArguments )
         {
-          helpContents += QStringLiteral( "\u2026" );
+          helpContents += QChar( 0x2026 );
         }
 
         helpContents += ')';

src/crashhandler/main.cpp

@@ -32,7 +32,7 @@ int main( int argc, char *argv[] )
   if ( argc < 2 )
   {
     std::cout << "QGIS Crash Handler Usage: \n"
-              << "qgscrashhandler {infofile}" << std::endl;
+              << "qgiscrashhandler {infofile}" << std::endl;
     return -1;
   }
 
@@ -73,7 +73,7 @@ int main( int argc, char *argv[] )
   sscanf_s( exceptionPointersString.toLocal8Bit().constData(), "%p", &exception );
 
   std::cout << "Process ID: " << processIdString.toLocal8Bit().constData() << std::endl;
-  std::cout << "Trhead ID:" << threadIdString.toLocal8Bit().constData() << std::endl;
+  std::cout << "Thread ID:" << threadIdString.toLocal8Bit().constData() << std::endl;
   std::cout << "Exception Pointer: " << exceptionPointersString.toLocal8Bit().constData() << std::endl;
   std::cout << "Symbol Path :" << symbolPaths.toUtf8().data() << std::endl;
 

src/gui/qgsattributeformeditorwidget.cpp

@@ -143,17 +143,17 @@ void QgsAttributeFormEditorWidget::setConstraintStatus( const QString &constrain
   switch ( result )
   {
     case QgsEditorWidgetWrapper::ConstraintResultFailHard:
-      mConstraintResultLabel->setText( QStringLiteral( "<font color=\"#FF9800\">\u2718</font>" ) );
+      mConstraintResultLabel->setText( QStringLiteral( "<font color=\"#FF9800\">%1</font>" ).arg( QChar( 0x2718 ) ) );
       mConstraintResultLabel->setToolTip( description.isEmpty() ? QStringLiteral( "<b>%1</b>: %2" ).arg( constraint, err ) : description );
       break;
 
     case QgsEditorWidgetWrapper::ConstraintResultFailSoft:
-      mConstraintResultLabel->setText( QStringLiteral( "<font color=\"#FFC107\">\u2718</font>" ) );
+      mConstraintResultLabel->setText( QStringLiteral( "<font color=\"#FFC107\">%1</font>" ).arg( QChar( 0x2718 ) ) );
       mConstraintResultLabel->setToolTip( description.isEmpty() ? QStringLiteral( "<b>%1</b>: %2" ).arg( constraint, err ) : description );
       break;
 
     case QgsEditorWidgetWrapper::ConstraintResultPass:
-      mConstraintResultLabel->setText( QStringLiteral( "<font color=\"#259b24\">\u2714</font>" ) );
+      mConstraintResultLabel->setText( QStringLiteral( "<font color=\"#259B24\">%1</font>" ).arg( QChar( 0x2714 ) ) );
       mConstraintResultLabel->setToolTip( QString() );
       break;
   }

src/gui/qgsfilewidget.cpp

@@ -56,7 +56,7 @@ QgsFileWidget::QgsFileWidget( QWidget *parent )
   mLayout->addWidget( mLineEdit );
 
   mFileWidgetButton = new QToolButton( this );
-  mFileWidgetButton->setText( QStringLiteral( "\u2026" ) );
+  mFileWidgetButton->setText( QChar( 0x2026 ) );
   connect( mFileWidgetButton, &QAbstractButton::clicked, this, &QgsFileWidget::openFileDialog );
   mLayout->addWidget( mFileWidgetButton );