Skip to content

Commit 416c004

Browse files
committed
fix warnings on lupdate
1 parent 66d72f0 commit 416c004

11 files changed

+21
-19
lines changed

src/core/symbology-ng/qgssymbollayerv2.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ class CORE_EXPORT QgsSymbolLayerV2
121121
be affected by data defined symbology rules.*/
122122
virtual double estimateMaxBleed() const { return 0; }
123123

124-
virtual void setOutputUnit( QgsSymbolV2::OutputUnit unit ) { Q_UNUSED( unit ); } //= 0;
125-
virtual QgsSymbolV2::OutputUnit outputUnit() const { return QgsSymbolV2::Mixed; } //= 0;
124+
virtual void setOutputUnit( QgsSymbolV2::OutputUnit unit ) { Q_UNUSED( unit ); }
125+
virtual QgsSymbolV2::OutputUnit outputUnit() const { return QgsSymbolV2::Mixed; }
126126

127-
virtual void setMapUnitScale( const QgsMapUnitScale& scale ) { Q_UNUSED( scale ); } //= 0;
128-
virtual QgsMapUnitScale mapUnitScale() const { return QgsMapUnitScale(); } //= 0;
127+
virtual void setMapUnitScale( const QgsMapUnitScale& scale ) { Q_UNUSED( scale ); }
128+
virtual QgsMapUnitScale mapUnitScale() const { return QgsMapUnitScale(); }
129129

130130
// used only with rending with symbol levels is turned on (0 = first pass, 1 = second, ...)
131131
void setRenderingPass( int renderingPass ) { mRenderingPass = renderingPass; }

src/gui/qgsdetaileditemdelegate.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,13 @@ int QgsDetailedItemDelegate::height( const QStyleOptionViewItem &theOption,
291291
myHeight += ( myList.count() + 1 ) * ( myDetailMetrics.height() - verticalSpacing() );
292292
//we don't word wrap the category so its easy to measure
293293
myHeight += myCategoryMetrics.height() + verticalSpacing();
294+
#if 0
294295
// if category should be wrapped use this code
295-
//~ myList = wordWrap( theData.category(),
296-
//~ myCategoryMetrics,
297-
//~ theOption.rect.width() - ( mpCheckBox->width() + horizontalSpacing() ) );
298-
//~ myHeight += ( myList.count() + 1 ) * ( myCategoryMetrics.height() - verticalSpacing() );
296+
myList = wordWrap( theData.category(),
297+
myCategoryMetrics,
298+
theOption.rect.width() - ( mpCheckBox->width() + horizontalSpacing() ) );
299+
myHeight += ( myList.count() + 1 ) * ( myCategoryMetrics.height() - verticalSpacing() );
300+
#endif
299301
return myHeight;
300302
}
301303

src/plugins/globe/globe_plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ void GlobePlugin::help()
993993
{
994994
}
995995

996-
void GlobePlugin::placeNode( osg::Node* node, double lat, double lon, double alt /*= 0.0*/ )
996+
void GlobePlugin::placeNode( osg::Node* node, double lat, double lon, double alt )
997997
{
998998
#ifdef HAVE_OSGEARTH_ELEVATION_QUERY
999999
Q_UNUSED( node );

src/plugins/offline_editing/offline_editing_plugin_gui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ QVariant QgsSelectLayerTreeModel::data( const QModelIndex& index, int role ) con
6767
}
6868

6969

70-
QgsOfflineEditingPluginGui::QgsOfflineEditingPluginGui( QWidget* parent /*= 0*/, Qt::WindowFlags fl /*= 0*/ )
70+
QgsOfflineEditingPluginGui::QgsOfflineEditingPluginGui( QWidget* parent, Qt::WindowFlags fl )
7171
: QDialog( parent, fl )
7272
{
7373
setupUi( this );

src/plugins/offline_editing/offline_editing_progress_dialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "offline_editing_progress_dialog.h"
2020

21-
QgsOfflineEditingProgressDialog::QgsOfflineEditingProgressDialog( QWidget* parent /*= 0*/, Qt::WindowFlags fl /*= 0*/ )
21+
QgsOfflineEditingProgressDialog::QgsOfflineEditingProgressDialog( QWidget* parent, Qt::WindowFlags fl )
2222
: QDialog( parent, fl )
2323
, mProgressUpdate( 0 )
2424
{

src/server/qgsgetrequesthandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <QUrl>
2020
#include <stdlib.h>
2121

22-
QgsGetRequestHandler::QgsGetRequestHandler( const bool captureOutput /*= FALSE*/ )
22+
QgsGetRequestHandler::QgsGetRequestHandler( const bool captureOutput )
2323
: QgsHttpRequestHandler( captureOutput )
2424
{
2525
}

src/server/qgshttprequesthandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <fcgi_stdio.h>
3434

3535

36-
QgsHttpRequestHandler::QgsHttpRequestHandler( const bool captureOutput /*= FALSE*/ )
36+
QgsHttpRequestHandler::QgsHttpRequestHandler( const bool captureOutput )
3737
: QgsRequestHandler( )
3838
{
3939
mException = nullptr;

src/server/qgshttprequesthandler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ It provides a method to set data to the client*/
3333
class QgsHttpRequestHandler: public QgsRequestHandler
3434
{
3535
public:
36-
explicit QgsHttpRequestHandler( const bool captureOutput /*= FALSE*/ );
36+
explicit QgsHttpRequestHandler( const bool captureOutput );
3737
~QgsHttpRequestHandler();
3838

3939
virtual void setGetMapResponse( const QString& service, QImage* img, int imageQuality ) override;

src/server/qgspostrequesthandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "qgsmessagelog.h"
2020
#include <QDomDocument>
2121

22-
QgsPostRequestHandler::QgsPostRequestHandler( const bool captureOutput /*= FALSE*/ )
22+
QgsPostRequestHandler::QgsPostRequestHandler( const bool captureOutput )
2323
: QgsHttpRequestHandler( captureOutput )
2424
{
2525
}

src/server/qgsserver.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void QgsServer::setupNetworkAccessManager()
111111
* @param captureOutput
112112
* @return request instance
113113
*/
114-
QgsRequestHandler* QgsServer::createRequestHandler( const bool captureOutput /*= false*/ )
114+
QgsRequestHandler* QgsServer::createRequestHandler( const bool captureOutput )
115115
{
116116
QgsRequestHandler* requestHandler = nullptr;
117117
char* requestMethod = getenv( "REQUEST_METHOD" );
@@ -427,13 +427,13 @@ bool QgsServer::init( int & argc, char ** argv )
427427
* @param queryString
428428
* @return response headers and body
429429
*/
430-
QPair<QByteArray, QByteArray> QgsServer::handleRequest( const QString& queryString /*= QString( )*/ )
430+
QPair<QByteArray, QByteArray> QgsServer::handleRequest( const QString& queryString )
431431
{
432432
// Run init if handleRequest was called without previously initialising
433433
// the server
434434
if ( ! mInitialised )
435435
{
436-
init( );
436+
init();
437437
}
438438

439439
/*

src/server/qgssoaprequesthandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <time.h>
2828
#include <fcgi_stdio.h>
2929

30-
QgsSOAPRequestHandler::QgsSOAPRequestHandler( const bool captureOutput /*= FALSE*/ )
30+
QgsSOAPRequestHandler::QgsSOAPRequestHandler( const bool captureOutput )
3131
: QgsHttpRequestHandler( captureOutput )
3232
{
3333
}

0 commit comments

Comments
 (0)