From 503fddb48f2229ecc6ed6930a99c4d740ff979e5 Mon Sep 17 00:00:00 2001
From: gregory guy <gregory-tde@laposte.net>
Date: Mon, 17 Aug 2020 20:03:11 +0200
Subject: Second step, convert to tqt3 libraries.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
---
 acinclude.m4 | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'acinclude.m4')

diff --git a/acinclude.m4 b/acinclude.m4
index dfde28b..5ca38c0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1043,19 +1043,19 @@ AC_DEFUN(KDE_PRINT_QT_PROGRAM,
 AC_REQUIRE([KDE_USE_QT])
 cat > conftest.$ac_ext <<EOF
 #include "confdefs.h"
-#include <qglobal.h>
-#include <qapplication.h>
+#include <ntqglobal.h>
+#include <ntqapplication.h>
 EOF
 if test "$kde_qtver" = "2"; then
 cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
+#include <ntqevent.h>
+#include <ntqstring.h>
+#include <ntqstyle.h>
 EOF
 
 if test $kde_qtsubver -gt 0; then
 cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
+#if TQT_VERSION < 210
 #error 1
 #endif
 EOF
@@ -1064,8 +1064,8 @@ fi
 
 if test "$kde_qtver" = "3"; then
 cat >> conftest.$ac_ext <<EOF
-#include <qcursor.h>
-#include <qstylefactory.h>
+#include <ntqcursor.h>
+#include <ntqstylefactory.h>
 #include <private/qucomextra_p.h>
 EOF
 fi
@@ -1144,20 +1144,20 @@ fi
 if test -z "$3"; then
    if test $kde_qtver = 3; then
      if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 0x030100"
+       kde_qt_verstring="TQT_VERSION >= 0x030100"
      else
-       kde_qt_verstring="QT_VERSION >= 300"
+       kde_qt_verstring="TQT_VERSION >= 300"
      fi
    fi
    if test $kde_qtver = 2; then
      if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 222"
+       kde_qt_verstring="TQT_VERSION >= 222"
      else
-       kde_qt_verstring="QT_VERSION >= 200"
+       kde_qt_verstring="TQT_VERSION >= 200"
      fi
    fi
    if test $kde_qtver = 1; then
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
+    kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
    fi
 else
    kde_qt_verstring=$3
@@ -1263,7 +1263,7 @@ AC_ARG_ENABLE(
 USING_QT_MT=""
 
 dnl ------------------------------------------------------------------------
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
+dnl If we not get --disable-tqt-mt then adjust some vars for the host.
 dnl ------------------------------------------------------------------------
 
 KDE_MT_LDFLAGS=
@@ -1326,7 +1326,7 @@ dnl ------------------------------------------------------------
 fi
 
 dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
+dnl If we got --enable-tqt-mt then adjust the Qt library name for the host.
 dnl ------------------------------------------------------------------------
 
 if test "x$kde_use_qt_mt" = "xyes"; then
@@ -1397,9 +1397,9 @@ if test ! "$ac_qt_includes" = "NO"; then
 fi
 
 if test "$kde_qtver" != "1"; then
-  kde_qt_header=qstyle.h
+  kde_qt_header=ntqstyle.h
 else
-  kde_qt_header=qglobal.h
+  kde_qt_header=ntqglobal.h
 fi
 
 AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
@@ -1896,7 +1896,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
 
  AC_TRY_LINK([
-   #include <qdom.h>
+   #include <ntqdom.h>
  ],
  [
    QDomDocument doc;
@@ -2436,7 +2436,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
 AC_TRY_LINK(
-[#include <qapplication.h>],
+[#include <ntqapplication.h>],
             [
             int argc;
             char** argv;
@@ -4270,7 +4270,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
 AC_TRY_RUN(dnl
 [
 #include <qimageio.h>
-#include <qstring.h>
+#include <ntqstring.h>
 int main() {
 		QString t = "hallo";
 		t.fill('t');
@@ -5070,7 +5070,7 @@ if test "${with_qt_dir+set}" = set; then
   kde_qtdir="$with_qt_dir"
 fi
 
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html ], QTDOCDIR)
+AC_FIND_FILE(ntqsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html ], QTDOCDIR)
 AC_MSG_RESULT($QTDOCDIR)
 
 AC_SUBST(QTDOCDIR)
@@ -5091,7 +5091,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
 AC_SUBST(DOXYGEN_PROJECT_NUMBER)
 
 KDE_HAS_DOXYGEN=no
-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/ntqsql.html; then
   KDE_HAS_DOXYGEN=yes
 fi
 AC_SUBST(KDE_HAS_DOXYGEN)
-- 
cgit v1.2.1