1 files changed, 22 insertions, 26 deletions

diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index 38b38a013..e3119b3dc 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -73,9 +73,9 @@ public:
     virtual bool tqt_emit( int, QUObject* );
     virtual bool tqt_property( int, int, QVariant* );
     static QMetaObject* staticMetaObject();
-    QObject* qObject();
-    static QString tr( const char *, const char * = 0 );
-    static QString trUtf8( const char *, const char * = 0 );
+    TQObject* qObject();
+    static TQString tr( const char *, const char * = 0 );
+    static TQString trUtf8( const char *, const char * = 0 );
 private:
 CODE
 
@@ -98,9 +98,8 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
     _STYLE_PLATINUM => '',
     _STYLE_SGI => '',
     _STYLE_WINDOWS => '',
-    QT_STATIC_CONST => 'static const',
-    Q_EXPORT => '',
-    Q_REFCOUNT => '',
+    TQ_EXPORT => '',
+    TQ_REFCOUNT => '',
     QM_EXPORT_CANVAS => '',
     QM_EXPORT_DNS => '',
     QM_EXPORT_ICONVIEW => '',
@@ -109,19 +108,18 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
     QM_EXPORT_WORKSPACE => '',
     TQT_NO_REMOTE => 'TQT_NO_REMOTE',
     QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT',
-    Q_WS_X11 => 'Q_WS_X11',
+    TQ_WS_X11 => 'TQ_WS_X11',
     TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
-    Q_WS_QWS => 'undef',
-    Q_WS_MAC => 'undef',
-    Q_OBJECT => <<'CODE',
+    TQ_WS_QWS => 'undef',
+    TQ_WS_MAC => 'undef',
     TQ_OBJECT => <<'CODE',
 public:
     virtual QMetaObject *metaObject() const;
     virtual const char *className() const;
     virtual bool tqt_invoke( int, QUObject* );
     virtual bool tqt_emit( int, QUObject* );
-    static QString tr( const char *, const char * = 0 );
-    static QString trUtf8( const char *, const char * = 0 );
+    static TQString tr( const char *, const char * = 0 );
+    static TQString trUtf8( const char *, const char * = 0 );
 private:
 CODE
 };
@@ -373,7 +371,7 @@ sub readSourceLine
 =head2 readCxxLine
 
 	Reads a C++ source line, skipping comments, blank lines,
-	preprocessor tokens and the Q_OBJECT/TQ_OBJECT macros
+	preprocessor tokens and the TQ_OBJECT macros
 
 =cut
 
@@ -401,16 +399,11 @@ LOOP:
 			}
 		}
 
-		if ( $p =~ /^\s*Q_OBJECT/ ) {
-			push @inputqueue, @codeqobject;
-			next;
-		}
 		if ( $p =~ /^\s*TQ_OBJECT/ ) {
 			push @inputqueue, @codeqobject;
 			next;
 		}
 		# Hack, waiting for real handling of preprocessor defines
-		$p =~ s/QT_STATIC_CONST/static const/;
 		$p =~ s/KSVG_GET/KJS::Value get();/;
 		$p =~ s/KSVG_BASECLASS_GET/KJS::Value get();/;
 		$p =~ s/KSVG_BRIDGE/KJS::ObjectImp *bridge();/;
@@ -423,7 +416,7 @@ LOOP:
 		}
 
 		next if ( $p =~ /^\s*$/s ); 		# blank lines
-#			|| $p =~ /^\s*Q_OBJECT/		# QObject macro
+#			|| $p =~ /^\s*TQ_OBJECT/		# TQObject macro
 #			);
 #
 
@@ -431,7 +424,7 @@ LOOP:
 						|| $p =~ /^\s*TQ_PROPERTY/		# and TQ_PROPERTY
 						|| $p =~ /^\s*TQ_OVERRIDE/		# and TQ_OVERRIDE
 						|| $p =~ /^\s*TQ_SETS/
-						|| $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/
+						|| $p =~ /^\s*TQ_DUMMY_COMPARISON_OPERATOR/
 						|| $p =~ /^\s*K_SYCOCATYPE/		# and K_SYCOCA stuff
 						|| $p =~ /^\s*K_SYCOCAFACTORY/	#
 						|| $p =~ /^\s*KSVG_/			# and KSVG stuff ;)
@@ -456,8 +449,8 @@ LOOP:
 			else {
 				# Skip platform-specific stuff, or #if 0 stuff
 				# or #else of something we parsed (e.g. for QKeySequence)
-				if ( $p =~ m/^#\s*ifdef\s*Q_WS_/ or
-				     $p =~ m/^#\s*if\s+defined\(Q_WS_/ or
+				if ( $p =~ m/^#\s*ifdef\s*TQ_WS_/ or
+				     $p =~ m/^#\s*if\s+defined\(TQ_WS_/ or
 				     $p =~ m/^#\s*if\s+defined\(Q_OS_/ or
 				     $p =~ m/^#\s*if\s+defined\(Q_CC_/ or
 				     $p =~ m/^#\s*if\s+defined\(TQT_THREAD_SUPPORT/ or
@@ -713,7 +706,7 @@ sub identifyDecl
 					\s*(class|struct|union|namespace) # 2 struct type
 					\s*([A-Z_]*EXPORT[A-Z_]*)?		  # 3 export
 					(?:\s*TQ_PACKED)?
-					(?:\s*Q_REFCOUNT)?
+					(?:\s*TQ_REFCOUNT)?
 					\s+([\w_]+						  # 4 name
 							(?:<[\w_ :,]+?>)?		  # maybe explicit template
 									#	 (eat chars between <> non-hungry)
@@ -776,7 +769,10 @@ sub identifyDecl
 					  \( (.*?) \)		# parameters
 					  \s*((?:const)?)\s*
 					  (?:throw\s*\(.*?\))?
-					  \s*((?:=\s*0(?:L?))?)\s*	# Pureness. is "0L" allowed?
+					  \s*((?:=\s*(?:
+					  0(?:L?)|      # Pureness. is "0L" allowed?
+					  default       # Default method
+					  ))?)
 					  \s*[;{]+/xs ) {	# rest
 
 		my $tpn = $1; # type + name
@@ -788,7 +784,7 @@ sub identifyDecl
 		}
 
 		my $const = $3 eq "" ? 0 : 1;
-		my $pure = $4 eq "" ? 0 : 1;
+		my $pure = $4 eq "" ? 0 : ($4 =~ "default" ? 0 : 1);
 		$tpn =~ s/\s+/ /g;
 		$params =~ s/\s+/ /g;
 
@@ -1475,7 +1471,7 @@ sub newMethod
 	This property contains a list of nodes, one for each parameter.
 
 	Each parameter node has the following properties:
-	* ArgType the type of the argument, e.g. const QString&
+	* ArgType the type of the argument, e.g. const TQString&
 	* ArgName the name of the argument - optionnal
 	* DefaultValue the default value of the argument - optionnal