From 0d9863ce237da414d17bf03e555fc597d17f4481 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 27 Sep 2018 16:03:53 +0900 Subject: [PATCH] qt -> tqt conversion: QTDIR -> TQTDIR QTDOC -> TQTDOC INCDIR_QT -> INCDIR_TQT LIBDIR_QT -> LIBDIR_TQT QT_INC -> TQT_INC QT_LIB -> TQT_LIB Signed-off-by: Michele Calgaro --- ConfigureChecks.cmake | 2 +- doc/faq/contrib.docbook | 4 ++-- doc/tdm/index.docbook | 6 +++--- .../ebrowsing/plugins/shorturi/tdeshorturifilter.cpp | 2 +- konsole/doc/mkDocs | 4 ++-- tdeioslave/media/configure.in.in | 12 ++++++------ tdeioslave/media/mediamanager/Makefile.am | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index e744cb45f..e480dc53a 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -441,7 +441,7 @@ if( WITH_HAL AND (BUILD_KSMSERVER OR BUILD_KICKER OR BUILD_TDEIOSLAVES) ) # dbus-tqt need Qt flags pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt ) tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) - set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS}) + set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}) set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} ) check_cxx_source_compiles(" #include diff --git a/doc/faq/contrib.docbook b/doc/faq/contrib.docbook index f261d2e99..6bb716f62 100644 --- a/doc/faq/contrib.docbook +++ b/doc/faq/contrib.docbook @@ -89,10 +89,10 @@ on. cmake. An excellent resource for learning &tde; programming is the &Qt; tutorials. These are installed along with &Qt;. To view them, -open $QTDIR/doc/html/index.html in +open $TQTDIR/doc/html/index.html in &konqueror; and bookmark the locatio. The tutorials can be found under "Using Qt". The source code for each lesson can be found in the $QTDIR/tutorial +class="directory">$TQTDIR/tutorial directory. There is one thing everybody interested in programming for &tde; should do: please subscribe to the developers diff --git a/doc/tdm/index.docbook b/doc/tdm/index.docbook index 0859e5282..2efb0d154 100644 --- a/doc/tdm/index.docbook +++ b/doc/tdm/index.docbook @@ -932,11 +932,11 @@ libraries. export export - + export - + export - + If you are still unsuccessful, try starting &xdm; instead, to diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp index 9dbe2d759..46499f2b6 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp @@ -301,7 +301,7 @@ bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const if ( expanded ) { - // Look for #ref again, after $ and ~ expansion (testcase: $QTDIR/doc/html/functions.html#s) + // Look for #ref again, after $ and ~ expansion (testcase: $TQTDIR/doc/html/functions.html#s) // Can't use KURL here, setPath would escape it... int pos = path.find('#'); if ( pos > -1 ) diff --git a/konsole/doc/mkDocs b/konsole/doc/mkDocs index dd22eabfc..c657c33a1 100755 --- a/konsole/doc/mkDocs +++ b/konsole/doc/mkDocs @@ -1,6 +1,6 @@ #!/bin/sh PATH=$PATH:/opt/doxygen-0.4/bin export PATH -# doxytag -t qt.tag $QTDIR/html +# doxytag -t qt.tag $TQTDIR/html doxygen konsole.Doxyfile -./konsole/html/installdox -l qt.tag@$QTDIR/html ./konsole/html/*.html +./konsole/html/installdox -l qt.tag@$TQTDIR/html ./konsole/html/*.html diff --git a/tdeioslave/media/configure.in.in b/tdeioslave/media/configure.in.in index 1f66f3b37..413848b64 100644 --- a/tdeioslave/media/configure.in.in +++ b/tdeioslave/media/configure.in.in @@ -114,7 +114,7 @@ if test "x$hal_test" = "xyes" ; then grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \ > /dev/null 2>&1 && have_qt_patch=1 if test $have_qt_patch = 1 ; then - DBUSQT_INCS="-I$dbusqt_incdir" + DBUSTQT_INCS="-I$dbusqt_incdir" dbusqt_inc=FOUND fi fi @@ -123,7 +123,7 @@ if test "x$hal_test" = "xyes" ; then AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir) if test -r $dbusqt_libdir/libdbus-qt-1.so ; then - DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1" + DBUSTQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1" dbusqt_lib=FOUND fi @@ -136,7 +136,7 @@ if test "x$hal_test" = "xyes" ; then grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \ > /dev/null 2>&1 && have_qt_patch=1 if test $have_qt_patch = 1 ; then - DBUSQT_INCS="-I$dbusqt_incdir" + DBUSTQT_INCS="-I$dbusqt_incdir" dbusqt_inc=FOUND fi fi @@ -145,7 +145,7 @@ if test "x$hal_test" = "xyes" ; then AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir) if test -r $dbusqt_libdir/libdbus-qt-1.so ; then - DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1" + DBUSTQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1" dbusqt_lib=FOUND fi @@ -159,8 +159,8 @@ if test "x$hal_test" = "xyes" ; then AC_MSG_RESULT(searched but not found) fi - AC_SUBST(DBUSQT_INCS) - AC_SUBST(DBUSQT_LIBS) + AC_SUBST(DBUSTQT_INCS) + AC_SUBST(DBUSTQT_LIBS) fi ########### Check if media HAL backend sould be compiled diff --git a/tdeioslave/media/mediamanager/Makefile.am b/tdeioslave/media/mediamanager/Makefile.am index 108b4d19b..489226e8e 100644 --- a/tdeioslave/media/mediamanager/Makefile.am +++ b/tdeioslave/media/mediamanager/Makefile.am @@ -1,7 +1,7 @@ kde_module_LTLIBRARIES = kded_mediamanager.la if include_media_halbackend -HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSQT_INCS) +HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSTQT_INCS) endif METASOURCES = AUTO @@ -11,7 +11,7 @@ if include_media_halbackend HALBACKEND_LIB = libhalbackend.la libhalbackend_la_SOURCES = halbackend.cpp libhalbackend_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined -libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT_LIBS) +libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSTQT_LIBS) endif if include_media_linuxcdpolling