emit is not a function

qgis · Feb 11, 2015 · f9ace43 · f9ace43
1 parent f601f92
commit f9ace43
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 17 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -499,7 +499,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   connect( mActionShowRulers, SIGNAL( triggered( bool ) ), this, SLOT( toggleRulers( bool ) ) );
 
   //init undo/redo buttons
-  mComposition  = new QgsComposition( mQgis->mapCanvas()->mapSettings() );
+  mComposition = new QgsComposition( mQgis->mapCanvas()->mapSettings() );
 
   mActionUndo->setEnabled( false );
   mActionRedo->setEnabled( false );
@@ -1008,7 +1008,7 @@ void QgsComposer::on_mActionAtlasPreview_triggered( bool checked )
   if ( checked )
   {
     mapCanvas()->stopRendering();
-    emit( atlasPreviewFeatureChanged() );
+    emit atlasPreviewFeatureChanged();
   }
   else
   {
@@ -1030,7 +1030,7 @@ void QgsComposer::on_mActionAtlasNext_triggered()
 
   loadAtlasPredefinedScalesFromProject();
   atlasMap->nextFeature();
-  emit( atlasPreviewFeatureChanged() );
+  emit atlasPreviewFeatureChanged();
 }
 
 void QgsComposer::on_mActionAtlasPrev_triggered()
@@ -1045,7 +1045,7 @@ void QgsComposer::on_mActionAtlasPrev_triggered()
 
   loadAtlasPredefinedScalesFromProject();
   atlasMap->prevFeature();
-  emit( atlasPreviewFeatureChanged() );
+  emit atlasPreviewFeatureChanged();
 }
 
 void QgsComposer::on_mActionAtlasFirst_triggered()
@@ -1060,7 +1060,7 @@ void QgsComposer::on_mActionAtlasFirst_triggered()
 
   loadAtlasPredefinedScalesFromProject();
   atlasMap->firstFeature();
-  emit( atlasPreviewFeatureChanged() );
+  emit atlasPreviewFeatureChanged();
 }
 
 void QgsComposer::on_mActionAtlasLast_triggered()
@@ -1075,7 +1075,7 @@ void QgsComposer::on_mActionAtlasLast_triggered()
 
   loadAtlasPredefinedScalesFromProject();
   atlasMap->lastFeature();
-  emit( atlasPreviewFeatureChanged() );
+  emit atlasPreviewFeatureChanged();
 }
 
 QgsMapCanvas *QgsComposer::mapCanvas( void )
@@ -3701,7 +3701,7 @@ void QgsComposer::setAtlasFeature( QgsMapLayer* layer, const QgsFeature& feat )
 
   //set current preview feature id
   atlas.prepareForFeature( &feat );
-  emit( atlasPreviewFeatureChanged() );
+  emit atlasPreviewFeatureChanged();
 }
 
 void QgsComposer::updateAtlasMapLayerAction( QgsVectorLayer *coverageLayer )

diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
@@ -698,15 +698,21 @@ void QgsCoordinateTransform::transformCoords( const int& numPoints, double *x, d
 
     dir = ( direction == ForwardTransform ) ? tr( "forward transform" ) : tr( "inverse transform" );
 
+    char *srcdef = pj_get_def( mSourceProjection, 0 );
+    char *dstdef = pj_get_def( mDestinationProjection, 0 );
+
     QString msg = tr( "%1 of\n"
                       "%2"
                       "PROJ.4: %3 +to %4\n"
                       "Error: %5" )
                   .arg( dir )
                   .arg( points )
-                  .arg( mSourceCRS.toProj4() ).arg( mDestCRS.toProj4() )
+                  .arg( srcdef ).arg( dstdef )
                   .arg( QString::fromUtf8( pj_strerrno( projResult ) ) );
 
+    pj_dalloc( srcdef );
+    pj_dalloc( dstdef );
+
     QgsDebugMsg( "Projection failed emitting invalid transform signal: " + msg );
 
     emit invalidTransformInput();

diff --git a/src/core/qgsrelationmanager.cpp b/src/core/qgsrelationmanager.cpp
@@ -156,7 +156,7 @@ void QgsRelationManager::readProject( const QDomDocument & doc )
     QgsDebugMsg( "No relations data present in this document" );
   }
 
-  emit( relationsLoaded() );
+  emit relationsLoaded();
   emit changed();
 }
 

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2818,15 +2818,15 @@ void QgsVectorLayer::addExpressionField( const QString& exp, const QgsField& fld
   mExpressionFieldBuffer->addExpression( exp, fld );
   updateFields();
   int idx = mUpdatedFields.indexFromName( fld.name() );
-  emit( attributeAdded( idx ) );
+  emit attributeAdded( idx );
 }
 
 void QgsVectorLayer::removeExpressionField( int index )
 {
   int oi = mUpdatedFields.fieldOriginIndex( index );
   mExpressionFieldBuffer->removeExpression( oi );
   updateFields();
-  emit( attributeDeleted( index ) );
+  emit attributeDeleted( index );
 }
 
 void QgsVectorLayer::updateFields()

diff --git a/src/core/qgsvectorlayercache.cpp b/src/core/qgsvectorlayercache.cpp
@@ -219,7 +219,7 @@ void QgsVectorLayerCache::onFeatureAdded( QgsFeatureId fid )
     QgsFeature feat;
     featureAtId( fid, feat );
   }
-  emit( featureAdded( fid ) );
+  emit featureAdded( fid );
 }
 
 void QgsVectorLayerCache::attributeAdded( int field )

diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -311,7 +311,7 @@ void QgsAttributeTableModel::loadLayer()
     if ( t.elapsed() > 1000 )
     {
       bool cancel = false;
-      emit( progress( i, cancel ) );
+      emit progress( i, cancel );
       if ( cancel )
         break;
 

diff --git a/src/gui/attributetable/qgsfeaturelistmodel.cpp b/src/gui/attributetable/qgsfeaturelistmodel.cpp
@@ -131,7 +131,7 @@ bool QgsFeatureListModel::setDisplayExpression( const QString expression )
   delete mExpression;
   mExpression = exp;
 
-  emit( dataChanged( index( 0, 0 ), index( rowCount() - 1, 0 ) ) );
+  emit dataChanged( index( 0, 0 ), index( rowCount() - 1, 0 ) );
   return true;
 }
 

diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -1725,13 +1725,13 @@ void QgsComposerView::paintEvent( QPaintEvent* event )
 
 void QgsComposerView::hideEvent( QHideEvent* e )
 {
-  emit( composerViewHide( this ) );
+  emit composerViewHide( this );
   e->ignore();
 }
 
 void QgsComposerView::showEvent( QShowEvent* e )
 {
-  emit( composerViewShow( this ) );
+  emit composerViewShow( this );
   e->ignore();
 }
 

diff --git a/src/providers/delimitedtext/qgsdelimitedtextfile.cpp b/src/providers/delimitedtext/qgsdelimitedtextfile.cpp
@@ -124,7 +124,7 @@ bool QgsDelimitedTextFile::open()
 void QgsDelimitedTextFile::updateFile()
 {
   close();
-  emit( fileUpdated() );
+  emit fileUpdated();
 }
 
 // Clear information based on current definition of file