Skip to content

Commit f9ace43

Browse files
committed
emit is not a function
1 parent f601f92 commit f9ace43

9 files changed

+23
-17
lines changed

src/app/composer/qgscomposer.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
499499
connect( mActionShowRulers, SIGNAL( triggered( bool ) ), this, SLOT( toggleRulers( bool ) ) );
500500

501501
//init undo/redo buttons
502-
mComposition = new QgsComposition( mQgis->mapCanvas()->mapSettings() );
502+
mComposition = new QgsComposition( mQgis->mapCanvas()->mapSettings() );
503503

504504
mActionUndo->setEnabled( false );
505505
mActionRedo->setEnabled( false );
@@ -1008,7 +1008,7 @@ void QgsComposer::on_mActionAtlasPreview_triggered( bool checked )
10081008
if ( checked )
10091009
{
10101010
mapCanvas()->stopRendering();
1011-
emit( atlasPreviewFeatureChanged() );
1011+
emit atlasPreviewFeatureChanged();
10121012
}
10131013
else
10141014
{
@@ -1030,7 +1030,7 @@ void QgsComposer::on_mActionAtlasNext_triggered()
10301030

10311031
loadAtlasPredefinedScalesFromProject();
10321032
atlasMap->nextFeature();
1033-
emit( atlasPreviewFeatureChanged() );
1033+
emit atlasPreviewFeatureChanged();
10341034
}
10351035

10361036
void QgsComposer::on_mActionAtlasPrev_triggered()
@@ -1045,7 +1045,7 @@ void QgsComposer::on_mActionAtlasPrev_triggered()
10451045

10461046
loadAtlasPredefinedScalesFromProject();
10471047
atlasMap->prevFeature();
1048-
emit( atlasPreviewFeatureChanged() );
1048+
emit atlasPreviewFeatureChanged();
10491049
}
10501050

10511051
void QgsComposer::on_mActionAtlasFirst_triggered()
@@ -1060,7 +1060,7 @@ void QgsComposer::on_mActionAtlasFirst_triggered()
10601060

10611061
loadAtlasPredefinedScalesFromProject();
10621062
atlasMap->firstFeature();
1063-
emit( atlasPreviewFeatureChanged() );
1063+
emit atlasPreviewFeatureChanged();
10641064
}
10651065

10661066
void QgsComposer::on_mActionAtlasLast_triggered()
@@ -1075,7 +1075,7 @@ void QgsComposer::on_mActionAtlasLast_triggered()
10751075

10761076
loadAtlasPredefinedScalesFromProject();
10771077
atlasMap->lastFeature();
1078-
emit( atlasPreviewFeatureChanged() );
1078+
emit atlasPreviewFeatureChanged();
10791079
}
10801080

10811081
QgsMapCanvas *QgsComposer::mapCanvas( void )
@@ -3701,7 +3701,7 @@ void QgsComposer::setAtlasFeature( QgsMapLayer* layer, const QgsFeature& feat )
37013701

37023702
//set current preview feature id
37033703
atlas.prepareForFeature( &feat );
3704-
emit( atlasPreviewFeatureChanged() );
3704+
emit atlasPreviewFeatureChanged();
37053705
}
37063706

37073707
void QgsComposer::updateAtlasMapLayerAction( QgsVectorLayer *coverageLayer )

src/core/qgscoordinatetransform.cpp

