[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Andi Fischer]

SVN commit 1241685 by fischer:

All includes of kdebug.h replaced with debug_utils.h.

 M  +11 -11    basictypes.h  
 M  +3 -1      codeimport/kdevcppparser/ast.cpp  
 M  +2 -2      codeimport/kdevcppparser/ast_utils.cpp  
 M  +2 -2      codeimport/kdevcppparser/driver.cpp  
 M  +3 -2      codeimport/kdevcppparser/lexer.cpp  
 M  +2 -2      codeimport/kdevcppparser/lookup.cpp  
 M  +1 -1      codeimport/kdevcppparser/parser.cpp  
 M  +2 -2      codeimport/kdevcppparser/preprocesslexer.cpp  
 M  +1 -1      codeimport/kdevcppparser/tree_parser.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/basictypes.h #1241684:1241685
@@ -294,17 +294,17 @@
      * Enumeration used for stating where a line is on a widget.
      * @note Do not change this ordering, as we use these values in for loop.
      */
-    enum Region {
-        reg_Error = 0,
-        reg_West,
-        reg_North,
-        reg_East,
-        reg_South,
-        reg_NorthWest,
-        reg_NorthEast,
-        reg_SouthEast,
-        reg_SouthWest
-    };
+//     enum Region {
+//         Error = 0,
+//         West,
+//         North,
+//         East,
+//         South,
+//         NorthWest,
+//         NorthEast,
+//         SouthEast,
+//         SouthWest
+//     };
 
     /**
      * 
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp #1241684:1241685
@@ -18,8 +18,10 @@
 */
 
 #include "ast.h"
+
+#include "debug_utils.h"
+
 #include <QtCore/QStringList>
-#include <kdebug.h>
 
 QString nodeTypeToString( int type )
 {
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp #1241684:1241685
@@ -10,13 +10,14 @@
  ***************************************************************************/
 
 #include "ast_utils.h"
+
 #include "ast.h"
+#include "debug_utils.h"
 
 #include <QtCore/QStringList>
 #include <QtCore/QRegExp>
 
 #include <klocale.h>
-#include <kdebug.h>
 
 AST* findNodeAt( AST* node, Position const& position )
 {
@@ -154,4 +155,3 @@
 
    return text.replace( QRegExp(" :: "), "::" ).simplified();
 }
-
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp #1241684:1241685
@@ -18,11 +18,11 @@
 */
 
 #include "driver.h"
+
 #include "lexer.h"
 #include "parser.h"
+#include "debug_utils.h"
 
-#include <kdebug.h>
-
 #include <stdlib.h>
 
 #include <QFile>
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp #1241684:1241685
@@ -18,10 +18,11 @@
 */
 
 #include "lexer.h"
+
+#include "debug_utils.h"
 #include "lookup.h"
 #include "keywords.lut.h"
 
-#include <kdebug.h>
 #include <klocale.h>
 
 #include <QtCore/QRegExp>
@@ -66,7 +67,7 @@
 SkipRule Lexer::m_SkipRule = nothing_p;
 
 #if defined( KDEVELOP_BGPARSER )
-#include <qthread.h>
+#include <QThread>
 
 class KDevTread: public QThread
 {
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp #1241684:1241685
@@ -23,13 +23,13 @@
 
 #include "lookup.h"
 
-#include <kdebug.h>
+#include "debug_utils.h"
 
 const HashEntry* Lookup::findEntry( const struct HashTable *table,
                               const QChar *c, unsigned int len )
 {
   if (table->type != 2) {
-    kDebug() << "KJS: Unknown hash table version";
+    uDebug() << "KJS: Unknown hash table version";
     return 0;
   }
   char *ascii = new char[len+1];
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp #1241684:1241685
@@ -22,13 +22,13 @@
 #include "driver.h"
 #include "lexer.h"
 #include "errors.h"
+#include "debug_utils.h"
 
 // qt support
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
 // kde support
-#include <kdebug.h>
 #include <klocale.h>
 
 bool Parser::advance(int tk, char const* descr)
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.cpp #1241684:1241685
@@ -18,10 +18,11 @@
 */
 
 #include "preprocesslexer.h"  //was lexer.h
+
 #include "lookup.h"
 #include "keywords.lut.h"
+#include "debug_utils.h"
 
-#include <kdebug.h>
 #include <klocale.h>
 
 #include <QtCore/QRegExp>
@@ -424,7 +425,6 @@
         if (m_preprocessorEnabled && m_driver->hasMacro(ide) &&
                 (k == -1 || !m_driver->macro(ide).body().isEmpty())) {
 
-
             bool preproc = m_preprocessorEnabled;
             m_preprocessorEnabled = false;
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp #1241684:1241685
@@ -19,7 +19,7 @@
 
 #include "tree_parser.h"
 
-#include <kdebug.h>
+#include "debug_utils.h"
 
 #include <QtCore/QList>