[QGIS Commit] r10658 - in trunk/qgis/src: app app/composer
app/legend core core/composer core/symbology gui
plugins/diagram_overlay plugins/quick_print plugins/wfs
providers/delimitedtext providers/wfs
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Apr 26 18:56:23 EDT 2009
Author: jef
Date: 2009-04-26 18:56:23 -0400 (Sun, 26 Apr 2009)
New Revision: 10658
Modified:
trunk/qgis/src/app/composer/qgscomposer.cpp
trunk/qgis/src/app/legend/qgslegendlayerfilegroup.cpp
trunk/qgis/src/app/legend/qgslegendvectorsymbologyitem.cpp
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/app/qgscontinuouscolordialog.cpp
trunk/qgis/src/app/qgscustomprojectiondialog.cpp
trunk/qgis/src/app/qgsdbsourceselect.cpp
trunk/qgis/src/app/qgsgeomtypedialog.cpp
trunk/qgis/src/app/qgsmaptooladdfeature.cpp
trunk/qgis/src/app/qgsspatialitesourceselect.cpp
trunk/qgis/src/app/qgsuniquevaluedialog.cpp
trunk/qgis/src/core/composer/qgscomposition.cpp
trunk/qgis/src/core/qgsmaprenderer.cpp
trunk/qgis/src/core/qgsproject.cpp
trunk/qgis/src/core/qgsprojectproperty.cpp
trunk/qgis/src/core/qgsvectorlayer.cpp
trunk/qgis/src/core/symbology/qgssymbologyutils.cpp
trunk/qgis/src/gui/qgsprojectionselector.cpp
trunk/qgis/src/gui/qgsquickprint.cpp
trunk/qgis/src/plugins/diagram_overlay/qgsdiagramoverlay.cpp
trunk/qgis/src/plugins/quick_print/quickprintgui.cpp
trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp
trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
trunk/qgis/src/providers/wfs/qgswfsdata.cpp
trunk/qgis/src/providers/wfs/qgswfsprovider.cpp
Log:
reduce debug output noise when not debugging
Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -604,7 +604,7 @@
}
myOutputFileNameQString = myQFileDialog->selectedFiles().last();
- qWarning( "%s", myOutputFileNameQString.toLocal8Bit().constData() );
+ QgsDebugMsg( myOutputFileNameQString );
QString myFilterString = myQFileDialog->selectedFilter();
QgsDebugMsg( QString( "Selected filter: %1" ).arg( myFilterString ) );
QgsDebugMsg( QString( "Image type: %1" ).arg( myFilterMap[myFilterString] ) );
Modified: trunk/qgis/src/app/legend/qgslegendlayerfilegroup.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegendlayerfilegroup.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/app/legend/qgslegendlayerfilegroup.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -20,6 +20,7 @@
#include "qgslegendlayerfile.h"
#include "qgslegendsymbologygroup.h"
#include "qgsmaplayer.h"
+#include "qgslogger.h"
QgsLegendLayerFileGroup::QgsLegendLayerFileGroup( QTreeWidgetItem* theItem, QString theString ): QgsLegendItem( theItem, theString )
{
@@ -41,9 +42,7 @@
QgsLegendItem::DRAG_ACTION QgsLegendLayerFileGroup::accept( const QgsLegendItem* li ) const
{
-#ifdef QGISDEBUG
- qWarning( "in QgsLegendLayerFileGroup::accept" );
-#endif
+ QgsDebugMsg( "entered." );
if ( li )
{
LEGEND_ITEM_TYPE type = li->type();
@@ -146,9 +145,7 @@
void QgsLegendLayerFileGroup::release( QgsLegendItem* formerChild )
{
-#ifdef QGISDEBUG
- qWarning( "In QgsLegendLayerFileGroup::release" );
-#endif
+ QgsDebugMsg( "entered." );
if ( formerChild->type() == LEGEND_LAYER_FILE )
{
QgsLegendLayer* ll = dynamic_cast<QgsLegendLayer*>( parent() );
Modified: trunk/qgis/src/app/legend/qgslegendvectorsymbologyitem.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegendvectorsymbologyitem.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/app/legend/qgslegendvectorsymbologyitem.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -30,9 +30,6 @@
void QgsLegendVectorSymbologyItem::handleDoubleClickEvent()
{
-#ifdef QGISDEBUG
- qWarning( "in QgsLegendVectorSymbologyItem::handleDoubleClickEvent" );
-#endif
//todo: show the dialog
//QgsSiSyDialog d(0);
//std::list<QgsSymbol*>::iterator iter = mSymbols.begin();
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/app/qgisapp.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -2024,7 +2024,7 @@
if ( !driver )
{
- qWarning( "unable to get driver %d", i );
+ QgsDebugMsg( QString( "unable to get driver %1" ).arg( i ) );
continue;
}
Modified: trunk/qgis/src/app/qgscontinuouscolordialog.cpp
===================================================================
--- trunk/qgis/src/app/qgscontinuouscolordialog.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/app/qgscontinuouscolordialog.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -33,9 +33,7 @@
: QDialog(), mVectorLayer( layer )
{
setupUi( this );
-#ifdef QGISDEBUG
- qWarning( "constructor QgsContinuousColorDialog" );
-#endif
+ QgsDebugMsg( "entered." );
QObject::connect( btnMinValue, SIGNAL( clicked() ), this, SLOT( selectMinimumColor() ) );
QObject::connect( btnMaxValue, SIGNAL( clicked() ), this, SLOT( selectMaximumColor() ) );
@@ -63,7 +61,7 @@
}
else
{
- qWarning( "Warning, data provider is null in QgsContinuousColorDialog::QgsContinuousColorDialog(...)" );
+ QgsDebugMsg( "data provider is null" );
return;
}
@@ -139,16 +137,12 @@
QgsContinuousColorDialog::QgsContinuousColorDialog()
{
setupUi( this );
-#ifdef QGISDEBUG
- qWarning( "constructor QgsContinuousColorDialog" );
-#endif
+ QgsDebugMsg( "entered." );
}
QgsContinuousColorDialog::~QgsContinuousColorDialog()
{
-#ifdef QGISDEBUG
- qWarning( "destructor QgsContinuousColorDialog" );
-#endif
+ QgsDebugMsg( "entered." );
}
void QgsContinuousColorDialog::apply()
Modified: trunk/qgis/src/app/qgscustomprojectiondialog.cpp
===================================================================
--- trunk/qgis/src/app/qgscustomprojectiondialog.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/app/qgscustomprojectiondialog.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -987,7 +987,7 @@
myStart = myProjRegExp.indexIn( myProj4String, myStart );
if ( myStart == -1 )
{
- qDebug( "proj string supplied has no +proj argument!" );
+ QgsDebugMsg( "proj string supplied has no +proj argument!" );
return NULL;
}
else
@@ -1000,7 +1000,7 @@
QString QgsCustomProjectionDialog::getEllipseFromParameters()
{
- QgsLogger::debug( "QgsCustomProjectionDialog::getEllipseFromParameters()" );
+ QgsDebugMsg( "entered." );
QString myProj4String = leParameters->text();
QRegExp myEllipseRegExp( "\\+ellps=[a-zA-Z0-9\\-_]*" );
int myStart = 0;
Modified: trunk/qgis/src/app/qgsdbsourceselect.cpp
===================================================================
--- trunk/qgis/src/app/qgsdbsourceselect.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/app/qgsdbsourceselect.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -447,7 +447,7 @@
}
else
{
- qDebug( "Unable to get list of spatially enabled tables from the database\n%s", PQerrorMessage( pd ) );
+ QgsDebugMsg( QString( "Unable to get list of spatially enabled tables from the database\n%1" ).arg( PQerrorMessage( pd ) ) );
}
// BEGIN CHANGES ECOS
if ( cmbConnections->count() > 0 )
@@ -494,7 +494,7 @@
{
if ( !index.parent().isValid() )
{
- qWarning( "schema item found" );
+ QgsDebugMsg( "schema item found" );
return;
}
@@ -514,7 +514,7 @@
QString schemaName = mTableModel.itemFromIndex( mProxyModel.mapToSource( schemaSibling ) )->text();
QString tableName = mTableModel.itemFromIndex( mProxyModel.mapToSource( tableSibling ) )->text();
QString tableString = "\"" + schemaName + "\".\"" + tableName + "\"";
- qWarning( "%s", tableString.toUtf8().constData() );
+ QgsDebugMsg( tableString );
QString currentSql;
QModelIndex sqlSibling = index.sibling( index.row(), 4 );
Modified: trunk/qgis/src/app/qgsgeomtypedialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsgeomtypedialog.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/app/qgsgeomtypedialog.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -19,6 +19,7 @@
#include "qgsgeomtypedialog.h"
#include "qgsapplication.h"
#include "qgisapp.h" // <- for theme icons
+#include "qgslogger.h"
#include <QPushButton>
QgsGeomTypeDialog::QgsGeomTypeDialog( QWidget *parent, Qt::WFlags fl )
@@ -95,9 +96,7 @@
{
QTreeWidgetItem *item = *it;
at.push_back( std::make_pair( item->text( 0 ), item->text( 1 ) ) );
-#ifdef QGISDEBUG
- qWarning( "appending %s//%s", item->text( 0 ).toLocal8Bit().constData(), item->text( 1 ).toLocal8Bit().constData() );
-#endif
+ QgsDebugMsg( QString( "appending %1//%2" ).arg( item->text( 0 ) ).arg( item->text( 1 ) ) );
++it;
}
}
Modified: trunk/qgis/src/app/qgsmaptooladdfeature.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptooladdfeature.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/app/qgsmaptooladdfeature.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -180,7 +180,7 @@
bool isDisabledAttributeValuesDlg = settings.value( "/qgis/digitizing/disable_enter_attribute_values_dialog", false ).toBool();
if ( isDisabledAttributeValuesDlg )
{
- qDebug( "Adding feature to layer" );
+ QgsDebugMsg( "Adding feature to layer" );
vlayer->addFeature( *f );
}
else
@@ -188,12 +188,12 @@
QgsAttributeDialog * mypDialog = new QgsAttributeDialog( vlayer, f );
if ( mypDialog->exec() )
{
- qDebug( "Adding feature to layer" );
+ QgsDebugMsg( "Adding feature to layer" );
vlayer->addFeature( *f );
}
else
{
- qDebug( "Adding feature to layer failed" );
+ QgsDebugMsg( "Adding feature to layer failed" );
delete f;
}
delete mypDialog;
Modified: trunk/qgis/src/app/qgsspatialitesourceselect.cpp
===================================================================
--- trunk/qgis/src/app/qgsspatialitesourceselect.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/app/qgsspatialitesourceselect.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -3,7 +3,7 @@
Dialog to select SpatiaLite layer(s) and add it to the map canvas
-------------------
begin : Dec 2008
-copyright : (C) 2008 bySandro Furieri
+copyright : (C) 2008 by Sandro Furieri
email : a.furieri at lqt.it
***************************************************************************/
@@ -217,7 +217,7 @@
}
}
sqlite3_free_table( results );
- if ( tableName == true && geomColumn == true && type == true && coordDims == true && gcSrid == true && spatialIndex == true )
+ if ( tableName && geomColumn && type && coordDims && gcSrid && spatialIndex )
gcSpatiaLite = true;
// checking if table SPATIAL_REF_SYS exists and has the expected layout
@@ -244,11 +244,11 @@
}
}
sqlite3_free_table( results );
- if ( srsSrid == true && authName == true && authSrid == true && refSysName == true && proj4text == true )
+ if ( srsSrid && authName && authSrid && refSysName && proj4text )
rsSpatiaLite = true;
// OK, this one seems to be a valid SpatiaLite DB
- if ( gcSpatiaLite == true && rsSpatiaLite == true )
+ if ( gcSpatiaLite && rsSpatiaLite )
return handle;
// this one cannot be a valid SpatiaLite DB - no Spatial MetaData where found
@@ -487,12 +487,9 @@
// get the list of suitable tables and columns and populate the UI
geomCol details;
- if ( getTableInfo( handle ) == true )
- ;
- else
+ if ( !getTableInfo( handle ) )
{
- qDebug( "Unable to get list of spatially enabled tables from the database" );
- qDebug( "%s", sqlite3_errmsg( handle ) );
+ QgsDebugMsg( QString( "Unable to get list of spatially enabled tables from the database\n%1" ).arg( sqlite3_errmsg( handle ) ) );
}
closeSpatiaLiteDb( handle );
Modified: trunk/qgis/src/app/qgsuniquevaluedialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsuniquevaluedialog.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/app/qgsuniquevaluedialog.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -47,7 +47,7 @@
}
else
{
- qWarning( "Warning, data provider is null in QgsUniqueValueDialog::QgsUniqueValueDialog" );
+ QgsDebugMsg( "data provider is null" );
return;
}
Modified: trunk/qgis/src/core/composer/qgscomposition.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposition.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/core/composer/qgscomposition.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -18,6 +18,7 @@
#include "qgscomposeritem.h"
#include "qgscomposermap.h"
#include "qgspaperitem.h"
+#include "qgslogger.h"
#include <QDomDocument>
#include <QDomElement>
#include <QGraphicsRectItem>
@@ -239,7 +240,7 @@
return;
}
mItemZList.push_back( item );
- qWarning( "%d", mItemZList.size() );
+ QgsDebugMsg( QString::number( mItemZList.size() ) );
item->setZValue( mItemZList.size() );
}
@@ -522,7 +523,7 @@
currentItem = *it;
if ( currentItem )
{
- qWarning( "%d", counter );
+ QgsDebugMsg( QString::number( counter ) );
currentItem->setZValue( counter );
}
++counter;
@@ -531,13 +532,15 @@
void QgsComposition::sortZList()
{
+#ifdef QGISDEBUG
//debug: list before sorting
- qWarning( "before sorting" );
+ QgsDebugMsg( "before sorting" );
QLinkedList<QgsComposerItem*>::iterator before_it = mItemZList.begin();
for ( ; before_it != mItemZList.end(); ++before_it )
{
- qWarning( "%lf", ( *before_it )->zValue() );
+ QgsDebugMsg( QString( "%1" ).arg(( *before_it )->zValue() ) );
}
+#endif
QMutableLinkedListIterator<QgsComposerItem*> it( mItemZList );
int previousZ, afterZ; //z values of items before and after
@@ -584,14 +587,16 @@
}
}
+#ifdef QGISDEBUG
//debug: list after sorting
//debug: list before sorting
- qWarning( "after sorting" );
+ QgsDebugMsg( "after sorting" );
QLinkedList<QgsComposerItem*>::iterator after_it = mItemZList.begin();
for ( ; after_it != mItemZList.end(); ++after_it )
{
- qWarning( "%lf", ( *after_it )->zValue() );
+ QgsDebugMsg( QString( "%1" ).arg(( *after_it )->zValue() ) );
}
+#endif
}
QPointF QgsComposition::snapPointToGrid( const QPointF& scenePoint ) const
Modified: trunk/qgis/src/core/qgsmaprenderer.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaprenderer.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/core/qgsmaprenderer.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -614,7 +614,7 @@
}
catch ( QgsCsException &cse )
{
- qDebug( "Transform error caught in %s line %d:\n%s", __FILE__, __LINE__, cse.what() );
+ QgsDebugMsg( QString( "Transform error caught: " ).arg( cse.what() ) );
}
}
else
@@ -636,7 +636,7 @@
}
catch ( QgsCsException &cse )
{
- qDebug( "Transform error caught in %s line %d:\n%s", __FILE__, __LINE__, cse.what() );
+ QgsDebugMsg( QString( "Transform error caught:%s" ).arg( cse.what() ) );
}
}
else
@@ -657,7 +657,7 @@
}
catch ( QgsCsException &cse )
{
- qDebug( "Transform error caught in %s line %d:\n%s", __FILE__, __LINE__, cse.what() );
+ QgsDebugMsg( QString( "Transform error caught: %s" ).arg( cse.what() ) );
throw cse; //let client classes know there was a transformation error
}
}
@@ -679,7 +679,7 @@
}
catch ( QgsCsException &cse )
{
- qDebug( "Transform error caught in %s line %d:\n%s", __FILE__, __LINE__, cse.what() );
+ QgsDebugMsg( QString( "Transform error caught: %1" ).arg( cse.what() ) );
throw cse; //let client classes know there was a transformation error
}
}
Modified: trunk/qgis/src/core/qgsproject.cpp
===================================================================
--- trunk/qgis/src/core/qgsproject.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/core/qgsproject.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -19,8 +19,6 @@
#include <deque>
#include <memory>
-#include <cassert>
-#include <iostream>
#include "qgslogger.h"
#include "qgsrectangle.h"
@@ -421,7 +419,7 @@
/// basically a debugging tool to dump property list values
static void dump_( QgsPropertyKey const & topQgsPropertyKey )
{
- qDebug( "current properties:" );
+ QgsDebugMsg( "current properties:" );
topQgsPropertyKey.dump();
} // dump_
@@ -464,7 +462,7 @@
if ( properties.count() > 1 )
{
- qDebug( "there appears to be more than one ``properties'' XML tag ... bailing" );
+ QgsDebugMsg( "there appears to be more than one ``properties'' XML tag ... bailing" );
return;
}
else if ( properties.count() < 1 ) // no properties found, so we're done
@@ -478,7 +476,7 @@
if ( scopes.count() < 1 )
{
- qDebug( "empty ``properties'' XML tag ... bailing" );
+ QgsDebugMsg( "empty ``properties'' XML tag ... bailing" );
return;
}
@@ -486,7 +484,7 @@
if ( ! project_properties.readXML( propertyNode ) )
{
- qDebug( "Project_properties.readXML() failed" );
+ QgsDebugMsg( "Project_properties.readXML() failed" );
}
// DEPRECATED as functionality has been shoved down to QgsProperyKey::readXML()
@@ -548,7 +546,7 @@
if ( !nl.count() )
{
- qDebug( "%s : %d %s", __FILE__, __LINE__, " unable to find title element\n" );
+ QgsDebugMsg( "unable to find title element" );
return;
}
@@ -556,7 +554,7 @@
if ( !titleNode.hasChildNodes() ) // if not, then there's no actual text
{
- qDebug( "%s : %d %s", __FILE__, __LINE__, " unable to find title element\n" );
+ QgsDebugMsg( "unable to find title element" );
return;
}
@@ -564,7 +562,7 @@
if ( !titleTextNode.isText() )
{
- qDebug( "%s : %d %s", __FILE__, __LINE__, " unable to find title element\n" );
+ QgsDebugMsg( "unable to find title element" );
return;
}
@@ -769,7 +767,7 @@
QString errorString = tr( "Project file read error: %1 at line %2 column %3" )
.arg( errorMsg ).arg( line ).arg( column );
- qDebug( "%s", errorString.toUtf8().constData() );
+ QgsDebugMsg( errorString );
imp_->file.close();
@@ -991,7 +989,7 @@
dump_( imp_->properties_ );
- qDebug( "there are %d property scopes", static_cast<int>( imp_->properties_.count() ) );
+ QgsDebugMsg( QString( "there are %1 property scopes" ).arg( static_cast<int>( imp_->properties_.count() ) ) );
if ( !imp_->properties_.isEmpty() ) // only worry about properties if we
// actually have any properties
Modified: trunk/qgis/src/core/qgsprojectproperty.cpp
===================================================================
--- trunk/qgis/src/core/qgsprojectproperty.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/core/qgsprojectproperty.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -16,6 +16,7 @@
***************************************************************************/
#include "qgsprojectproperty.h"
+#include "qgslogger.h"
#include <QDomDocument>
#include <QStringList>
@@ -34,12 +35,12 @@
for ( QStringList::const_iterator i = sl.begin(); i != sl.end(); ++i )
{
- qDebug( "%s[%s] ", tabString.toLocal8Bit().constData(), ( *i ).toLocal8Bit().constData() );
+ QgsDebugMsg( QString( "%1[%2] " ).arg( tabString ).arg( *i ) );
}
}
else
{
- qDebug( "%s%s", tabString.toLocal8Bit().constData(), value_.toString().toLocal8Bit().constData() );
+ QgsDebugMsg( QString( "%1%2" ).arg( tabString ).arg( value_.toString() ) );
}
} // QgsPropertyValue::dump()
@@ -55,8 +56,7 @@
if ( QString::null == typeString )
{
- qDebug( "%s:%d null ``type'' attribute for %s", __FILE__, __LINE__,
- keyNode.nodeName().toUtf8().constData() );
+ QgsDebugMsg( QString( "null ``type'' attribute for %1" ).arg( keyNode.nodeName() ) );
return false;
}
@@ -78,27 +78,17 @@
switch ( type )
{
case QVariant::Invalid:
- qDebug( "%s:%d invalid value type %s .. ", __FILE__, __LINE__,
- typeString.toUtf8().constData() );
-
+ QgsDebugMsg( QString( "invalid value type %1 .. " ).arg( typeString ) );
return false;
- break;
-
case QVariant::Map:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Map", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Map" );
return false;
- break;
-
case QVariant::List:
- qDebug( "qgsproject.cpp:%d add support for QVariant::List", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::List" );
return false;
- break;
-
case QVariant::String:
value_ = subkeyElement.text(); // no translating necessary
break;
@@ -119,155 +109,100 @@
}
else
{
- qDebug
- ( "qgsproject.cpp:%d non <value> element ``%s'' in string list",
- __LINE__, values.item( i ).nodeName().toUtf8().constData() );
+ QgsDebugMsg( QString( "non <value> element ``%1'' in string list" ).arg( values.item( i ).nodeName() ) );
}
++i;
}
value_ = valueStringList;
-
break;
}
- case QVariant::Font:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Font", __LINE__ );
+ case QVariant::Font:
+ QgsDebugMsg( "no support for QVariant::Font" );
return false;
- break;
-
case QVariant::Pixmap:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Pixmap", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Pixmap" );
return false;
- break;
-
case QVariant::Brush:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Brush", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Brush" );
return false;
- break;
-
case QVariant::Rect:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Rect", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Rect" );
return false;
- break;
-
case QVariant::Size:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Size", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Size" );
return false;
- break;
-
case QVariant::Color:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Color", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Color" );
return false;
- break;
-
case QVariant::Palette:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Palette", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Palette" );
return false;
- break;
-
case QVariant::Point:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Point", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Point" );
return false;
- break;
-
case QVariant::Image:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Image", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Image" );
return false;
- break;
-
case QVariant::Int:
value_ = QVariant( subkeyElement.text() ).toInt();
-
break;
case QVariant::UInt:
value_ = QVariant( subkeyElement.text() ).toUInt();
-
break;
case QVariant::Bool:
value_ = QVariant( subkeyElement.text() ).toBool();
-
break;
case QVariant::Double:
value_ = QVariant( subkeyElement.text() ).toDouble();
-
break;
case QVariant::ByteArray:
value_ = QVariant( subkeyElement.text() ).toByteArray();
-
break;
case QVariant::Polygon:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Polygon",
- __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Polygon" );
return false;
- break;
-
case QVariant::Region:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Region", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Region" );
return false;
- break;
-
case QVariant::Bitmap:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Bitmap", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Bitmap" );
return false;
- break;
-
-
case QVariant::Cursor:
- qDebug( "qgsproject.cpp:%d add support for QVariant::Cursor", __LINE__ );
+ QgsDebugMsg( "no support for QVariant::Cursor" );
return false;
- break;
-
case QVariant::BitArray :
- qDebug( "qgsproject.cpp:%d add support for QVariant::BitArray", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::BitArray" );
return false;
- break;
-
case QVariant::KeySequence :
- qDebug( "qgsproject.cpp:%d add support for QVariant::KeySequence", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::KeySequence" );
return false;
- break;
-
case QVariant::Pen :
- qDebug( "qgsproject.cpp:%d add support for QVariant::Pen", __LINE__ );
-
+ QgsDebugMsg( "no support for QVariant::Pen" );
return false;
- break;
//
// QGIS DIES NOT SUPPORT THESE VARIANT TYPES IN VERSION 3.1 DISABLING FOR NOW
//
@@ -281,8 +216,7 @@
break;
*/
default :
- qDebug( "%s:%d unsupported value type %s .. not propertly translated to QVariant in qgsproject.cpp",
- __FILE__, __LINE__, typeString.toUtf8().constData() );
+ QgsDebugMsg( QString( "unsupported value type %1 .. not propertly translated to QVariant" ).arg( typeString ) );
}
return true;
@@ -355,7 +289,7 @@
}
else
{
- qDebug( "%s:%d QgsPropertyKey has null child", __FILE__, __LINE__ );
+ QgsDebugMsg( "key has null child" );
return QVariant(); // just return an QVariant::Invalid
}
@@ -368,7 +302,7 @@
tabString.fill( '\t', tabs );
- qDebug( "%sname: %s", tabString.toLocal8Bit().constData(), name().toLocal8Bit().constData() );
+ QgsDebugMsg( QString( "%1name: %2" ).arg( tabString ).arg( name() ) );
tabs++;
tabString.fill( '\t', tabs );
@@ -385,27 +319,20 @@
if ( QVariant::StringList == propertyValue->value().type() )
{
- qDebug( "%skey: <%s> value:",
- tabString.toLocal8Bit().constData(),
- i.key().toLocal8Bit().constData() );
-
+ QgsDebugMsg( QString( "%1key: <%2> value:" ).arg( tabString ).arg( i.key() ) );
propertyValue->dump( tabs + 1 );
}
else
{
- qDebug( "%skey: <%s> value: %s",
- tabString.toLocal8Bit().constData(),
- i.key().toLocal8Bit().constData(),
- propertyValue->value().toString().toLocal8Bit().constData() );
+ QgsDebugMsg( QString( "%1key: <%2> value: %3" ).arg( tabString ).arg( i.key() ).arg( propertyValue->value().toString() ) );
}
}
else
{
- qDebug( "%skey: <%s> subkey: <%s>",
- tabString.toLocal8Bit().constData(),
- i.key().toLocal8Bit().constData(),
- dynamic_cast<QgsPropertyKey*>( i.value() )->name().toLocal8Bit().data() );
-
+ QgsDebugMsg( QString( "%1key: <%2> subkey: <%3>" )
+ .arg( tabString )
+ .arg( i.key() )
+ .arg( dynamic_cast<QgsPropertyKey*>( i.value() )->name() ) );
i.value()->dump( tabs + 1 );
}
@@ -448,8 +375,7 @@
if ( !mProperties[subkeys.item( i ).nodeName()]->readXML( subkey ) )
{
- qDebug( "%s:%d unable to parse key value %s", __FILE__, __LINE__,
- subkeys.item( i ).nodeName().toUtf8().constData() );
+ QgsDebugMsg( QString( "unable to parse key value %1" ).arg( subkeys.item( i ).nodeName() ) );
}
}
else // otherwise it's a subkey, so just
@@ -461,8 +387,7 @@
if ( !mProperties[subkeys.item( i ).nodeName()]->readXML( subkey ) )
{
- qDebug( "%s:%d unable to parse subkey %s", __FILE__, __LINE__,
- subkeys.item( i ).nodeName().toUtf8().constData() );
+ QgsDebugMsg( QString( "unable to parse subkey %1" ).arg( subkeys.item( i ).nodeName() ) );
}
}
Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -985,17 +985,11 @@
case QGis::WKBMultiPolygon25D:
return QGis::Polygon;
}
-#ifdef QGISDEBUG
- QgsLogger::debug( "Warning: Data Provider Geometry type is not recognised, is", type, 1, __FILE__, __FUNCTION__, __LINE__ );
-#endif
-
+ QgsDebugMsg( QString( "Data Provider Geometry type is not recognised, is %1" ).arg( type ) );
}
else
{
-#ifdef QGISDEBUG
- qWarning( "warning, pointer to mDataProvider is null in QgsVectorLayer::type()" );
-#endif
-
+ QgsDebugMsg( "pointer to mDataProvider is null" );
}
// We shouldn't get here, and if we have, other things are likely to
Modified: trunk/qgis/src/core/symbology/qgssymbologyutils.cpp
===================================================================
--- trunk/qgis/src/core/symbology/qgssymbologyutils.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/core/symbology/qgssymbologyutils.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -16,6 +16,7 @@
***************************************************************************/
/* $Id$ */
#include "qgssymbologyutils.h"
+#include "qgslogger.h"
#include <QPixmap>
static const char *solidLineData[] =
@@ -800,7 +801,7 @@
}
else //return a null string
{
- qWarning( "Warning, no matching pattern found in QgsSymbologyUtils::brushStyle2QString" );
+ QgsDebugMsg( "no matching pattern found" );
return " ";
}
}
@@ -873,7 +874,7 @@
}
else //return a null string
{
- qWarning( "Brush style \"%s\" not found in qString2BrushStyle", brushString.toUtf8().constData() );
+ QgsDebugMsg( QString( "Brush style \"%1\" not found" ).arg( brushString ) );
return Qt::NoBrush;
}
}
@@ -980,7 +981,7 @@
}
else //return a null patternString
{
- qWarning( "Warning, no matching pattern found in QgsSymbologyUtils::qString2PatternPixmap" );
+ QgsDebugMsg( "no matching pattern found" );
return QPixmap();
}
}
@@ -1127,7 +1128,7 @@
else
{
- qWarning( "Warning, no matching style found in QgsSymbologyUtils::char2LinePixmap" );
+ QgsDebugMsg( "no matching style found" );
return QPixmap();
}
}
@@ -1200,7 +1201,7 @@
}
else
{
- qWarning( "Warning, no matching pattern found in QgsSymbologyUtils::char2PatternPixmap" );
+ QgsDebugMsg( "no matching pattern found" );
return QPixmap();
}
@@ -1238,7 +1239,7 @@
}
else
{
- qWarning( "Warning, no matching pen style found in QgsSymbologyUtils::char2PenStyle" );
+ QgsDebugMsg( "no matching pen style found" );
return Qt::NoPen;
}
}
@@ -1311,7 +1312,7 @@
}
else //return a null string
{
- qWarning( "Warning, no matching brush style found in QgsSymbologyUtils::char2BrushStyle" );
+ QgsDebugMsg( "no matching brush style found" );
return Qt::NoBrush;
}
}
@@ -1339,7 +1340,7 @@
return QPixmap( noPenLineData );
break;
default:
- qWarning( "Warning, no matching pen style found in QgsSymbologyUtils::penStyle2Pixmap" );
+ QgsDebugMsg( "no matching pen style found" );
return QPixmap();
}
}
@@ -1396,7 +1397,7 @@
case( Qt::NoBrush ):
return QPixmap( nobrush );
default:
- qWarning( "Warning, no matching pattern found in QgsSymbologyUtils::brushStyle2Pixmap" );
+ QgsDebugMsg( "no matching pattern found" );
}
return QPixmap(); // XXX I hope returning a blank one is ok
Modified: trunk/qgis/src/gui/qgsprojectionselector.cpp
===================================================================
--- trunk/qgis/src/gui/qgsprojectionselector.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/gui/qgsprojectionselector.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -945,7 +945,7 @@
myFileInfo.setFile( myDatabaseFileName );
if ( !myFileInfo.exists( ) ) //its not critical if this happens
{
- qDebug( "%s\nUser db does not exist", myDatabaseFileName.toUtf8().constData() );
+ QgsDebugMsg( QString( "%1\nUser db does not exist" ).arg( myDatabaseFileName ) );
return ;
}
myResult = sqlite3_open( myDatabaseFileName.toUtf8().data(), &myDatabase );
Modified: trunk/qgis/src/gui/qgsquickprint.cpp
===================================================================
--- trunk/qgis/src/gui/qgsquickprint.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/gui/qgsquickprint.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -83,12 +83,12 @@
void QgsQuickPrint::setLogo1( QString theFileName )
{
mLogo1File = theFileName;
- qDebug( "Logo1 set to: %s", mLogo1File.toLocal8Bit().constData() );
+ QgsDebugMsg( QString( "Logo1 set to: %1" ).arg( mLogo1File ) );
}
void QgsQuickPrint::setLogo2( QString theFileName )
{
mLogo2File = theFileName;
- qDebug( "Logo2 set to: %s", mLogo2File.toLocal8Bit().constData() );
+ QgsDebugMsg( QString( "Logo2 set to: %1" ).arg( mLogo2File ) );
}
void QgsQuickPrint::setOutputPdf( QString theFileName )
{
@@ -140,7 +140,7 @@
int myPrintResolutionDpi = 300;
myPrinter.setResolution( myPrintResolutionDpi );
myPrinter.setOutputFormat( QPrinter::PdfFormat );
- qDebug( "Printing to page size %s", pageSizeToString( mPageSize ).toLocal8Bit().constData() );
+ QgsDebugMsg( QString( "Printing to page size %1" ).arg( pageSizeToString( mPageSize ) ) );
myPrinter.setPageSize( mPageSize );
myPrinter.setOutputFileName( mOutputFileName );
myPrinter.setOrientation( QPrinter::Landscape );
@@ -588,7 +588,7 @@
int myLogoXDim = ( myDrawableWidth / 100 ) * myLogoWidthPercent;
int myLogoYDim = ( myDrawableHeight / 100 ) * myLogoHeightPercent;
QPixmap myLogo1;
- qDebug( "Logo1: %s", mLogo1File.toLocal8Bit().constData() );
+ QgsDebugMsg( QString( "Logo1: %1" ).arg( mLogo1File ) );
myLogo1.fill( Qt::white );
myLogo1.load( mLogo1File );
myLogo1 = myLogo1.scaled( myLogoXDim, myLogoYDim, Qt::KeepAspectRatio );
Modified: trunk/qgis/src/plugins/diagram_overlay/qgsdiagramoverlay.cpp
===================================================================
--- trunk/qgis/src/plugins/diagram_overlay/qgsdiagramoverlay.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/plugins/diagram_overlay/qgsdiagramoverlay.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -31,6 +31,7 @@
#include "qgsrendercontext.h"
#include "qgssymbologyutils.h"
#include "qgsvectordataprovider.h"
+#include "qgslogger.h"
#include <QPainter>
QgsDiagramOverlay::QgsDiagramOverlay( QgsVectorLayer* vl ): QgsVectorOverlay( vl ), mDiagramRenderer( 0 )
@@ -125,7 +126,7 @@
currentDiagramImage = mDiagramRenderer->renderDiagram( currentFeature, context );
if ( !currentDiagramImage )
{
- qWarning( "diagram image is 0" );
+ QgsDebugMsg( "diagram image is 0" );
continue;
}
//search for overlay object in the map
Modified: trunk/qgis/src/plugins/quick_print/quickprintgui.cpp
===================================================================
--- trunk/qgis/src/plugins/quick_print/quickprintgui.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/plugins/quick_print/quickprintgui.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -13,6 +13,7 @@
#include <qgsquickprint.h>
#include "qgscontexthelp.h"
#include "qgsapplication.h"
+#include "qgslogger.h"
//qt includes
#include <QMessageBox>
@@ -146,7 +147,7 @@
myQuickPrint.setOutputPdf( myOutputFileName );
QString myPageSizeString = cboPageSize->itemData( cboPageSize->currentIndex() ).toString();
myQuickPrint.setPageSize( QgsQuickPrint::stringToPageSize( myPageSizeString ) );
- qDebug( "Page size : %s", myPageSizeString.toLocal8Bit().constData() );
+ QgsDebugMsg( QString( "Page size : %1" ).arg( myPageSizeString ) );
myQuickPrint.printMap();
}
else
Modified: trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp
===================================================================
--- trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -23,6 +23,7 @@
#include "qgscontexthelp.h"
#include "qgsproject.h"
#include "qgscoordinatereferencesystem.h"
+#include "qgslogger.h"
#include <QDomDocument>
#include <QListWidgetItem>
#include <QMessageBox>
@@ -213,8 +214,7 @@
//print out result for a test
- QString resultString( result );
- qWarning( "%s", resultString.toUtf8().constData() );
+ QgsDebugMsg( result );
return 0;
}
@@ -269,7 +269,7 @@
QSettings settings;
QString key = "/Qgis/connections-wfs/" + cmbConnections->currentText() + "/url";
mUri = settings.value( key ).toString();
- qWarning( "url is: %s", mUri.toUtf8().constData() );
+ QgsDebugMsg( QString( "url is: %1" ).arg( mUri ) );
//make a GetCapabilities request
std::list<QString> typenames;
@@ -289,7 +289,7 @@
if ( getCapabilities( mUri, QgsWFSSourceSelect::GET, typenames, crsList, titles, abstracts ) != 0 )
{
- qWarning( "error during GetCapabilities request" );
+ QgsDebugMsg( "error during GetCapabilities request" );
}
//insert the available CRS into mAvailableCRS
@@ -330,8 +330,6 @@
{
btnAdd->setEnabled( false );
}
-
-
}
void QgsWFSSourceSelect::addLayer()
@@ -349,7 +347,7 @@
{
uri.append( "?" );
}
- qWarning( "%sSERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=%s", uri.toUtf8().constData(), typeName.toUtf8().constData() );
+ QgsDebugMsg( QString( "%1SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=%2" ).arg( uri ).arg( typeName ) );
//get CRS
QString crsString;
@@ -385,7 +383,7 @@
if ( currentTreeItem )
{
QString currentTypename = currentTreeItem->text( 1 );
- qWarning( "the current typename is: %s", currentTypename.toUtf8().constData() );
+ QgsDebugMsg( QString( "the current typename is: %1" ).arg( currentTypename ) );
std::map<QString, std::list<QString> >::const_iterator crsIterator = mAvailableCRS.find( currentTypename );
if ( crsIterator != mAvailableCRS.end() )
Modified: trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
===================================================================
--- trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -351,7 +351,7 @@
s << ( quint8 )0; // 0 is for big-endian
break;
default :
- qDebug( "%s:%d unknown endian", __FILE__, __LINE__ );
+ QgsDebugMsg( "unknown endian" );
//delete [] geometry;
return false;
}
Modified: trunk/qgis/src/providers/wfs/qgswfsdata.cpp
===================================================================
--- trunk/qgis/src/providers/wfs/qgswfsdata.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/providers/wfs/qgswfsdata.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -16,6 +16,7 @@
#include "qgsrectangle.h"
#include "qgscoordinatereferencesystem.h"
#include "qgshttptransaction.h"
+#include "qgslogger.h"
#include <QBuffer>
#include <QUrl>
#include <QList>
@@ -58,7 +59,7 @@
if ( it->startsWith( "TYPENAME", Qt::CaseInsensitive ) )
{
mTypeName = it->section( "=", 1, 1 );
- qWarning( "mTypeName is: %s", mTypeName.toLocal8Bit().constData() );
+ QgsDebugMsg( QString( "mTypeName is: %1" ).arg( mTypeName ) );
}
}
@@ -115,7 +116,7 @@
//loop to read the data
QByteArray readData;
int atEnd = 0;
- qWarning( "Entering loop" );
+ QgsDebugMsg( "Entering loop" );
while ( !mFinished || mHttp.bytesAvailable() > 0 )
{
if ( mFinished )
@@ -186,14 +187,14 @@
int epsgNr;
if ( readEpsgFromAttribute( epsgNr, attr ) != 0 )
{
- qWarning( "error, could not get epsg id" );
+ QgsDebugMsg( "error, could not get epsg id" );
}
//qWarning(("epsg id is: " + QString::number(epsgNr)).toLocal8Bit().data());
if ( mSrs )
{
if ( !mSrs->createFromEpsg( epsgNr ) )
{
- qWarning( "Creation of srs from epsg failed" );
+ QgsDebugMsg( "Creation of srs from epsg failed" );
}
}
}
@@ -268,7 +269,7 @@
//create bounding box from mStringCash
if ( createBBoxFromCoordinateString( mExtent, mStringCash ) != 0 )
{
- qWarning( "creation of bounding box failed" );
+ QgsDebugMsg( "creation of bounding box failed" );
}
if ( !mParseModeStack.empty() )
Modified: trunk/qgis/src/providers/wfs/qgswfsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wfs/qgswfsprovider.cpp 2009-04-26 22:49:37 UTC (rev 10657)
+++ trunk/qgis/src/providers/wfs/qgswfsprovider.cpp 2009-04-26 22:56:23 UTC (rev 10658)
@@ -295,12 +295,12 @@
if ( dataReader.getWFSData() != 0 )
{
- qWarning( "getWFSData returned with error" );
+ QgsDebugMsg( "getWFSData returned with error" );
return 1;
}
- qWarning( "feature count after request is: %d", mFeatures.size() );
- qWarning( "mExtent after request is: %s", mExtent.toString().toLocal8Bit().data() );
+ QgsDebugMsg( QString( "feature count after request is: %1" ).arg( mFeatures.size() ) );
+ QgsDebugMsg( QString( "mExtent after request is: %1" ).arg( mExtent.toString() ) );
for ( QList<QgsFeature*>::iterator it = mFeatures.begin(); it != mFeatures.end(); ++it )
{
More information about the QGIS-commit
mailing list