Less verbose debug output in layer tree model

wonder-sk · wonder-sk · commit d3662025993f · 2014-10-31T18:55:23.000+07:00
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -41,7 +41,6 @@ QgsLayerTreeModel::QgsLayerTreeModel( QgsLayerTreeGroup* rootNode, QObject *pare
     , mLegendMapViewDpi( 0 )
     , mLegendMapViewScale( 0 )
 {
-  QgsDebugCall;
   connectToRootNode();
 
   mFontLayer.setBold( true );
@@ -111,7 +110,6 @@ int QgsLayerTreeModel::rowCount( const QModelIndex &parent ) const
 
 int QgsLayerTreeModel::columnCount( const QModelIndex &parent ) const
 {
-  QgsDebugCall;
   Q_UNUSED( parent );
   return 1;
 }
@@ -347,9 +345,6 @@ Qt::ItemFlags QgsLayerTreeModel::flags( const QModelIndex& index ) const
 
 bool QgsLayerTreeModel::setData( const QModelIndex& index, const QVariant& value, int role )
 {
-  QgsDebugCall;
-  QgsDebugMsg( QString( "setData( r=%1 c=%2 value=%3 role=%4 )" ).arg( index.row() ).arg( index.column() ).arg( value.toString() ).arg( role ) );
-
   QgsLayerTreeModelLegendNode *sym = index2legendNode( index );
   if ( sym )
   {
@@ -443,7 +438,6 @@ static bool _isChildOfNodes( QgsLayerTreeNode* child, QList<QgsLayerTreeNode*> n
 
 QList<QgsLayerTreeNode*> QgsLayerTreeModel::indexes2nodes( const QModelIndexList& list, bool skipInternal ) const
 {
-  QgsDebugCall;
   QList<QgsLayerTreeNode*> nodes;
   foreach ( QModelIndex index, list )
   {
@@ -491,7 +485,6 @@ QgsLayerTreeGroup*QgsLayerTreeModel::rootGroup() const
 
 void QgsLayerTreeModel::setRootGroup( QgsLayerTreeGroup* newRootGroup )
 {
-  QgsDebugCall;
   beginResetModel();
 
   disconnectFromRootNode();
@@ -508,7 +501,6 @@ void QgsLayerTreeModel::setRootGroup( QgsLayerTreeGroup* newRootGroup )
 
 void QgsLayerTreeModel::refreshLayerLegend( QgsLayerTreeLayer* nodeLayer )
 {
-  QgsDebugCall;
   // update title
   QModelIndex idx = node2index( nodeLayer );
   emit dataChanged( idx, idx );
@@ -529,13 +521,11 @@ void QgsLayerTreeModel::refreshLayerLegend( QgsLayerTreeLayer* nodeLayer )
 
 QModelIndex QgsLayerTreeModel::currentIndex() const
 {
-  QgsDebugCall;
   return mCurrentIndex;
 }
 
 void QgsLayerTreeModel::setCurrentIndex( const QModelIndex& currentIndex )
 {
-  QgsDebugCall;
   QModelIndex oldIndex = mCurrentIndex;
   mCurrentIndex = currentIndex;
 
@@ -548,7 +538,6 @@ void QgsLayerTreeModel::setCurrentIndex( const QModelIndex& currentIndex )
 
 void QgsLayerTreeModel::setLayerTreeNodeFont( int nodeType, const QFont& font )
 {
-  QgsDebugCall;
   if ( nodeType == QgsLayerTreeNode::NodeGroup )
   {
     if ( mFontGroup != font )
@@ -574,7 +563,6 @@ void QgsLayerTreeModel::setLayerTreeNodeFont( int nodeType, const QFont& font )
 
 QFont QgsLayerTreeModel::layerTreeNodeFont( int nodeType ) const
 {
-  QgsDebugCall;
   if ( nodeType == QgsLayerTreeNode::NodeGroup )
     return mFontGroup;
   else if ( nodeType == QgsLayerTreeNode::NodeLayer )
@@ -588,7 +576,6 @@ QFont QgsLayerTreeModel::layerTreeNodeFont( int nodeType ) const
 
 void QgsLayerTreeModel::setLegendFilterByScale( double scaleDenominator )
 {
-  QgsDebugCall;
   mLegendFilterByScale = scaleDenominator;
 
   // this could be later done in more efficient way

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ QgsLayerTreeModel::QgsLayerTreeModel( QgsLayerTreeGroup* rootNode, QObject *pare`
`41`	`41`	`, mLegendMapViewDpi( 0 )`
`42`	`42`	`, mLegendMapViewScale( 0 )`
`43`	`43`	`{`
`44`		`- QgsDebugCall;`
`45`	`44`	`connectToRootNode();`
`46`	`45`
`47`	`46`	`mFontLayer.setBold( true );`
`@@ -111,7 +110,6 @@ int QgsLayerTreeModel::rowCount( const QModelIndex &parent ) const`
`111`	`110`
`112`	`111`	`int QgsLayerTreeModel::columnCount( const QModelIndex &parent ) const`
`113`	`112`	`{`
`114`		`- QgsDebugCall;`
`115`	`113`	`Q_UNUSED( parent );`
`116`	`114`	`return 1;`
`117`	`115`	`}`
`@@ -347,9 +345,6 @@ Qt::ItemFlags QgsLayerTreeModel::flags( const QModelIndex& index ) const`
`347`	`345`
`348`	`346`	`bool QgsLayerTreeModel::setData( const QModelIndex& index, const QVariant& value, int role )`
`349`	`347`	`{`
`350`		`- QgsDebugCall;`
`351`		`- QgsDebugMsg( QString( "setData( r=%1 c=%2 value=%3 role=%4 )" ).arg( index.row() ).arg( index.column() ).arg( value.toString() ).arg( role ) );`
`352`		`-`
`353`	`348`	`QgsLayerTreeModelLegendNode *sym = index2legendNode( index );`
`354`	`349`	`if ( sym )`
`355`	`350`	`{`
`@@ -443,7 +438,6 @@ static bool _isChildOfNodes( QgsLayerTreeNode* child, QList<QgsLayerTreeNode*> n`
`443`	`438`
`444`	`439`	`QList<QgsLayerTreeNode*> QgsLayerTreeModel::indexes2nodes( const QModelIndexList& list, bool skipInternal ) const`
`445`	`440`	`{`
`446`		`- QgsDebugCall;`
`447`	`441`	`QList<QgsLayerTreeNode*> nodes;`
`448`	`442`	`foreach ( QModelIndex index, list )`
`449`	`443`	`{`
`@@ -491,7 +485,6 @@ QgsLayerTreeGroup*QgsLayerTreeModel::rootGroup() const`
`491`	`485`
`492`	`486`	`void QgsLayerTreeModel::setRootGroup( QgsLayerTreeGroup* newRootGroup )`
`493`	`487`	`{`
`494`		`- QgsDebugCall;`
`495`	`488`	`beginResetModel();`
`496`	`489`
`497`	`490`	`disconnectFromRootNode();`
`@@ -508,7 +501,6 @@ void QgsLayerTreeModel::setRootGroup( QgsLayerTreeGroup* newRootGroup )`
`508`	`501`
`509`	`502`	`void QgsLayerTreeModel::refreshLayerLegend( QgsLayerTreeLayer* nodeLayer )`
`510`	`503`	`{`
`511`		`- QgsDebugCall;`
`512`	`504`	`// update title`
`513`	`505`	`QModelIndex idx = node2index( nodeLayer );`
`514`	`506`	`emit dataChanged( idx, idx );`
`@@ -529,13 +521,11 @@ void QgsLayerTreeModel::refreshLayerLegend( QgsLayerTreeLayer* nodeLayer )`
`529`	`521`
`530`	`522`	`QModelIndex QgsLayerTreeModel::currentIndex() const`
`531`	`523`	`{`
`532`		`- QgsDebugCall;`
`533`	`524`	`return mCurrentIndex;`
`534`	`525`	`}`
`535`	`526`
`536`	`527`	`void QgsLayerTreeModel::setCurrentIndex( const QModelIndex& currentIndex )`
`537`	`528`	`{`
`538`		`- QgsDebugCall;`
`539`	`529`	`QModelIndex oldIndex = mCurrentIndex;`
`540`	`530`	`mCurrentIndex = currentIndex;`
`541`	`531`
`@@ -548,7 +538,6 @@ void QgsLayerTreeModel::setCurrentIndex( const QModelIndex& currentIndex )`
`548`	`538`
`549`	`539`	`void QgsLayerTreeModel::setLayerTreeNodeFont( int nodeType, const QFont& font )`
`550`	`540`	`{`
`551`		`- QgsDebugCall;`
`552`	`541`	`if ( nodeType == QgsLayerTreeNode::NodeGroup )`
`553`	`542`	`{`
`554`	`543`	`if ( mFontGroup != font )`
`@@ -574,7 +563,6 @@ void QgsLayerTreeModel::setLayerTreeNodeFont( int nodeType, const QFont& font )`
`574`	`563`
`575`	`564`	`QFont QgsLayerTreeModel::layerTreeNodeFont( int nodeType ) const`
`576`	`565`	`{`
`577`		`- QgsDebugCall;`
`578`	`566`	`if ( nodeType == QgsLayerTreeNode::NodeGroup )`
`579`	`567`	`return mFontGroup;`
`580`	`568`	`else if ( nodeType == QgsLayerTreeNode::NodeLayer )`
`@@ -588,7 +576,6 @@ QFont QgsLayerTreeModel::layerTreeNodeFont( int nodeType ) const`
`588`	`576`
`589`	`577`	`void QgsLayerTreeModel::setLegendFilterByScale( double scaleDenominator )`
`590`	`578`	`{`
`591`		`- QgsDebugCall;`
`592`	`579`	`mLegendFilterByScale = scaleDenominator;`
`593`	`580`
`594`	`581`	`// this could be later done in more efficient way`