From 6658576e27c5fb66f4732a216be5b4f3771c6f36 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 27 Sep 2018 17:59:08 +0900 Subject: qt -> tqt conversion: QT_NO_ASCII_CAST -> TQT_NO_ASCII_CAST QT_NO_STL -> TQT_NO_STL QT_NO_COMPAT -> TQT_NO_COMPAT QT_NO_TRANSLATION -> TQT_NO_TRANSLATION Signed-off-by: Michele Calgaro --- doc/scripts/man-fixincludes.1.docbook | 2 +- kmtrace/Makefile.am | 2 +- scripts/fixkdeincludes | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/scripts/man-fixincludes.1.docbook b/doc/scripts/man-fixincludes.1.docbook index a4850ddc..a773cf7a 100644 --- a/doc/scripts/man-fixincludes.1.docbook +++ b/doc/scripts/man-fixincludes.1.docbook @@ -62,7 +62,7 @@ problems will simply be written to standard output. command-line. If no files are given, all C++ sources in or beneath the current directory will be examined (with the exception of directories whose Makefile.am contains - or + or ) This utility is part of the KDE Software Development Kit. diff --git a/kmtrace/Makefile.am b/kmtrace/Makefile.am index 99b8feb0..b83403dc 100644 --- a/kmtrace/Makefile.am +++ b/kmtrace/Makefile.am @@ -17,7 +17,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -AM_CPPFLAGS = -DQT_NO_ASCII_CAST -UQT_NO_COMPAT -O3 +AM_CPPFLAGS = -DTQT_NO_ASCII_CAST -UTQT_NO_COMPAT -O3 LDADD = $(LIB_TDECORE) -liberty INCLUDES = $(all_includes) diff --git a/scripts/fixkdeincludes b/scripts/fixkdeincludes index 4d4b7d56..c66d915d 100644 --- a/scripts/fixkdeincludes +++ b/scripts/fixkdeincludes @@ -736,7 +736,7 @@ foreach $dir(@dirlist) { # check if this directory wants not to be fixed if(open(M, "$dir/Makefile.am")) { - my @mcontents = grep /(\-UQT_NO_COMPAT|\-UKDE_NO_COMPAT)/, ; + my @mcontents = grep /(\-UTQT_NO_COMPAT|\-UKDE_NO_COMPAT)/, ; close(M); if ( @mcontents ) { print "Skipping directory: $dir\n"; -- cgit v1.2.3