Merge fixes for kalyptus that were made in tdelibs/dcopidlng:

+ includes may use quotation marks
+ argument types can contain multiple words
+ avoid use long, short, int or char type as the argument name
+ avoid use type as the argument name if the const qualifier is used
+ use long notation of int types
+ the arguments can be nameless
+ return types can have qualifiers
+ do not warn on inherit of the DCOPObject and TQObject classes
+ the documentation comment does not have to end on a separate line
+ do not skip an empty class if it is declared with K_DCOP

Signed-off-by: Slávek Banko <[email protected]>

1 files changed, 4 insertions, 8 deletions

diff --git a/kalyptus/kdocParseDoc.pm b/kalyptus/kdocParseDoc.pm
index f28b4e5..befa8c5 100644
--- a/kalyptus/kdocParseDoc.pm
+++ b/kalyptus/kdocParseDoc.pm
@@ -60,15 +60,15 @@ PARSELOOP:
 		next if !defined $text;
 		$text =~ s#^\s*\*(?!\/)##;
 
+		if ( $text =~ m#\*/# ) {
+			$finished = 1;
+			$text = $`;
+		}
 #		if ( $text =~ /^\s*<\/pre>/i ) {
 #			flushProp();
 #			$inbounded = 0;
 #		}
 		if( $inbounded ) {
-			if ( $text =~ m#\*/# ) {
-				$finished = 1;
-				$text = $`;
-			}
 			$buffer .= $text;
 			next PARSELOOP;
 		}
@@ -165,10 +165,6 @@ PARSELOOP:
 			docProp( "LibDoc" );
 		}
 		else {
-			if ( $text =~ m#\*/# ) {
-				$finished = 1;
-				$text = $`;
-			}
 			$buffer .= $text;
 		}
 	}