Browse Source

qt -> tqt conversion:

qtlib -> tqtlib
libqt -> libtqt
QTLIB -> TQTLIB
LIBQT -> LIBTQT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 8 months ago
parent
commit
5528a539d1
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 35 additions and 35 deletions
  1. 2
    2
      ChangeLog
  2. 33
    33
      acinclude.m4

+ 2
- 2
ChangeLog View File

@@ -483,7 +483,7 @@
483 483
 
484 484
 2001-08-20 Alexander Rawass <alexannika@users.sourceforge.net>
485 485
 
486
-	* modified configure.in.in to test for libqtreemap
486
+	* modified configure.in.in to test for libtqtreemap
487 487
 	  test may not work on some/most systems
488 488
 
489 489
 2001-08-18 Alexander Rawass <alexannika@users.sourceforge.net>
@@ -517,7 +517,7 @@
517 517
 	  qlistviewtreemap.h
518 518
 	  qxmltreemapviewer.cpp
519 519
 
520
-	* files q*treemap* are built as a library libqtreemap
520
+	* files q*treemap* are built as a library libtqtreemap
521 521
 	* new qxmltreemapviewer binary:
522 522
 	  stand-alone QT/Xml Treemap Viewer
523 523
 	* QTreeMap/QListViewTreeMapArea works fine with KProf

+ 33
- 33
acinclude.m4 View File

@@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
371 371
   fi
372 372
 
373 373
 AC_MSG_CHECKING([for KDE libraries installed])
374
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
374
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBTQT $KDE_TEST_RPATH 1>&5'
375 375
 
376 376
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
377 377
   AC_MSG_RESULT(yes)
@@ -1227,9 +1227,9 @@ ac_libs_safe="$LIBS"
1227 1227
 CXXFLAGS="$CXXFLAGS -I$tqt_includes"
1228 1228
 LDFLAGS="$LDFLAGS $X_LDFLAGS"
1229 1229
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
1230
-LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
1230
+LIBS="$LIBTQT -lXext -lX11 $LIBSOCKET"
1231 1231
 else
1232
-LIBS="$LIBQT $LIBSOCKET"
1232
+LIBS="$LIBTQT $LIBSOCKET"
1233 1233
 fi
1234 1234
 LD_LIBRARY_PATH=
1235 1235
 export LD_LIBRARY_PATH
@@ -1269,7 +1269,7 @@ fi
1269 1269
 
1270 1270
 dnl ------------------------------------------------------------------------
1271 1271
 dnl Try to find the Qt headers and libraries.
1272
-dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
1272
+dnl $(QT_LDFLAGS) will be -Ltqtliblocation (if needed)
1273 1273
 dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
1274 1274
 dnl ------------------------------------------------------------------------
1275 1275
 dnl
@@ -1322,27 +1322,27 @@ kde_qt_was_given=yes
1322 1322
 dnl ------------------------------------------------------------------------
1323 1323
 dnl If we haven't been told how to link to Qt, we work it out for ourselves.
1324 1324
 dnl ------------------------------------------------------------------------
1325
-if test -z "$LIBQT_GLOB"; then
1325
+if test -z "$LIBTQT_GLOB"; then
1326 1326
   if test "x$kde_use_qt_emb" = "xyes"; then
1327
-    LIBQT_GLOB="libqte.*"
1327
+    LIBTQT_GLOB="libtqte.*"
1328 1328
   else
1329
-    LIBQT_GLOB="libqt.*"
1329
+    LIBTQT_GLOB="libtqt.*"
1330 1330
   fi
1331 1331
 fi
1332 1332
 
1333
-if test -z "$LIBQT"; then
1333
+if test -z "$LIBTQT"; then
1334 1334
 dnl ------------------------------------------------------------
1335 1335
 dnl If we got --enable-embedded then adjust the Qt library name.
1336 1336
 dnl ------------------------------------------------------------
1337 1337
   if test "x$kde_use_qt_emb" = "xyes"; then
1338
-    qtlib="qte"
1338
+    tqtlib="qte"
1339 1339
   else
1340
-    qtlib="qt"
1340
+    tqtlib="qt"
1341 1341
   fi
1342 1342
 
1343
-  kde_int_qt="-l$qtlib"
1343
+  kde_int_qt="-l$tqtlib"
1344 1344
 else
1345
-  kde_int_qt="$LIBQT"
1345
+  kde_int_qt="$LIBTQT"
1346 1346
   kde_lib_qt_set=yes
1347 1347
 fi
1348 1348
 
@@ -1366,35 +1366,35 @@ dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
1366 1366
 dnl ------------------------------------------------------------------------
1367 1367
 
1368 1368
 if test "x$kde_use_qt_mt" = "xyes"; then
1369
-  if test -z "$LIBQT"; then
1370
-    LIBQT="-l$qtlib-mt"
1371
-    kde_int_qt="-l$qtlib-mt"
1369
+  if test -z "$LIBTQT"; then
1370
+    LIBTQT="-l$tqtlib-mt"
1371
+    kde_int_qt="-l$tqtlib-mt"
1372 1372
   else
1373
-    LIBQT="$qtlib-mt"
1374
-    kde_int_qt="$qtlib-mt"
1373
+    LIBTQT="$tqtlib-mt"
1374
+    kde_int_qt="$tqtlib-mt"
1375 1375
   fi
