More fixes and wxWidgets coding standards.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp
index ffe02441cd062dbd411eb267b0e1607d8ec23d02..1dccac576943c9cbc0114a0e51bed86eba8af5b5 100644 (file)
--- a/utils/HelpGen/src/HelpGen.cpp
+++ b/utils/HelpGen/src/HelpGen.cpp
@@ -1300,7 +1300,7 @@ void HelpGenVisitor::VisitOperation( spOperation& op )
                       "\\%sfunc{%s%s}{%s}{",
                       op.mIsConstant ? "const" : "",
                       op.mIsVirtual ? "virtual " : "",
-                      op.mRetType.c_str(),
+                      op.m_RetType.c_str(),
                       funcname.c_str());
     m_textFunc += func;
 }
@@ -1317,7 +1317,7 @@ void HelpGenVisitor::VisitParameter( spParameter& param )
         m_textFunc << ", ";
     }
 
-    m_textFunc << "\\param{" << param.mType << " }{" << param.GetName();
+    m_textFunc << "\\param{" << param.m_Type << " }{" << param.GetName();
     wxString defvalue = param.mInitVal;
     if ( !defvalue.empty() ) {
         m_textFunc << " = " << defvalue;
@@ -1878,7 +1878,7 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const
                             continue;
                         }
 
