Merge pull request #200 from sdikiy/dirdebug

Debugging of all files in a directory
qgis · Sep 1, 2012 · cbdafbc · cbdafbc
2 parents b43ed34 + df04771
commit cbdafbc
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/src/core/qgslogger.cpp b/src/core/qgslogger.cpp
@@ -35,7 +35,7 @@ void QgsLogger::debug( const QString& msg, int debuglevel, const char* file, con
   const char* dfile = debugFile();
   if ( dfile ) //exit if QGIS_DEBUG_FILE is set and the message comes from the wrong file
   {
-    if ( !file || strcmp( dfile, file ) != 0 )
+    if ( !file || strncmp( dfile, file, strlen( dfile ) ) != 0 )
     {
       return;
     }
@@ -82,7 +82,7 @@ void QgsLogger::debug( const QString& var, int val, int debuglevel, const char*
   const char* dfile = debugFile();
   if ( dfile ) //exit if QGIS_DEBUG_FILE is set and the message comes from the wrong file
   {
-    if ( !file || strcmp( dfile, file ) != 0 )
+    if ( !file || strncmp( dfile, file, strlen( dfile ) ) != 0 )
     {
       return;
     }
@@ -123,7 +123,7 @@ void QgsLogger::debug( const QString& var, double val, int debuglevel, const cha
   const char* dfile = debugFile();
   if ( dfile ) //exit if QGIS_DEBUG_FILE is set and the message comes from the wrong file
   {
-    if ( !file || strcmp( dfile, file ) != 0 )
+    if ( !file || strncmp( dfile, file, strlen( dfile ) ) != 0 )
     {
       return;
     }

diff --git a/src/mapserver/qgshttprequesthandler.cpp b/src/mapserver/qgshttprequesthandler.cpp
@@ -29,7 +29,6 @@
 #include <QStringList>
 #include <QUrl>
 #include <fcgi_stdio.h>
-#include "qgslogger.h"
 
 QgsHttpRequestHandler::QgsHttpRequestHandler(): QgsRequestHandler()
 {

diff --git a/src/mapserver/qgswfsserver.cpp b/src/mapserver/qgswfsserver.cpp
@@ -39,7 +39,6 @@
 #include "qgsrenderer.h"
 #include "qgslegendmodel.h"
 #include "qgscomposerlegenditem.h"
-#include "qgslogger.h"
 #include "qgsrequesthandler.h"
 #include <QImage>
 #include <QPainter>

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -39,7 +39,6 @@
 #include "qgsrendererv2.h"
 #include "qgslegendmodel.h"
 #include "qgscomposerlegenditem.h"
-#include "qgslogger.h"
 #include "qgspaintenginehack.h"
 
 #include <QImage>