jef-n

#include <QMap>
#include <QSet>

typedef qint64 QgsFeatureId;
class QgsVectorLayer;

class QgsGeometry {
public:
        QgsGeometry() {}
        ~QgsGeometry() {}

jef-n

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b96a2ea..6d0f2ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -291,6 +291,11 @@ IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
   ADD_DEFINITIONS(-DQGISDEBUG=1)
 ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
 
+IF(MSVC)
+  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DQGISDEBUG=1")

jef-n

Index: ogr/ogrfeature.cpp
===================================================================
--- ogr/ogrfeature.cpp	(revision 24702)
+++ ogr/ogrfeature.cpp	(working copy)
@@ -1927,8 +1927,13 @@ void OGR_F_SetFieldDouble( OGRFeatureH hFeat, int
 void OGRFeature::SetField( int iField, const char * pszValue )
 
 {
-    OGRFieldDefn        *poFDefn = poDefn->GetFieldDefn( iField );
+    static int bWarn = -1;

jef-n

diff --git a/src/core/composer/qgscomposerarrow.cpp b/src/core/composer/qgscomposerarrow.cpp
index c167af8..94672c0 100644
--- a/src/core/composer/qgscomposerarrow.cpp
+++ b/src/core/composer/qgscomposerarrow.cpp
@@ -284,8 +284,8 @@ void QgsComposerArrow::adaptItemSceneRect()
 bool QgsComposerArrow::writeXML( QDomElement& elem, QDomDocument & doc ) const
 {
   QDomElement composerArrowElem = doc.createElement( "ComposerArrow" );
-  composerArrowElem.setAttribute( "outlineWidth", outlineWidth() );
-  composerArrowElem.setAttribute( "arrowHeadWidth", mArrowHeadWidth );

jef-n

diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp
index 9770078..ef15b4e 100644
--- a/src/core/composer/qgscomposerattributetable.cpp
+++ b/src/core/composer/qgscomposerattributetable.cpp
@@ -264,7 +264,7 @@ bool QgsComposerAttributeTable::writeXML( QDomElement& elem, QDomDocument & doc
   for ( ; sortIt != mSortInformation.constEnd(); ++sortIt )
   {
     QDomElement columnElem = doc.createElement( "column" );
-    columnElem.setAttribute( "index", QString::number( sortIt->first ) );
+    columnElem.setAttribute( "index", sortIt->first );

jef-n

diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
index 3fbbf2c..29ea24b 100644
--- a/src/app/composer/qgscomposer.cpp
+++ b/src/app/composer/qgscomposer.cpp
@@ -83,7 +83,9 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   int size = settings.value( "/IconSize", QGIS_ICON_SIZE ).toInt();
   setIconSize( QSize( size, size ) );
 
+#ifndef Q_WS_MAC
   setFontSize( settings.value( "/fontPointSize", QGIS_DEFAULT_FONTSIZE ).toInt() );

jef-n

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
index b4e06a7..3dad784 100644
--- a/src/core/qgsvectorlayer.cpp
+++ b/src/core/qgsvectorlayer.cpp
@@ -1828,6 +1828,12 @@ bool QgsVectorLayer::nextFeature( QgsFeature &f )
     {
       updateFeatureAttributes( f ); //check joined attributes / changed attributes
     }
+
+    if ( mFetchGeometry && mChangedGeometries.contains( f.id() ) )

jef-n

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
index 0f1c943..cbaeacb 100644
--- a/src/core/qgsapplication.cpp
+++ b/src/core/qgsapplication.cpp
@@ -200,7 +200,8 @@ bool QgsApplication::event( QEvent * event )
 bool QgsApplication::notify( QObject * receiver, QEvent * event )
 {
   bool done = false;
-  emit preNotify( receiver, event, &done );
+  if( thread() == receiver->thread() )

jef-n

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 3253a34..f73ab00 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -649,11 +649,13 @@ int main( int argc, char *argv[] )
   QgisApp *qgis = new QgisApp( mypSplash, myRestorePlugins ); // "QgisApp" used to find canonical instance
   qgis->setObjectName( "QgisApp" );
 
+#if 0
   myApp.connect(

jef-n

export [email protected]
export DEBFULLNAME="Jürgen E. Fischer"

export PPA=${1:-qgis-unstable-ubuntugis-jef}
export T=$(mktemp)

cp debian/changelog $T

trap "cp $T debian/changelog && rm -f $T" EXIT