From 757f562a48ce1b9f35fbc54f094f3f1e9d92582e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 27 Sep 2018 17:59:53 +0900 Subject: [PATCH] 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 --- configure.in.in | 2 +- src/rtf2html/rtf2html.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.in.in b/configure.in.in index 406e664..3eb0c23 100644 --- a/configure.in.in +++ b/configure.in.in @@ -27,7 +27,7 @@ AM_KDE_MIN_VERSION(3,3,1) dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__ dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__ -dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS -DQT_NO_ASCII_CAST -DQT_NO_TRANSLATION" dnl __tdevelop[exc]__ +dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS -DTQT_NO_ASCII_CAST -DTQT_NO_TRANSLATION" dnl __tdevelop[exc]__ dnl KDE_NEED_FLEX dnl __tdevelop__ dnl AC_PROG_YACC dnl __tdevelop__ diff --git a/src/rtf2html/rtf2html.cpp b/src/rtf2html/rtf2html.cpp index eec9caa..6940608 100644 --- a/src/rtf2html/rtf2html.cpp +++ b/src/rtf2html/rtf2html.cpp @@ -15,9 +15,9 @@ ***************************************************************************/ // force to use QT with STL -#if defined(QT_NO_STL) -# define DISABLE_QT_NO_STL -# undef QT_NO_STL +#if defined(TQT_NO_STL) +# define DISABLE_TQT_NO_STL +# undef TQT_NO_STL #endif #include "rtf2html.h" @@ -535,8 +535,8 @@ TQString RTF2HTML::toHTML() const { return html; } -// restore QT_NO_STL -#if defined(DISABLE_QT_NO_STL) -# undef DISABLE_QT_NO_STL -# define QT_NO_STL +// restore TQT_NO_STL +#if defined(DISABLE_TQT_NO_STL) +# undef DISABLE_TQT_NO_STL +# define TQT_NO_STL #endif