From 67bc284c98c2f3daf98cec39bedbcf9ecde751e8 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 17 Oct 2018 19:46:41 +0900 Subject: [PATCH] QT_NO_* -> TQT_NO_* renaming. Signed-off-by: Michele Calgaro --- examples/stylewindow/Makefile | 2 +- examples/tqt3reference/Makefile | 4 ++-- examples/unstyledwindow/Makefile | 2 +- lib/tdeqt4painter.cpp | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/stylewindow/Makefile b/examples/stylewindow/Makefile index a9dd2db..61126ff 100644 --- a/examples/stylewindow/Makefile +++ b/examples/stylewindow/Makefile @@ -10,7 +10,7 @@ CC = gcc CXX = g++ -DEFINES = -DQT_WEBKIT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED +DEFINES = -DQT_WEBKIT -DTQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. diff --git a/examples/tqt3reference/Makefile b/examples/tqt3reference/Makefile index e1e5369..eacb396 100644 --- a/examples/tqt3reference/Makefile +++ b/examples/tqt3reference/Makefile @@ -12,8 +12,8 @@ CC = gcc CXX = g++ LEX = flex YACC = yacc -CFLAGS = -pipe -g -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DTQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -CXXFLAGS = -pipe -g -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DTQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT +CFLAGS = -pipe -g -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -O2 -D_REENTRANT -DTQT_NO_DEBUG -DTQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT +CXXFLAGS = -pipe -g -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -O2 -D_REENTRANT -DTQT_NO_DEBUG -DTQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT LEXFLAGS = YACCFLAGS= -d INCPATH = -I/usr/share/tqt3/mkspecs/default -I. -I/usr/include/tqt3 -I/usr/include/tqt -I/opt/trinity/include -I/usr/include/tqt3 diff --git a/examples/unstyledwindow/Makefile b/examples/unstyledwindow/Makefile index e9d5f39..54ffd33 100644 --- a/examples/unstyledwindow/Makefile +++ b/examples/unstyledwindow/Makefile @@ -10,7 +10,7 @@ CC = gcc CXX = g++ -DEFINES = -DQT_WEBKIT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED +DEFINES = -DQT_WEBKIT -DTQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. diff --git a/lib/tdeqt4painter.cpp b/lib/tdeqt4painter.cpp index 45f6f73..0d0410b 100644 --- a/lib/tdeqt4painter.cpp +++ b/lib/tdeqt4painter.cpp @@ -669,19 +669,19 @@ bool TDEQt4PaintDevice::cmd( int c, TQPainter *pt, TQPDevCmdParam *p ) break; case PdcSetVXform: s >> i_8; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS painter->setViewXForm( i_8 ); #endif break; case PdcSetWindow: s >> r; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS painter->setWindow( r ); #endif break; case PdcSetViewport: s >> r; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS painter->setViewport( r ); #endif break; @@ -693,7 +693,7 @@ bool TDEQt4PaintDevice::cmd( int c, TQPainter *pt, TQPDevCmdParam *p ) m_qt4painter->setWorldMatrix( qt4matrix, p[1].ival ); break; #if 0 -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS case PdcSaveWMatrix: painter->saveWorldMatrix(); break;