summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-27 16:03:53 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-27 16:03:53 +0900
commit2518c29202d07d42d3220963b4596f5252e52937 (patch)
tree1babf16d23314ec80ef35c571b063966c49d272e
parent50087701ab4e8f67501bc90351298acd308049ab (diff)
downloadtdelibs-2518c29202d07d42d3220963b4596f5252e52937.tar.gz
tdelibs-2518c29202d07d42d3220963b4596f5252e52937.zip
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>
-rw-r--r--COMPILING.html10
-rw-r--r--Makefile.am.in4
-rw-r--r--dcop/HOWTO2
-rw-r--r--dcop/testdcop.h4
-rw-r--r--doc/common/README.Doxygen8
-rw-r--r--tdeio/tests/kurifiltertest.cpp6
-rw-r--r--tdeprint/tests/main.cpp2
-rw-r--r--win/tools/build_tdelibs_dbg2
-rw-r--r--win/zlib.pro2
9 files changed, 20 insertions, 20 deletions
diff --git a/COMPILING.html b/COMPILING.html
index bc5ffb4f..5e27f811 100644
--- a/COMPILING.html
+++ b/COMPILING.html
@@ -47,13 +47,13 @@ source. Qt libs then end up in /usr/local/lib/qt3/lib.
<p>On systems that respond to environment variables something similar to the
following is appropriate:
-<p>export LD_LIBRARY_PATH=$TDEDIR/lib:$QTDIR/lib
+<p>export LD_LIBRARY_PATH=$TDEDIR/lib:$TQTDIR/lib
<p>On systems whose diety of choice is ldconfig, try:
<pre>ldconfig -m $TDEDIR/lib
-ldconfig -m $QTDIR/lib</pre>
+ldconfig -m $TQTDIR/lib</pre>
-<p>You probably also want to add $TDEDIR/bin and $QTDIR/bin to your path.
+<p>You probably also want to add $TDEDIR/bin and $TQTDIR/bin to your path.
<p>See http://www.kde.org/kde2-and-trinity.html for tips about setting up
KDE 3.0 next to KDE 2.x.
@@ -92,7 +92,7 @@ make</pre>
especially if your system has more version of Qt installed. Be aware
that information about library paths gets saved in the "config.cache"
file, "Makefile.in" as well as "Makefile" files. So it can be that after
-some struggle to get QTDIR/TDEDIR setup correctly your setup is actually
+some struggle to get TQTDIR/TDEDIR setup correctly your setup is actually
correct, but old -incorrect- settings are still lying around.
<p>The best thing to do in such a case is to do a "make cvs-clean". This
@@ -109,7 +109,7 @@ files lying around in your source tree any more, they will be deleted!
Do a "make cvs-clean" and start from scratch, usually this solves the problem.
<p>If you encounter missing include files, especially if the files start with
-a 'q', you probably have not setup your QTDIR correct or have the wrong
+a 'q', you probably have not setup your TQTDIR correct or have the wrong
version of Qt.
<p>If you encounter compile errors after updating from CVS, check whether you
diff --git a/Makefile.am.in b/Makefile.am.in
index 2ca45ce3..da8ed21f 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -71,7 +71,7 @@ dist-hook:
cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin
# Rule for generating HTML documentation [you need kdoc installed]
-# Don't forget to run qt2kdoc first (qt2kdoc $QTDIR/doc/html)
+# Don't forget to run qt2kdoc first (qt2kdoc $TQTDIR/doc/html)
# The tdelibs docu will end up in ./srcdoc/
kdedoc:
cd $(top_srcdir) && \
@@ -101,7 +101,7 @@ apidox-am-toplevel-tdelibs: $(top_builddir)/apidocs/qt/qt.tag
$(top_builddir)/apidocs/qt/qt.tag:
@echo "*** Creating a tag file for the Qt library:"; \
$(mkinstalldirs) $(top_builddir)/apidocs/qt; \
- doxytag -t $(top_builddir)/apidocs/qt/qt.tag $(QTDOCDIR)
+ doxytag -t $(top_builddir)/apidocs/qt/qt.tag $(TQTDOCDIR)
install-data-local: install-apidox-tdelibs
diff --git a/dcop/HOWTO b/dcop/HOWTO
index 4c98b6df..dedcf97d 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -503,7 +503,7 @@ int main(int argc, char **argv)
Compiled with:
-g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -ltdecore
+g++ -O2 -o testit testit.cpp -I$TQTDIR/include -L$TQTDIR/lib -ltdecore
on Linux yields the following memory use statistics:
diff --git a/dcop/testdcop.h b/dcop/testdcop.h
index 7835ca31..3cb81372 100644
--- a/dcop/testdcop.h
+++ b/dcop/testdcop.h
@@ -35,8 +35,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdio.h>
/**
- $QTDIR/bin/moc testdcop.cpp -o testdcop.moc
- g++ -o testdcop testdcop.cpp -I$QTDIR/include -L$QTDIR/lib
+ $TQTDIR/bin/moc testdcop.cpp -o testdcop.moc
+ g++ -o testdcop testdcop.cpp -I$TQTDIR/include -L$TQTDIR/lib
@internal
**/
diff --git a/doc/common/README.Doxygen b/doc/common/README.Doxygen
index 183b85c3..8073f082 100644
--- a/doc/common/README.Doxygen
+++ b/doc/common/README.Doxygen
@@ -85,12 +85,12 @@ Differences with current dox: <TODO>
# sh /mnt/src/tdepim/doc/api/doxygen.sh /mnt/src/tdepim kpilot/lib
#
# When generating dox for tdelibs, a tag file for Qt is also created.
-# The location of Qt is specified indirectly through $QTDOCDIR or,
-# if that is not set, $QTDIR, or otherwise guessed. You may explicitly
-# set the location of a pre-generated tag file with $QTDOCTAG. One
+# The location of Qt is specified indirectly through $TQTDOCDIR or,
+# if that is not set, $TQTDIR, or otherwise guessed. You may explicitly
+# set the location of a pre-generated tag file with $TQTDOCTAG. One
# typical approach might be:
#
-# QTDOCTAG=$QTDIR/doc/qt.tag QTDOCDIR=http://doc.trolltech.com/3.3/
+# TQTDOCTAG=$TQTDIR/doc/qt.tag TQTDOCDIR=http://doc.trolltech.com/3.3/
#
# Finally, there is a --no-recurse option for top-level generation
# that avoids generating all the subdirectories as well. It also
diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp
index 9de62e13..dec95515 100644
--- a/tdeio/tests/kurifiltertest.cpp
+++ b/tdeio/tests/kurifiltertest.cpp
@@ -288,14 +288,14 @@ int main(int argc, char **argv)
setenv( "SOMEVAR", "/somevar", 0 );
setenv( "ETC", "/etc", 0 );
- TQCString qtdir=getenv("QTDIR");
+ TQCString qtdir=getenv("TQTDIR");
TQCString home = getenv("HOME");
TQCString tdehome = getenv("TDEHOME");
filter( "$SOMEVAR/tdelibs/tdeio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
filter( "$ETC/passwd", "/etc/passwd", KURIFilterData::LOCAL_FILE );
if( !qtdir.isEmpty() ) {
- filter( "$QTDIR/doc/html/functions.html#s", TQCString("file://")+qtdir+"/doc/html/functions.html#s", KURIFilterData::LOCAL_FILE );
+ filter( "$TQTDIR/doc/html/functions.html#s", TQCString("file://")+qtdir+"/doc/html/functions.html#s", KURIFilterData::LOCAL_FILE );
}
filter( "http://www.kde.org/$USER", "http://www.kde.org/$USER", KURIFilterData::NET_PROTOCOL ); // no expansion
@@ -336,7 +336,7 @@ int main(int argc, char **argv)
// itself if the requested environment variable
// is not already set.
if( !qtdir.isEmpty() ) {
- filter( "$QTDIR", 0, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.
+ filter( "$TQTDIR", 0, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.
}
filter( "$HOME", home, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.
diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp
index d714bcdf..c91cd23a 100644
--- a/tdeprint/tests/main.cpp
+++ b/tdeprint/tests/main.cpp
@@ -23,7 +23,7 @@ int main( int argc, char ** argv )
if (argc > 1)
home = argv[1];
else
- home = TQString(getenv("QTDIR")) + "/doc/html/index.html";
+ home = TQString(getenv("TQTDIR")) + "/doc/html/index.html";
HelpWindow *help = new HelpWindow(home, ".", 0, "help viewer");
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index b293bc26..97b778a3 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/win/tools/build_tdelibs_dbg
@@ -73,7 +73,7 @@ qmake maketdewidgets.pro && $make clean && $make || exit 1
qmake && $make clean && $make || exit 1
# copy tdewidgets plugin for Qt Designer
-cp $TDEDIR/lib/trinity/plugins/designer/tdewidgets.dll $QTDIR/plugins/designer/
+cp $TDEDIR/lib/trinity/plugins/designer/tdewidgets.dll $TQTDIR/plugins/designer/
cd $pwd
diff --git a/win/zlib.pro b/win/zlib.pro
index 899d54c9..c881e9c0 100644
--- a/win/zlib.pro
+++ b/win/zlib.pro
@@ -6,5 +6,5 @@ exists( $(KDELIBS)/win/3rdparty/zlib/zlib.h ) {
LIBS += $$KDELIBDESTDIR\zdll.lib
}
!exists( $(KDELIBS)/win/3rdparty/zlib/zlib.h ) {
- INCLUDEPATH += $(QTDIR)/src/3rdparty/zlib
+ INCLUDEPATH += $(TQTDIR)/src/3rdparty/zlib
}