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

[Jean Vittor]

SVN commit 792928 by jvittor:

Some renaming

 M  +10 -10    lexer.cpp  
 M  +1 -1      lexer.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp #792927:792928
@@ -322,20 +322,20 @@
 };
 
 Lexer::Lexer( Driver* driver )
-  : d( new LexerData),
+  : m_data( new LexerData),
     m_driver( driver ),
     m_recordComments( false ),
     m_skipWordsEnabled( true ),
     m_preprocessorEnabled( true )
 {
   reset();
-  d->beginScope();
+  m_data->beginScope();
 }
 
 Lexer::~Lexer()
 {
-    d->endScope();
-    delete( d );
+  m_data->endScope();
+  delete m_data;
 }
 
 void Lexer::setSource( const QString& source,
@@ -453,7 +453,7 @@
       bool preproc = m_preprocessorEnabled;
       m_preprocessorEnabled = false;
 
-      d->beginScope();
+      m_data->beginScope();
 
       Position svPosition = currentPosition();
 
@@ -480,7 +480,7 @@
 	    QString arg = readArgument();
 
 	    if( !ellipsis )
-	      d->bind( argName, arg );
+	      m_data->bind( argName, arg );
 	    else
 	      ellipsisArg += arg;
 
@@ -504,7 +504,7 @@
 
 	  m_source.set_startLine( false);
 
-	  d->endScope();        // OPS!!
+	  m_data->endScope();        // OPS!!
 	  m_preprocessorEnabled = preproc;
 	  return;
 	}
@@ -538,7 +538,7 @@
 	  break;
 
 	QString tokText = tok.text();
-	QString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText;
+	QString str = (tok == Token_identifier && m_data->hasBind(tokText)) ? m_data->apply( tokText ) : tokText;
 	if( str == ide ){
 	  //Problem p( i18n("unsafe use of macro '%1'").arg(ide), m_currentLine, m_currentColumn );
 	  //m_driver->addProblem( m_driver->currentFileName(), p );
@@ -551,7 +551,7 @@
 	} else if( merge ){
 	  textToInsert.truncate( textToInsert.length() - 1 );
 	  textToInsert.append( str );
-	} else if( tok == Token_ellipsis && d->hasBind("...") ){
+	} else if( tok == Token_ellipsis && m_data->hasBind("...") ){
 	  textToInsert.append( ellipsisArg );
 	} else {
 	  textToInsert.append( str + QString::fromLatin1(" ") );
@@ -563,7 +563,7 @@
 #endif
       m_source.insert( textToInsert);
 
-      d->endScope();
+      m_data->endScope();
       m_preprocessorEnabled = preproc;
       //m_driver->addMacro( m );
       m_source.set_currentPosition( argsEndAtPosition);
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lexer.h #792927:792928
@@ -258,7 +258,7 @@
 private:
   static SkipRule m_SkipRule;
 
-  LexerData* d;
+  LexerData* m_data;
   Driver* m_driver;
   TokenList m_tokens;
   class Source {