Skip to content
Permalink
Browse files

fix warnings

  • Loading branch information
jef-n committed Sep 1, 2012
1 parent 42a9d01 commit b43ed34872fb11ea387b22694de970f56498f2c7
Showing with 8 additions and 3 deletions.
  1. +4 −1 src/core/qgsexpression.cpp
  2. +2 −1 src/core/qgsexpression.h
  3. +2 −0 src/gui/qgsmessagebar.h
  4. +0 −1 tests/src/core/testqgscomposerhtml.cpp
@@ -898,7 +898,10 @@ int QgsExpression::functionCount()


QgsExpression::QgsExpression( const QString& expr )
: mExpression( expr ), mRowNumber( 0 ), mCalc( NULL ), mScale( 0 )
: mExpression( expr )
, mRowNumber( 0 )
, mScale( 0 )
, mCalc( NULL )
{
mRootNode = ::parseExpression( mExpression, mParserErrorString );

@@ -507,6 +507,8 @@ class CORE_EXPORT QgsExpression
// internally used to create an empty expression
QgsExpression() : mRootNode( NULL ), mRowNumber( 0 ), mCalc( NULL ) {}

void initGeomCalculator();

QString mExpression;
Node* mRootNode;

@@ -516,7 +518,6 @@ class CORE_EXPORT QgsExpression
int mRowNumber;
double mScale;

void initGeomCalculator();
QgsDistanceArea* mCalc;
};

@@ -43,12 +43,14 @@ class GUI_EXPORT QgsMessageBar: public QFrame

/*! display a widget on the bar after hiding the currently visible one
* and putting it in a stack
* @param widget widget to add
* @param level is 0 for information, 1 for warning, 2 for critical
*/
void pushWidget( QWidget *widget, int level = 0 );

/*! remove the passed widget from the bar (if previously added),
* then display the next one in the stack if any or hide the bar
* @param widget widget to remove
* @return true if the widget was removed, false otherwise
*/
bool popWidget( QWidget *widget );
@@ -82,7 +82,6 @@ void TestQgsComposerHtml::tableMultiFrame()
bool result = true;
//page1
htmlItem->setUrl( QUrl( QString( "file:///%1" ).arg( QString( TEST_DATA_DIR ) + QDir::separator() + "html_table.html" ) ) );
int nFrames = htmlItem->nFrames();
htmlItem->frame( 0 )->setFrameEnabled( true );
QgsCompositionChecker checker1( "Composer html table", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() +
"control_images" + QDir::separator() + "expected_composerhtml" + QDir::separator() + "composerhtml_table_multiframe1.png" ) );

0 comments on commit b43ed34

Please sign in to comment.
You can’t perform that action at this time.