fix warnings on lupdate

qgis · Dec 27, 2015 · 416c004 · 416c004
1 parent 66d72f0
commit 416c004
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 19 deletions.
diff --git a/src/core/symbology-ng/qgssymbollayerv2.h b/src/core/symbology-ng/qgssymbollayerv2.h
@@ -121,11 +121,11 @@ class CORE_EXPORT QgsSymbolLayerV2
       be affected by data defined symbology rules.*/
     virtual double estimateMaxBleed() const { return 0; }
 
-    virtual void setOutputUnit( QgsSymbolV2::OutputUnit unit ) { Q_UNUSED( unit ); } //= 0;
-    virtual QgsSymbolV2::OutputUnit outputUnit() const { return QgsSymbolV2::Mixed; } //= 0;
+    virtual void setOutputUnit( QgsSymbolV2::OutputUnit unit ) { Q_UNUSED( unit ); }
+    virtual QgsSymbolV2::OutputUnit outputUnit() const { return QgsSymbolV2::Mixed; }
 
-    virtual void setMapUnitScale( const QgsMapUnitScale& scale ) { Q_UNUSED( scale ); } //= 0;
-    virtual QgsMapUnitScale mapUnitScale() const { return QgsMapUnitScale(); } //= 0;
+    virtual void setMapUnitScale( const QgsMapUnitScale& scale ) { Q_UNUSED( scale ); }
+    virtual QgsMapUnitScale mapUnitScale() const { return QgsMapUnitScale(); }
 
     // used only with rending with symbol levels is turned on (0 = first pass, 1 = second, ...)
     void setRenderingPass( int renderingPass ) { mRenderingPass = renderingPass; }

diff --git a/src/gui/qgsdetaileditemdelegate.cpp b/src/gui/qgsdetaileditemdelegate.cpp
@@ -291,11 +291,13 @@ int QgsDetailedItemDelegate::height( const QStyleOptionViewItem &theOption,
   myHeight += ( myList.count() + 1 ) * ( myDetailMetrics.height() - verticalSpacing() );
   //we don't word wrap the category so its easy to measure
   myHeight += myCategoryMetrics.height() + verticalSpacing();
+#if 0
   // if category should be wrapped use this code
-  //~ myList = wordWrap( theData.category(),
-  //~ myCategoryMetrics,
-  //~ theOption.rect.width() - ( mpCheckBox->width() + horizontalSpacing() ) );
-  //~ myHeight += ( myList.count() + 1 ) * ( myCategoryMetrics.height() - verticalSpacing() );
+  myList = wordWrap( theData.category(),
+                     myCategoryMetrics,
+                     theOption.rect.width() - ( mpCheckBox->width() + horizontalSpacing() ) );
+  myHeight += ( myList.count() + 1 ) * ( myCategoryMetrics.height() - verticalSpacing() );
+#endif
   return myHeight;
 }
 

diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -993,7 +993,7 @@ void GlobePlugin::help()
 {
 }
 
-void GlobePlugin::placeNode( osg::Node* node, double lat, double lon, double alt /*= 0.0*/ )
+void GlobePlugin::placeNode( osg::Node* node, double lat, double lon, double alt )
 {
 #ifdef HAVE_OSGEARTH_ELEVATION_QUERY
   Q_UNUSED( node );

diff --git a/src/plugins/offline_editing/offline_editing_plugin_gui.cpp b/src/plugins/offline_editing/offline_editing_plugin_gui.cpp
@@ -67,7 +67,7 @@ QVariant QgsSelectLayerTreeModel::data( const QModelIndex& index, int role ) con
 }
 
 
