Replace Q_WS_* defines with TQ_WS_* equivalents

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 59a8bf7c09)

Doxyfile.global

@@ -1282,7 +1282,7 @@ INCLUDE_FILE_PATTERNS  =
 
 PREDEFINED             = TQT_VERSION=320 \
                          __cplusplus \
-                         Q_WS_X11
+                         TQ_WS_X11
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.

acinclude.m4.in

@@ -1083,18 +1083,14 @@ AC_DEFUN([KDE_USE_TQT],
 [
   kde_tqtver=0
   kde_tqtsubver=0
-  
+
+  KDE_PKG_CHECK_MODULES(TQt, tqt)
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
   ac_cxxflags_safe="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -I/usr/include/tqt"
+  CXXFLAGS="$CXXFLAGS $TQt_CFLAGS"
   AC_TRY_COMPILE([
-  #define TQT_VERSION_ONLY
   #include <tqt.h>
-  #undef TQT_VERSION_ONLY
-  #ifdef USE_QT4
-  choke me
-  #endif
   ], ,
     kde_tqtver=3,
   )
@@ -1286,7 +1282,6 @@ fi
 
 dnl ------------------------------------------------------------
 dnl If we got --enable-embedded then adjust the TQt library name.
-dnl Also TQt4 uses a different library name
 dnl ------------------------------------------------------------
 if test "$kde_tqtver" = "3"; then
   if test "x$kde_use_tqt_emb" = "xyes"; then
@@ -2555,8 +2550,8 @@ fi
 LIBS="$ac_save_LIBS"
 CXXFLAGS="$ac_save_CXXFLAGS"
 AC_LANG_RESTORE
-fi
 ])
+fi
 
 if eval "test ! \"`echo $kde_cv_tqt_jpeg`\" = no"; then
   AC_MSG_RESULT(yes)
@@ -3373,9 +3368,9 @@ if $PKG_CONFIG --exists tqt-mt ; then
           AC_TRY_COMPILE(
           [
 #include <tqglobal.h>
-#if Q_EXPORT - 0 != 0
-/* if this compiles, then Q_EXPORT is undefined */
-/* if Q_EXPORT is nonempty, this will break compilation */
+#if TQ_EXPORT - 0 != 0
+/* if this compiles, then TQ_EXPORT is undefined */
+/* if TQ_EXPORT is nonempty, this will break compilation */
 #endif
           ], [/* Elvis is not dead, he just went home! (Men In Black, 1997) */],
           kde_cv_val_tqt_gcc_visibility_patched=no, kde_cv_val_tqt_gcc_visibility_patched=yes)

am_edit

@@ -1366,7 +1366,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,: TQWizard\\(,: KWizard(,g; s,: 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";
@@ -2116,10 +2116,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