[QGIS Commit] r13143 - in trunk/qgis/src: app plugins/point_displacement_renderer providers/wms ui

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-03-22 18:10:28 -0400 (Mon, 22 Mar 2010)
New Revision: 13143

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgsoptions.cpp
   trunk/qgis/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp
   trunk/qgis/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp
   trunk/qgis/src/providers/wms/qgswmsprovider.cpp
   trunk/qgis/src/ui/qgsoptionsbase.ui
Log:
remove Qt 4.5 dependencies

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-03-22 18:30:37 UTC (rev 13142)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-03-22 22:10:28 UTC (rev 13143)
@@ -68,11 +68,14 @@
 #include <QWhatsThis>
 
 #include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 #include <QNetworkReply>
 #include <QNetworkProxy>
 #include <QAuthenticator>
 
+#if QT_VERSION >= 0x40500
+#include <QNetworkDiskCache>
+#endif
+
 //
 // Mac OS X Includes
 // Must include before GEOS 3 due to unqualified use of 'Point'
@@ -6270,9 +6273,6 @@
 
 #if QT_VERSION >= 0x40500
   mNAM->setProxyFactory( new QgsNetworkProxyFactory( proxy, excludes ) );
-#else
-  mNAM->setProxy( proxy );
-#endif
 
   QNetworkDiskCache *cache = qobject_cast<QNetworkDiskCache*>( nam()->cache() );
   if ( !cache )
@@ -6289,4 +6289,7 @@
 
   if ( mNAM->cache() != cache )
     mNAM->setCache( cache );
+#else
+  mNAM->setProxy( proxy );
+#endif
 }

Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp	2010-03-22 18:30:37 UTC (rev 13142)
+++ trunk/qgis/src/app/qgsoptions.cpp	2010-03-22 22:10:28 UTC (rev 13143)
@@ -29,7 +29,10 @@
 #include <QColorDialog>
 #include <QLocale>
 #include <QNetworkAccessManager>
+
+#if QT_VERSION >= 0x40500
 #include <QNetworkDiskCache>
+#endif
 
 #include <limits>
 #include <sqlite3.h>
@@ -116,10 +119,7 @@
     }
   }
 
-#if QT_VERSION < 0x40500
-  grpUrlExclude->setHidden( true );
-#endif
-
+#if QT_VERSION >= 0x40500
   // cache settings
   QNetworkDiskCache *cache = qobject_cast<QNetworkDiskCache*>( QgisApp::instance()->nam()->cache() );
   if ( cache )
@@ -131,6 +131,10 @@
     QgsDebugMsg( QString( "set cacheSize: %1" ).arg( cache->maximumCacheSize() ) );
     mCacheSize->setValue( cache->maximumCacheSize() / 1024 );
   }
+#else
+  grpUrlExclude->setHidden( true );
+  grpCache->setHidden( true );
+#endif
 
   //wms search server
   leWmsSearch->setText( settings.value( "/qgis/WMSSearchUrl", "http://geopole.org/wms/search?search=%1&type=rss" ).toString() );
@@ -868,5 +872,7 @@
 
 void QgsOptions::on_mClearCache_clicked()
 {
+#if QT_VERSION >= 0x40500
   QgisApp::instance()->nam()->cache()->clear();
+#endif
 }

Modified: trunk/qgis/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp
===================================================================
--- trunk/qgis/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp	2010-03-22 18:30:37 UTC (rev 13142)
+++ trunk/qgis/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp	2010-03-22 22:10:28 UTC (rev 13143)
@@ -238,7 +238,7 @@
   }
   if ( mRenderer )
   {
-    attributeList.append( mRenderer->usedAttributes() );
+    attributeList += mRenderer->usedAttributes();
   }
   return attributeList;
 }

Modified: trunk/qgis/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp
===================================================================
--- trunk/qgis/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp	2010-03-22 18:30:37 UTC (rev 13142)
+++ trunk/qgis/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp	2010-03-22 22:10:28 UTC (rev 13143)
@@ -224,7 +224,11 @@
     return;
   }
 
+#if QT_VERSION >= 0x040500
   QColor newColor = QColorDialog::getColor( mRenderer->circleColor(), 0, tr( "Circle color" ), QColorDialog::ShowAlphaChannel );
+#else
+  QColor newColor = QColorDialog::getColor( mRenderer->circleColor() );
+#endif
   if ( newColor.isValid() )
   {
     mRenderer->setCircleColor( newColor );
@@ -239,7 +243,11 @@
     return;
   }
 
+#if QT_VERSION >= 0x040500
   QColor newColor = QColorDialog::getColor( mRenderer->labelColor(), 0, tr( "Label color" ), QColorDialog::ShowAlphaChannel );
+#else
+  QColor newColor = QColorDialog::getColor( mRenderer->labelColor() );
+#endif
   if ( newColor.isValid() )
   {
     mRenderer->setLabelColor( newColor );

Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-03-22 18:30:37 UTC (rev 13142)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-03-22 22:10:28 UTC (rev 13143)
@@ -35,9 +35,12 @@
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QNetworkDiskCache>
 #include <QNetworkProxy>
 
+#if QT_VERSION >= 0x40500
+#include <QNetworkDiskCache>
+#endif
+
 #include <QUrl>
 #include <QImage>
 #include <QPainter>
@@ -105,6 +108,7 @@
       }
     }
 
+#if QT_VERSION >= 0x40500
     if ( !smNAM )
     {
       QgsDebugMsg( "application doesn't have a network access manager - creating wmscache" );
@@ -113,6 +117,7 @@
       ndc->setCacheDirectory( "wmsCache" );
       smNAM->setCache( ndc );
     }
+#endif
   }
 
   // URL may contain username/password information for a WMS
@@ -670,11 +675,13 @@
 {
   QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() );
 
+#if QT_VERSION >= 0x40500
   bool fromCache = reply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ).toBool();
   if ( fromCache )
     mCacheHits++;
   else
     mCacheMisses++;
+#endif
   int tileReqNo = reply->request().attribute( static_cast<QNetworkRequest::Attribute>( QNetworkRequest::User + 0 ) ).toInt();
   int tileNo = reply->request().attribute( static_cast<QNetworkRequest::Attribute>( QNetworkRequest::User + 1 ) ).toInt();
   QRectF r = reply->request().attribute( static_cast<QNetworkRequest::Attribute>( QNetworkRequest::User + 2 ) ).toRectF();

Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui	2010-03-22 18:30:37 UTC (rev 13142)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui	2010-03-22 22:10:28 UTC (rev 13143)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>813</width>
-    <height>565</height>
+    <height>605</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -1407,7 +1407,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_4">
+        <widget class="QGroupBox" name="grpCache">
          <property name="title">
           <string>Cache settings</string>
          </property>