sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove more debug noise

Browse Source
This commit is contained in:
Matthias Kuhn 2016-06-12 16:05:40 +02:00
parent c63b910d75
commit 7b3e667282
57 changed files with 0 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/composer/qgscomposer.cpp
View File

@ -473,7 +473,6 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
mWindowAction = new QAction( windowTitle(), this );
connect( mWindowAction, SIGNAL( triggered() ), this, SLOT( activate() ) );
QgsDebugMsg( "entered." );
setMouseTracking( true );
mViewFrame->setMouseTracking( true );

1
src/app/qgscustomprojectiondialog.cpp
View File

@ -448,7 +448,6 @@ void QgsCustomProjectionDialog::on_buttonBox_accepted()
void QgsCustomProjectionDialog::on_pbnCalculate_clicked()
{
QgsDebugMsg( "entered." );
//

5
src/app/qgshandlebadlayers.cpp
View File

@ -157,7 +157,6 @@ QgsHandleBadLayers::~QgsHandleBadLayers()
void QgsHandleBadLayers::selectionChanged()
{
QgsDebugMsg( "entered." );
mRows.clear();
@ -250,7 +249,6 @@ void QgsHandleBadLayers::setFilename( int row, const QString& filename )
void QgsHandleBadLayers::browseClicked()
{
QgsDebugMsg( "entered." );
if ( mRows.size() == 1 )
{
@ -362,7 +360,6 @@ void QgsHandleBadLayers::editAuthCfg()
void QgsHandleBadLayers::apply()
{
QgsDebugMsg( "entered." );
for ( int i = 0; i < mLayerList->rowCount(); i++ )
{
int idx = mLayerList->item( i, 0 )->data( Qt::UserRole ).toInt();
@ -385,7 +382,6 @@ void QgsHandleBadLayers::apply()
void QgsHandleBadLayers::accept()
{
QgsDebugMsg( "entered." );
apply();
if ( mLayerList->rowCount() > 0 &&
@ -405,7 +401,6 @@ void QgsHandleBadLayers::accept()
void QgsHandleBadLayers::rejected()
{
QgsDebugMsg( "entered." );
if ( mLayerList->rowCount() > 0 &&
QMessageBox::warning( this,

7
src/app/qgslabeldialog.cpp
View File

@ -36,7 +36,6 @@ QgsLabelDialog::QgsLabelDialog( QgsLabel *label, QWidget *parent )
, mFont( "Helvetica" )
{
setupUi( this );
QgsDebugMsg( "entering." );
Q_ASSERT( label );
@ -53,7 +52,6 @@ QgsLabelDialog::QgsLabelDialog( QgsLabel *label, QWidget *parent )
void QgsLabelDialog::init()
{
QgsDebugMsg( "entering." );
QgsLabelAttributes * myLabelAttributes = mLabel->labelAttributes();
//populate a string list with all the field names which will be used to set up the
@ -274,7 +272,6 @@ void QgsLabelDialog::init()
void QgsLabelDialog::changeFont()
{
QgsDebugMsg( "entering." );
qreal fontSize = mFont.pointSizeF();
bool resultFlag;
@ -293,7 +290,6 @@ void QgsLabelDialog::changeFont()
void QgsLabelDialog::changeFontColor()
{
QgsDebugMsg( "entering." );
QColor color = QColorDialog::getColor( mFontColor );
if ( !color.isValid() )
@ -307,7 +303,6 @@ void QgsLabelDialog::changeFontColor()
void QgsLabelDialog::changeBufferColor()
{
QgsDebugMsg( "entering." );
QColor color = QColorDialog::getColor( mBufferColor );
if ( !color.isValid() )
@ -328,12 +323,10 @@ int QgsLabelDialog::itemNoForField( const QString& theFieldName, const QStringLi
QgsLabelDialog::~QgsLabelDialog()
{
QgsDebugMsg( "entering." );
}
void QgsLabelDialog::apply()
{
QgsDebugMsg( "entering." );
//set the label props that are NOT bound to a field in the attributes tbl
//All of these are set in the labelAttributes member of the layer

1
src/app/qgsmaptoollabel.cpp
View File

@ -620,7 +620,6 @@ bool QgsMapToolLabel::layerCanPin( QgsVectorLayer* vlayer, int& xCol, int& yCol
bool QgsMapToolLabel::labelCanShowHide( QgsVectorLayer* vlayer, int& showCol ) const
{
//QgsDebugMsg( "entered" );
if ( !vlayer || !vlayer->isEditable() )
{
return false;

1
src/app/qgsmaptoolmovefeature.cpp
View File

@ -142,7 +142,6 @@ void QgsMapToolMoveFeature::canvasPressEvent( QgsMapMouseEvent* e )
void QgsMapToolMoveFeature::canvasReleaseEvent( QgsMapMouseEvent* e )
{
//QgsDebugMsg("entering.");
if ( !mRubberBand )
{
return;

1
src/app/qgsrasterlayerproperties.cpp
View File

@ -483,7 +483,6 @@ void QgsRasterLayerProperties::setupTransparencyTable( int nBands )
void QgsRasterLayerProperties::populateTransparencyTable( QgsRasterRenderer* renderer )
{
QgsDebugMsg( "entering." );
if ( !mRasterLayer )
{
return;

1
src/core/composer/qgscomposeritem.cpp
View File

@ -154,7 +154,6 @@ QgsComposerItem::~QgsComposerItem()
void QgsComposerItem::setSelected( bool s )
{
QgsDebugMsg( "entered." );
QGraphicsRectItem::setSelected( s );
//inform model that id data has changed
if ( mComposition )

1
src/core/gps/qgsgpsdconnection.cpp
View File

@ -34,7 +34,6 @@ QgsGpsdConnection::QgsGpsdConnection( const QString& host, qint16 port, const QS
QgsGpsdConnection::~QgsGpsdConnection()
{
//connection will be closed by base class
QgsDebugMsg( "entered." );
}
void QgsGpsdConnection::connected()

1
src/core/gps/qgsqtlocationconnection.cpp
View File

@ -37,7 +37,6 @@ QgsQtLocationConnection::QgsQtLocationConnection(): QgsGPSConnection( new QLocal
QgsQtLocationConnection::~QgsQtLocationConnection()
{
//connection will be closed by base class
QgsDebugMsg( "entered." );
}
//Needed to make connection detectable (half HACK)

1
src/core/qgscoordinatereferencesystem.cpp
View File

@ -996,7 +996,6 @@ void QgsCoordinateReferenceSystem::setMapUnits()
*/
long QgsCoordinateReferenceSystem::findMatchingProj()
{
QgsDebugMsg( "entered." );
if ( d->mEllipsoidAcronym.isNull() || d->mProjectionAcronym.isNull()
|| !d->mIsValid )
{

2
src/core/qgshttptransaction.cpp
View File

@ -392,7 +392,6 @@ void QgsHttpTransaction::dataFinished( int id, bool error )
void QgsHttpTransaction::transactionFinished( bool error )
{
#ifdef QGISDEBUG
QgsDebugMsg( "entered." );
#if 0
// The signal that this slot is connected to, QHttp::requestFinished,
@ -489,7 +488,6 @@ void QgsHttpTransaction::dataStateChanged( int state )
void QgsHttpTransaction::networkTimedOut()
{
QgsDebugMsg( "entering." );
mError = tr( "Network timed out after %n second(s) of inactivity.\n"
"This may be a problem in your network connection or at the WMS server.", "inactivity timeout", mNetworkTimeoutMsec / 1000 );

1
src/core/qgsprojectfiletransform.cpp
View File

@ -204,7 +204,6 @@ void QgsProjectFileTransform::transform081to090()
void QgsProjectFileTransform::transform091to0100()
{
QgsDebugMsg( "entering" );
if ( ! mDom.isNull() )
{
// Insert transforms here!

1
src/core/qgsvectorlayer.cpp
View File

@ -175,7 +175,6 @@ QgsVectorLayer::QgsVectorLayer( const QString& vectorLayerPath,
QgsVectorLayer::~QgsVectorLayer()
{
QgsDebugMsg( "entered." );
emit layerDeleted();

1
src/gui/auth/qgsauthimportidentitydialog.cpp
View File

@ -139,7 +139,6 @@ void QgsAuthImportIdentityDialog::validateIdentity()
bool QgsAuthImportIdentityDialog::validateBundle()
{
QgsDebugMsg( "entered" );
// clear out any previously set bundle
QSslCertificate emptycert;

1
src/gui/qgsnewnamedialog.cpp
View File

@ -111,7 +111,6 @@ QString QgsNewNameDialog::highlightText( const QString& text )
void QgsNewNameDialog::nameChanged()
{
QgsDebugMsg( "entered" );
QString namesString = tr( "Full names" ) + ": ";
if ( !mExtensions.isEmpty() )

4
src/gui/qgsowssourceselect.cpp
View File

@ -139,7 +139,6 @@ void QgsOWSSourceSelect::clearFormats()
void QgsOWSSourceSelect::populateFormats()
{
QgsDebugMsg( "entered" );
// A server may offer more similar formats, which are mapped
// to the same GDAL format, e.g. GeoTIFF and TIFF
@ -225,7 +224,6 @@ void QgsOWSSourceSelect::populateFormats()
void QgsOWSSourceSelect::populateTimes()
{
QgsDebugMsg( "entered" );
mTimeComboBox->clear();
mTimeComboBox->insertItems( 0, selectedLayersTimes() );
mTimeComboBox->setEnabled( !selectedLayersTimes().isEmpty() );
@ -345,7 +343,6 @@ void QgsOWSSourceSelect::populateLayerList()
void QgsOWSSourceSelect::on_mConnectButton_clicked()
{
QgsDebugMsg( "entered" );
mLayersTreeWidget->clear();
clearFormats();
@ -367,7 +364,6 @@ void QgsOWSSourceSelect::on_mConnectButton_clicked()
void QgsOWSSourceSelect::addClicked()
{
QgsDebugMsg( "entered" );
}
void QgsOWSSourceSelect::enableLayersForCrs( QTreeWidgetItem * )

2
src/gui/qgssearchquerybuilder.cpp
View File

@ -73,7 +73,6 @@ void QgsSearchQueryBuilder::populateFields()
if ( !mLayer )
return;
QgsDebugMsg( "entering." );
const QgsFields& fields = mLayer->fields();
for ( int idx = 0; idx < fields.count(); ++idx )
{
@ -87,7 +86,6 @@ void QgsSearchQueryBuilder::populateFields()
void QgsSearchQueryBuilder::setupListViews()
{
QgsDebugMsg( "entering." );
//Models
mModelFields = new QStandardItemModel();
mModelValues = new QStandardItemModel();

2
src/gui/raster/qgsrasterhistogramwidget.cpp
View File

@ -283,7 +283,6 @@ void QgsRasterHistogramWidget::on_btnHistoCompute_clicked()
bool QgsRasterHistogramWidget::computeHistogram( bool forceComputeFlag )
{
QgsDebugMsg( "entered." );
//bool myIgnoreOutOfRangeFlag = true;
//bool myThoroughBandScanFlag = false;
@ -340,7 +339,6 @@ void QgsRasterHistogramWidget::refreshHistogram()
//
int myBandCountInt = mRasterLayer->bandCount();
QgsDebugMsg( "entered." );
if ( ! computeHistogram( false ) )
{

1
src/gui/raster/qgsrastertransparencywidget.cpp
View File

@ -494,7 +494,6 @@ void QgsRasterTransparencyWidget::pixelSelected( const QgsPoint & canvasPoint )
void QgsRasterTransparencyWidget::populateTransparencyTable( QgsRasterRenderer *renderer )
{
QgsDebugMsg( "entering." );
if ( !mRasterLayer )
{
return;

6
src/plugins/grass/qgsgrasseditrenderer.cpp
View File

@ -204,7 +204,6 @@ QString QgsGrassEditRenderer::dump() const
QDomElement QgsGrassEditRenderer::save( QDomDocument& doc )
{
QgsDebugMsg( "entered" );
QDomElement rendererElem = doc.createElement( RENDERER_TAG_NAME );
rendererElem.setAttribute( "type", "grassEdit" );
@ -222,7 +221,6 @@ QDomElement QgsGrassEditRenderer::save( QDomDocument& doc )
QgsFeatureRendererV2* QgsGrassEditRenderer::create( QDomElement& element )
{
QgsDebugMsg( "entered" );
QgsGrassEditRenderer *renderer = new QgsGrassEditRenderer();
QDomElement childElem = element.firstChildElement();
@ -260,7 +258,6 @@ QgsFeatureRendererV2* QgsGrassEditRenderer::create( QDomElement& element )
QgsRendererV2Widget* QgsGrassEditRendererWidget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )
{
QgsDebugMsg( "entered" );
return new QgsGrassEditRendererWidget( layer, style, renderer );
}
@ -270,7 +267,6 @@ QgsGrassEditRendererWidget::QgsGrassEditRendererWidget( QgsVectorLayer* layer, Q
, mLineRendererWidget( 0 )
, mPointRendererWidget( 0 )
{
QgsDebugMsg( "entered" );
mRenderer = dynamic_cast<QgsGrassEditRenderer*>( renderer->clone() );
if ( !mRenderer )
{
@ -288,13 +284,11 @@ QgsGrassEditRendererWidget::QgsGrassEditRendererWidget( QgsVectorLayer* layer, Q
QgsGrassEditRendererWidget::~QgsGrassEditRendererWidget()
{
QgsDebugMsg( "entered" );
delete mRenderer;
}
QgsFeatureRendererV2* QgsGrassEditRendererWidget::renderer()
{
QgsDebugMsg( "entered" );
mRenderer->setLineRenderer( mLineRendererWidget->renderer()->clone() );
mRenderer->setMarkerRenderer( mPointRendererWidget->renderer()->clone() );
return mRenderer;

26
src/plugins/grass/qgsgrassmapcalc.cpp
View File

@ -459,7 +459,6 @@ QStringList QgsGrassMapcalc::arguments()
QStringList QgsGrassMapcalc::checkOutput()
{
QgsDebugMsg( "entered." );
QStringList list;
QString value = mOutputLineEdit->text().trimmed();
@ -484,7 +483,6 @@ QStringList QgsGrassMapcalc::checkOutput()
QStringList QgsGrassMapcalc::checkRegion()
{
QgsDebugMsg( "entered." );
QStringList list;
QList<QGraphicsItem *> l = mCanvasScene->items();
@ -545,7 +543,6 @@ bool QgsGrassMapcalc::inputRegion( struct Cell_head *window, QgsCoordinateRefere
{
Q_UNUSED( crs );
Q_UNUSED( all );
QgsDebugMsg( "entered." );
try
{
@ -610,7 +607,6 @@ bool QgsGrassMapcalc::inputRegion( struct Cell_head *window, QgsCoordinateRefere
QStringList QgsGrassMapcalc::output( int type )
{
QgsDebugMsg( "entered." );
QStringList list;
if ( type == QgsGrassModuleOption::Raster )
{
@ -650,7 +646,6 @@ void QgsGrassMapcalc::showOptions( int tool )
void QgsGrassMapcalc::setOption()
{
QgsDebugMsg( "entered." );
if ( mTool != Select )
return;
@ -846,7 +841,6 @@ void QgsGrassMapcalc::setToolActionsOff()
void QgsGrassMapcalc::mapChanged( const QString & text )
{
QgsDebugMsg( "entered." );
if (( mTool != AddMap && mTool != Select ) || !mObject )
return;
@ -859,7 +853,6 @@ void QgsGrassMapcalc::mapChanged( const QString & text )
void QgsGrassMapcalc::constantChanged()
{
QgsDebugMsg( "entered." );
if (( mTool != AddConstant && mTool != Select ) || !mObject )
return;
@ -872,7 +865,6 @@ void QgsGrassMapcalc::constantChanged()
void QgsGrassMapcalc::functionChanged()
{
QgsDebugMsg( "entered." );
if (( mTool != AddFunction && mTool != Select ) || !mObject )
return;
@ -904,7 +896,6 @@ void QgsGrassMapcalc::resizeCanvas( int width, int height )
void QgsGrassMapcalc::growCanvas( int left, int right, int top, int bottom )
{
QgsDebugMsg( "entered." );
QgsDebugMsg( QString( "left = %1 right = %2 top = %3 bottom = %4" ).arg( left ).arg( right ).arg( top ).arg( bottom ) );
int width = mCanvasScene->width() + left + right;
@ -940,7 +931,6 @@ void QgsGrassMapcalc::growCanvas( int left, int right, int top, int bottom )
void QgsGrassMapcalc::autoGrow()
{
QgsDebugMsg( "entered." );
int thresh = 15;
@ -988,7 +978,6 @@ void QgsGrassMapcalc::autoGrow()
void QgsGrassMapcalc::saveAs()
{
QgsDebugMsg( "entered." );
// Check/create 'mapcalc' directory in current mapset
QString ms = QgsGrass::getDefaultGisdbase() + "/"
@ -1045,7 +1034,6 @@ void QgsGrassMapcalc::saveAs()
void QgsGrassMapcalc::save()
{
QgsDebugMsg( "entered." );
if ( mFileName.isEmpty() ) // Should not happen
{
QMessageBox::warning( this, tr( "Save mapcalc" ), tr( "File name empty" ) );
@ -1176,7 +1164,6 @@ void QgsGrassMapcalc::save()
void QgsGrassMapcalc::load()
{
QgsDebugMsg( "entered." );
QgsGrassSelect *sel = new QgsGrassSelect( this, QgsGrassSelect::MAPCALC );
if ( sel->exec() == QDialog::Rejected )
@ -1379,7 +1366,6 @@ void QgsGrassMapcalc::load()
void QgsGrassMapcalc::clear()
{
QgsDebugMsg( "entered." );
setTool( Select );
@ -1402,7 +1388,6 @@ QgsGrassMapcalcItem::QgsGrassMapcalcItem()
: mSelected( false )
, mId( -1 )
{
QgsDebugMsg( "entered." );
}
QgsGrassMapcalcItem::~QgsGrassMapcalcItem()
@ -1425,7 +1410,6 @@ QgsGrassMapcalcObject::QgsGrassMapcalcObject( int type )
, mOutputConnector( 0 )
, mOutputConnectorEnd( 0 )
{
QgsDebugMsg( "entered." );
QGraphicsRectItem::setZValue( 20 );
@ -1447,7 +1431,6 @@ QgsGrassMapcalcObject::QgsGrassMapcalcObject( int type )
QgsGrassMapcalcObject::~QgsGrassMapcalcObject()
{
QgsDebugMsg( "entered." );
// Delete connections
for ( int i = 0; i < mInputCount; i++ )
{
@ -1703,7 +1686,6 @@ void QgsGrassMapcalcObject::setSelected( bool s )
bool QgsGrassMapcalcObject::tryConnect( QgsGrassMapcalcConnector *connector,
int end )
{
QgsDebugMsg( "entered." );
QPoint p = connector->point( end );
@ -1749,7 +1731,6 @@ bool QgsGrassMapcalcObject::tryConnect( QgsGrassMapcalcConnector *connector,
void QgsGrassMapcalcObject::setConnector( int direction, int socket,
QgsGrassMapcalcConnector *connector, int end )
{
QgsDebugMsg( "entered." );
if ( direction == In )
{
@ -1767,7 +1748,6 @@ void QgsGrassMapcalcObject::setConnector( int direction, int socket,
QPoint QgsGrassMapcalcObject::socketPoint( int direction, int socket )
{
// QgsDebugMsg("entered.");
if ( direction == In )
{
@ -1779,7 +1759,6 @@ QPoint QgsGrassMapcalcObject::socketPoint( int direction, int socket )
QString QgsGrassMapcalcObject::expression()
{
QgsDebugMsg( "entered." );
QgsDebugMsg( QString( "mType = %1" ).arg( mType ) );
if ( mType == Map || mType == Constant )
@ -1833,7 +1812,6 @@ QgsGrassMapcalcConnector::QgsGrassMapcalcConnector( QGraphicsScene *canvas )
, QgsGrassMapcalcItem()
, mSelectedEnd( -1 )
{
QgsDebugMsg( "entered." );
canvas->addItem( this );
@ -1919,7 +1897,6 @@ void QgsGrassMapcalcConnector::setSelected( bool s )
void QgsGrassMapcalcConnector::selectEnd( QPoint point )
{
QgsDebugMsg( "entered." );
mSelectedEnd = -1;
double d0 = sqrt( pow(( double )( point.x() - mPoints[0].x() ), 2.0 )
@ -1950,7 +1927,6 @@ int QgsGrassMapcalcConnector::selectedEnd()
bool QgsGrassMapcalcConnector::tryConnectEnd( int end )
{
QgsDebugMsg( "entered." );
QList<QGraphicsItem *> l = scene()->items( mPoints[end] );
QgsGrassMapcalcObject *object = 0;
@ -1970,7 +1946,6 @@ bool QgsGrassMapcalcConnector::tryConnectEnd( int end )
void QgsGrassMapcalcConnector::setSocket( int end,
QgsGrassMapcalcObject *object, int direction, int socket )
{
QgsDebugMsg( "entered." );
// Remove old connection from object
if ( mSocketObjects[end] )
@ -2010,7 +1985,6 @@ bool QgsGrassMapcalcConnector::connected( int direction )
QString QgsGrassMapcalcConnector::expression()
{
QgsDebugMsg( "entered." );
for ( int i = 0; i < 2; i++ )
{
if ( !mSocketObjects[i] )

14
src/plugins/grass/qgsgrassmoduleinput.cpp
View File

@ -59,7 +59,6 @@ QgsGrassModuleInputModel::QgsGrassModuleInputModel( QObject *parent )
: QStandardItemModel( parent )
, mWatcher( 0 )
{
QgsDebugMsg( "entered" );
setColumnCount( 1 );
mWatcher = new QFileSystemWatcher( this );
@ -274,7 +273,6 @@ void QgsGrassModuleInputModel::refreshMapset( QStandardItem *mapsetItem, const Q
void QgsGrassModuleInputModel::reload()
{
QgsDebugMsg( "entered" );
if ( !mWatcher->files().isEmpty() )
{
mWatcher->removePaths( mWatcher->files() );
@ -316,7 +314,6 @@ void QgsGrassModuleInputModel::reload()
void QgsGrassModuleInputModel::onMapsetChanged()
{
QgsDebugMsg( "entered" );
if ( mLocationPath != QgsGrass::getDefaultLocationPath() )
{
reload();
@ -325,7 +322,6 @@ void QgsGrassModuleInputModel::onMapsetChanged()
void QgsGrassModuleInputModel::onMapsetSearchPathChanged()
{
QgsDebugMsg( "entered" );
emit dataChanged( index( 0, 0 ), index( rowCount() - 1, 0 ) );
}
@ -438,7 +434,6 @@ QgsGrassModuleInputPopup::QgsGrassModuleInputPopup( QWidget * parent )
void QgsGrassModuleInputPopup::setModel( QAbstractItemModel * model )
{
QgsDebugMsg( "entered" );
QTreeView::setModel( model );
}
@ -494,7 +489,6 @@ QModelIndex QgsGrassModuleInputCompleterProxy::mapToSource( const QModelIndex &
void QgsGrassModuleInputCompleterProxy::refreshMapping()
{
// TODO: emit data changed
QgsDebugMsg( "entered" );
mIndexes.clear();
mRows.clear();
map( QModelIndex() );
@ -503,7 +497,6 @@ void QgsGrassModuleInputCompleterProxy::refreshMapping()
void QgsGrassModuleInputCompleterProxy::map( const QModelIndex & parent, int level )
{
//QgsDebugMsg( "entered" );
if ( !sourceModel() )
{
return;
@ -825,7 +818,6 @@ QgsGrassModuleInput::QgsGrassModuleInput( QgsGrassModule *module,
, mUsesRegion( false )
, mRequired( false )
{
QgsDebugMsg( "entered" );
mGeometryTypeMask = GV_POINT | GV_LINE | GV_AREA;
if ( mTitle.isEmpty() )
@ -1062,7 +1054,6 @@ QgsGrassModuleInput::~QgsGrassModuleInput()
bool QgsGrassModuleInput::useRegion()
{
QgsDebugMsg( "entered" );
return mUsesRegion && mType == QgsGrassObject::Raster && mRegionButton && mRegionButton->isChecked();
}
@ -1110,7 +1101,6 @@ QStringList QgsGrassModuleInput::options()
QgsFields QgsGrassModuleInput::currentFields()
{
QgsDebugMsg( "entered" );
QgsGrassVectorLayer * layer = currentLayer();
if ( !layer )
@ -1122,7 +1112,6 @@ QgsFields QgsGrassModuleInput::currentFields()
QgsGrassObject QgsGrassModuleInput::currentGrassObject()
{
QgsDebugMsg( "entered" );
QgsGrassObject grassObject( QgsGrass::getDefaultGisdbase(), QgsGrass::getDefaultLocation(), "", "", mType );
grassObject.setFullName( mComboBox->currentText() );
@ -1240,7 +1229,6 @@ void QgsGrassModuleInput::onChanged( const QString & text )
void QgsGrassModuleInput::onLayerChanged()
{
QgsDebugMsg( "entered" );
// TODO(?): support vector sublayers/types for multiple input
if ( multiple() )
@ -1289,7 +1277,6 @@ void QgsGrassModuleInput::onLayerChanged()
QString QgsGrassModuleInput::ready()
{
QgsDebugMsg( "entered" );
QString error;
@ -1363,7 +1350,6 @@ void QgsGrassModuleInput::onActivated( const QString & text )
void QgsGrassModuleInput::deleteSelectedItem( const QModelIndex &index )
{
QgsDebugMsg( "entered" );
if ( index.isValid() )
{
mSelectedModel->removeRow( index.row() );

1
src/plugins/grass/qgsgrassmoduleoptions.cpp
View File

@ -646,7 +646,6 @@ bool QgsGrassModuleStandardOptions::hasOutput( int type )
QStringList QgsGrassModuleStandardOptions::ready()
{
QgsDebugMsg( "entered." );
QStringList list;
for ( int i = 0; i < mParams.size(); i++ )

15
src/plugins/grass/qgsgrassmoduleparam.cpp
View File

@ -294,7 +294,6 @@ QgsGrassModuleOption::QgsGrassModuleOption( QgsGrassModule *module, QString key,
, mValidator( 0 )
, mUsesRegion( false )
{
QgsDebugMsg( "entered" );
setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Minimum );
if ( mHidden )
@ -521,7 +520,6 @@ QgsGrassModuleOption::QgsGrassModuleOption( QgsGrassModule *module, QString key,
void QgsGrassModuleOption::addRow()
{
QgsDebugMsg( "entered" );
// TODO make the widget growing with new lines. HOW???!!!
QLineEdit *lineEdit = new QLineEdit( this );
@ -586,7 +584,6 @@ void QgsGrassModuleOption::addRow()
void QgsGrassModuleOption::removeRow()
{
QgsDebugMsg( "entered" );
if ( mLineEdits.size() < 2 )
{
@ -599,7 +596,6 @@ void QgsGrassModuleOption::removeRow()
void QgsGrassModuleOption::browse( bool checked )
{
Q_UNUSED( checked );
QgsDebugMsg( "entered" );
QSettings settings;
QString lastDir = settings.value( "/GRASS/lastDirectOutputDir", "" ).toString();
@ -617,7 +613,6 @@ void QgsGrassModuleOption::browse( bool checked )
QString QgsGrassModuleOption::outputExists()
{
QgsDebugMsg( "entered" );
if ( !mIsOutput )
return QString();
@ -784,7 +779,6 @@ QgsGrassModuleFlag::QgsGrassModuleFlag( QgsGrassModule *module, QString key,
bool direct, QWidget * parent )
: QgsGrassModuleCheckBox( "", parent ), QgsGrassModuleParam( module, key, qdesc, gdesc, gnode, direct )
{
QgsDebugMsg( "entered" );
if ( mHidden )
hide();
@ -893,7 +887,6 @@ QgsGrassModuleGdalInput::QgsGrassModuleGdalInput(
void QgsGrassModuleGdalInput::updateQgisLayers()
{
QgsDebugMsg( "entered" );
QString current = mLayerComboBox->currentText();
mLayerComboBox->clear();
@ -1071,7 +1064,6 @@ QStringList QgsGrassModuleGdalInput::options()
QString QgsGrassModuleGdalInput::ready()
{
QgsDebugMsg( "entered" );
QString error;
@ -1159,7 +1151,6 @@ QgsGrassModuleVectorField::QgsGrassModuleVectorField(
void QgsGrassModuleVectorField::addRow()
{
QgsDebugMsg( "entered" );
QComboBox *comboBox = new QComboBox();
comboBox->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
paramsLayout()->addWidget( comboBox );
@ -1169,7 +1160,6 @@ void QgsGrassModuleVectorField::addRow()
void QgsGrassModuleVectorField::removeRow()
{
QgsDebugMsg( "entered" );
if ( mComboBoxList.size() < 2 )
{
@ -1181,7 +1171,6 @@ void QgsGrassModuleVectorField::removeRow()
void QgsGrassModuleVectorField::updateFields()
{
QgsDebugMsg( "entered" );
Q_FOREACH ( QComboBox *comboBox, mComboBoxList )
{
@ -1287,7 +1276,6 @@ QgsGrassModuleSelection::QgsGrassModuleSelection(
void QgsGrassModuleSelection::onLayerChanged()
{
QgsDebugMsg( "entered" );
if ( !mLayerInput )
{
@ -1385,7 +1373,6 @@ QgsVectorLayer * QgsGrassModuleSelection::currentSelectionLayer()
void QgsGrassModuleSelection::onModeChanged()
{
QgsDebugMsg( "entered" );
int index = mModeComboBox->currentIndex();
if ( mModeComboBox->itemData( index ).toInt() == AddLayer )
{
@ -1413,7 +1400,6 @@ void QgsGrassModuleSelection::onModeChanged()
void QgsGrassModuleSelection::onLayerSelectionChanged()
{
QgsDebugMsg( "entered" );
mLineEdit->clear();
QgsVectorLayer *vectorLayer = currentSelectionLayer();
@ -1625,7 +1611,6 @@ QgsGrassModuleCheckBox::QgsGrassModuleCheckBox( const QString & text, QWidget *
: QCheckBox( text, parent )
, mText( text )
{
QgsDebugMsg( "entered" );
adjustText();
}

28
src/plugins/grass/qgsgrassnewmapset.cpp
View File

@ -124,7 +124,6 @@ QgsGrassNewMapset::QgsGrassNewMapset( QgisInterface *iface,
QgsGrassNewMapset::~QgsGrassNewMapset()
{
QgsDebugMsg( "entered" );
QSettings settings;
settings.setValue( "/Windows/QgsGrassNewMapset/geometry", saveGeometry() );
mRunning = false;
@ -144,7 +143,6 @@ void QgsGrassNewMapset::browseDatabase()
void QgsGrassNewMapset::databaseChanged()
{
QgsDebugMsg( "entered" );
QSettings settings;
settings.setValue( "/GRASS/lastGisdbase", mDatabaseLineEdit->text() );
@ -213,14 +211,12 @@ bool QgsGrassNewMapset::gisdbaseExists()
/*************************** LOCATION *******************************/
void QgsGrassNewMapset::setLocationPage()
{
QgsDebugMsg( "entered" );
setLocations();
}
void QgsGrassNewMapset::setLocations()
{
QgsDebugMsg( "entered" );
mLocationComboBox->clear();
@ -341,38 +337,32 @@ void QgsGrassNewMapset::checkLocation()
void QgsGrassNewMapset::existingLocationChanged( const QString &text )
{
Q_UNUSED( text );
QgsDebugMsg( "entered" );
}
void QgsGrassNewMapset::newLocationChanged()
{
QgsDebugMsg( "entered" );
checkLocation();
}
/************************** CRS ******************************/
void QgsGrassNewMapset::setProjectionPage()
{
QgsDebugMsg( "entered" );
setGrassProjection();
}
void QgsGrassNewMapset::sridSelected( QString theSRID )
{
Q_UNUSED( theSRID );
QgsDebugMsg( "entered" );
projectionSelected();
}
void QgsGrassNewMapset::projectionSelected()
{
QgsDebugMsg( "entered" );
setGrassProjection();
}
void QgsGrassNewMapset::projRadioSwitched()
{
QgsDebugMsg( "entered" );
if ( mNoProjRadioButton->isChecked() )
{
mProjectionSelector->setEnabled( false );
@ -387,7 +377,6 @@ void QgsGrassNewMapset::projRadioSwitched()
void QgsGrassNewMapset::setGrassProjection()
{
QgsDebugMsg( "entered" );
setError( mProjErrorLabel );
QString proj4 = mProjectionSelector->selectedProj4String();
@ -477,7 +466,6 @@ void QgsGrassNewMapset::setGrassProjection()
/**************************** REGION ********************************/
void QgsGrassNewMapset::setRegionPage()
{
QgsDebugMsg( "entered" );
// Set defaults
if ( !mRegionModified )
@ -635,7 +623,6 @@ void QgsGrassNewMapset::setGrassRegionDefaults()
void QgsGrassNewMapset::regionChanged()
{
QgsDebugMsg( "entered" );
mRegionModified = true;
checkRegion();
@ -644,7 +631,6 @@ void QgsGrassNewMapset::regionChanged()
void QgsGrassNewMapset::checkRegion()
{
QgsDebugMsg( "entered" );
bool err = false;
@ -707,7 +693,6 @@ void QgsGrassNewMapset::checkRegion()
void QgsGrassNewMapset::loadRegions()
{
QgsDebugMsg( "entered" );
QString path = QgsApplication::pkgDataPath() + "/grass/locations.gml";
QgsDebugMsg( QString( "load:%1" ).arg( path.toLocal8Bit().constData() ) );
@ -808,7 +793,6 @@ void QgsGrassNewMapset::loadRegions()
void QgsGrassNewMapset::setSelectedRegion()
{
QgsDebugMsg( "entered" );
// mRegionsPoints are in EPSG 4326 = LL WGS84
int index = 2 * mRegionsComboBox->currentIndex();
@ -921,7 +905,6 @@ void QgsGrassNewMapset::setSelectedRegion()
void QgsGrassNewMapset::setCurrentRegion()
{
QgsDebugMsg( "entered" );
QgsRectangle ext = mIface->mapCanvas()->extent();
@ -975,7 +958,6 @@ void QgsGrassNewMapset::setCurrentRegion()
void QgsGrassNewMapset::clearRegion()
{
QgsDebugMsg( "entered" );
QPixmap pm = mPixmap;
mRegionMap->setPixmap( pm );
@ -983,7 +965,6 @@ void QgsGrassNewMapset::clearRegion()
void QgsGrassNewMapset::drawRegion()
{
QgsDebugMsg( "entered" );
QPixmap pm = mPixmap;
mRegionMap->setPixmap( pm );
@ -1129,7 +1110,6 @@ void QgsGrassNewMapset::drawRegion()
/**************************** MAPSET ********************************/
void QgsGrassNewMapset::setMapsets()
{
QgsDebugMsg( "entered" );
mMapsetsListView->clear();
if ( mCreateLocationRadioButton->isChecked() )
@ -1167,7 +1147,6 @@ void QgsGrassNewMapset::setMapsets()
void QgsGrassNewMapset::mapsetChanged()
{
QgsDebugMsg( "entered" );
button( QWizard::NextButton )->setEnabled( false );
setError( mMapsetErrorLabel );
@ -1203,14 +1182,12 @@ void QgsGrassNewMapset::mapsetChanged()
void QgsGrassNewMapset::on_mOpenNewMapsetCheckBox_stateChanged( int state )
{
Q_UNUSED( state );
QgsDebugMsg( "entered" );
QSettings settings;
settings.setValue( "/GRASS/newMapsetWizard/openMapset", mOpenNewMapsetCheckBox->isChecked() );
}
void QgsGrassNewMapset::setFinishPage()
{
QgsDebugMsg( "entered" );
mDatabaseLabel->setText( tr( "Database" ) + " : " + mDatabaseLineEdit->text() );
@ -1230,7 +1207,6 @@ void QgsGrassNewMapset::setFinishPage()
void QgsGrassNewMapset::createMapset()
{
QgsDebugMsg( "entered" );
// TODO: handle all possible errors better, especially half created location/mapset
@ -1330,7 +1306,6 @@ void QgsGrassNewMapset::createMapset()
void QgsGrassNewMapset::accept()
{
QgsDebugMsg( "entered" );
createMapset();
}
@ -1338,7 +1313,6 @@ void QgsGrassNewMapset::accept()
/********************************************************************/
void QgsGrassNewMapset::setError( QLabel *line, const QString &err )
{
QgsDebugMsg( "entered" );
if ( !err.isEmpty() )
{
@ -1443,7 +1417,6 @@ bool QgsGrassNewMapset::isRunning( void )
void QgsGrassNewMapset::close( void )
{
QgsDebugMsg( "entered" );
hide();
mRunning = false;
@ -1452,7 +1425,6 @@ void QgsGrassNewMapset::close( void )
void QgsGrassNewMapset::closeEvent( QCloseEvent *e )
{
QgsDebugMsg( "entered" );
e->accept();
close();

14
src/plugins/grass/qgsgrassplugin.cpp
View File

@ -98,7 +98,6 @@ QgsGrassPlugin::QgsGrassPlugin( QgisInterface * theQgisInterFace )
QgsGrassPlugin::~QgsGrassPlugin()
{
QgsDebugMsg( "entered." );
// When main app is closed, QgsGrassTools (probably because of dock widget) are destroyed before QgsGrassPlugin
// -> do not call mTools here
//if ( mTools )
@ -306,7 +305,6 @@ void QgsGrassPlugin::initGui()
void QgsGrassPlugin::onGisbaseChanged()
{
QgsDebugMsg( "entered" );
if ( !QgsGrass::init() )
{
// TODO: save init error and get it here more reliably
@ -435,7 +433,6 @@ void QgsGrassPlugin::onEditingStarted()
void QgsGrassPlugin::onEditingStopped()
{
QgsDebugMsg( "entered" );
QgsVectorLayer *vectorLayer = qobject_cast<QgsVectorLayer *>( sender() );
if ( vectorLayer )
{
@ -451,7 +448,6 @@ void QgsGrassPlugin::onEditingStopped()
void QgsGrassPlugin::onFieldsChanged()
{
QgsDebugMsg( "entered" );
QgsGrassProvider* grassProvider = dynamic_cast<QgsGrassProvider*>( sender() );
if ( !grassProvider )
{
@ -480,7 +476,6 @@ void QgsGrassPlugin::onFieldsChanged()
void QgsGrassPlugin::addFeature()
{
QgsDebugMsg( "entered" );
QgsGrassProvider* grassProvider = 0;
QgsVectorLayer *vectorLayer = qobject_cast<QgsVectorLayer *>( qGisInterface->activeLayer() );
if ( vectorLayer )
@ -525,7 +520,6 @@ void QgsGrassPlugin::addFeature()
void QgsGrassPlugin::onSplitFeaturesTriggered( bool checked )
{
QgsDebugMsg( "entered" );
if ( checked )
{
QgsGrassProvider* grassProvider = 0;
@ -545,7 +539,6 @@ void QgsGrassPlugin::onSplitFeaturesTriggered( bool checked )
void QgsGrassPlugin::mapsetChanged()
{
QgsDebugMsg( "entered" );
if ( !QgsGrass::activeMode() )
{
mRegionAction->setEnabled( false );
@ -666,12 +659,10 @@ void QgsGrassPlugin::postRender( QPainter *painter )
Q_UNUSED( painter );
// We have to redraw rectangle, because canvas->mapRenderer()->destinationCrs is set after GRASS plugin constructor! This way it is redrawn also if canvas CRS has changed.
displayRegion();
// QgsDebugMsg("entered.");
}
void QgsGrassPlugin::displayRegion()
{
QgsDebugMsg( "entered" );
mRegionBand->reset();
if ( !mRegionAction->isChecked() )
@ -707,7 +698,6 @@ void QgsGrassPlugin::displayRegion()
void QgsGrassPlugin::switchRegion( bool on )
{
// QgsDebugMsg("entered.");
QSettings settings;
settings.setValue( "/GRASS/region/on", on );
@ -724,14 +714,12 @@ void QgsGrassPlugin::switchRegion( bool on )
void QgsGrassPlugin::redrawRegion()
{
// QgsDebugMsg("entered.");
displayRegion();
}
void QgsGrassPlugin::openMapset()
{
// QgsDebugMsg("entered.");
QString element;
@ -770,7 +758,6 @@ void QgsGrassPlugin::newMapset()
void QgsGrassPlugin::projectRead()
{
QgsDebugMsg( "entered." );
bool ok;
QString gisdbase = QgsProject::instance()->readPath(
@ -816,7 +803,6 @@ void QgsGrassPlugin::projectRead()
void QgsGrassPlugin::newProject()
{
QgsDebugMsg( "entered" );
}
// Unload the plugin by cleaning up the GUI

8
src/plugins/grass/qgsgrassregion.cpp
View File

@ -37,7 +37,6 @@
QgsGrassRegionEdit::QgsGrassRegionEdit( QgsMapCanvas* canvas )
: QgsMapTool( canvas )
{
QgsDebugMsg( "entered" );
mDraw = false;
mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
mSrcRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
@ -57,7 +56,6 @@ QgsGrassRegionEdit::~QgsGrassRegionEdit()
//! mouse pressed in map canvas
void QgsGrassRegionEdit::canvasPressEvent( QgsMapMouseEvent * event )
{
QgsDebugMsg( "entered." );
mDraw = true;
mRubberBand->reset( QGis::Polygon );
mSrcRubberBand->reset( QGis::Polygon );
@ -289,7 +287,6 @@ void QgsGrassRegion::refreshGui()
mUpdatingGui = true;
QgsDebugMsg( "entered." );
mNorth->setText( formatExtent( mWindow.north ) );
mSouth->setText( formatExtent( mWindow.south ) );
@ -431,7 +428,6 @@ void QgsGrassRegion::colsChanged()
void QgsGrassRegion::adjust()
{
QgsDebugMsg( "entered" );
mButtonBox->button( QDialogButtonBox::Apply )->setDisabled( false );
int rc = 0;
if ( mRowsColsRadio->isChecked() )
@ -451,7 +447,6 @@ void QgsGrassRegion::adjust()
void QgsGrassRegion::radioChanged()
{
QgsDebugMsg( "entered." );
bool res = !mRowsColsRadio->isChecked();
@ -468,7 +463,6 @@ void QgsGrassRegion::radioChanged()
void QgsGrassRegion::onCaptureFinished()
{
QgsDebugMsg( "entered." );
if ( !mRegionEdit )
{
return;
@ -486,7 +480,6 @@ void QgsGrassRegion::onCaptureFinished()
void QgsGrassRegion::canvasMapToolSet( QgsMapTool *tool )
{
QgsDebugMsg( "entered" );
mDrawButton->setChecked( tool == mRegionEdit );
}
@ -504,7 +497,6 @@ void QgsGrassRegion::displayRegion()
void QgsGrassRegion::on_mDrawButton_clicked()
{
QgsDebugMsg( "entered" );
mCanvas->setMapTool( mRegionEdit );
}

1
src/plugins/grass/qgsgrassshell.cpp
View File

@ -76,7 +76,6 @@ QgsGrassShell::QgsGrassShell( QgsGrassTools *tools, QTabWidget *parent, const ch
QgsGrassShell::~QgsGrassShell()
{
QgsDebugMsg( "entered" );
}
void QgsGrassShell::closeShell()

6
src/plugins/grass/qgsgrasstools.cpp
View File

@ -230,7 +230,6 @@ void QgsGrassTools::resetTitle()
void QgsGrassTools::showTabs()
{
QgsDebugMsg( "entered." );
resetTitle();
@ -585,7 +584,6 @@ void QgsGrassTools::closeMapset()
void QgsGrassTools::mapsetChanged()
{
QgsDebugMsg( "entered." );
mTabWidget->setCurrentIndex( 0 );
closeTools();
@ -595,7 +593,6 @@ void QgsGrassTools::mapsetChanged()
QgsGrassTools::~QgsGrassTools()
{
QgsDebugMsg( "entered." );
saveWindowLocation();
}
@ -635,13 +632,11 @@ void QgsGrassTools::saveWindowLocation()
void QgsGrassTools::emitRegionChanged()
{
QgsDebugMsg( "entered." );
emit regionChanged();
}
void QgsGrassTools::closeTools()
{
QgsDebugMsg( "entered." );
for ( int i = mTabWidget->count() - 1; i > 1; i-- ) // first is module tree, second is region
{
@ -711,7 +706,6 @@ void QgsGrassTools::itemClicked( const QModelIndex &theIndex )
void QgsGrassTools::on_mDebugButton_clicked()
{
QgsDebugMsg( "entered" );
QApplication::setOverrideCursor( Qt::BusyCursor );

2
src/plugins/grass/qgsgrassutils.cpp
View File

@ -99,7 +99,6 @@ QString QgsGrassElementDialog::getItem( QString element,
QString title, QString label,
QString text, QString source, bool * ok )
{
QgsDebugMsg( "entered." );
if ( ok )
*ok = false;
mElement = element;
@ -158,7 +157,6 @@ QString QgsGrassElementDialog::getItem( QString element,
void QgsGrassElementDialog::textChanged()
{
QgsDebugMsg( "entered." );
QString text = mLineEdit->text().trimmed();

1
src/providers/db2/qgsdb2provider.cpp
View File

@ -915,7 +915,6 @@ bool QgsDb2Provider::changeAttributeValues( const QgsChangedAttributesMap &attr_
bool QgsDb2Provider::addFeatures( QgsFeatureList & flist )
{
QgsDebugMsg( "entering" );
QgsDebugMsg( "mGeometryColType: " + mGeometryColType );
int writeCount = 0;
bool copyOperation = false;

1
src/providers/db2/qgsdb2sourceselect.cpp
View File

@ -391,7 +391,6 @@ void QgsDb2SourceSelect::on_mSearchModeComboBox_currentIndexChanged( const QStri
void QgsDb2SourceSelect::setLayerType( QgsDb2LayerProperty layerProperty )
{
QgsDebugMsg( "entering." );
mTableModel.setGeometryTypesForTable( layerProperty );
}

2
src/providers/gdal/qgsgdalprovider.cpp
View File

@ -226,7 +226,6 @@ bool QgsGdalProvider::crsFromWkt( const char *wkt )
QgsGdalProvider::~QgsGdalProvider()
{
QgsDebugMsg( "entering." );
if ( mGdalBaseDataset )
{
GDALDereferenceDataset( mGdalBaseDataset );
@ -872,7 +871,6 @@ void QgsGdalProvider::computeMinMax( int theBandNo ) const
*/
QList<QgsColorRampShader::ColorRampItem> QgsGdalProvider::colorTable( int theBandNumber )const
{
QgsDebugMsg( "entered." );
return QgsGdalProviderBase::colorTable( mGdalDataset, theBandNumber );
}

1
src/providers/gdal/qgsgdalproviderbase.cpp
View File

@ -38,7 +38,6 @@ QgsGdalProviderBase::QgsGdalProviderBase()
*/
QList<QgsColorRampShader::ColorRampItem> QgsGdalProviderBase::colorTable( GDALDatasetH gdalDataset, int theBandNumber )const
{
QgsDebugMsg( "entered." );
QList<QgsColorRampShader::ColorRampItem> ct;
//Invalid band number, segfault prevention

16
src/providers/grass/qgsgrass.cpp
View File

@ -659,7 +659,6 @@ bool QgsGrass::isMapsetInSearchPath( QString mapset )
void QgsGrass::addMapsetToSearchPath( const QString & mapset, QString& error )
{
QgsDebugMsg( "entered" );
QString cmd = gisbase() + "/bin/g.mapsets";
QStringList arguments;
@ -682,7 +681,6 @@ void QgsGrass::addMapsetToSearchPath( const QString & mapset, QString& error )
void QgsGrass::removeMapsetFromSearchPath( const QString & mapset, QString& error )
{
QgsDebugMsg( "entered" );
QString cmd = gisbase() + "/bin/g.mapsets";
QStringList arguments;
@ -705,7 +703,6 @@ void QgsGrass::removeMapsetFromSearchPath( const QString & mapset, QString& erro
void QgsGrass::loadMapsetSearchPath()
{
QgsDebugMsg( "entered" );
// do not lock, it is called from locked function
QStringList oldMapsetSearchPath = mMapsetSearchPath;
mMapsetSearchPath.clear();
@ -1084,7 +1081,6 @@ QString QgsGrass::openMapset( const QString& gisdbase,
QString QgsGrass::closeMapset()
{
QgsDebugMsg( "entered." );
if ( mMapsetLock.length() > 0 )
{
@ -1147,7 +1143,6 @@ QString QgsGrass::closeMapset()
bool QgsGrass::closeMapsetWarn()
{
QgsDebugMsg( "entered" );
QString err = QgsGrass::closeMapset();
@ -1161,7 +1156,6 @@ bool QgsGrass::closeMapsetWarn()
void QgsGrass::saveMapset()
{
QgsDebugMsg( "entered." );
// Save working mapset in project file
QgsProject::instance()->writeEntry( "GRASS", "/WorkingGisdbase",
@ -1177,7 +1171,6 @@ void QgsGrass::saveMapset()
void QgsGrass::createMapset( const QString& gisdbase, const QString& location,
const QString& mapset, QString& error )
{
QgsDebugMsg( "entered." );
QString locationPath = gisdbase + "/" + location;
QDir locationDir( locationPath );
@ -1253,7 +1246,6 @@ QStringList QgsGrass::mapsets( const QString& locationPath )
QStringList QgsGrass::vectors( const QString& gisdbase, const QString& locationName,
const QString& mapsetName )
{
QgsDebugMsg( "entered." );
if ( gisdbase.isEmpty() || locationName.isEmpty() || mapsetName.isEmpty() )
return QStringList();
@ -1427,7 +1419,6 @@ QStringList QgsGrass::vectorLayers( const QString& gisdbase, const QString& loca
QStringList QgsGrass::rasters( const QString& gisdbase, const QString& locationName,
const QString& mapsetName )
{
QgsDebugMsg( "entered." );
if ( gisdbase.isEmpty() || locationName.isEmpty() || mapsetName.isEmpty() )
return QStringList();
@ -1695,7 +1686,6 @@ bool QgsGrass::writeRegion( const QString& gisbase,
const QString& location, const QString& mapset,
const struct Cell_head *window )
{
QgsDebugMsg( "entered." );
QgsDebugMsg( QString( "n = %1 s = %2" ).arg( window->north ).arg( window->south ) );
QgsDebugMsg( QString( "e = %1 w = %2" ).arg( window->east ).arg( window->west ) );
@ -1848,7 +1838,6 @@ bool QgsGrass::mapRegion( QgsGrassObject::Type type, QString gisdbase,
QString location, QString mapset, QString map,
struct Cell_head *window )
{
QgsDebugMsg( "entered." );
QgsDebugMsg( QString( "map = %1" ).arg( map ) );
QgsDebugMsg( QString( "mapset = %1" ).arg( mapset ) );
@ -2366,7 +2355,6 @@ QMap<QString, QString> QgsGrass::query( QString gisdbase, QString location, QStr
void QgsGrass::renameObject( const QgsGrassObject & object, const QString& newName )
{
QgsDebugMsg( "entered" );
QString cmd = gisbase() + "/bin/g.rename";
QStringList arguments;
@ -2400,7 +2388,6 @@ void QgsGrass::copyObject( const QgsGrassObject & srcObject, const QgsGrassObjec
bool QgsGrass::deleteObject( const QgsGrassObject & object )
{
QgsDebugMsg( "entered" );
// TODO: check if user has permissions
@ -2436,7 +2423,6 @@ bool QgsGrass::deleteObject( const QgsGrassObject & object )
bool QgsGrass::deleteObjectDialog( const QgsGrassObject & object )
{
QgsDebugMsg( "entered" );
return QMessageBox::question( 0, QObject::tr( "Delete confirmation" ),
QObject::tr( "Are you sure you want to delete %1 %2?" ).arg( object.elementName(), object.name() ),
@ -2445,7 +2431,6 @@ bool QgsGrass::deleteObjectDialog( const QgsGrassObject & object )
void QgsGrass::createVectorMap( const QgsGrassObject & object, QString &error )
{
QgsDebugMsg( "entered" );
QgsGrass::setMapset( object );
@ -2923,7 +2908,6 @@ void QgsGrass::setModulesDebug( bool debug )
void QgsGrass::openOptions()
{
QgsDebugMsg( "entered" );
QgsGrassOptions dialog;
dialog.exec();
}

2
src/providers/grass/qgsgrassfeatureiterator.cpp
View File

@ -73,7 +73,6 @@ QgsGrassFeatureIterator::QgsGrassFeatureIterator( QgsGrassFeatureSource* source,
, mNextCidx( 0 )
, mNextLid( 1 )
{
QgsDebugMsg( "entered" );
// WARNING: the iterater cannot use mutex lock for its whole life, because QgsVectorLayerFeatureIterator is opening
// multiple iterators if features are edited -> lock only critical sections
@ -584,7 +583,6 @@ bool QgsGrassFeatureIterator::rewind()
bool QgsGrassFeatureIterator::close()
{
QgsDebugMsg( "entered" );
if ( mClosed )
{
QgsDebugMsg( "already closed" );

9
src/providers/grass/qgsgrassimport.cpp
View File

@ -67,7 +67,6 @@ void QgsGrassImportProgress::setProcess( QProcess *process )
void QgsGrassImportProgress::onReadyReadStandardError()
{
QgsDebugMsg( "entered" );
if ( mProcess )
{
// TODO: parse better progress output
@ -161,7 +160,6 @@ QString QgsGrassImport::error()
void QgsGrassImport::importInThread()
{
QgsDebugMsg( "entered" );
mFutureWatcher = new QFutureWatcher<bool>( this );
connect( mFutureWatcher, SIGNAL( finished() ), SLOT( onFinished() ) );
mFutureWatcher->setFuture( QtConcurrent::run( run, this ) );
@ -169,14 +167,12 @@ void QgsGrassImport::importInThread()
bool QgsGrassImport::run( QgsGrassImport *imp )
{
QgsDebugMsg( "entered" );
imp->import();
return true;
}
void QgsGrassImport::onFinished()
{
QgsDebugMsg( "entered" );
emit finished( this );
}
@ -194,7 +190,6 @@ bool QgsGrassImport::isCanceled() const
void QgsGrassImport::cancel()
{
QgsDebugMsg( "entered" );
mCanceled = true;
}
@ -221,7 +216,6 @@ QgsGrassRasterImport::~QgsGrassRasterImport()
bool QgsGrassRasterImport::import()
{
QgsDebugMsg( "entered" );
if ( !mPipe )
{
setError( "Pipe is null." );
@ -556,7 +550,6 @@ QgsGrassVectorImport::~QgsGrassVectorImport()
bool QgsGrassVectorImport::import()
{
QgsDebugMsg( "entered" );
if ( !mProvider )
{
@ -770,7 +763,6 @@ QgsGrassCopy::~QgsGrassCopy()
bool QgsGrassCopy::import()
{
QgsDebugMsg( "entered" );
try
{
@ -804,7 +796,6 @@ QgsGrassExternal::~QgsGrassExternal()
bool QgsGrassExternal::import()
{
QgsDebugMsg( "entered" );
try
{

17
src/providers/grass/qgsgrassprovider.cpp
View File

@ -279,7 +279,6 @@ QgsGrassProvider::QgsGrassProvider( QString uri )
QgsGrassProvider::~QgsGrassProvider()
{
QgsDebugMsg( "entered" );
if ( mLayer )
{
mLayer->close();
@ -314,7 +313,6 @@ int QgsGrassProvider::capabilities() const
bool QgsGrassProvider::openLayer()
{
QgsDebugMsg( "entered" );
// the map may be invalid (e.g. wrong uri or open failed)
QgsGrassVectorMap *vectorMap = QgsGrassVectorMapStore::instance()->openMap( mGrassObject );
if ( !vectorMap ) // should not happen
@ -382,7 +380,6 @@ void QgsGrassProvider::loadMapInfo()
void QgsGrassProvider::update()
{
QgsDebugMsg( "entered" );
mValid = false;
@ -563,7 +560,6 @@ int QgsGrassProvider::grassLayerType( QString name )
void QgsGrassProvider::onDataChanged()
{
QgsDebugMsg( "entered" );
update();
emit dataChanged();
}
@ -572,7 +568,6 @@ void QgsGrassProvider::onDataChanged()
bool QgsGrassProvider::isGrassEditable( void )
{
QgsDebugMsg( "entered" );
if ( !isValid() )
return false;
@ -594,7 +589,6 @@ bool QgsGrassProvider::isEdited( void )
void QgsGrassProvider::freeze()
{
QgsDebugMsg( "entered" );
if ( !isValid() )
{
@ -613,7 +607,6 @@ void QgsGrassProvider::freeze()
void QgsGrassProvider::thaw()
{
QgsDebugMsg( "entered" );
if ( !openLayer() )
{
@ -628,7 +621,6 @@ void QgsGrassProvider::thaw()
bool QgsGrassProvider::closeEdit( bool newMap, QgsVectorLayer *vectorLayer )
{
QgsDebugMsg( "entered" );
if ( !isValid() )
{
@ -685,7 +677,6 @@ void QgsGrassProvider::ensureUpdated()
int QgsGrassProvider::numLines( void )
{
QgsDebugMsg( "entered" );
//return ( Vect_get_num_lines( map() ) );
return mLayer->map()->numLines();
@ -693,7 +684,6 @@ int QgsGrassProvider::numLines( void )
int QgsGrassProvider::numNodes( void )
{
QgsDebugMsg( "entered" );
return ( Vect_get_num_nodes( map() ) );
}
@ -818,7 +808,6 @@ int QgsGrassProvider::rewriteLine( int oldLid, int type, struct line_pnts *Point
int QgsGrassProvider::deleteLine( int line )
{
QgsDebugMsg( "entered" );
if ( !isEdited() )
return -1;
@ -1047,14 +1036,12 @@ QgsAttributeMap *QgsGrassProvider::attributes( int field, int cat )
int QgsGrassProvider::numDbLinks( void )
{
QgsDebugMsg( "entered" );
return ( Vect_get_num_dblinks( map() ) );
}
int QgsGrassProvider::dbLinkField( int link )
{
QgsDebugMsg( "entered" );
struct field_info *fi = Vect_get_dblink( map(), link );
@ -1932,7 +1919,6 @@ void QgsGrassProvider::onAttributeDeleted( int idx )
void QgsGrassProvider::setAddedFeaturesSymbol()
{
QgsDebugMsg( "entered" );
if ( !mEditBuffer )
{
return;
@ -2006,18 +1992,15 @@ bool QgsGrassProvider::deleteAttributes( const QgsAttributeIds &attributes )
void QgsGrassProvider::onBeforeCommitChanges()
{
QgsDebugMsg( "entered" );
mLayer->map()->clearUndoCommands();
}
void QgsGrassProvider::onBeforeRollBack()
{
QgsDebugMsg( "entered" );
}
void QgsGrassProvider::onEditingStopped()
{
QgsDebugMsg( "entered" );
QgsVectorLayer *vectorLayer = qobject_cast<QgsVectorLayer *>( sender() );
closeEdit( false, vectorLayer );
}

13
src/providers/grass/qgsgrassprovidermodule.cpp
View File

@ -121,7 +121,6 @@ QList<QAction*> QgsGrassItemActions::actions()
void QgsGrassItemActions::newMapset()
{
QgsDebugMsg( "entered" );
QStringList existingNames = QgsGrass::mapsets( mGrassObject.gisdbase(), mGrassObject.mapsetPath() );
QgsDebugMsg( "existingNames = " + existingNames.join( "," ) );
@ -145,7 +144,6 @@ void QgsGrassItemActions::newMapset()
void QgsGrassItemActions::openMapset()
{
QgsDebugMsg( "entered" );
QString error = QgsGrass::openMapset( mGrassObject.gisdbase(), mGrassObject.location(), mGrassObject.mapset() );
if ( !error.isEmpty() )
{
@ -157,7 +155,6 @@ void QgsGrassItemActions::openMapset()
void QgsGrassItemActions::addMapsetToSearchPath()
{
QgsDebugMsg( "entered" );
QString error;
QgsGrass::instance()->addMapsetToSearchPath( mGrassObject.mapset(), error );
if ( !error.isEmpty() )
@ -169,7 +166,6 @@ void QgsGrassItemActions::addMapsetToSearchPath()
void QgsGrassItemActions::removeMapsetFromSearchPath()
{
QgsDebugMsg( "entered" );
QString error;
QgsGrass::instance()->removeMapsetFromSearchPath( mGrassObject.mapset(), error );
if ( !error.isEmpty() )
@ -237,7 +233,6 @@ void QgsGrassItemActions::deleteGrassObject()
QString QgsGrassItemActions::newVectorMap()
{
QgsDebugMsg( "entered" );
QStringList existingNames = QgsGrass::grassObjects( mGrassObject, QgsGrassObject::Vector );
QgsDebugMsg( "existingNames = " + existingNames.join( "," ) );
@ -270,7 +265,6 @@ QString QgsGrassItemActions::newVectorMap()
void QgsGrassItemActions::newLayer( QString type )
{
QgsDebugMsg( "entered" );
QString name;
if ( mGrassObject.type() == QgsGrassObject::Mapset )
{
@ -305,19 +299,16 @@ void QgsGrassItemActions::newLayer( QString type )
void QgsGrassItemActions::newPointLayer()
{
QgsDebugMsg( "entered" );
newLayer( "point" );
}
void QgsGrassItemActions::newLineLayer()
{
QgsDebugMsg( "entered" );
newLayer( "line" );
}
void QgsGrassItemActions::newPolygonLayer()
{
QgsDebugMsg( "entered" );
newLayer( "polygon" );
}
@ -916,7 +907,6 @@ bool QgsGrassMapsetItem::handleDrop( const QMimeData * data, Qt::DropAction )
void QgsGrassMapsetItem::onImportFinished( QgsGrassImport* import )
{
QgsDebugMsg( "entered" );
if ( !import->error().isEmpty() )
{
QgsMessageOutput *output = QgsMessageOutput::createMessageOutput();
@ -934,7 +924,6 @@ void QgsGrassMapsetItem::onImportFinished( QgsGrassImport* import )
void QgsGrassMapsetItem::onDirectoryChanged()
{
QgsDebugMsg( "entered" );
if ( state() == Populating )
{
// schedule to refresh later, because refres() simply returns if Populating
@ -1016,7 +1005,6 @@ QgsGrassVectorItem::~QgsGrassVectorItem()
void QgsGrassVectorItem::onDirectoryChanged()
{
QgsDebugMsg( "entered" );
if ( parent() )
{
parent()->refresh();
@ -1195,7 +1183,6 @@ QList<QAction*> QgsGrassImportItem::actions()
QWidget * QgsGrassImportItem::paramWidget()
{
QgsDebugMsg( "entered" );
QgsGrassImportItemWidget *widget = new QgsGrassImportItemWidget();
if ( mImport && mImport->progress() )

4
src/providers/grass/qgsgrassrasterprovider.cpp
View File

@ -637,14 +637,12 @@ QDateTime QgsGrassRasterProvider::dataTimestamp() const
void QgsGrassRasterProvider::freeze()
{
QgsDebugMsg( "entered" );
mRasterValue.stop();
mValid = false;
}
void QgsGrassRasterProvider::thaw()
{
QgsDebugMsg( "entered" );
mValid = true;
}
@ -670,7 +668,6 @@ void QgsGrassRasterValue::set( const QString & gisdbase, const QString & locatio
void QgsGrassRasterValue::start()
{
QgsDebugMsg( "entered" );
if ( mProcess )
{
QgsDebugMsg( "already running" );
@ -695,7 +692,6 @@ void QgsGrassRasterValue::start()
void QgsGrassRasterValue::stop()
{
QgsDebugMsg( "entered" );
if ( mProcess )
{
QgsDebugMsg( "closing process" );

7
src/providers/grass/qgsgrassvectormap.cpp
View File

@ -416,7 +416,6 @@ QgsGrassVectorMapLayer * QgsGrassVectorMap::openLayer( int field )
void QgsGrassVectorMap::reloadLayers()
{
QgsDebugMsg( "entered" );
Q_FOREACH ( QgsGrassVectorMapLayer *l, mLayers )
{
l->load();
@ -497,7 +496,6 @@ void QgsGrassVectorMap::update()
bool QgsGrassVectorMap::mapOutdated()
{
QgsDebugMsg( "entered" );
QString dp = mGrassObject.mapsetPath() + "/vector/" + mGrassObject.name();
QFileInfo di( dp );
@ -519,7 +517,6 @@ bool QgsGrassVectorMap::mapOutdated()
bool QgsGrassVectorMap::attributesOutdated()
{
QgsDebugMsg( "entered" );
QString dp = mGrassObject.mapsetPath() + "/vector/" + mGrassObject.name() + "/dbln";
QFileInfo di( dp );
@ -535,14 +532,12 @@ bool QgsGrassVectorMap::attributesOutdated()
int QgsGrassVectorMap::numLines()
{
QgsDebugMsg( "entered" );
return ( Vect_get_num_lines( mMap ) );
}
int QgsGrassVectorMap::numAreas()
{
QgsDebugMsg( "entered" );
return ( Vect_get_num_areas( mMap ) );
}
@ -554,7 +549,6 @@ QString QgsGrassVectorMap::toString()
void QgsGrassVectorMap::printDebug()
{
QgsDebugMsg( "entered" );
if ( !mValid || !mMap )
{
QgsDebugMsg( "map not valid" );
@ -745,7 +739,6 @@ QgsGrassVectorMapStore::QgsGrassVectorMapStore()
QgsGrassVectorMapStore::~QgsGrassVectorMapStore()
{
QgsDebugMsg( "entered" );
}
QgsGrassVectorMapStore *QgsGrassVectorMapStore::instance()

6
src/providers/grass/qgsgrassvectormaplayer.cpp
View File

@ -55,7 +55,6 @@ QgsGrassVectorMapLayer::QgsGrassVectorMapLayer( QgsGrassVectorMap *map, int fiel
void QgsGrassVectorMapLayer::clear()
{
QgsDebugMsg( "entered" );
mTableFields.clear();
mFields.clear();
mAttributeFields.clear();
@ -87,7 +86,6 @@ int QgsGrassVectorMapLayer::cidxFieldNumCats()
void QgsGrassVectorMapLayer::load()
{
QgsDebugMsg( "entered" );
clear();
if ( !mMap )
@ -351,7 +349,6 @@ QStringList QgsGrassVectorMapLayer::fieldNames( QgsFields & fields )
void QgsGrassVectorMapLayer::updateFields()
{
QgsDebugMsg( "entered" );
// update fields to pass layer/buffer check when committing
for ( int i = mFields.size() - 1; i >= 0; i-- )
@ -420,7 +417,6 @@ QString QgsGrassVectorMapLayer::quotedValue( QVariant value )
dbDriver * QgsGrassVectorMapLayer::openDriver( QString &error )
{
QgsDebugMsg( "entered" );
dbDriver * driver = 0;
if ( !mFieldInfo )
@ -472,7 +468,6 @@ void QgsGrassVectorMapLayer::addTopoField( QgsFields &fields )
void QgsGrassVectorMapLayer::startEdit()
{
QgsDebugMsg( "entered" );
// add topo field which is present until closeEdit when data are reloaded
addTopoField( mFields );
@ -490,7 +485,6 @@ void QgsGrassVectorMapLayer::startEdit()
void QgsGrassVectorMapLayer::closeEdit()
{
QgsDebugMsg( "entered" );
if ( mDriver )
{

1
src/providers/mssql/qgsmssqlsourceselect.cpp
View File

@ -386,7 +386,6 @@ void QgsMssqlSourceSelect::on_mSearchModeComboBox_currentIndexChanged( const QSt
void QgsMssqlSourceSelect::setLayerType( const QgsMssqlLayerProperty& layerProperty )
{
QgsDebugMsg( "entering." );
mTableModel.setGeometryTypesForTable( layerProperty );
}

1
src/providers/oracle/qgsoracleprovider.cpp
View File

@ -1983,7 +1983,6 @@ void QgsOracleProvider::appendGeomParam( const QgsGeometry *geom, QSqlQuery &qry
bool QgsOracleProvider::changeGeometryValues( const QgsGeometryMap &geometry_map )
{
QgsDebugMsg( "entering." );
if ( mIsQuery || mGeometryColumn.isNull() || !mConnection )
return false;

1
src/providers/oracle/qgsoraclesourceselect.cpp
View File

@ -432,7 +432,6 @@ void QgsOracleSourceSelect::on_mSearchModeComboBox_currentIndexChanged( const QS
void QgsOracleSourceSelect::setLayerType( QgsOracleLayerProperty layerProperty )
{
QgsDebugMsg( "entering." );
mTableModel.addTableEntry( layerProperty );
}

1
src/providers/postgres/qgspgsourceselect.cpp
View File

@ -448,7 +448,6 @@ void QgsPgSourceSelect::on_mSearchModeComboBox_currentIndexChanged( const QStrin
void QgsPgSourceSelect::setLayerType( const QgsPostgresLayerProperty& layerProperty )
{
QgsDebugMsg( "entering." );
mTableModel.addTableEntry( layerProperty );
}

2
src/providers/postgres/qgspostgresprovider.cpp
View File

@ -2494,7 +2494,6 @@ void QgsPostgresProvider::appendGeomParam( const QgsGeometry *geom, QStringList
bool QgsPostgresProvider::changeGeometryValues( const QgsGeometryMap &geometry_map )
{
QgsDebugMsg( "entering." );
if ( mIsQuery || mGeometryColumn.isNull() )
return false;
@ -2681,7 +2680,6 @@ bool QgsPostgresProvider::changeGeometryValues( const QgsGeometryMap &geometry_m
bool QgsPostgresProvider::changeFeatures( const QgsChangedAttributesMap &attr_map,
const QgsGeometryMap &geometry_map )
{
QgsDebugMsg( "entering." );
Q_ASSERT( mSpatialColType != sctTopoGeometry );
bool returnvalue = true;

1
src/providers/wcs/qgswcscapabilities.cpp
View File

@ -1167,7 +1167,6 @@ QString QgsWcsCapabilities::lastErrorFormat()
bool QgsWcsCapabilities::setAuthorization( QNetworkRequest &request ) const
{
QgsDebugMsg( "entered" );
if ( mUri.hasParam( "authcfg" ) && !mUri.param( "authcfg" ).isEmpty() )
{
return QgsAuthManager::instance()->updateNetworkRequest( request, mUri.param( "authcfg" ) );

4
src/providers/wcs/qgswcsprovider.cpp
View File

@ -916,7 +916,6 @@ void QgsWcsProvider::clearCache()
QList<QgsColorRampShader::ColorRampItem> QgsWcsProvider::colorTable( int theBandNumber )const
{
QgsDebugMsg( "entered." );
return mColorTables.value( theBandNumber - 1 );
}
@ -929,7 +928,6 @@ int QgsWcsProvider::colorInterpretation( int bandNo ) const
bool QgsWcsProvider::parseServiceExceptionReportDom( QByteArray const & xml, const QString& wcsVersion, QString& errorTitle, QString& errorText )
{
QgsDebugMsg( "entering." );
#ifdef QGISDEBUG
//test the content of the QByteArray
@ -984,7 +982,6 @@ bool QgsWcsProvider::parseServiceExceptionReportDom( QByteArray const & xml, con
void QgsWcsProvider::parseServiceException( QDomElement const & e, const QString& wcsVersion, QString& errorTitle, QString& errorText )
{
QgsDebugMsg( "entering." );
errorTitle = tr( "Service Exception" );
@ -1078,7 +1075,6 @@ QString QgsWcsProvider::wcsVersion()
bool QgsWcsProvider::calculateExtent()
{
QgsDebugMsg( "entered." );
// Make sure we know what extents are available
if ( !mCoverageSummary.described )

8
src/providers/wcs/qgswcssourceselect.cpp
View File

@ -47,7 +47,6 @@ QgsWCSSourceSelect::~QgsWCSSourceSelect()
void QgsWCSSourceSelect::populateLayerList()
{
QgsDebugMsg( "entered" );
mLayersTreeWidget->clear();
@ -115,7 +114,6 @@ QString QgsWCSSourceSelect::selectedIdentifier()
void QgsWCSSourceSelect::addClicked()
{
QgsDebugMsg( "entered" );
QgsDataSourceURI uri = mUri;
QString identifier = selectedIdentifier();
@ -155,7 +153,6 @@ void QgsWCSSourceSelect::addClicked()
void QgsWCSSourceSelect::on_mLayersTreeWidget_itemSelectionChanged()
{
QgsDebugMsg( "entered" );
QString identifier = selectedIdentifier();
if ( identifier.isEmpty() ) { return; }
@ -175,7 +172,6 @@ void QgsWCSSourceSelect::on_mLayersTreeWidget_itemSelectionChanged()
void QgsWCSSourceSelect::updateButtons()
{
QgsDebugMsg( "entered" );
if ( mLayersTreeWidget->selectedItems().isEmpty() )
{
@ -194,7 +190,6 @@ void QgsWCSSourceSelect::updateButtons()
QList<QgsWCSSourceSelect::SupportedFormat> QgsWCSSourceSelect::providerFormats()
{
QgsDebugMsg( "entered" );
QList<SupportedFormat> formats;
QMap<QString, QString> mimes = QgsWcsProvider::supportedMimes();
@ -218,7 +213,6 @@ QList<QgsWCSSourceSelect::SupportedFormat> QgsWCSSourceSelect::providerFormats()
QStringList QgsWCSSourceSelect::selectedLayersFormats()
{
QgsDebugMsg( "entered" );
QString identifier = selectedIdentifier();
if ( identifier.isEmpty() ) { return QStringList(); }
@ -232,7 +226,6 @@ QStringList QgsWCSSourceSelect::selectedLayersFormats()
QStringList QgsWCSSourceSelect::selectedLayersCRSs()
{
QgsDebugMsg( "entered" );
QString identifier = selectedIdentifier();
if ( identifier.isEmpty() ) { return QStringList(); }
@ -245,7 +238,6 @@ QStringList QgsWCSSourceSelect::selectedLayersCRSs()
QStringList QgsWCSSourceSelect::selectedLayersTimes()
{
QgsDebugMsg( "entered" );
QString identifier = selectedIdentifier();
if ( identifier.isEmpty() ) { return QStringList(); }

1
src/providers/wfs/qgswfsrequest.cpp
View File

@ -205,7 +205,6 @@ void QgsWFSRequest::replyProgress( qint64 bytesReceived, qint64 bytesTotal )
void QgsWFSRequest::replyFinished()
{
QgsDebugMsg( "entering." );
if ( !mIsAborted && mReply )
{
if ( mReply->error() == QNetworkReply::NoError )

18
src/providers/wms/qgswmscapabilities.cpp
View File

@ -216,7 +216,6 @@ bool QgsWmsCapabilities::parseResponse( const QByteArray& response, const QgsWms
bool QgsWmsCapabilities::parseCapabilitiesDom( QByteArray const &xml, QgsWmsCapabilitiesProperty& capabilitiesProperty )
{
QgsDebugMsg( "entering." );
#ifdef QGISDEBUG
QFile file( QDir::tempPath() + "/qgis-wmsprovider-capabilities.xml" );
@ -312,7 +311,6 @@ bool QgsWmsCapabilities::parseCapabilitiesDom( QByteArray const &xml, QgsWmsCapa
void QgsWmsCapabilities::parseService( QDomElement const & e, QgsWmsServiceProperty& serviceProperty )
{
QgsDebugMsg( "entering." );
QDomNode n1 = e.firstChild();
while ( !n1.isNull() )
@ -377,7 +375,6 @@ void QgsWmsCapabilities::parseService( QDomElement const & e, QgsWmsServicePrope
void QgsWmsCapabilities::parseOnlineResource( QDomElement const & e, QgsWmsOnlineResourceAttribute& onlineResourceAttribute )
{
QgsDebugMsg( "entering." );
onlineResourceAttribute.xlinkHref = QUrl::fromEncoded( e.attribute( "xlink:href" ).toUtf8() ).toString();
@ -387,7 +384,6 @@ void QgsWmsCapabilities::parseOnlineResource( QDomElement const & e, QgsWmsOnlin
void QgsWmsCapabilities::parseKeywordList( QDomElement const & e, QStringList& keywordListProperty )
{
QgsDebugMsg( "entering." );
QDomNode n1 = e.firstChild();
while ( !n1.isNull() )
@ -415,7 +411,6 @@ void QgsWmsCapabilities::parseKeywordList( QDomElement const & e, QStringList&
void QgsWmsCapabilities::parseContactInformation( QDomElement const & e, QgsWmsContactInformationProperty& contactInformationProperty )
{
QgsDebugMsg( "entering." );
QDomNode n1 = e.firstChild();
while ( !n1.isNull() )
@ -482,7 +477,6 @@ void QgsWmsCapabilities::parseContactInformation( QDomElement const & e, QgsWmsC
void QgsWmsCapabilities::parseContactPersonPrimary( QDomElement const & e, QgsWmsContactPersonPrimaryProperty& contactPersonPrimaryProperty )
{
QgsDebugMsg( "entering." );
QDomNode n1 = e.firstChild();
while ( !n1.isNull() )
@ -512,7 +506,6 @@ void QgsWmsCapabilities::parseContactPersonPrimary( QDomElement const & e, QgsWm
void QgsWmsCapabilities::parseContactAddress( QDomElement const & e, QgsWmsContactAddressProperty& contactAddressProperty )
{
QgsDebugMsg( "entering." );
QDomNode n1 = e.firstChild();
while ( !n1.isNull() )
@ -558,7 +551,6 @@ void QgsWmsCapabilities::parseContactAddress( QDomElement const & e, QgsWmsConta
void QgsWmsCapabilities::parseCapability( QDomElement const & e, QgsWmsCapabilityProperty& capabilityProperty )
{
QgsDebugMsg( "entering." );
for ( QDomNode n1 = e.firstChild(); !n1.isNull(); n1 = n1.nextSibling() )
{
@ -651,7 +643,6 @@ void QgsWmsCapabilities::parseCapability( QDomElement const & e, QgsWmsCapabilit
void QgsWmsCapabilities::parseRequest( QDomElement const & e, QgsWmsRequestProperty& requestProperty )
{
QgsDebugMsg( "entering." );
QDomNode n1 = e.firstChild();
while ( !n1.isNull() )
@ -691,7 +682,6 @@ void QgsWmsCapabilities::parseRequest( QDomElement const & e, QgsWmsRequestPrope
void QgsWmsCapabilities::parseLegendUrl( QDomElement const & e, QgsWmsLegendUrlProperty& legendUrlProperty )
{
QgsDebugMsg( "entering." );
legendUrlProperty.width = e.attribute( "width" ).toUInt();
legendUrlProperty.height = e.attribute( "height" ).toUInt();
@ -724,7 +714,6 @@ void QgsWmsCapabilities::parseLegendUrl( QDomElement const & e, QgsWmsLegendUrlP
void QgsWmsCapabilities::parseLayer( QDomElement const & e, QgsWmsLayerProperty& layerProperty,
QgsWmsLayerProperty *parentProperty )
{
//QgsDebugMsg( "entering." );
// TODO: Delete this stanza completely, depending on success of "Inherit things into the sublayer" below.
#if 0
@ -990,7 +979,6 @@ void QgsWmsCapabilities::parseLayer( QDomElement const & e, QgsWmsLayerProperty&
void QgsWmsCapabilities::parseStyle( QDomElement const & e, QgsWmsStyleProperty& styleProperty )
{
QgsDebugMsg( "entering." );
QDomNode n1 = e.firstChild();
while ( !n1.isNull() )
@ -1037,7 +1025,6 @@ void QgsWmsCapabilities::parseStyle( QDomElement const & e, QgsWmsStyleProperty&
void QgsWmsCapabilities::parseOperationType( QDomElement const & e, QgsWmsOperationType& operationType )
{
QgsDebugMsg( "entering." );
QDomNode n1 = e.firstChild();
while ( !n1.isNull() )
@ -1071,7 +1058,6 @@ void QgsWmsCapabilities::parseOperationType( QDomElement const & e, QgsWmsOperat
void QgsWmsCapabilities::parseDcpType( QDomElement const & e, QgsWmsDcpTypeProperty& dcpType )
{
QgsDebugMsg( "entering." );
QDomNode n1 = e.firstChild();
while ( !n1.isNull() )
@ -1093,7 +1079,6 @@ void QgsWmsCapabilities::parseDcpType( QDomElement const & e, QgsWmsDcpTypePrope
void QgsWmsCapabilities::parseHttp( QDomElement const & e, QgsWmsHttpProperty& httpProperty )
{
QgsDebugMsg( "entering." );
QDomNode n1 = e.firstChild();
while ( !n1.isNull() )
@ -1124,7 +1109,6 @@ void QgsWmsCapabilities::parseHttp( QDomElement const & e, QgsWmsHttpProperty& h
void QgsWmsCapabilities::parseGet( QDomElement const & e, QgsWmsGetProperty& getProperty )
{
QgsDebugMsg( "entering." );
QDomNode n1 = e.firstChild();
while ( !n1.isNull() )
@ -1150,7 +1134,6 @@ void QgsWmsCapabilities::parseGet( QDomElement const & e, QgsWmsGetProperty& get
void QgsWmsCapabilities::parsePost( QDomElement const & e, QgsWmsPostProperty& postProperty )
{
QgsDebugMsg( "entering." );
QDomNode n1 = e.firstChild();
while ( !n1.isNull() )
@ -1975,7 +1958,6 @@ void QgsWmsCapabilitiesDownload::capabilitiesReplyProgress( qint64 bytesReceived
void QgsWmsCapabilitiesDownload::capabilitiesReplyFinished()
{
QgsDebugMsg( "entering." );
if ( !mIsAborted && mCapabilitiesReply )
{
if ( mCapabilitiesReply->error() == QNetworkReply::NoError )

6
src/providers/wms/qgswmsprovider.cpp
View File

@ -1028,7 +1028,6 @@ bool QgsWmsProvider::extentForNonTiledLayer( const QString& layerName, const QSt
bool QgsWmsProvider::parseServiceExceptionReportDom( QByteArray const & xml, QString& errorTitle, QString& errorText )
{
QgsDebugMsg( "entering." );
#ifdef QGISDEBUG
//test the content of the QByteArray
@ -1095,7 +1094,6 @@ bool QgsWmsProvider::parseServiceExceptionReportDom( QByteArray const & xml, QSt
void QgsWmsProvider::parseServiceException( QDomElement const & e, QString& errorTitle, QString& errorText )
{
QgsDebugMsg( "entering." );
QString seCode = e.attribute( "code" );
QString seText = e.text();
@ -1213,7 +1211,6 @@ bool QgsWmsProvider::calculateExtent()
{
//! \todo Make this handle non-geographic CRSs (e.g. floor plans) as per WMS spec
QgsDebugMsg( "entered." );
if ( mSettings.mTiled )
{
@ -1312,7 +1309,6 @@ int QgsWmsProvider::capabilities() const
int capability = NoCapabilities;
bool canIdentify = false;
QgsDebugMsg( "entering." );
if ( mSettings.mTiled && mTileLayer )
{
@ -3039,7 +3035,6 @@ QImage QgsWmsProvider::getLegendGraphic( double scale, bool forceRefresh, const
// TODO manage return basing of getCapablity => avoid call if service is not available
// some services doesn't expose getLegendGraphic in capabilities but adding LegendURL in
// the layer tags inside capabilities
QgsDebugMsg( "entering." );
QString lurl = getLegendGraphicUrl();
@ -3123,7 +3118,6 @@ QgsImageFetcher* QgsWmsProvider::getLegendGraphicFetcher( const QgsMapSettings*
void QgsWmsProvider::getLegendGraphicReplyFinished( const QImage& img )
{
QgsDebugMsg( "entering." );
QObject* reply = sender();

1
src/server/qgshostedrdsbuilder.cpp
View File

@ -42,7 +42,6 @@ QgsMapLayer* QgsHostedRDSBuilder::createMapLayer( const QDomElement& elem,
bool allowCaching ) const
{
Q_UNUSED( filesToRemove );
QgsDebugMsg( "entering." );
if ( elem.isNull() )
{

2
src/server/qgsremotedatasourcebuilder.cpp
View File

@ -38,7 +38,6 @@ QgsRemoteDataSourceBuilder::~QgsRemoteDataSourceBuilder()
QgsMapLayer* QgsRemoteDataSourceBuilder::createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching ) const
{
QgsDebugMsg( "entering." );
QgsMapLayer* theLayer = nullptr;
if ( elem.tagName() == "RemoteRDS" )
{
@ -63,7 +62,6 @@ QgsRasterLayer* QgsRemoteDataSourceBuilder::rasterLayerFromRemoteRDS( const QDom
{
Q_UNUSED( layerName );
Q_UNUSED( allowCaching );
QgsDebugMsg( "entering." );
//load file with QgsHttpTransaction or QgsFtpTransaction
QByteArray fileContents;

4
tests/bench/qgsbench.cpp
View File

@ -129,7 +129,6 @@ QgsBench::QgsBench( int theWidth, int theHeight, int theIterations )
, mSysStart( 0.0 )
, mParallel( false )
{
QgsDebugMsg( "entered" );
QgsDebugMsg( QString( "mIterations = %1" ).arg( mIterations ) );
@ -143,7 +142,6 @@ QgsBench::~QgsBench()
bool QgsBench::openProject( const QString & theFileName )
{
QgsDebugMsg( "entered" );
// QgsProject loads layers to QgsMapLayerRegistry singleton
QFileInfo file( theFileName );
if ( ! QgsProject::instance()->read( file ) )
@ -156,7 +154,6 @@ bool QgsBench::openProject( const QString & theFileName )
void QgsBench::readProject( const QDomDocument &doc )
{
QgsDebugMsg( "entered" );
QDomNodeList nodes = doc.elementsByTagName( "mapcanvas" );
if ( nodes.count() )
{
@ -177,7 +174,6 @@ void QgsBench::setExtent( const QgsRectangle & extent )
void QgsBench::render()
{
QgsDebugMsg( "entered" );
QgsDebugMsg( "extent: " + mMapSettings.extent().toString() );