Browse Source

Conversion qt -> tqt

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Michele Calgaro 5 months ago
parent
commit
7ed4760de4
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
8 changed files with 480 additions and 868 deletions
  1. 15
    15
      Doxyfile.global
  2. 415
    803
      acinclude.m4.in
  3. 4
    4
      am_edit
  4. 4
    4
      configure.in.bot.end
  5. 1
    1
      configure.in.min
  6. 4
    4
      cvs.sh
  7. 3
    3
      debianrules
  8. 34
    34
      doxygen.sh

+ 15
- 15
Doxyfile.global View File

@@ -134,18 +134,18 @@ SHORT_NAMES            = NO
134 134
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
135 135
 # will interpret the first line (until the first dot) of a JavaDoc-style
136 136
 # comment as the brief description. If set to NO, the JavaDoc
137
-# comments will behave just like regular Qt-style comments
137
+# comments will behave just like regular TQt-style comments
138 138
 # (thus requiring an explicit @brief command for a brief description.)
139 139
 
140 140
 JAVADOC_AUTOBRIEF      = YES
141 141
 
142
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
143
-# interpret the first line (until the first dot) of a Qt-style
142
+# If the TQT_AUTOBRIEF tag is set to YES then Doxygen will
143
+# interpret the first line (until the first dot) of a TQt-style
144 144
 # comment as the brief description. If set to NO, the comments
145
-# will behave just like regular Qt-style comments (thus requiring
145
+# will behave just like regular TQt-style comments (thus requiring
146 146
 # an explicit \brief command for a brief description.)
147 147
 
148
-QT_AUTOBRIEF           = NO
148
+TQT_AUTOBRIEF           = NO
149 149
 
150 150
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
151 151
 # treat a multi-line C++ special comment block (i.e. a block of //! or ///
@@ -905,7 +905,7 @@ TOC_EXPAND             = NO
905 905
 
906 906
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
907 907
 # are set, an additional index file will be generated that can be used as input for
908
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
908
+# TQt's qhelpgenerator to generate a TQt Compressed Help (.qch) of the generated
909 909
 # HTML documentation.
910 910
 
911 911
 GENERATE_QHP           = NO
@@ -917,36 +917,36 @@ GENERATE_QHP           = NO
917 917
 QCH_FILE               =
918 918
 
919 919
 # The QHP_NAMESPACE tag specifies the namespace to use when generating
920
-# Qt Help Project output. For more information please see
921
-# http://doc.trolltech.com/qthelpproject.html#namespace
920
+# TQt Help Project output. For more information please see
921
+# http://doc.qt.io/qt-5/tqthelpproject.html#namespace
922 922
 
923 923
 QHP_NAMESPACE          =
924 924
 
925 925
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
926
-# Qt Help Project output. For more information please see
927
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
926
+# TQt Help Project output. For more information please see
927
+# http://doc.qt.io/qt-5/tqthelpproject.html#virtual-folders
928 928
 
929 929
 QHP_VIRTUAL_FOLDER     = doc
930 930
 
931 931
 # If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
932 932
 # For more information please see
933
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
933
+# http://doc.qt.io/qt-5/tqthelpproject.html#custom-filters
934 934
 
935 935
 QHP_CUST_FILTER_NAME   =
936 936
 
937 937
 # The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
938
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
938
+# <a href="http://doc.qt.io/qt-5/tqthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
939 939
 
940 940
 QHP_CUST_FILTER_ATTRS  =
941 941
 
942 942
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
943 943
 # filter section matches.
944
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
944
+# <a href="http://doc.qt.io/qt-5/tqthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
945 945
 
946 946
 QHP_SECT_FILTER_ATTRS  =
947 947
 
948 948
 # If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
949
-# be used to specify the location of Qt's qhelpgenerator.
949
+# be used to specify the location of TQt's qhelpgenerator.
950 950
 # If non-empty doxygen will try to run qhelpgenerator on the generated
951 951
 # .qhp file.
952 952
 
@@ -993,7 +993,7 @@ TREEVIEW_WIDTH         = 250
993 993
 FORMULA_FONTSIZE       = 10
994 994
 
995 995
 # When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
996
-# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
996
+# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or TQt help (GENERATE_QHP)
997 997
 # there is already a search function so this one should typically
998 998
 # be disabled.
999 999
 

+ 415
- 803
acinclude.m4.in
File diff suppressed because it is too large
View File


+ 4
- 4
am_edit View File

