revert debian unrelated part from r13438

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

Author: jef

src/app/qgisapp.cpp

@@ -154,11 +154,8 @@
 #include "qgsattributetabledialog.h"
 #include "qgsvectorfilewriter.h"
 #include "qgscredentialdialog.h"
-#include "qgstilescalewidget.h"
-
-#if QT_VERSION >= 0x40500
 #include "qgsnetworkproxyfactory.h"
-#endif
+#include "qgstilescalewidget.h"
 
 #ifdef HAVE_QWT
 #include "qgsgpsinformationwidget.h"
@@ -365,6 +362,9 @@ 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,17 +6627,14 @@ void QgisApp::namUpdate()
   }
 
 #if QT_VERSION >= 0x40500
-  if( !mNAM->proxyFactory() )
+  if ( !mProxyFactory )
   {
-    mNAM->setProxyFactory( new QgsNetworkProxyFactory() ); 
-  } 
-
-  QgsNetworkProxyFactory *pf = dynamic_cast<QgsNetworkProxyFactory *>( mNAM->proxyFactory() );
-  if( pf )
-  {
-    pf->setProxyAndExcludes( proxy, excludes );
+    mProxyFactory = new QgsNetworkProxyFactory();
+    mNAM->setProxyFactory( mProxyFactory );
   }
 
+  mProxyFactory->setProxyAndExcludes( proxy, excludes );
+
   QNetworkDiskCache *cache = qobject_cast<QNetworkDiskCache*>( nam()->cache() );
   if ( !cache )
     cache = new QNetworkDiskCache( this );

src/app/qgisapp.h

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

src/app/qgsmaptoolannotation.cpp

@@ -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/qgsmaptoolrotatepointsymbols.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/qgsmaptoolsimplify.cpp

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

src/app/qgsnetworkproxyfactory.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.h

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

src/plugins/grass/qtermwidget/TerminalDisplay.cpp

@@ -2423,8 +2423,6 @@ QVariant TerminalDisplay::inputMethodQuery( Qt::InputMethodQuery query ) const
     case Qt::ImCurrentSelection:
       return QString();
       break;
-    default:
-      break;
   }
 
   return QVariant();

src/plugins/spatialquery/qgsspatialquerydialog.cpp

@@ -190,7 +190,6 @@ void QgsSpatialQueryDialog::runQuery()
   buttonBox->button( QDialogButtonBox::Close )->show();
   buttonBox->button( QDialogButtonBox::Cancel )->hide();
   buttonBox->button( QDialogButtonBox::Ok )->hide();
-  adjustSize();
 } // void QgsSpatialQueryDialog::runQuery()
 
 void QgsSpatialQueryDialog::setInputsVisible( bool show )
@@ -587,17 +586,8 @@ void QgsSpatialQueryDialog::on_buttonBox_accepted()
 
 void QgsSpatialQueryDialog::on_buttonBox_rejected()
 {
-  if ( grpResults->isHidden() )
-    reject();
-  else
-  {
-    grpResults->hide();
-    setInputsVisible( true );
-    progressBarStatus->show();
-    buttonBox->button( QDialogButtonBox::Close )->hide();
-    buttonBox->button( QDialogButtonBox::Cancel )->show();
-    buttonBox->button( QDialogButtonBox::Ok )->show();
-  }
+  reject();
+
 } // void QgsSpatialQueryDialog::on_buttonBox_rejected()
 
 void QgsSpatialQueryDialog::on_targetLayerComboBox_currentIndexChanged( int index )

src/plugins/spatialquery/qgsspatialquerydialogbase.ui

@@ -315,4 +315,22 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>QgsSpatialQueryDialogBase</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>288</x>
+     <y>438</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>292</x>
+     <y>459</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>