-                        if ( param.GetType() != ctxParam->mType ) {
+                        if ( param.GetType() != ctxParam->m_Type ) {
                             foundDiff = true;
 
                             wxLogError("Type of parameter '%s' of '%s::%s' "
@@ -1886,7 +1886,7 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const
                                        ctxParam->m_Name.c_str(),
                                        nameClass.c_str(),
                                        nameMethod.c_str(),
-                                       ctxParam->mType.c_str(),
+                                       ctxParam->m_Type.c_str(),
                                        param.GetType().GetName().c_str());
 
                             continue;
@@ -2192,6 +2192,9 @@ static const wxString GetVersionString()
 
 /*
    $Log$
+   Revision 1.38  2005/05/24 09:06:20  ABX
+   More fixes and wxWidgets coding standards.
+
    Revision 1.37  2005/05/23 15:22:08  ABX
    Initial HelpGen source cleaning.
 

diff --git a/utils/HelpGen/src/cjparser.cpp b/utils/HelpGen/src/cjparser.cpp
index 321eb8979202fd324e644c8f82807294464532bd..890dde76d48aeba51f490b58557402e40c255ddd 100644 (file)
--- a/utils/HelpGen/src/cjparser.cpp
+++ b/utils/HelpGen/src/cjparser.cpp
@@ -898,13 +898,13 @@ static inline void skip_scope_block( char*& cur )
 // moves tokens like '*' '**', '***', '&' from the name
 // to the type
 
-static void arrange_indirection_tokens_between( string& type,
-                                                string& identifier )
+static void arrange_indirection_tokens_between( wxString& type,
+                                                wxString& identifier )
 {
     // TBD:: FIXME:: return value of operators !
 
-    while ( identifier[0u] == '*' ||
-            identifier[0u] == '&'
+    while ( identifier[0u] == _T('*') ||
+            identifier[0u] == _T('&')
           )
     {
         type += identifier[0u];
@@ -1626,10 +1626,10 @@ bool CJSourceParser::ParseNameAndRetVal( char*& cur, bool& isAMacro )
         string toerase("WXDLLEXPORT ");
         while((pos = rettype.find(toerase, pos)) != string::npos)
             rettype.erase(pos, toerase.length());
-        pOp->mRetType = rettype;
+        pOp->m_RetType = rettype;
     }
 
-    arrange_indirection_tokens_between( pOp->mRetType, pOp->m_Name );
+    arrange_indirection_tokens_between( pOp->m_RetType, pOp->m_Name );
 
     cur = savedPos;
     restore_line_no( tmpLnNo );
@@ -1753,9 +1753,9 @@ bool CJSourceParser::ParseArguments( char*& cur )
         size_t len = blockSizes[ typeBlock ];
         len = size_t ( (blocks[ typeBlock ] + len) - blocks[ 0 ] );
 
-        pPar->mType = string( blocks[0], len );
+        pPar->m_Type = string( blocks[0], len );
 
-        arrange_indirection_tokens_between( pPar->mType, pPar->m_Name );
+        arrange_indirection_tokens_between( pPar->m_Type, pPar->m_Name );
 
         if ( *cur == ')' )
         {
@@ -1877,7 +1877,7 @@ void CJSourceParser::ParseMemberVar( char*& cur )
         skip_next_token_back( cur );
         skip_token_back( cur );
 
-        pAttr->mType = get_token_str( cur );
+        pAttr->m_Type = get_token_str( cur );
 
         // if comma, than variable list continues
         // otherwise the variable type reached - stop
@@ -1916,12 +1916,12 @@ void CJSourceParser::ParseMemberVar( char*& cur )
         if ( !pAttr )
             continue;
 
-        if ( pAttr->mType.empty() )
-            pAttr->mType = type;
+        if ( pAttr->m_Type.empty() )
+            pAttr->m_Type = type;
         pAttr->mVisibility = mCurVis;
 
         if ( !pAttr->m_Name.empty() )
-            arrange_indirection_tokens_between( pAttr->mType, pAttr->m_Name );
+            arrange_indirection_tokens_between( pAttr->m_Type, pAttr->m_Name );
     }
 
     cur = savedPos;

diff --git a/utils/HelpGen/src/docripper.cpp b/utils/HelpGen/src/docripper.cpp
index 3accf5dbd173553dd071aada4b023c776fa0fce4..7ecb44cf8860792d4732c2e1e6e80a24fcbe1a8f 100644 (file)
--- a/utils/HelpGen/src/docripper.cpp
+++ b/utils/HelpGen/src/docripper.cpp
@@ -493,7 +493,7 @@ void RipperDocGen::VisitAttribute( spAttribute& attr )
 {
     string body;
     body += mTags[TAG_BOLD].start;
-    body += attr.mType;
+    body += attr.m_Type;
     body += mTags[TAG_BOLD].end;
 
     body += mTags[TAG_ITALIC].start;

diff --git a/utils/HelpGen/src/scriptbinder.cpp b/utils/HelpGen/src/scriptbinder.cpp
index f02e65ef8189b58aca19006d309b882393cd50b9..b9c79ba841f6f858a9b138be4315ece9beebef63 100644 (file)
--- a/utils/HelpGen/src/scriptbinder.cpp
+++ b/utils/HelpGen/src/scriptbinder.cpp
@@ -192,7 +192,7 @@ inline void ScriptTemplate::PrintVar( TVarInfo*   pInfo,
 {
     char buf[128];
 
-    switch ( pInfo->mType )
+    switch ( pInfo->m_Type )
     {
         case TVAR_INTEGER :
             {
@@ -214,7 +214,7 @@ inline void ScriptTemplate::PrintVar( TVarInfo*   pInfo,
                 cout << "DBG:: pInfo->mOfs value is " << (int)pInfo->mOfs << endl;
                 cout << "DBG:: d+pInfo->mOfs is " << (int)((char*)dataObj + pInfo->mOfs) << endl;
                 cout << "DBG:: pInfo->m_Name is " << pInfo->m_Name << endl;
-                cout << "DBG:: pInfo->mType is " << pInfo->mType << endl;
+                cout << "DBG:: pInfo->m_Type is " << pInfo->m_Type << endl;
                 cout << "DBG:: end of dump. " << endl;
 
                 cout << "DBG:: cs value is " << endl << cs << endl;

diff --git a/utils/HelpGen/src/scriptbinder.h b/utils/HelpGen/src/scriptbinder.h
index dbd8055967619b597a0887e2d6eeb23a784a7d35..904cb3306b6e63b50f6d9e8bbc06a4666eba9b01 100644 (file)
--- a/utils/HelpGen/src/scriptbinder.h
+++ b/utils/HelpGen/src/scriptbinder.h
@@ -90,12 +90,12 @@ struct TVarInfo
 {
 public:
     const char*     m_Name;
-    int             mType;
+    int             m_Type;
     int             mOfs;
 
     TVarInfo( const char* name, int ofs, int varType )
         : m_Name(name),
-          mType( varType ),
+          m_Type( varType ),
           mOfs( ofs )
     {}
 };

diff --git a/utils/HelpGen/src/srcparser.cpp b/utils/HelpGen/src/srcparser.cpp
index 8f541c7a775d17aa0480106525b89ce10073c970..d9d4468ce6382cfe8caae6c8bb87c22666e2228e 100644 (file)
--- a/utils/HelpGen/src/srcparser.cpp
+++ b/utils/HelpGen/src/srcparser.cpp
@@ -423,7 +423,7 @@ spOperation::spOperation()
 
 string spOperation::GetFullName(MarkupTagsT tags)
 {
-    string txt = tags[TAG_BOLD].start + mRetType;
+    string txt = tags[TAG_BOLD].start + m_RetType;
     txt += " ";
     txt += m_Name;
     txt += "( ";
@@ -441,7 +441,7 @@ string spOperation::GetFullName(MarkupTagsT tags)
 
         txt += tags[TAG_BOLD].start;
 
-        txt += param.mType;
+        txt += param.m_Type;
 
         txt += tags[TAG_BOLD].end;
         txt += tags[TAG_ITALIC].start;
@@ -575,13 +575,13 @@ void spContext::DumpThis(const wxString& WXUNUSED(indent)) const
 void spParameter::DumpThis(const wxString& indent) const
 {
     wxLogDebug("%sparam named '%s' of type '%s'",
-               indent.c_str(), m_Name.c_str(), mType.c_str());
+               indent.c_str(), m_Name.c_str(), m_Type.c_str());
 }
 
 void spAttribute::DumpThis(const wxString& indent) const
 {
     wxLogDebug("%svariable named '%s' of type '%s'",
-               indent.c_str(), m_Name.c_str(), mType.c_str());
+               indent.c_str(), m_Name.c_str(), m_Type.c_str());
 }
 
 void spOperation::DumpThis(const wxString& indent) const
@@ -614,7 +614,7 @@ void spOperation::DumpThis(const wxString& indent) const
                mIsConstant ? "const " : "",
                mIsVirtual ? "virtual " : "",
                protection.c_str(),
-               mScope.c_str(), m_Name.c_str(), mRetType.c_str());
+               mScope.c_str(), m_Name.c_str(), m_RetType.c_str());
 }
 
 void spPreprocessorLine::DumpThis(const wxString& indent) const

diff --git a/utils/HelpGen/src/srcparser.h b/utils/HelpGen/src/srcparser.h
index bba490c7afba39d76c3f15fa732af1166c9e9698..54ced62df44123609a7a790f36f6d5191c93f0c0 100644 (file)
--- a/utils/HelpGen/src/srcparser.h
+++ b/utils/HelpGen/src/srcparser.h
@@ -500,7 +500,7 @@ class spParameter : public spContext
 {
 public:
     // type of argument (parameter)
-    string mType;
+    wxString m_Type;
 
     // "stringified" initial value
     string mInitVal;
@@ -521,7 +521,7 @@ class spAttribute : public spContext
 {
 public:
     // type of the attribute
-    string mType;
+    wxString m_Type;
 
     // it's initial value
     string mInitVal;
@@ -542,7 +542,7 @@ class spOperation : public spContext
 {
 public:
     // type of return value
-    string      mRetType;
+    wxString    m_RetType;
 
     // argument list
     //MParamListT mParams;