@@ -566,7 +566,7 @@ sub initialise ()
566 566
 
567 567
     %kdeopts = ();
568 568
     $kdeopts{"foreign"} = 0;
569
-    $kdeopts{"qtonly"} = 0;
569
+    $kdeopts{"tqtonly"} = 0;
570 570
     $kdeopts{"noautodist"} = 0;
571 571
     $kdeopts{"foreign-libtool"} = $foreign_libtool;
572 572
     $kdeopts{"nofinal"} = !$use_final; # default
@@ -1361,7 +1361,7 @@ sub tag_UIFILES ()
1361 1361
 
1362 1362
                 my $dep_lines = "$source.$cxxsuffix: $sourcedir$source.ui $source.h $source.moc\n";
1363 1363
                 $dep_lines .= "\trm -f $source.$cxxsuffix\n";
1364
-                if (!$kdeopts{"qtonly"}) {
1364
+                if (!$kdeopts{"tqtonly"}) {
1365 1365
                     $dep_lines .= "\techo '#include <kdialog.h>' > $source.$cxxsuffix\n";
1366 1366
                     $dep_lines .= "\techo '#include <tdelocale.h>' >> $source.$cxxsuffix\n";
1367 1367
                     my ($mangled_source) = $source;
@@ -1375,7 +1375,7 @@ sub tag_UIFILES ()
1375 1375
 		$dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include \"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit \$\$ret ; fi\n\n";
1376 1376
                 $dep_lines .= "$source.h: $sourcedir$source.ui\n";
1377 1377
                 $dep_lines .= "\trm -rf $source.h;\n";
1378
-                if (!$kdeopts{"qtonly"}) {
1378
+                if (!$kdeopts{"tqtonly"}) {
1379 1379
                     $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public TQWizard,public KWizard,g; s,#include <ntqwizard.h>,#include <kwizard.h>,g; s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
1380 1380
                 } else {
1381 1381
                     $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
@@ -2301,7 +2301,7 @@ sub make_bcheck_target()
2301 2301
 
2302 2302
 sub make_meta_classes ()
2303 2303
 {
2304
-    return if ($kdeopts{"qtonly"});
2304
+    return if ($kdeopts{"tqtonly"});
2305 2305
 
2306 2306
     my $cppFile;
2307 2307
     my $hFile;

+ 4
- 4
configure.in.bot.end View File

@@ -16,17 +16,17 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
16 16
   fi
17 17
 fi
18 18
 
19
-if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
19
+if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_tqt_gcc_visibility_patched = "xno"; then
20 20
   echo ""
21
-  echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
21
+  echo "Your GCC supports symbol visibility, but the patch for TQt supporting visibility"
22 22
   echo "was not included. Therefore, GCC symbol visibility support remains disabled."
23 23
   echo ""
24
-  echo "For better performance, consider including the Qt visibility supporting patch"
24
+  echo "For better performance, consider including the TQt visibility supporting patch"
25 25
   echo "located at:"
26 26
   echo ""
27 27
   echo "http://bugs.kde.org/show_bug.cgi?id=109386"
28 28
   echo ""
29
-  echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
29
+  echo "and recompile all of TQt and KDE. Note, this is entirely optional and"
30 30
   echo "everything will continue to work just fine without it."
31 31
   echo ""
32 32
 fi

+ 1
- 1
configure.in.min View File

@@ -55,5 +55,5 @@ dnl for NLS support. Call them in this order!
55 55
 dnl WITH_NLS is for the po files
56 56
 AM_KDE_WITH_NLS
57 57
 
58
-dnl KDE_USE_QT
58
+dnl KDE_USE_TQT
59 59
 AC_PATH_KDE

+ 4
- 4
cvs.sh View File

@@ -225,7 +225,7 @@ touch stamp-h.in
225 225
 configure_in()
226 226
 {
227 227
 rm -f configure.in configure.in.new
228
-kde_use_qt_param=
228
+kde_use_tqt_param=
229 229
 test -f configure.files || { echo "need configure.files for configure.in"; exit 1; }
230 230
 list=`fgrep -v "configure.in.bot" < configure.files | fgrep -v "configure.in.mid"`
231 231
 : > configure.in.new
@@ -291,7 +291,7 @@ echo "AC_OUTPUT" >> configure.in.new
291 291
 modulename=
292 292
 if test -f configure.in.in; then
293 293
    if head -n 2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
294
-      kde_use_qt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
294
+      kde_use_tqt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
295 295
    fi
296 296
    if head -n 2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
297 297
       line=`grep "^AM_INIT_AUTOMAKE(" configure.in.in`
@@ -313,8 +313,8 @@ if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
313 313
    modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"`   
314 314
 
315 315
 fi
316
-if test -n "$kde_use_qt_param"; then
317
-      sed -e "s#^dnl KDE_USE_QT#KDE_USE_QT($kde_use_qt_param)#" \
316
+if test -n "$kde_use_tqt_param"; then
317
+      sed -e "s#^dnl KDE_USE_TQT#KDE_USE_TQT($kde_use_tqt_param)#" \
318 318
       	configure.in.new > configure.in && mv configure.in configure.in.new
319 319
 fi
320 320
 sed -e "s#@MODULENAME@#$modulename#" configure.in.new |

+ 3
- 3
debianrules View File

@@ -12,7 +12,7 @@ $sysconfdir	=	"/etc";
12 12
 $kde_includedir	=	"$kde_prefix/include/tde";
13 13
 $infodir	=	"$kde_prefix/share/info";
14 14
 $mandir		=	"$kde_prefix/share/man";
15
-$qtdir		=	"/usr/share/tqt3";
15
+$tqtdir		=	"/usr/share/tqt3";
16 16
 
17 17
 $kde_cgidir	=	"$kde_prefix/lib/cgi-bin";
18 18
 $kde_confdir	=	"$sysconfdir/trinity";
@@ -31,13 +31,13 @@ if (@ARGV && $ARGV[0] eq 'echodirs') {
31 31
   print STDOUT "export kde_includedir=$kde_includedir\n";
32 32
   print STDOUT "export infodir=$infodir\n";
33 33
   print STDOUT "export mandir=$mandir\n";
34
-  print STDOUT "export qtdir=$qtdir\n";
34
+  print STDOUT "export tqtdir=$tqtdir\n";
35 35
 
36 36
   print STDOUT "export kde_cgidir=$kde_cgidir\n";
37 37
   print STDOUT "export kde_confdir=$kde_confdir\n";
38 38
   print STDOUT "export kde_htmldir=$kde_htmldir\n";
39 39
 
40
-  print STDOUT "configkde=$enable_debug --disable-rpath --prefix=\$(kde_prefix) --sysconfdir=\$(sysconfdir) --includedir=\$(kde_includedir) --infodir=\$(infodir) --mandir=\$(mandir) --with-qt-dir=\$(qtdir)\n";
40
+  print STDOUT "configkde=$enable_debug --disable-rpath --prefix=\$(kde_prefix) --sysconfdir=\$(sysconfdir) --includedir=\$(kde_includedir) --infodir=\$(infodir) --mandir=\$(mandir) --with-tqt-dir=\$(tqtdir)\n";
41 41
 
42 42
   exit
43 43
 }

+ 34
- 34
doxygen.sh View File

@@ -82,33 +82,33 @@ fi
82 82
 
83 83
 
84 84
 
85
-### Sanity check and guess QTDOCDIR.
86
-if test -z "$QTDOCDIR" ; then
87
-	if test -z "$QTDIR" ; then
88
-		for i in /usr/X11R6/share/doc/qt/html
85
+### Sanity check and guess TQTDOCDIR.
86
+if test -z "$TQTDOCDIR" ; then
87
+	if test -z "$TQTDIR" ; then
88
+		for i in /usr/X11R6/share/doc/tqt/html
89 89
 		do
90
-			QTDOCDIR="$i"
91
-			test -d "$QTDOCDIR" && break
90
+			TQTDOCDIR="$i"
91
+			test -d "$TQTDOCDIR" && break
92 92
 		done
93 93
 	else
94
-		for i in share/doc/qt/html doc/html
94
+		for i in share/doc/tqt/html doc/html
95 95
 		do
96
-			QTDOCDIR="$QTDIR/$i"
97
-			test -d "$QTDOCDIR" && break
96
+			TQTDOCDIR="$TQTDIR/$i"
97
+			test -d "$TQTDOCDIR" && break
98 98
 		done
99 99
 	fi
100 100
 fi
101
-if test -z "$QTDOCDIR"  || test ! -d "$QTDOCDIR" ; then
102
-	if test -z "$QTDOCDIR" ; then
103
-		echo "* QTDOCDIR could not be guessed."
101
+if test -z "$TQTDOCDIR"  || test ! -d "$TQTDOCDIR" ; then
102
+	if test -z "$TQTDOCDIR" ; then
103
+		echo "* TQTDOCDIR could not be guessed."
104 104
 	else
105
-		echo "* QTDOCDIR does not name a directory."
105
+		echo "* TQTDOCDIR does not name a directory."
106 106
 	fi
107
-	if test -z "$QTDOCTAG" ; then
108
-		echo "* QTDOCDIR set to \"\""
109
-		QTDOCDIR=""
107
+	if test -z "$TQTDOCTAG" ; then
108
+		echo "* TQTDOCDIR set to \"\""
109
+		TQTDOCDIR=""
110 110
 	else
111
-		echo "* But I'll use $QTDOCDIR anyway because of QTDOCTAG."
111
+		echo "* But I'll use $TQTDOCDIR anyway because of TQTDOCTAG."
112 112
 	fi
113 113
 fi
114 114
 
@@ -562,7 +562,7 @@ apidox_subdir()
562 562
 	echo "TAGFILES = \\" >> "$subdir/Doxyfile"
563 563
 	## For now, don't support \ continued references lines
564 564
 	tags=`extract_line DOXYGEN_REFERENCES`
565
-	for i in $tags qt ; do
565
+	for i in $tags tqt ; do
566 566
 		tagsubdir=`dirname $i` ; tag=`basename $i`
567 567
 		tagpath=""
568 568
 		not_found=""
@@ -609,15 +609,15 @@ apidox_subdir()
609 609
 				fi
610 610
 			fi
611 611
 		fi
612
-		if test "$tag" = "qt" ; then
613
-			if test -z "$QTDOCDIR" ; then
612
+		if test "$tag" = "tqt" ; then
613
+			if test -z "$TQTDOCDIR" ; then
614 614
 				echo "  $file" >> "$subdir/Doxyfile"
615 615
 			else
616 616
 				if test -z "$file" ; then
617
-					# Really no Qt tags
617
+					# Really no TQt tags
618 618
 					echo "" >> "$subdir/Doxyfile"
619 619
 				else
620
-					echo "  $file=$QTDOCDIR" >> "$subdir/Doxyfile"
620
+					echo "  $file=$TQTDOCDIR" >> "$subdir/Doxyfile"
621 621
 				fi
622 622
 			fi
623 623
 		else
@@ -845,18 +845,18 @@ if test "x." = "x$top_builddir" ; then
845 845
 	create_installdox > installdox-slow
846 846
 	if test "x$recurse" = "x1" ; then
847 847
 		if test "x$module_name" = "xtdelibs" ; then
848
-			if test -z "$QTDOCTAG" && test -d "$QTDOCDIR" && \
849
-				test ! -f "qt/qt.tag" ; then
850
-				# Special case: create a qt tag file.
851
-				echo "*** Creating a tag file for the Qt library:"
852
-				mkdir qt
853
-				doxytag -t qt/qt.tag "$QTDOCDIR" > /dev/null 2>&1
848
+			if test -z "$TQTDOCTAG" && test -d "$TQTDOCDIR" && \
849
+				test ! -f "tqt/tqt.tag" ; then
850
+				# Special case: create a tqt tag file.
851
+				echo "*** Creating a tag file for the TQt library:"
852
+				mkdir tqt
853
+				doxytag -t tqt/tqt.tag "$TQTDOCDIR" > /dev/null 2>&1
854 854
 			fi
855 855
 		fi
856
-		if test -n "$QTDOCTAG" && test -r "$QTDOCTAG" ; then
857
-			echo "*** Copying tag file for the Qt library:"
858
-			mkdir qt
859
-			cp "$QTDOCTAG" qt/qt.tag
856
+		if test -n "$TQTDOCTAG" && test -r "$TQTDOCTAG" ; then
857
+			echo "*** Copying tag file for the TQt library:"
858
+			mkdir tqt
859
+			cp "$TQTDOCTAG" tqt/tqt.tag
860 860
 		fi
861 861
 
862 862
 		do_subdirs_re "."
@@ -875,8 +875,8 @@ fi
875 875
 if test "YES" = "$cleanup" ; then
876 876
 	rm -f subdirs.in  subdirs.later subdirs.sort subdirs.top Doxyfile.in
877 877
 	rm -f `find . -name Doxyfile`
878
-	rm -f qt/qt.tag
879
-	rmdir qt > /dev/null 2>&1
878
+	rm -f tqt/tqt.tag
879
+	rmdir tqt > /dev/null 2>&1
880 880
 fi
881 881
 
882 882
 

Loading…
Cancel
Save