+7-1
Original file line numberDiff line numberDiff line change
@@ -698,15 +698,21 @@ void QgsCoordinateTransform::transformCoords( const int& numPoints, double *x, d
698698

699699
dir = ( direction == ForwardTransform ) ? tr( "forward transform" ) : tr( "inverse transform" );
700700

701+
char *srcdef = pj_get_def( mSourceProjection, 0 );
702+
char *dstdef = pj_get_def( mDestinationProjection, 0 );
703+
701704
QString msg = tr( "%1 of\n"
702705
"%2"
703706
"PROJ.4: %3 +to %4\n"
704707
"Error: %5" )
705708
.arg( dir )
706709
.arg( points )
707-
.arg( mSourceCRS.toProj4() ).arg( mDestCRS.toProj4() )
710+
.arg( srcdef ).arg( dstdef )
708711
.arg( QString::fromUtf8( pj_strerrno( projResult ) ) );
709712

713+
pj_dalloc( srcdef );
714+
pj_dalloc( dstdef );
715+
710716
QgsDebugMsg( "Projection failed emitting invalid transform signal: " + msg );
711717

712718
emit invalidTransformInput();

src/core/qgsrelationmanager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ void QgsRelationManager::readProject( const QDomDocument & doc )
156156
QgsDebugMsg( "No relations data present in this document" );
157157
}
158158

159-
emit( relationsLoaded() );
159+
emit relationsLoaded();
160160
emit changed();
161161
}
162162

src/core/qgsvectorlayer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2818,15 +2818,15 @@ void QgsVectorLayer::addExpressionField( const QString& exp, const QgsField& fld
28182818
mExpressionFieldBuffer->addExpression( exp, fld );
28192819
updateFields();
28202820
int idx = mUpdatedFields.indexFromName( fld.name() );
2821-
emit( attributeAdded( idx ) );
2821+
emit attributeAdded( idx );
28222822
}
28232823

28242824
void QgsVectorLayer::removeExpressionField( int index )
28252825
{
28262826
int oi = mUpdatedFields.fieldOriginIndex( index );
28272827
mExpressionFieldBuffer->removeExpression( oi );
28282828
updateFields();
2829-
emit( attributeDeleted( index ) );
2829+
emit attributeDeleted( index );
28302830
}
28312831

28322832
void QgsVectorLayer::updateFields()

src/core/qgsvectorlayercache.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ void QgsVectorLayerCache::onFeatureAdded( QgsFeatureId fid )
219219
QgsFeature feat;
220220
featureAtId( fid, feat );
221221
}
222-
emit( featureAdded( fid ) );
222+
emit featureAdded( fid );
223223
}
224224

225225
void QgsVectorLayerCache::attributeAdded( int field )

src/gui/attributetable/qgsattributetablemodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ void QgsAttributeTableModel::loadLayer()
311311
if ( t.elapsed() > 1000 )
312312
{
313313
bool cancel = false;
314-
emit( progress( i, cancel ) );
314+
emit progress( i, cancel );
315315
if ( cancel )
316316
break;
317317

src/gui/attributetable/qgsfeaturelistmodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ bool QgsFeatureListModel::setDisplayExpression( const QString expression )
131131
delete mExpression;
132132
mExpression = exp;
133133

134-
emit( dataChanged( index( 0, 0 ), index( rowCount() - 1, 0 ) ) );
134+
emit dataChanged( index( 0, 0 ), index( rowCount() - 1, 0 ) );
135135
return true;
136136
}
137137

src/gui/qgscomposerview.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1725,13 +1725,13 @@ void QgsComposerView::paintEvent( QPaintEvent* event )
17251725

17261726
void QgsComposerView::hideEvent( QHideEvent* e )
17271727
{
1728-
emit( composerViewHide( this ) );
1728+
emit composerViewHide( this );
17291729
e->ignore();
17301730
}
17311731

17321732
void QgsComposerView::showEvent( QShowEvent* e )
17331733
{
1734-
emit( composerViewShow( this ) );
1734+
emit composerViewShow( this );
17351735
e->ignore();
17361736
}
17371737

src/providers/delimitedtext/qgsdelimitedtextfile.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ bool QgsDelimitedTextFile::open()
124124
void QgsDelimitedTextFile::updateFile()
125125
{
126126
close();
127-
emit( fileUpdated() );
127+
emit fileUpdated();
128128
}
129129

130130
// Clear information based on current definition of file

0 commit comments

Comments
 (0)