Use proper TQt headers

Signed-off-by: Michele Calgaro <[email protected]>

2 files changed, 9 insertions, 21 deletions

diff --git a/acinclude.m4.in b/acinclude.m4.in
index 3f0c0fc..8931be6 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -987,8 +987,8 @@ fi
 LIB_XEXT="-lXext"
 TQTE_NORTTI=""
 
-CFLAGS="$CFLAGS -I/usr/include/tqt"
-CXXFLAGS="$CXXFLAGS -I/usr/include/tqt"
+CFLAGS="$CFLAGS -I/usr/include/tqt3 -I/usr/include/tqt"
+CXXFLAGS="$CXXFLAGS -I/usr/include/tqt3 -I/usr/include/tqt"
 
 elif test "$kde_use_tqt_emb" = "yes"; then
   dnl We're using TQT Embedded
@@ -1044,16 +1044,8 @@ if $PKG_CONFIG --exists tqt-mt ; then
 cat >> conftest.$ac_ext <<EOF
 #include <tqglobal.h>
 #include <tqapplication.h>
-EOF
-fi
-fi
-
-if test "$kde_tqtver" = "3"; then
-if $PKG_CONFIG --exists tqt-mt ; then
-cat >> conftest.$ac_ext <<EOF
 #include <tqcursor.h>
 #include <tqstylefactory.h>
-#include <tqucomextra_p.h>
 EOF
 fi
 fi
@@ -1381,17 +1373,13 @@ if test "$PKG_CONFIG" != "no" ; then
       tqt_incdirs="$tqt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`"
   fi
 fi
-tqt_incdirs="$TQTINC $tqt_incdirs /usr/include/tqt3 /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/tqt $x_includes"
+tqt_incdirs="$TQTINC $tqt_incdirs /usr/include/tqt3 /usr/include/tqt /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/tqt $x_includes"
 if test ! "$ac_tqt_includes" = "NO"; then
    tqt_incdirs="$ac_tqt_includes $tqt_incdirs"
 fi
 
-kde_tqt_header=ntqstyle.h
-
+kde_tqt_header=tqstyle.h
 AC_FIND_FILE($kde_tqt_header, $tqt_incdirs, tqt_incdir)
-if test "$tqt_incdir" = "NO"; then
-   AC_FIND_FILE($kde_tqt_header, $tqt_incdirs, tqt_incdir)
-fi
 ac_tqt_includes="$tqt_incdir"
 
 tqt_libdirs=""
@@ -4895,7 +4883,7 @@ AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAX
 AC_DEFUN([KDE_CHECK_HEADER],
 [
    kde_safe_cppflags=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt"
+   CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt3 -I/usr/include/tqt"
    AC_LANG_SAVE
    AC_LANG_CPLUSPLUS
    AC_CHECK_HEADER([$1], [$2], [$3], [$4])
@@ -4908,7 +4896,7 @@ AC_DEFUN([KDE_CHECK_HEADERS],
    AH_CHECK_HEADERS_TDE([$1])
    AC_LANG_SAVE
    kde_safe_cppflags=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt"
+   CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt3 -I/usr/include/tqt"
    AC_LANG_CPLUSPLUS
    AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
    CPPFLAGS=$kde_safe_cppflags
@@ -5549,7 +5537,7 @@ if test "${with_tqt_dir+set}" = set; then
   kde_tqtdir="$with_tqt_dir"
 fi
 
-AC_FIND_FILE(ntqsql.html, [ $kde_tqtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/tqt3/html /usr/lib/tqt3/doc /usr/lib/tqt3/doc/html /usr/doc/tqt3/html /usr/doc/tqt3 /usr/share/doc/tqt3-doc /usr/share/tqt3/doc/html /usr/X11R6/share/doc/tqt/html ], TQTDOCDIR)
+AC_FIND_FILE(tqsql.html, [ $kde_tqtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/tqt3/html /usr/lib/tqt3/doc /usr/lib/tqt3/doc/html /usr/doc/tqt3/html /usr/doc/tqt3 /usr/share/doc/tqt3-doc /usr/share/tqt3/doc/html /usr/X11R6/share/doc/tqt/html ], TQTDOCDIR)
 AC_MSG_RESULT($TQTDOCDIR)
 
 AC_SUBST(TQTDOCDIR)
@@ -5570,7 +5558,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
 AC_SUBST(DOXYGEN_PROJECT_NUMBER)
 
 KDE_HAS_DOXYGEN=no
-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/ntqsql.html; then
+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/tqsql.html; then
   KDE_HAS_DOXYGEN=yes
 fi
 AC_SUBST(KDE_HAS_DOXYGEN)
diff --git a/am_edit b/am_edit
index 4449002..a85fb1f 100644
--- a/am_edit
+++ b/am_edit
@@ -1374,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 TQWizard,public KWizard,g; s,#include <tqwizard.h>,#include <kwizard.h>,g; s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
                 } else {
                     $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
                 }