Browse Source

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 <michele.calgaro@yahoo.it>
Michele Calgaro 6 months ago
parent
commit
0d9863ce23
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF

+ 1
- 1
ConfigureChecks.cmake View File

@@ -441,7 +441,7 @@ if( WITH_HAL AND (BUILD_KSMSERVER OR BUILD_KICKER OR BUILD_TDEIOSLAVES) )
441 441
   # dbus-tqt need Qt flags
442 442
   pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
443 443
   tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
444
-  set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
444
+  set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS})
445 445
   set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
446 446
   check_cxx_source_compiles("
447 447
     #include <tqt.h>

+ 2
- 2
doc/faq/contrib.docbook View File

@@ -89,10 +89,10 @@ on.</para>
89 89
 <application>cmake</application>.</para>
90 90
 <para>An excellent resource for learning &tde;
91 91
 programming is the &Qt; tutorials. These are installed along with &Qt;. To view them,
92
-open <filename>$<envar>QTDIR</envar>/doc/html/index.html</filename> in
92
+open <filename>$<envar>TQTDIR</envar>/doc/html/index.html</filename> in
93 93
 &konqueror; and bookmark the locatio. The tutorials
94 94
 can be found under "Using Qt". The source code for each lesson can be found in the <filename
95
-class="directory">$<envar>QTDIR</envar>/tutorial</filename>
95
+class="directory">$<envar>TQTDIR</envar>/tutorial</filename>
96 96
 directory.</para>
97 97
 <para>There is one thing everybody interested in
98 98
 programming for &tde; should do: please <emphasis>subscribe to the developers

+ 3
- 3
doc/tdm/index.docbook View File

@@ -932,11 +932,11 @@ libraries.</para>
932 932
 <screen><command>export 
933 933
 <option>TDEDIR=<replaceable>/opt/tde</replaceable></option></command>
934 934
 <command>export 
935
-<option>QTDIR=<replaceable>/usr/lib/qt2</replaceable></option></command>
935
+<option>TQTDIR=<replaceable>/usr/lib/qt2</replaceable></option></command>
936 936
 <command>export 
937
-<option>PATH=<replaceable>$TDEDIR/bin:$QTDIR/bin:$PATH</replaceable></option></command>
937
+<option>PATH=<replaceable>$TDEDIR/bin:$TQTDIR/bin:$PATH</replaceable></option></command>
938 938
 <command>export 
939
-<option>LD_LIBRARY_PATH=<replaceable>$TDEDIR/lib:$QTDIR/lib</replaceable></option></command>
939
+<option>LD_LIBRARY_PATH=<replaceable>$TDEDIR/lib:$TQTDIR/lib</replaceable></option></command>
940 940
 </screen>
941 941
 
942 942
 <para>If you are still unsuccessful, try starting &xdm; instead, to

+ 1
- 1
kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp View File

@@ -301,7 +301,7 @@ bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const
301 301
 
302 302
   if ( expanded )
303 303
   {
304
-    // Look for #ref again, after $ and ~ expansion (testcase: $QTDIR/doc/html/functions.html#s)
304
+    // Look for #ref again, after $ and ~ expansion (testcase: $TQTDIR/doc/html/functions.html#s)
305 305
     // Can't use KURL here, setPath would escape it...
306 306
     int pos = path.find('#');
307 307
     if ( pos > -1 )

+ 2
- 2
konsole/doc/mkDocs View File

@@ -1,6 +1,6 @@
1 1
 #!/bin/sh
2 2
 PATH=$PATH:/opt/doxygen-0.4/bin
3 3
 export PATH
4
-# doxytag -t qt.tag $QTDIR/html
4
+# doxytag -t qt.tag $TQTDIR/html
5 5
 doxygen konsole.Doxyfile
6
-./konsole/html/installdox -l qt.tag@$QTDIR/html ./konsole/html/*.html
6
+./konsole/html/installdox -l qt.tag@$TQTDIR/html ./konsole/html/*.html

+ 6
- 6
tdeioslave/media/configure.in.in View File

@@ -114,7 +114,7 @@ if test "x$hal_test" = "xyes" ; then
114 114
     grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \
115 115
     > /dev/null 2>&1 && have_qt_patch=1
116 116
     if test $have_qt_patch = 1 ; then
117
-      DBUSQT_INCS="-I$dbusqt_incdir"
117
+      DBUSTQT_INCS="-I$dbusqt_incdir"
118 118
       dbusqt_inc=FOUND
119 119
     fi
120 120
   fi
@@ -123,7 +123,7 @@ if test "x$hal_test" = "xyes" ; then
123 123
   AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir)
124 124
 
125 125
   if test -r $dbusqt_libdir/libdbus-qt-1.so ; then
126
-    DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
126
+    DBUSTQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
127 127
     dbusqt_lib=FOUND
128 128
   fi
129 129
 
@@ -136,7 +136,7 @@ if test "x$hal_test" = "xyes" ; then
136 136
       grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \
137 137
       > /dev/null 2>&1 && have_qt_patch=1
138 138
       if test $have_qt_patch = 1 ; then
139
-        DBUSQT_INCS="-I$dbusqt_incdir"
139
+        DBUSTQT_INCS="-I$dbusqt_incdir"
140 140
         dbusqt_inc=FOUND
141 141
       fi
142 142
     fi
@@ -145,7 +145,7 @@ if test "x$hal_test" = "xyes" ; then
145 145
     AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir)
146 146
 
147 147
     if test -r $dbusqt_libdir/libdbus-qt-1.so ; then
148
-      DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
148
+      DBUSTQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
149 149
       dbusqt_lib=FOUND
150 150
     fi
151 151
 
@@ -159,8 +159,8 @@ if test "x$hal_test" = "xyes" ; then
159 159
     AC_MSG_RESULT(searched but not found)
160 160
   fi
161 161
 
162
-  AC_SUBST(DBUSQT_INCS)
163
-  AC_SUBST(DBUSQT_LIBS)
162
+  AC_SUBST(DBUSTQT_INCS)
163
+  AC_SUBST(DBUSTQT_LIBS)
164 164
 fi
165 165
 
166 166
 ########### Check if media HAL backend sould be compiled

+ 2
- 2
tdeioslave/media/mediamanager/Makefile.am View File

@@ -1,7 +1,7 @@
1 1
 kde_module_LTLIBRARIES = kded_mediamanager.la
2 2
 
3 3
 if include_media_halbackend
4
-HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSQT_INCS)
4
+HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSTQT_INCS)
5 5
 endif
6 6
 
7 7
 METASOURCES = AUTO
@@ -11,7 +11,7 @@ if include_media_halbackend
11 11
 HALBACKEND_LIB = libhalbackend.la
12 12
 libhalbackend_la_SOURCES = halbackend.cpp
13 13
 libhalbackend_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
14
-libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT_LIBS)
14
+libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSTQT_LIBS)
15 15
 endif
16 16
 
17 17
 if include_media_linuxcdpolling

Loading…
Cancel
Save