fix for previous commit

[wxWidgets.git] / utils / HelpGen / src / docripper.cpp

diff --git a/utils/HelpGen/src/docripper.cpp b/utils/HelpGen/src/docripper.cpp
index 9599d619200dc84b8b21ee0dd6186c401348a120..e7552491ad482ebda1e00c00d156af8053dcfcd6 100644 (file)
--- a/utils/HelpGen/src/docripper.cpp
+++ b/utils/HelpGen/src/docripper.cpp
@@ -22,7 +22,11 @@
 
 #include "docripper.h"
 
-#include <iostream.h>
+#if wxUSE_IOSTREAMH
+    #include <iostream.h>
+#else
+    #include <iostream>
+#endif
 
 // script templates
 
@@ -178,12 +182,14 @@ void RipperDocGen::AppendComments( spContext& fromContext, string& str )
                        if ( lst[i]->StartsParagraph() )
                        {
                                str += mTags[TAG_PARAGRAPH].start;
+
                        }
        
                str += lst[i]->mText;
        }
 
        // remove new lines, and insert paragraph breaks
+
        // if empty lines found
 
        size_t len = str.length();
@@ -192,22 +198,38 @@ void RipperDocGen::AppendComments( spContext& fromContext, string& str )
        
                if ( str[n] == 10 || 
                     str[n] == 13  ) 
+
                {
+
                        if ( n + 2 < len )
+
                        {
+
                                if ( ( str[n] == 13 && str[n+1] == 10 &&  // FIXME:: quick-hack
+
                                           str[n+2] == 13 ) ||
+
                                         ( str[n] == 10 && str[n+1] == 10 )
+
                            )
+
                                {
+
                                        str.insert( n + 1, "<p>" ); // FIXME:: quick-hack
+
                                        len += 3;
+
                                }
+
                        }
 
+
+
                        str[n] = ' ';
+
                }
 
+
        str += mTags[TAG_PARAGRAPH].end;
 }
 
@@ -347,13 +369,13 @@ void RipperDocGen::LinkSuperClassRefs()
 
 void RipperDocGen::ProcessFile( const char* sourceFile )
 {
-       cout << "Processing file " << sourceFile << "..." << endl;
+       wxSTD cout << "Processing file " << sourceFile << "..." << wxSTD endl;
 
        spFile* pCtx = mpParser->ParseFile( sourceFile );
 
        if ( pCtx == NULL )
        {
-               cout << "Cannot open file " << sourceFile << ", skipped..." << endl;
+               wxSTD cout << "Cannot open file " << sourceFile << ", skipped..." << wxSTD endl;
 
                return;
        }
@@ -423,9 +445,12 @@ void RipperDocGen::VisitTypeDef( spTypeDef& td )
 void RipperDocGen::VisitPreprocessorLine( spPreprocessorLine& pd )
 {
        if ( pd.mDefType != SP_PREP_DEF_REDEFINE_SYMBOL )
+
        
+
                return;
 
+
        if ( CheckIfUncommented( pd, *mpMacroIdx ) )
                return;