debian packaging update

git-svn-id: http://svn.osgeo.org/qgis/trunk@13438 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: jef

debian/changelog

@@ -8,8 +8,9 @@ qgis (1.5.0) UNRELEASED; urgency=low
     libgdal1-$VERSION-grass
   * add spatialquery plugin
   * include qgis.g.browser in grass plugin
+  * drop symbol tracking, C++ ABIs change too frequently 
 
- -- Jürgen E. Fischer <jef@norbit.de>  Fri, 07 May 2010 13:11:22 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 08 May 2010 13:26:13 +0200
 
 qgis (1.4.0) UNRELEASED; urgency=low
 

debian/libqgis{QGIS_ABI}.symbols

@@ -284,6 +284,7 @@ logile:logfile
 protecion:protection
 aritmetic:arithmetic
 futhermore:furthermore
+futher:further
 initializiation:initialization
 pronouce:pronounce
 expecially:especially

scripts/spelling.dat

@@ -154,9 +154,12 @@
 #include "qgsattributetabledialog.h"
 #include "qgsvectorfilewriter.h"
 #include "qgscredentialdialog.h"
-#include "qgsnetworkproxyfactory.h"
 #include "qgstilescalewidget.h"
 
+#if QT_VERSION >= 0x40500
+#include "qgsnetworkproxyfactory.h"
+#endif
+
 #ifdef HAVE_QWT
 #include "qgsgpsinformationwidget.h"
 #endif
@@ -362,9 +365,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
     , mPythonUtils( NULL )
     , mNAM( NULL )
     , mpTileScaleWidget( NULL )
-#if QT_VERSION >= 0x40500
-    , mProxyFactory( NULL )
-#endif
 #ifdef HAVE_QWT
     , mpGpsWidget( NULL )
 #endif
@@ -6627,13 +6627,16 @@ void QgisApp::namUpdate()
   }
 
 #if QT_VERSION >= 0x40500
-  if ( !mProxyFactory )
+  if( !mNAM->proxyFactory() )
   {
-    mProxyFactory = new QgsNetworkProxyFactory();
-    mNAM->setProxyFactory( mProxyFactory );
-  }
+    mNAM->setProxyFactory( new QgsNetworkProxyFactory() ); 
+  } 
 
-  mProxyFactory->setProxyAndExcludes( proxy, excludes );
+  QgsNetworkProxyFactory *pf = dynamic_cast<QgsNetworkProxyFactory *>( mNAM->proxyFactory() );
+  if( pf )
+  {
+    pf->setProxyAndExcludes( proxy, excludes );
+  }
 
   QNetworkDiskCache *cache = qobject_cast<QNetworkDiskCache*>( nam()->cache() );
   if ( !cache )

src/app/qgisapp.cpp

@@ -80,10 +80,6 @@ class QgsGPSInformationWidget;
 #include "qgsfeature.h"
 #include "qgspoint.h"
 
-#if QT_VERSION >= 0x40500
-class QgsNetworkProxyFactory;
-#endif
-
 /*! \class QgisApp
  * \brief Main window for the Qgis application
  */
@@ -1100,10 +1096,6 @@ class QgisApp : public QMainWindow
     //! Persistent tile scale slider
     QgsTileScaleWidget * mpTileScaleWidget;
 
-#if QT_VERSION >= 0x40500
-    QgsNetworkProxyFactory *mProxyFactory;
-#endif
-
     int mLastComposerId;
 
 #ifdef HAVE_QWT

src/app/qgisapp.h

@@ -25,7 +25,7 @@
 #include <QDialog>
 #include <QMouseEvent>
 
-QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas ): QgsMapTool( canvas ), \
+QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas ): QgsMapTool( canvas ),
     mActiveItem( 0 ), mCurrentMoveAction( QgsAnnotationItem::NoAction ), mLastMousePosition( 0, 0 )
 {
   mCursor = QCursor( Qt::ArrowCursor );
@@ -158,26 +158,26 @@ void QgsMapToolAnnotation::canvasMoveEvent( QMouseEvent * e )
       double xmax = xmin + size.width();
       double ymax = ymin + size.height();
 
-      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRight || \
-           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown || \
+      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRight ||
+           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown ||
            mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightUp )
       {
         xmax += e->posF().x() - mLastMousePosition.x();
       }
-      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeft || \
-           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown || \
+      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeft ||
+           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown ||
            mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp )
       {
         xmin += e->posF().x() - mLastMousePosition.x();
       }
-      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameUp || \
-           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp || \
+      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameUp ||
+           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp ||
            mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightUp )
       {
         ymin += e->posF().y() - mLastMousePosition.y();
       }
-      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameDown || \
-           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown || \
+      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameDown ||
+           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown ||
            mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown )
       {
         ymax += e->posF().y() - mLastMousePosition.y();

src/app/qgsmaptoolannotation.cpp

@@ -24,8 +24,8 @@
 #include <QMessageBox>
 #include <QMouseEvent>
 
-QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ), \
-    mActiveLayer( 0 ), mFeatureNumber( 0 ), mCurrentMouseAzimut( 0.0 ), mCurrentRotationFeature( 0.0 ), \
+QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ),
+    mActiveLayer( 0 ), mFeatureNumber( 0 ), mCurrentMouseAzimut( 0.0 ), mCurrentRotationFeature( 0.0 ),
     mRotating( false ), mRotationItem( 0 ), mCtrlPressed( false )
 {
 

src/app/qgsmaptoolrotatepointsymbols.cpp

@@ -166,7 +166,7 @@ bool QgsMapToolSimplify::calculateSliderBoudaries()
   {
     count++;
     if ( count == 30 && !maximized )
-    { //special case when tolerance is tool low to be correct so it's similat to 0
+    { //special case when tolerance is too low to be correct so it's near 0
       // else in some special cases this algorithm would create infinite loop
       found = true;
       minTolerance = 0;

src/app/qgsmaptoolsimplify.cpp

@@ -57,7 +57,7 @@ QList<QNetworkProxy> QgsNetworkProxyFactory::queryProxy( const QNetworkProxyQuer
   }
 
   QgsDebugMsg( QString("using user proxy for %1").arg( url ) );
-  return QList<QNetworkProxy>() << mProxy; 
+  return QList<QNetworkProxy>() << mProxy;
 }
 
 #endif // QT_VERSION >= 0x40500

src/app/qgsnetworkproxyfactory.cpp

@@ -18,12 +18,10 @@
 #ifndef QGSNETWORKPROXYFACTORY_H
 #define QGSNETWORKPROXYFACTORY_H
 
-#if QT_VERSION >= 0x40500
-
 #include <QNetworkProxyFactory>
 #include <QStringList>
 
-class QgsNetworkProxyFactory : public QNetworkProxyFactory
+class QgsNetworkProxyFactory : public QObject, public QNetworkProxyFactory
 {
   public:
     QgsNetworkProxyFactory();
@@ -37,6 +35,4 @@ class QgsNetworkProxyFactory : public QNetworkProxyFactory
     QNetworkProxy mProxy;
 };
 
-#endif // QT_VERSION >= 0x40500
-
 #endif