-QgsOfflineEditingPluginGui::QgsOfflineEditingPluginGui( QWidget* parent /*= 0*/, Qt::WindowFlags fl /*= 0*/ )
+QgsOfflineEditingPluginGui::QgsOfflineEditingPluginGui( QWidget* parent, Qt::WindowFlags fl )
     : QDialog( parent, fl )
 {
   setupUi( this );

diff --git a/src/plugins/offline_editing/offline_editing_progress_dialog.cpp b/src/plugins/offline_editing/offline_editing_progress_dialog.cpp
@@ -18,7 +18,7 @@
 
 #include "offline_editing_progress_dialog.h"
 
-QgsOfflineEditingProgressDialog::QgsOfflineEditingProgressDialog( QWidget* parent /*= 0*/, Qt::WindowFlags fl /*= 0*/ )
+QgsOfflineEditingProgressDialog::QgsOfflineEditingProgressDialog( QWidget* parent, Qt::WindowFlags fl )
     : QDialog( parent, fl )
     , mProgressUpdate( 0 )
 {

diff --git a/src/server/qgsgetrequesthandler.cpp b/src/server/qgsgetrequesthandler.cpp
@@ -19,7 +19,7 @@
 #include <QUrl>
 #include <stdlib.h>
 
-QgsGetRequestHandler::QgsGetRequestHandler( const bool captureOutput /*= FALSE*/ )
+QgsGetRequestHandler::QgsGetRequestHandler( const bool captureOutput )
     : QgsHttpRequestHandler( captureOutput )
 {
 }

diff --git a/src/server/qgshttprequesthandler.cpp b/src/server/qgshttprequesthandler.cpp
@@ -33,7 +33,7 @@
 #include <fcgi_stdio.h>
 
 
-QgsHttpRequestHandler::QgsHttpRequestHandler( const bool captureOutput /*= FALSE*/ )
+QgsHttpRequestHandler::QgsHttpRequestHandler( const bool captureOutput )
     : QgsRequestHandler( )
 {
   mException = nullptr;

diff --git a/src/server/qgshttprequesthandler.h b/src/server/qgshttprequesthandler.h
@@ -33,7 +33,7 @@ It provides a method to set data to the client*/
 class QgsHttpRequestHandler: public QgsRequestHandler
 {
   public:
-    explicit QgsHttpRequestHandler( const bool captureOutput /*= FALSE*/ );
+    explicit QgsHttpRequestHandler( const bool captureOutput );
     ~QgsHttpRequestHandler();
 
     virtual void setGetMapResponse( const QString& service, QImage* img, int imageQuality ) override;

diff --git a/src/server/qgspostrequesthandler.cpp b/src/server/qgspostrequesthandler.cpp
@@ -19,7 +19,7 @@
 #include "qgsmessagelog.h"
 #include <QDomDocument>
 
-QgsPostRequestHandler::QgsPostRequestHandler( const bool captureOutput /*= FALSE*/ )
+QgsPostRequestHandler::QgsPostRequestHandler( const bool captureOutput )
     : QgsHttpRequestHandler( captureOutput )
 {
 }

diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -111,7 +111,7 @@ void QgsServer::setupNetworkAccessManager()
  * @param captureOutput
  * @return request instance
  */
-QgsRequestHandler* QgsServer::createRequestHandler( const bool captureOutput /*= false*/ )
+QgsRequestHandler* QgsServer::createRequestHandler( const bool captureOutput )
 {
   QgsRequestHandler* requestHandler = nullptr;
   char* requestMethod = getenv( "REQUEST_METHOD" );
@@ -427,13 +427,13 @@ bool QgsServer::init( int & argc, char ** argv )
  * @param queryString
  * @return response headers and body
  */
-QPair<QByteArray, QByteArray> QgsServer::handleRequest( const QString& queryString /*= QString( )*/ )
+QPair<QByteArray, QByteArray> QgsServer::handleRequest( const QString& queryString )
 {
   // Run init if handleRequest was called without previously initialising
   // the server
   if ( ! mInitialised )
   {
-    init( );
+    init();
   }
 
   /*

diff --git a/src/server/qgssoaprequesthandler.cpp b/src/server/qgssoaprequesthandler.cpp
@@ -27,7 +27,7 @@
 #include <time.h>
 #include <fcgi_stdio.h>
 
-QgsSOAPRequestHandler::QgsSOAPRequestHandler( const bool captureOutput /*= FALSE*/ )
+QgsSOAPRequestHandler::QgsSOAPRequestHandler( const bool captureOutput )
     : QgsHttpRequestHandler( captureOutput )
 {
 }