1 files changed, 9 insertions, 13 deletions
diff --git a/am_edit b/am_edit
index d04044c..b4b4f37 100644
--- a/am_edit
+++ b/am_edit
@@ -229,7 +229,7 @@ sub processMakefile ($)
 
     local $allidls = "";
     local $idl_output = "";# lists all idl generated files for cleantarget
-    local $ui_output = "";# lists all uic generated files for cleantarget
+    local $ui_output = "";# lists all tquic generated files for cleantarget
     local $kcfg_output = "";# lists all kcfg generated files for cleantarget
 
     local %dependmocs = ();
@@ -820,7 +820,6 @@ sub tag_FINAL()
             $handling .= "\trm -f $program.all_$suffix.files $program.all_$suffix.final; \\\n";
             $handling .= "\techo \"#define KDE_USE_FINAL 1\" >> $program.all_$suffix.final; \\\n";
             $handling .= "\tfor file in " . $sourcelist{$suffix} . "; do \\\n";
-#            $handling .= "\t  tqt-replace \$\(srcdir\)/\$\$file; \\\n";
             $handling .= "\t  echo \"#include \\\"\$\$file\\\"\" >> $program.all_$suffix.files; \\\n";
             $handling .= "\t  test ! -f \$\(srcdir\)/\$\$file || egrep '^#pragma +implementation' \$\(srcdir\)/\$\$file >> $program.all_$suffix.final; \\\n";
             $handling .= "\tdone; \\\n";
@@ -873,9 +872,9 @@ sub tag_TDEINIT()
                 $lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${tdeinit}.la.$cxxsuffix\n";
 
                 $lines .= "\n${tdeinit}_dummy.$cxxsuffix:\n";
-                $lines .= "\techo '#include <kdemacros.h>' > ${tdeinit}_dummy.$cxxsuffix; \\\n";
+                $lines .= "\techo '#include <tdemacros.h>' > ${tdeinit}_dummy.$cxxsuffix; \\\n";
                 $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' >> ${tdeinit}_dummy.$cxxsuffix; \\\n";
-                $lines .= "\techo 'extern \"C\" KDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${tdeinit}_dummy.$cxxsuffix\n";
+                $lines .= "\techo 'extern \"C\" TDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${tdeinit}_dummy.$cxxsuffix\n";
 
                 push(@cleanfiles, "${tdeinit}.la.$cxxsuffix");
                 push(@cleanfiles, "${tdeinit}_dummy.$cxxsuffix");
@@ -1262,9 +1261,8 @@ sub tag_IDLFILES ()
             }
             
             if ($allidls !~ /$source\_kidl/) {
-                
-                $use_ng = ($MakefileData =~ /\n$source\_DCOPIDLNG\s*=\s*(\S+)\n/);
-                $dcopidl =  $use_ng ? "KDECONFIG=\"\$(KDECONFIG)\" \$(TQTDCOPIDLNG)" : " \$(TQTDCOPIDL)";
+
+                $dcopidl = "KDECONFIG=\"\$(KDECONFIG)\" \$(TQTDCOPIDLNG)";
 
                 $dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOP_DEPENDENCIES)\n";
                 $dep_lines .= "\t$dcopidl $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; false )\n";
@@ -1367,7 +1365,7 @@ sub tag_UIFILES ()
                     my ($mangled_source) = $source;
                     $mangled_source =~ s/[^A-Za-z0-9]/_/g;  # get rid of garbage
                     $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n";
-                    $dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" | \$(PERL) -pe \"s,: TQWizard\\(,: KWizard(,g; s,: QWizard\\(,: KWizard(,g;\" >> $source.$cxxsuffix ;\\\n";
+                    $dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),TQString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),TQString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" | \$(PERL) -pe \"s,: T?QWizard\\(,: KWizard(,g;\" >> $source.$cxxsuffix ;\\\n";
 		    $dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n";
                 } else {
                     $dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix; ret=\$\$?; \\\n";
@@ -1376,7 +1374,7 @@ sub tag_UIFILES ()
                 $dep_lines .= "$source.h: $sourcedir$source.ui\n";
                 $dep_lines .= "\trm -rf $source.h;\n";
                 if (!$kdeopts{"tqtonly"}) {
-                    $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pe \"s,public TQWizard,public KWizard,g; s,#include <ntqwizard.h>,#include <kwizard.h>,g; s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
+                    $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pe \"s,public T?QWizard,public KWizard,g; s,#include <(n?t)?qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
                 } else {
                     $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
                 }
@@ -2117,10 +2115,8 @@ sub findMocCandidates ()
             seek(HFIN, 0, 0);
             read HFIN, $hfData, $hfsize;
             close HFIN;
-            # push (@list, $hf) if(index($hfData, "Q_OBJECT") >= 0); ### fast but doesn't handle //Q_OBJECT
-	    # handle " { friend class blah; Q_OBJECT ", but don't match antlarr_Q_OBJECT (\b).
-            if ( $hfData =~ /{([^}]*)\bQ_OBJECT/s ) {
-                push (@list, $hf) unless $1 =~ m://[^\n]*Q_OBJECT[^\n]*$:s;  ## reject "// Q_OBJECT"
+            if ( $hfData =~ /{([^}]*)\bT?Q_OBJECT/s ) {
+                push (@list, $hf) unless $1 =~ m://[^\n]*T?Q_OBJECT[^\n]*$:s;  ## reject "// (T)Q_OBJECT"
             }
         }
         # The assoc array of root of headerfile and header filename