Skip to content

Commit 85fbea8

Browse files
manisandronyalldawson
authored andcommitted
Fix warnings emitted by linguist when parsing sources
1 parent 49af957 commit 85fbea8

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/app/composer/qgscomposerlegendwidget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ QgsComposerLegendMenuProvider::QgsComposerLegendMenuProvider( QgsLayerTreeView*
10061006
, mWidget( w )
10071007
{}
10081008

1009-
QMenu*QgsComposerLegendMenuProvider::createContextMenu()
1009+
QMenu* QgsComposerLegendMenuProvider::createContextMenu()
10101010
{
10111011
if ( !mView->currentNode() )
10121012
return nullptr;
@@ -1018,7 +1018,7 @@ QMenu*QgsComposerLegendMenuProvider::createContextMenu()
10181018

10191019
if ( QgsLayerTree::isLayer( mView->currentNode() ) )
10201020
{
1021-
menu->addAction( tr( "Reset to defaults" ), mWidget, SLOT( resetLayerNodeToDefaults() ) );
1021+
menu->addAction( QObject::tr( "Reset to defaults" ), mWidget, SLOT( resetLayerNodeToDefaults() ) );
10221022
menu->addSeparator();
10231023
}
10241024

src/app/composer/qgscomposerlegendwidget.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,8 @@ class QgsComposerLegendWidget: public QgsComposerItemBaseWidget, private Ui::Qgs
107107
};
108108

109109

110-
class QgsComposerLegendMenuProvider : public QObject, public QgsLayerTreeViewMenuProvider
110+
class QgsComposerLegendMenuProvider : public QgsLayerTreeViewMenuProvider
111111
{
112-
Q_OBJECT
113112

114113
public:
115114
QgsComposerLegendMenuProvider( QgsLayerTreeView* view, QgsComposerLegendWidget* w );

src/core/raster/qgsrasterrenderer.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
#include <QImage>
2525
#include <QPainter>
2626

27-
#define tr( sourceText ) QCoreApplication::translate ( "QgsRasterRenderer", sourceText )
28-
2927
// See #9101 before any change of NODATA_COLOR!
3028
const QRgb QgsRasterRenderer::NODATA_COLOR = qRgba( 0, 0, 0, 0 );
3129

src/core/raster/qgsrasterrenderer.h

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ class QgsRasterTransparency;
3333
*/
3434
class CORE_EXPORT QgsRasterRenderer : public QgsRasterInterface
3535
{
36+
37+
Q_DECLARE_TR_FUNCTIONS( QgsRasterRenderer );
38+
3639
public:
3740
// Origin of min / max values
3841
enum MinMaxOrigin

0 commit comments

Comments
 (0)