1376
-  LIBQT_GLOB="lib$qtlib-mt.*"
1376
+  LIBTQT_GLOB="lib$tqtlib-mt.*"
1377 1377
   USING_QT_MT="using -mt"
1378 1378
 else
1379
-  LIBQT="-l$qtlib"
1379
+  LIBTQT="-l$tqtlib"
1380 1380
 fi
1381 1381
 
1382 1382
 if test $kde_qtver != 1; then
1383 1383
 
1384 1384
   AC_REQUIRE([AC_FIND_PNG])
1385 1385
   AC_REQUIRE([AC_FIND_JPEG])
1386
-  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
1386
+  LIBTQT="$LIBTQT $LIBPNG $LIBJPEG"
1387 1387
 fi
1388 1388
 
1389 1389
 if test $kde_qtver = 3; then
1390 1390
   AC_REQUIRE([KDE_CHECK_LIBDL])
1391
-  LIBQT="$LIBQT $LIBDL"
1391
+  LIBTQT="$LIBTQT $LIBDL"
1392 1392
 fi
1393 1393
 
1394 1394
 AC_MSG_CHECKING([for Qt])
1395 1395
 
1396 1396
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
1397
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
1397
+LIBTQT="$LIBTQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
1398 1398
 fi
1399 1399
 ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
1400 1400
 qt_libraries=""
@@ -1445,21 +1445,21 @@ qt_libdirs=""
1445 1445
 for dir in $kde_qt_dirs; do
1446 1446
    qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
1447 1447
 done
1448
-qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1448
+qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1449 1449
 if test ! "$ac_qt_libraries" = "NO"; then
1450 1450
   qt_libdir=$ac_qt_libraries
1451 1451
 else
1452 1452
   qt_libdirs="$ac_qt_libraries $qt_libdirs"
1453
-  # if the Qt was given, the chance is too big that libqt.* doesn't exist
1453
+  # if the Qt was given, the chance is too big that libtqt.* doesn't exist
1454 1454
   qt_libdir=NONE
1455 1455
   for dir in $qt_libdirs; do
1456
-    try="ls -1 $dir/${LIBQT_GLOB}"
1456
+    try="ls -1 $dir/${LIBTQT_GLOB}"
1457 1457
     if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
1458 1458
   done
1459 1459
 fi
1460 1460
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
1461 1461
   if test -e "$a"; then
1462
-    LIBQT="$LIBQT ${kde_int_qt}_incremental"
1462
+    LIBTQT="$LIBTQT ${kde_int_qt}_incremental"
1463 1463
     break
1464 1464
   fi
1465 1465
 done
@@ -1475,7 +1475,7 @@ ac_libs_safe="$LIBS"
1475 1475
 
1476 1476
 CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
1477 1477
 LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
1478
-LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
1478
+LIBS="$LIBS $LIBTQT $KDE_MT_LIBS"
1479 1479
 
1480 1480
 KDE_PRINT_QT_PROGRAM
1481 1481
 
@@ -1506,9 +1506,9 @@ if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then
1506 1506
     if test "x$kde_use_qt_mt" = "xyes"; then
1507 1507
        missing_qt_mt="
1508 1508
 Make sure that you have compiled Qt with thread support!"
1509
-       ac_qt_notfound="(library $qtlib-mt)";
1509
+       ac_qt_notfound="(library $tqtlib-mt)";
1510 1510
     else
1511
-       ac_qt_notfound="(library $qtlib)";
1511
+       ac_qt_notfound="(library $tqtlib)";
1512 1512
     fi
1513 1513
   fi
1514 1514
 
@@ -1982,7 +1982,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
1982 1982
  kde_libs_safe="$LIBS"
1983 1983
  kde_cxxflags_safe="$CXXFLAGS"
1984 1984
 
1985
- LIBS="-lkde-qt-addon $LIBQT $LIBS"
1985
+ LIBS="-lkde-qt-addon $LIBTQT $LIBS"
1986 1986
  CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
1987 1987
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
1988 1988
 
@@ -2526,7 +2526,7 @@ AC_CACHE_VAL(kde_cv_qt_jpeg,
2526 2526
 AC_LANG_SAVE
2527 2527
 AC_LANG_CPLUSPLUS
2528 2528
 ac_save_LIBS="$LIBS"
2529
-LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
2529
+LIBS="$all_libraries $USER_LDFLAGS $LIBTQT"
2530 2530
 LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
2531 2531
 ac_save_CXXFLAGS="$CXXFLAGS"
2532 2532
 CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
@@ -4278,7 +4278,7 @@ AC_LANG_SAVE
4278 4278
 AC_LANG_CPLUSPLUS
4279 4279
 ac_save_LIBS="$LIBS"
4280 4280
 ac_save_CXXFLAGS="$CXXFLAGS"
4281
-LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
4281
+LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBTQT"
4282 4282
 CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
4283 4283
 AC_TRY_RUN(dnl
4284 4284
 [
@@ -5082,7 +5082,7 @@ is required.])
5082 5082
 
5083 5083
   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
5084 5084
   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
5085
-  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
5085
+  LIBS="$LIBS $LIB_TQTOPIA $LIBTQT"
5086 5086
 
5087 5087
   cat > conftest.$ac_ext <<EOF
5088 5088
 #include "confdefs.h"

Loading…
Cancel
Save