Moved code to set windows style to constructor of QgsSingleSymbolDialog. Removed an assert statement in QgsOgrProvider

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

Author: mhugent

src/gui/qgssinglesymboldialog.cpp

@@ -33,11 +33,23 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog(): QDialog(), mVectorLayer(0)
 #ifdef QGISDEBUG
     qWarning("constructor QgsSingleSymbolDialog called WITHOUT a layer");
 #endif
+    #ifdef Q_WS_WIN
+        // Coloured labels do not work under the Windows XP style - use plain Windows buttons instead
+        btnFillColor->setStyle(&mWindowsStyle);
+	btnOutlineColor->setStyle(&mWindowsStyle);
+    #endif
 }
 
 QgsSingleSymbolDialog::QgsSingleSymbolDialog(QgsVectorLayer * layer): QDialog(), mVectorLayer(layer)
 {
     setupUi(this);
+
+#ifdef Q_WS_WIN
+        // Coloured labels do not work under the Windows XP style - use plain Windows buttons instead
+        btnFillColor->setStyle(&mWindowsStyle);
+	btnOutlineColor->setStyle(&mWindowsStyle);
+#endif
+
 #ifdef QGISDEBUG
     qWarning("constructor QgsSingleSymbolDialog called WITH a layer");
 #endif
@@ -340,19 +352,11 @@ void QgsSingleSymbolDialog::set ( const QgsSymbol *sy )
 // old Qt3 idiom
 //        lblFillColor->setPaletteBackgroundColor(sy->brush().color());
 // new Qt4 idiom
-#ifdef Q_WS_WIN
-        // Coloured labels do not work under the Windows XP style - use plain Windows buttons instead
-        btnFillColor->setStyle(&mWindowsStyle);
-#endif
         btnFillColor->setPalette( sy->brush().color() );
 
 // old Qt3 idiom
 //        lblOutlineColor->setPaletteBackgroundColor(sy->pen().color());
 // new Qt4 idiom
-#ifdef Q_WS_WIN
-        // Coloured labels do not work under the Windows XP style - use plain Windows buttons instead
-        btnOutlineColor->setStyle(&mWindowsStyle);
-#endif
         btnOutlineColor->setPalette( sy->pen().color() );
 
 	//stylebutton->setName(QgsSymbologyUtils::penStyle2Char(sy->pen().style()));

src/providers/ogr/qgsogrprovider.cpp

@@ -635,7 +635,6 @@ void QgsOgrProvider::select(QgsRect *rect, bool useIntersect)
   }else{
 #ifdef QGISDEBUG    
     QgsLogger::warning("Setting spatial filter failed!");
-    assert(result==OGRERR_NONE);
 #endif
   }
   OGRGeometryFactory::destroyGeometry(filter);  

src/providers/wms/qgshttptransaction.cpp

@@ -96,7 +96,7 @@ bool QgsHttpTransaction::getSynchronously(QByteArray &respondedContent, int redi
 
   mWatchdogTimer = new QTimer( this );
 
-  QgsDebugMsg("QgsHttpTransaction::getSynchronously: qurl.host() is '" + qurl.host()+ "'.");
+  //QgsDebugMsg("QgsHttpTransaction::getSynchronously: qurl.host() is '" + qurl.host()+ "'.");
 
   httpresponse.truncate(0);
 
@@ -152,8 +152,8 @@ bool QgsHttpTransaction::getSynchronously(QByteArray &respondedContent, int redi
 #ifdef QGISDEBUG
   QgsDebugMsg("QgsHttpTransaction::getSynchronously: Response received.");
 
-//  QString httpresponsestring(httpresponse);
-//  QgsDebugMsg("QgsHttpTransaction::getSynchronously: Response received; being '" + httpresponsestring + "'.");
+  //QString httpresponsestring(httpresponse);
+  //QgsDebugMsg("QgsHttpTransaction::getSynchronously: Response received; being '" + httpresponsestring + "'.");
 #endif
 
   delete http;

src/providers/wms/qgswmsprovider.cpp

@@ -693,6 +693,7 @@ bool QgsWmsProvider::retrieveServerCapabilities(bool forceRefresh)
 
 QByteArray QgsWmsProvider::retrieveUrl(QString url)
 {
+  QgsDebugMsg("WMS request Url: " + url);
   QgsHttpTransaction http(
     url,
     mHttpProxyHost,