From 922475a92719192403269f15e7013db919880fd0 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Thu, 9 Apr 2026 21:49:01 +0300 Subject: q => tq rebranding: rename qt_* symbols in src/kernel (part 2/2) All the symbols are internal and shouldn't affect API/ABI. The rename was done with next script: grep -horE '\/t&/g'! > /tmp/qt-rename.sed find * -type f -exec sed -i -f /tmp/qt-rename.sed '{}' \+ With some minor manual adjustments. Signed-off-by: Alexander Golubev --- qmake/main.cpp | 4 +-- src/dialogs/tqfiledialog.cpp | 10 +++---- src/kernel/tqfont_x11.cpp | 26 +++++++++--------- src/kernel/tqfontdatabase.cpp | 6 ++-- src/kernel/tqfontdatabase_x11.cpp | 32 ++++++++++----------- src/kernel/tqfontengine_x11.cpp | 12 ++++---- src/kernel/tqimage.cpp | 18 ++++++------ src/kernel/tqjpegio.cpp | 32 ++++++++++----------- src/kernel/tqkeysequence.cpp | 6 ++-- src/kernel/tqmetaobject.cpp | 46 +++++++++++++++---------------- src/kernel/tqmime.cpp | 4 +-- src/kernel/tqobject.cpp | 46 +++++++++++++++---------------- src/kernel/tqpainter.cpp | 10 +++---- src/kernel/tqpainter_x11.cpp | 6 ++-- src/kernel/tqpalette.cpp | 6 ++-- src/kernel/tqpixmap_x11.cpp | 58 +++++++++++++++++++-------------------- src/kernel/tqpngio.cpp | 10 +++---- src/kernel/tqprinter_unix.cpp | 4 +-- src/kernel/tqprocess_unix.cpp | 6 ++-- src/kernel/tqpsprinter.cpp | 6 ++-- src/kernel/tqregion_x11.cpp | 4 +-- src/kernel/tqrichtext.cpp | 4 +-- src/kernel/tqscriptengine.cpp | 8 +++--- src/kernel/tqsimplerichtext.cpp | 6 ++-- src/kernel/tqsizegrip.cpp | 18 ++++++------ src/kernel/tqsound.cpp | 4 +-- src/kernel/tqsound_x11.cpp | 2 +- src/kernel/tqthread_unix.cpp | 14 +++++----- src/kernel/tqtranslator.cpp | 18 ++++++------ src/kernel/tqwidget.cpp | 26 +++++++++--------- src/kernel/tqwidget_x11.cpp | 24 ++++++++-------- src/kernel/tqwidgetcreate_x11.cpp | 6 ++-- src/kernel/tqwmatrix.cpp | 16 +++++------ src/tools/tqfile_unix.cpp | 4 +-- src/tools/tqglobal.cpp | 4 +-- src/tools/tqsettings.cpp | 4 +-- tools/assistant/mainwindow.ui.h | 4 +-- 37 files changed, 257 insertions(+), 257 deletions(-) diff --git a/qmake/main.cpp b/qmake/main.cpp index b8a307512..d8ba9ea2c 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -56,14 +56,14 @@ bool tqt_resolve_symlinks = false; #endif #if defined(TQ_WS_WIN) -extern TQ_EXPORT int qt_ntfs_permission_lookup; +extern TQ_EXPORT int tqt_ntfs_permission_lookup; #endif int main(int argc, char **argv) { #if defined(TQ_WS_WIN) // Workaround for TQFileInfo::isReadable() failing for certain users. See task: 54320 - qt_ntfs_permission_lookup = 0; + tqt_ntfs_permission_lookup = 0; #endif /* parse command line */ diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp index a706fd008..1257640c5 100644 --- a/src/dialogs/tqfiledialog.cpp +++ b/src/dialogs/tqfiledialog.cpp @@ -2453,7 +2453,7 @@ TQFileDialog::TQFileDialog( const TQString& dirName, const TQString & filter, #if defined(TQ_WS_WIN) -extern int qt_ntfs_permission_lookup; +extern int tqt_ntfs_permission_lookup; #endif /*! @@ -2481,7 +2481,7 @@ void TQFileDialog::init() d->mimeTypeTimer = new TQTimer( this ); d->cursorOverride = false; #if defined(TQ_WS_WIN) - d->oldPermissionLookup = qt_ntfs_permission_lookup; + d->oldPermissionLookup = tqt_ntfs_permission_lookup; #endif connect( d->mimeTypeTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doMimeTypeLookup() ) ); @@ -5795,7 +5795,7 @@ void TQFileDialog::urlStart( TQNetworkOperation *op ) return; #if defined(TQ_WS_WIN) - qt_ntfs_permission_lookup--; + tqt_ntfs_permission_lookup--; #endif if ( op->operation() == TQNetworkProtocol::OpListChildren ) { #ifndef TQT_NO_CURSOR @@ -5916,8 +5916,8 @@ void TQFileDialog::urlFinished( TQNetworkOperation *op ) } #if defined(TQ_WS_WIN) - if (d->oldPermissionLookup != qt_ntfs_permission_lookup) - qt_ntfs_permission_lookup++; + if (d->oldPermissionLookup != tqt_ntfs_permission_lookup) + tqt_ntfs_permission_lookup++; #endif } diff --git a/src/kernel/tqfont_x11.cpp b/src/kernel/tqfont_x11.cpp index e93f5a83a..86d3507bf 100644 --- a/src/kernel/tqfont_x11.cpp +++ b/src/kernel/tqfont_x11.cpp @@ -81,7 +81,7 @@ TQt::HANDLE tqt_xft_handle(const TQFont &font) } #endif -double qt_pixelSize(double pointSize, TQPaintDevice *paintdevice, int scr) +double tqt_pixelSize(double pointSize, TQPaintDevice *paintdevice, int scr) { if (pointSize < 0) return -1.; @@ -94,7 +94,7 @@ double qt_pixelSize(double pointSize, TQPaintDevice *paintdevice, int scr) return result; } -double qt_pointSize(double pixelSize, TQPaintDevice *paintdevice, int scr) +double tqt_pointSize(double pixelSize, TQPaintDevice *paintdevice, int scr) { if (pixelSize < 0) return -1.; @@ -111,7 +111,7 @@ static inline double pixelSize( const TQFontDef &request, TQPaintDevice *paintde int scr ) { return ((request.pointSize != -1) ? - qt_pixelSize(request.pointSize / 10., paintdevice, scr) : + tqt_pixelSize(request.pointSize / 10., paintdevice, scr) : (double)request.pixelSize); } @@ -119,7 +119,7 @@ static inline double pointSize( const TQFontDef &request, TQPaintDevice *paintde int scr ) { return ((request.pixelSize != -1) ? - qt_pointSize(request.pixelSize, paintdevice, scr) * 10.: + tqt_pointSize(request.pixelSize, paintdevice, scr) * 10.: (double)request.pointSize); } @@ -130,7 +130,7 @@ static inline double pointSize( const TQFontDef &request, TQPaintDevice *paintde Returns \a xlfd with all wildcards removed if a match for \a xlfd is found, otherwise it returns \a xlfd. */ -static TQCString qt_fixXLFD( const TQCString &xlfd ) +static TQCString tqt_fixXLFD( const TQCString &xlfd ) { TQCString ret = xlfd; int count = 0; @@ -144,17 +144,17 @@ static TQCString qt_fixXLFD( const TQCString &xlfd ) typedef TQMap FallbackMap; static FallbackMap *fallbackMap = 0; -static TQSingleCleanupHandler qt_fallback_font_family_cleanup; +static TQSingleCleanupHandler tqt_fallback_font_family_cleanup; static void ensure_fallback_map() { if ( fallbackMap ) return; fallbackMap = new FallbackMap; - qt_fallback_font_family_cleanup.set( &fallbackMap ); + tqt_fallback_font_family_cleanup.set( &fallbackMap ); } // Returns the user-configured fallback family for the specified script. -TQString qt_fallback_font_family( TQFont::Script script ) +TQString tqt_fallback_font_family( TQFont::Script script ) { TQString ret; @@ -169,7 +169,7 @@ TQString qt_fallback_font_family( TQFont::Script script ) } // Sets the fallback family for the specified script. -void qt_set_fallback_font_family( TQFont::Script script, const TQString &family ) +void tqt_set_fallback_font_family( TQFont::Script script, const TQString &family ) { ensure_fallback_map(); @@ -213,7 +213,7 @@ void TQFont::initialize() #endif // TQT_NO_BIG_CODECS #endif // TQT_NO_CODECS - extern int qt_encoding_id_for_mib( int mib ); // from tqfontdatabase_x11.cpp + extern int tqt_encoding_id_for_mib( int mib ); // from tqfontdatabase_x11.cpp TQTextCodec *codec = TQTextCodec::codecForLocale(); // determine the default encoding id using the locale, otherwise // fallback to latin1 ( mib == 4 ) @@ -256,7 +256,7 @@ void TQFont::initialize() } // get the default encoding id for the locale encoding... - TQFontPrivate::defaultEncodingID = qt_encoding_id_for_mib( mib ); + TQFontPrivate::defaultEncodingID = tqt_encoding_id_for_mib( mib ); // get some sample text based on the users locale. we use this to determine the // default script for the font system @@ -499,9 +499,9 @@ void TQFont::setRawName( const TQString &name ) detach(); // from tqfontdatabase_x11.cpp - extern bool qt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen ); + extern bool tqt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen ); - if ( ! qt_fillFontDef( qt_fixXLFD( name.latin1() ), &d->request, d->screen ) ) { + if ( ! tqt_fillFontDef( tqt_fixXLFD( name.latin1() ), &d->request, d->screen ) ) { #ifdef QT_CHECK_STATE tqWarning("TQFont::setRawName(): Invalid XLFD: \"%s\"", name.latin1()); #endif // QT_CHECK_STATE diff --git a/src/kernel/tqfontdatabase.cpp b/src/kernel/tqfontdatabase.cpp index 26a2c00c0..55a191583 100644 --- a/src/kernel/tqfontdatabase.cpp +++ b/src/kernel/tqfontdatabase.cpp @@ -1232,7 +1232,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, if ( fp ) { #if defined(TQ_WS_X11) fe->fontDef.pointSize = - tqRound(10. * qt_pointSize(fe->fontDef.pixelSize, fp->paintdevice, fp->screen)); + tqRound(10. * tqt_pointSize(fe->fontDef.pixelSize, fp->paintdevice, fp->screen)); #elif defined(TQ_WS_WIN) fe->fontDef.pointSize = int( double( fe->fontDef.pixelSize ) * 720.0 / GetDeviceCaps(shared_dc,LOGPIXELSY) ); @@ -1720,7 +1720,7 @@ TQValueList TQFontDatabase::pointSizes( const TQString &family, if (size->pixelSize != 0 && size->pixelSize != USHRT_MAX) { #ifdef TQ_WS_X11 - const uint pointSize = tqRound(qt_pointSize(size->pixelSize, 0, -1)); + const uint pointSize = tqRound(tqt_pointSize(size->pixelSize, 0, -1)); #else const uint pointSize = size->pixelSize; // embedded uses 72dpi #endif @@ -1821,7 +1821,7 @@ TQValueList TQFontDatabase::smoothSizes( const TQString &family, if ( size->pixelSize != 0 && size->pixelSize != USHRT_MAX ) { #ifdef TQ_WS_X11 - const uint pointSize = tqRound(qt_pointSize(size->pixelSize, 0, -1)); + const uint pointSize = tqRound(tqt_pointSize(size->pixelSize, 0, -1)); #else const uint pointSize = size->pixelSize; // embedded uses 72dpi #endif diff --git a/src/kernel/tqfontdatabase_x11.cpp b/src/kernel/tqfontdatabase_x11.cpp index b26842fc7..d84e5c495 100644 --- a/src/kernel/tqfontdatabase_x11.cpp +++ b/src/kernel/tqfontdatabase_x11.cpp @@ -65,8 +65,8 @@ #endif // TQFONTDATABASE_DEBUG // from tqfont_x11.cpp -extern double qt_pointSize(double pixelSize, TQPaintDevice *paintdevice, int screen); -extern double qt_pixelSize(double pointSize, TQPaintDevice *paintdevice, int screen); +extern double tqt_pointSize(double pixelSize, TQPaintDevice *paintdevice, int screen); +extern double tqt_pixelSize(double pointSize, TQPaintDevice *paintdevice, int screen); static inline void capitalize ( char *s ) @@ -442,7 +442,7 @@ static const char scripts_for_xlfd_encoding[37][61] = { const int numEncodings = sizeof( xlfd_encoding ) / sizeof( XlfdEncoding ) - 1; -int qt_xlfd_encoding_id( const char *encoding ) +int tqt_xlfd_encoding_id( const char *encoding ) { // tqDebug("looking for encoding id for '%s'", encoding ); int len = strlen( encoding ); @@ -486,14 +486,14 @@ int qt_xlfd_encoding_id( const char *encoding ) return -1; } -int qt_mib_for_xlfd_encoding( const char *encoding ) +int tqt_mib_for_xlfd_encoding( const char *encoding ) { - int id = qt_xlfd_encoding_id( encoding ); + int id = tqt_xlfd_encoding_id( encoding ); if ( id != -1 ) return xlfd_encoding[id].mib; return 0; } -int qt_encoding_id_for_mib( int mib ) +int tqt_encoding_id_for_mib( int mib ) { const XlfdEncoding *enc = xlfd_encoding; for ( ; enc->name; ++enc ) { @@ -596,7 +596,7 @@ static inline bool isFixedPitch( char **tokens ) Returns true if the the given xlfd is valid. The fields lbearing and rbearing are not given any values. */ -bool qt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen ) +bool tqt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen ) { char *tokens[NFontFields]; TQCString buffer = xlfd.copy(); @@ -632,10 +632,10 @@ bool qt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen ) if ( r && fd->pixelSize && TQPaintDevice::x11AppDpiY( screen ) && r != TQPaintDevice::x11AppDpiY( screen ) ) { // calculate actual pointsize for display DPI - fd->pointSize = tqRound(qt_pointSize(fd->pixelSize, 0, screen) * 10.); + fd->pointSize = tqRound(tqt_pointSize(fd->pixelSize, 0, screen) * 10.); } else if ( fd->pixelSize == 0 && fd->pointSize ) { // calculate pixel size from pointsize/dpi - fd->pixelSize = tqRound(qt_pixelSize(fd->pointSize / 10., 0, screen)); + fd->pixelSize = tqRound(tqt_pixelSize(fd->pointSize / 10., 0, screen)); } return true; @@ -649,7 +649,7 @@ bool qt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen ) the XFontStruct. The fields lbearing and rbearing are not given any values. */ -static bool qt_fillFontDef( XFontStruct *fs, TQFontDef *fd, int screen ) +static bool tqt_fillFontDef( XFontStruct *fs, TQFontDef *fd, int screen ) { unsigned long value; if ( fs && !XGetFontProperty( fs, XA_FONT, &value ) ) @@ -659,7 +659,7 @@ static bool qt_fillFontDef( XFontStruct *fs, TQFontDef *fd, int screen ) TQCString xlfd( n ); if ( n ) XFree( n ); - return qt_fillFontDef( xlfd.lower(), fd, screen ); + return tqt_fillFontDef( xlfd.lower(), fd, screen ); } @@ -738,7 +738,7 @@ static void loadXlfds( const char *reqFamily, int encoding_id ) // here, since we can pass -1 to this function to do full // database population *(tokens[CharsetEncoding]-1) = '-'; - int encoding_id = qt_xlfd_encoding_id( tokens[CharsetRegistry] ); + int encoding_id = tqt_xlfd_encoding_id( tokens[CharsetRegistry] ); if ( encoding_id == -1 ) continue; @@ -1306,8 +1306,8 @@ TQFontEngine *loadEngine( TQFont::Script script, return 0; TQFontEngine *fe = new TQFontEngineXLFD( xfs, xlfd.data(), 0 ); - if ( ! qt_fillFontDef( xfs, &fe->fontDef, TQPaintDevice::x11AppScreen() ) && - ! qt_fillFontDef( xlfd, &fe->fontDef, TQPaintDevice::x11AppScreen() ) ) + if ( ! tqt_fillFontDef( xfs, &fe->fontDef, TQPaintDevice::x11AppScreen() ) && + ! tqt_fillFontDef( xlfd, &fe->fontDef, TQPaintDevice::x11AppScreen() ) ) fe->fontDef = TQFontDef(); return fe; @@ -1551,8 +1551,8 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef // these should only get added to the pattern _after_ substitution // append the default fallback font for the specified script - extern TQString qt_fallback_font_family( TQFont::Script ); - TQString fallback = qt_fallback_font_family( script ); + extern TQString tqt_fallback_font_family( TQFont::Script ); + TQString fallback = tqt_fallback_font_family( script ); if ( ! fallback.isEmpty() && ! family_list.contains( fallback ) ) { TQCString cs = fallback.utf8(); value.u.s = (const FcChar8 *)cs.data(); diff --git a/src/kernel/tqfontengine_x11.cpp b/src/kernel/tqfontengine_x11.cpp index 95a4b6431..3d264742d 100644 --- a/src/kernel/tqfontengine_x11.cpp +++ b/src/kernel/tqfontengine_x11.cpp @@ -61,8 +61,8 @@ #include // defined in tqfontdatbase_x11.cpp -extern int qt_mib_for_xlfd_encoding( const char *encoding ); -extern int qt_xlfd_encoding_id( const char *encoding ); +extern int tqt_mib_for_xlfd_encoding( const char *encoding ); +extern int tqt_xlfd_encoding_id( const char *encoding ); extern void tqt_draw_transformed_rect( TQPainter *p, int x, int y, int w, int h, bool fill ); @@ -1028,7 +1028,7 @@ void TQFontEngineLatinXLFD::findEngine( const TQChar &ch ) int which = -1; int i; for ( i = 0; i < mib_count; ++i ) { - const int mib = qt_mib_for_xlfd_encoding( alternate_encodings[i] ); + const int mib = tqt_mib_for_xlfd_encoding( alternate_encodings[i] ); bool skip = false; for ( int e = 0; e < _count; ++e ) { if ( _engines[e]->cmap() == mib ) { @@ -1048,7 +1048,7 @@ void TQFontEngineLatinXLFD::findEngine( const TQChar &ch ) if ( ! codec || which == -1 ) return; - const int enc_id = qt_xlfd_encoding_id( alternate_encodings[which] ); + const int enc_id = tqt_xlfd_encoding_id( alternate_encodings[which] ); TQFontDef req = fontDef; TQFontEngine *engine = TQFontDatabase::findFont( TQFont::Latin, 0, req, enc_id ); if ( ! engine ) { @@ -2379,7 +2379,7 @@ static void dump_string(OTL_Buffer buffer) } #endif -extern void qt_heuristicPosition(TQShaperItem *item); +extern void tqt_heuristicPosition(TQShaperItem *item); bool TQOpenType::shape(TQShaperItem *item, const unsigned int *properties) { @@ -2521,7 +2521,7 @@ bool TQOpenType::positionAndAdd(TQShaperItem *item, int availableGlyphs, bool do } item->has_positioning = true; } else { - qt_heuristicPosition(item); + tqt_heuristicPosition(item); } #ifdef OT_DEBUG diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp index b05aa9f9e..9435b6909 100644 --- a/src/kernel/tqimage.cpp +++ b/src/kernel/tqimage.cpp @@ -316,7 +316,7 @@ static const uchar bitflip[256] = { 15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255 }; -const uchar *qt_get_bitflip_array() // called from TQPixmap code +const uchar *tqt_get_bitflip_array() // called from TQPixmap code { return bitflip; } @@ -2011,7 +2011,7 @@ static bool convert_16_to_32( const TQImage *src, TQImage *dst ) ushort *s = (ushort*)src->scanLine(y); uint *end = p + dst->width(); while ( p < end ) - *p++ = qt_conv16ToRgb( *s++ ); + *p++ = tqt_conv16ToRgb( *s++ ); } return true; } @@ -2027,7 +2027,7 @@ static bool convert_32_to_16( const TQImage *src, TQImage *dst ) uint *s = (uint*)src->scanLine(y); ushort *end = p + dst->width(); while ( p < end ) - *p++ = qt_convRgbTo16( *s++ ); + *p++ = tqt_convRgbTo16( *s++ ); } return true; } @@ -2187,7 +2187,7 @@ TQRgb TQImage::pixel( int x, int y ) const return color( (int)s[x] ); #ifndef TQT_NO_IMAGE_16_BIT case 16: - return qt_conv16ToRgb(((ushort*)s)[x]); + return tqt_conv16ToRgb(((ushort*)s)[x]); #endif #ifndef TQT_NO_IMAGE_TRUECOLOR case 32: @@ -2251,7 +2251,7 @@ void TQImage::setPixel( int x, int y, uint index_or_rgb ) #ifndef TQT_NO_IMAGE_16_BIT } else if ( depth() == 16 ) { ushort * s = (ushort*)scanLine( y ); - s[x] = qt_convRgbTo16(index_or_rgb); + s[x] = tqt_convRgbTo16(index_or_rgb); #endif #ifndef TQT_NO_IMAGE_TRUECOLOR } else if ( depth() == 32 ) { @@ -4854,7 +4854,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image ) return true; } -bool qt_read_dib( TQDataStream& s, TQImage& image ) +bool tqt_read_dib( TQDataStream& s, TQImage& image ) { return read_dib(s,-1,-BMP_FILEHDR_SIZE,image); } @@ -4880,7 +4880,7 @@ static void read_bmp_image( TQImageIO *iio ) } } -bool qt_write_dib( TQDataStream& s, TQImage image ) +bool tqt_write_dib( TQDataStream& s, TQImage image ) { int nbits; int bpl_bmp; @@ -4986,7 +4986,7 @@ static void write_bmp_image( TQImageIO *iio ) int bpl_bmp; int bpl = image.bytesPerLine(); - // Code partially repeated in qt_write_dib + // Code partially repeated in tqt_write_dib if ( image.depth() == 8 && image.numColors() <= 16 ) { bpl_bmp = (((bpl+1)/2+3)/4)*4; } else if ( image.depth() == 32 ) { @@ -5003,7 +5003,7 @@ static void write_bmp_image( TQImageIO *iio ) bf.bfSize = bf.bfOffBits + bpl_bmp*image.height(); s << bf; // write file header - if ( !qt_write_dib( s, image ) ) + if ( !tqt_write_dib( s, image ) ) iio->setStatus( 1 ); } diff --git a/src/kernel/tqjpegio.cpp b/src/kernel/tqjpegio.cpp index ec7b892ab..9e467e1bb 100644 --- a/src/kernel/tqjpegio.cpp +++ b/src/kernel/tqjpegio.cpp @@ -106,7 +106,7 @@ void tqt_init_source(j_decompress_ptr) } static -boolean qt_fill_input_buffer(j_decompress_ptr cinfo) +boolean tqt_fill_input_buffer(j_decompress_ptr cinfo) { int num_read; my_jpeg_source_mgr* src = (my_jpeg_source_mgr*)cinfo->src; @@ -129,7 +129,7 @@ boolean qt_fill_input_buffer(j_decompress_ptr cinfo) } static -void qt_skip_input_data(j_decompress_ptr cinfo, long num_bytes) +void tqt_skip_input_data(j_decompress_ptr cinfo, long num_bytes) { my_jpeg_source_mgr* src = (my_jpeg_source_mgr*)cinfo->src; @@ -142,8 +142,8 @@ void qt_skip_input_data(j_decompress_ptr cinfo, long num_bytes) if (num_bytes > 0) { while (num_bytes > (long) src->bytes_in_buffer) { num_bytes -= (long) src->bytes_in_buffer; - (void) qt_fill_input_buffer(cinfo); - /* note we assume that qt_fill_input_buffer will never return false, + (void) tqt_fill_input_buffer(cinfo); + /* note we assume that tqt_fill_input_buffer will never return false, * so suspension need not be handled. */ } @@ -153,7 +153,7 @@ void qt_skip_input_data(j_decompress_ptr cinfo, long num_bytes) } static -void qt_term_source(j_decompress_ptr) +void tqt_term_source(j_decompress_ptr) { } @@ -165,10 +165,10 @@ void qt_term_source(j_decompress_ptr) inline my_jpeg_source_mgr::my_jpeg_source_mgr(TQImageIO* iioptr) { jpeg_source_mgr::init_source = tqt_init_source; - jpeg_source_mgr::fill_input_buffer = qt_fill_input_buffer; - jpeg_source_mgr::skip_input_data = qt_skip_input_data; + jpeg_source_mgr::fill_input_buffer = tqt_fill_input_buffer; + jpeg_source_mgr::skip_input_data = tqt_skip_input_data; jpeg_source_mgr::resync_to_restart = jpeg_resync_to_restart; - jpeg_source_mgr::term_source = qt_term_source; + jpeg_source_mgr::term_source = tqt_term_source; iio = iioptr; bytes_in_buffer = 0; next_input_byte = buffer; @@ -377,7 +377,7 @@ void tqt_init_destination(j_compress_ptr) } static -void qt_exit_on_error(j_compress_ptr cinfo, TQIODevice* dev) +void tqt_exit_on_error(j_compress_ptr cinfo, TQIODevice* dev) { if (dev->status() == IO_Ok) { return; @@ -388,13 +388,13 @@ void qt_exit_on_error(j_compress_ptr cinfo, TQIODevice* dev) } static -boolean qt_empty_output_buffer(j_compress_ptr cinfo) +boolean tqt_empty_output_buffer(j_compress_ptr cinfo) { my_jpeg_destination_mgr* dest = (my_jpeg_destination_mgr*)cinfo->dest; TQIODevice* dev = dest->iio->ioDevice(); if ( dev->writeBlock( (char*)dest->buffer, max_buf ) != max_buf ) - qt_exit_on_error(cinfo, dev); + tqt_exit_on_error(cinfo, dev); dest->next_output_byte = dest->buffer; dest->free_in_buffer = max_buf; @@ -407,18 +407,18 @@ boolean qt_empty_output_buffer(j_compress_ptr cinfo) } static -void qt_term_destination(j_compress_ptr cinfo) +void tqt_term_destination(j_compress_ptr cinfo) { my_jpeg_destination_mgr* dest = (my_jpeg_destination_mgr*)cinfo->dest; TQIODevice* dev = dest->iio->ioDevice(); TQ_LONG n = max_buf - dest->free_in_buffer; if ( dev->writeBlock( (char*)dest->buffer, n ) != n ) - qt_exit_on_error(cinfo, dev); + tqt_exit_on_error(cinfo, dev); dev->flush(); - qt_exit_on_error(cinfo, dev); + tqt_exit_on_error(cinfo, dev); } #if defined(Q_C_CALLBACKS) @@ -430,8 +430,8 @@ inline my_jpeg_destination_mgr::my_jpeg_destination_mgr(TQImageIO* iioptr) { jpeg_destination_mgr::init_destination = tqt_init_destination; - jpeg_destination_mgr::empty_output_buffer = qt_empty_output_buffer; - jpeg_destination_mgr::term_destination = qt_term_destination; + jpeg_destination_mgr::empty_output_buffer = tqt_empty_output_buffer; + jpeg_destination_mgr::term_destination = tqt_term_destination; iio = iioptr; next_output_byte = buffer; free_in_buffer = max_buf; diff --git a/src/kernel/tqkeysequence.cpp b/src/kernel/tqkeysequence.cpp index 007bf83be..2dead6397 100644 --- a/src/kernel/tqkeysequence.cpp +++ b/src/kernel/tqkeysequence.cpp @@ -387,8 +387,8 @@ int TQKeySequence::assign( TQString keyseq ) struct ModifKeyName { ModifKeyName() { } - ModifKeyName(int q, TQString n) : qt_key(q), name(n) { } - int qt_key; + ModifKeyName(int q, TQString n) : tqt_key(q), name(n) { } + int tqt_key; TQString name; }; @@ -420,7 +420,7 @@ int TQKeySequence::decodeString( const TQString& str ) TQString sl = accel.lower(); for( TQValueList::iterator it = modifs.begin(); it != modifs.end(); ++it ) { if ( sl.contains( (*it).name ) ) { - ret |= (*it).qt_key; + ret |= (*it).tqt_key; #ifndef TQT_NO_REGEXP accel.remove( TQRegExp(TQRegExp::escape((*it).name), false) ); #else diff --git a/src/kernel/tqmetaobject.cpp b/src/kernel/tqmetaobject.cpp index d2119851c..0999d66db 100644 --- a/src/kernel/tqmetaobject.cpp +++ b/src/kernel/tqmetaobject.cpp @@ -135,8 +135,8 @@ enum Flags { StoredOverride = 0x00020000 }; -static TQAsciiDict *qt_metaobjects = 0; -static int qt_metaobjects_count = 0; +static TQAsciiDict *tqt_metaobjects = 0; +static int tqt_metaobjects_count = 0; class TQMetaObjectPrivate { @@ -280,13 +280,13 @@ TQMetaObject::~TQMetaObject() delete d; #ifdef TQT_THREAD_SUPPORT TQMutexLocker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + tqt_global_mutexpool->get( &tqt_metaobjects ) : 0 ); #endif // TQT_THREAD_SUPPORT - if ( qt_metaobjects ) { - qt_metaobjects->remove( classname ); - if ( qt_metaobjects->isEmpty() ) { - delete qt_metaobjects; - qt_metaobjects = 0; + if ( tqt_metaobjects ) { + tqt_metaobjects->remove( classname ); + if ( tqt_metaobjects->isEmpty() ) { + delete tqt_metaobjects; + tqt_metaobjects = 0; } } @@ -793,13 +793,13 @@ bool TQMetaObject::inherits( const char* clname ) const TQMetaObject *TQMetaObject::metaObject( const char *class_name ) { - if ( !qt_metaobjects ) + if ( !tqt_metaobjects ) return 0; #ifdef TQT_THREAD_SUPPORT TQMutexLocker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + tqt_global_mutexpool->get( &tqt_metaobjects ) : 0 ); #endif // TQT_THREAD_SUPPORT - TQtStaticMetaObjectFunction func = (TQtStaticMetaObjectFunction)qt_metaobjects->find( class_name ); + TQtStaticMetaObjectFunction func = (TQtStaticMetaObjectFunction)tqt_metaobjects->find( class_name ); if ( func ) return func(); return 0; @@ -808,13 +808,13 @@ TQMetaObject *TQMetaObject::metaObject( const char *class_name ) /*! \internal */ bool TQMetaObject::hasMetaObject( const char *class_name ) { - if ( !qt_metaobjects ) + if ( !tqt_metaobjects ) return false; #ifdef TQT_THREAD_SUPPORT TQMutexLocker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + tqt_global_mutexpool->get( &tqt_metaobjects ) : 0 ); #endif // TQT_THREAD_SUPPORT - return !!qt_metaobjects->find( class_name ); + return !!tqt_metaobjects->find( class_name ); } #ifndef TQT_NO_PROPERTIES @@ -1202,13 +1202,13 @@ TQMetaObjectCleanUp::TQMetaObjectCleanUp( const char *mo_name, TQtStaticMetaObje { #ifdef TQT_THREAD_SUPPORT TQMutexLocker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + tqt_global_mutexpool->get( &tqt_metaobjects ) : 0 ); #endif // TQT_THREAD_SUPPORT - if ( !qt_metaobjects ) - qt_metaobjects = new TQAsciiDict( 257 ); - qt_metaobjects->insert( mo_name, (void*)func ); + if ( !tqt_metaobjects ) + tqt_metaobjects = new TQAsciiDict( 257 ); + tqt_metaobjects->insert( mo_name, (void*)func ); - qt_metaobjects_count++; + tqt_metaobjects_count++; } TQMetaObjectCleanUp::TQMetaObjectCleanUp() @@ -1224,11 +1224,11 @@ TQMetaObjectCleanUp::~TQMetaObjectCleanUp() { #ifdef TQT_THREAD_SUPPORT TQMutexLocker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + tqt_global_mutexpool->get( &tqt_metaobjects ) : 0 ); #endif // TQT_THREAD_SUPPORT - if ( !--qt_metaobjects_count ) { - delete qt_metaobjects; - qt_metaobjects = 0; + if ( !--tqt_metaobjects_count ) { + delete tqt_metaobjects; + tqt_metaobjects = 0; } if ( metaObject ) { delete *metaObject; diff --git a/src/kernel/tqmime.cpp b/src/kernel/tqmime.cpp index 4468082c1..fab43440f 100644 --- a/src/kernel/tqmime.cpp +++ b/src/kernel/tqmime.cpp @@ -64,7 +64,7 @@ IANA list of MIME media types\endlink */ -static int qt_mime_serial_number = 0; +static int tqt_mime_serial_number = 0; static TQMimeSourceFactory* defaultfactory = 0; static TQSingleCleanupHandler tqmime_cleanup_factory; @@ -77,7 +77,7 @@ static TQSingleCleanupHandler tqmime_cleanup_factory; TQMimeSource::TQMimeSource() { - ser_no = qt_mime_serial_number++; + ser_no = tqt_mime_serial_number++; cacheType = NoCache; } diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp index 86c76c4ee..58c3e1af7 100644 --- a/src/kernel/tqobject.cpp +++ b/src/kernel/tqobject.cpp @@ -421,7 +421,7 @@ static inline bool isSpace( char x ) return isspace( (uchar) x ); } -static TQCString qt_rmWS( const char *s ) +static TQCString tqt_rmWS( const char *s ) { TQCString result( tqstrlen(s)+1 ); char *d = result.data(); @@ -520,9 +520,9 @@ TQThread* TQObject::contextThreadObject() const Preliminary signal spy */ TQ_EXPORT TQObject* tqt_preliminary_signal_spy = 0; -static TQObject* qt_spy_signal_sender = 0; +static TQObject* tqt_spy_signal_sender = 0; -static void qt_spy_signal( TQObject* sender, int signal, TQUObject* o ) +static void tqt_spy_signal( TQObject* sender, int signal, TQUObject* o ) { TQMetaObject* mo = sender->metaObject(); while ( mo && signal - mo->signalOffset() < 0 ) @@ -539,16 +539,16 @@ static void qt_spy_signal( TQObject* sender, int signal, TQUObject* o ) int slot = tqt_preliminary_signal_spy->metaObject()->findSlot( s, true ); if ( slot >= 0 ) { #ifdef TQT_THREAD_SUPPORT - // protect access to qt_spy_signal_sender - void * const address = &qt_spy_signal_sender; + // protect access to tqt_spy_signal_sender + void * const address = &tqt_spy_signal_sender; TQMutexLocker locker( tqt_global_mutexpool ? tqt_global_mutexpool->get( address ) : 0 ); #endif // TQT_THREAD_SUPPORT - TQObject* old_sender = qt_spy_signal_sender; - qt_spy_signal_sender = sender; + TQObject* old_sender = tqt_spy_signal_sender; + tqt_spy_signal_sender = sender; tqt_preliminary_signal_spy->tqt_invoke( slot, o ); - qt_spy_signal_sender = old_sender; + tqt_spy_signal_sender = old_sender; break; } mo = mo->superClass(); @@ -1598,7 +1598,7 @@ TQConnectionList *TQObject::receivers( const char* signal ) const { if ( connections && signal ) { if ( *signal == '2' ) { // tag == 2, i.e. signal - TQCString s = qt_rmWS( signal+1 ); + TQCString s = tqt_rmWS( signal+1 ); return receivers( metaObject()->findSignal( (const char*)s, true ) ); } else { return receivers( metaObject()->findSignal(signal, true ) ); @@ -1936,12 +1936,12 @@ const TQObject *TQObject::sender() #ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY if ( this == tqt_preliminary_signal_spy ) { # ifdef TQT_THREAD_SUPPORT - // protect access to qt_spy_signal_sender - void * const address = &qt_spy_signal_sender; + // protect access to tqt_spy_signal_sender + void * const address = &tqt_spy_signal_sender; TQMutexLocker locker( tqt_global_mutexpool ? tqt_global_mutexpool->get( address ) : 0 ); # endif // TQT_THREAD_SUPPORT - return qt_spy_signal_sender; + return tqt_spy_signal_sender; } #endif if ( senderObjects && @@ -2042,7 +2042,7 @@ TQCString TQObject::normalizeSignalSlot( const char *signalSlot ) { if ( !signalSlot ) return TQCString(); - return qt_rmWS( signalSlot ); + return tqt_rmWS( signalSlot ); } @@ -2149,7 +2149,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, int signal_index = smeta->findSignal( signal, true ); if ( signal_index < 0 ) { // normalize and retry - nw_signal = qt_rmWS( signal-1 ); // remove whitespace + nw_signal = tqt_rmWS( signal-1 ); // remove whitespace signal = nw_signal.data()+1; // skip member type code signal_index = smeta->findSignal( signal, true ); } @@ -2183,7 +2183,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, case TQ_SLOT_CODE: member_index = rmeta->findSlot( member, true ); if ( member_index < 0 ) { // normalize and retry - nw_member = qt_rmWS(member); // remove whitespace + nw_member = tqt_rmWS(member); // remove whitespace member = nw_member; member_index = rmeta->findSlot( member, true ); } @@ -2191,7 +2191,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, case TQ_SIGNAL_CODE: member_index = rmeta->findSignal( member, true ); if ( member_index < 0 ) { // normalize and retry - nw_member = qt_rmWS(member); // remove whitespace + nw_member = tqt_rmWS(member); // remove whitespace member = nw_member; member_index = rmeta->findSignal( member, true ); } @@ -2280,7 +2280,7 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const break; } - TQConnection *c = new TQConnection( r, member_index, rm ? rm->name : "qt_invoke", membcode ); + TQConnection *c = new TQConnection( r, member_index, rm ? rm->name : "tqt_invoke", membcode ); TQ_CHECK_PTR( c ); clist->append( c ); if ( !r->senderObjects ) { // create list of senders @@ -2411,7 +2411,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, case TQ_SLOT_CODE: member_index = rmeta->findSlot( member, true ); if ( member_index < 0 ) { // normalize and retry - nw_member = qt_rmWS(member); // remove whitespace + nw_member = tqt_rmWS(member); // remove whitespace member = nw_member; member_index = rmeta->findSlot( member, true ); } @@ -2419,7 +2419,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, case TQ_SIGNAL_CODE: member_index = rmeta->findSignal( member, true ); if ( member_index < 0 ) { // normalize and retry - nw_member = qt_rmWS(member); // remove whitespace + nw_member = tqt_rmWS(member); // remove whitespace member = nw_member; member_index = rmeta->findSignal( member, true ); } @@ -2453,7 +2453,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, return false; int signal_index = smeta->findSignal( signal, true ); if ( signal_index < 0 ) { // normalize and retry - nw_signal = qt_rmWS( signal-1 ); // remove whitespace + nw_signal = tqt_rmWS( signal-1 ); // remove whitespace signal = nw_signal.data()+1; // skip member type code signal_index = smeta->findSignal( signal, true ); } @@ -2761,7 +2761,7 @@ void TQObject::activate_signal( int signal ) ( !connections || !connections->at( signal ) ) ) { TQUObject o[1]; o[0].isLastObject = true; - qt_spy_signal( this, signal, o ); + tqt_spy_signal( this, signal, o ); return; } } @@ -2789,7 +2789,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) #ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY if ( tqt_preliminary_signal_spy ) { - qt_spy_signal( this, connections->findRef( clist), o ); + tqt_spy_signal( this, connections->findRef( clist), o ); } #endif @@ -2980,7 +2980,7 @@ void TQObject::FNAME( int signal, TYPE param ) \ TQUObject o[2]; \ o[1].isLastObject = true; \ static_QUType_##TYPE.set( o+1, param ); \ - qt_spy_signal( this, signal, o ); \ + tqt_spy_signal( this, signal, o ); \ return; \ } \ } \ diff --git a/src/kernel/tqpainter.cpp b/src/kernel/tqpainter.cpp index e6bf1692a..d60225a5c 100644 --- a/src/kernel/tqpainter.cpp +++ b/src/kernel/tqpainter.cpp @@ -1672,7 +1672,7 @@ void TQPainter::resetXForm() #endif // TQT_NO_TRANSFORMATIONS -extern bool qt_old_transformations; +extern bool tqt_old_transformations; /*! \internal @@ -1682,7 +1682,7 @@ extern bool qt_old_transformations; void TQPainter::map( int x, int y, int *rx, int *ry ) const { #ifndef TQT_NO_TRANSFORMATIONS - if ( qt_old_transformations ) { + if ( tqt_old_transformations ) { switch ( txop ) { case TxNone: *rx = x; *ry = y; @@ -1741,7 +1741,7 @@ void TQPainter::map( int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh ) const { #ifndef TQT_NO_TRANSFORMATIONS - if ( qt_old_transformations ) { + if ( tqt_old_transformations ) { switch ( txop ) { case TxNone: *rx = x; *ry = y; @@ -1812,7 +1812,7 @@ void TQPainter::mapInv( int x, int y, int *rx, int *ry ) const if ( !txinv ) tqWarning( "TQPainter::mapInv: Internal error" ); #endif - if ( qt_old_transformations ) { + if ( tqt_old_transformations ) { double tx = im11()*x + im21()*y+idx(); double ty = im12()*x + im22()*y+idy(); *rx = tx >= 0 ? int(tx + 0.5) : int(tx - 0.5); @@ -1841,7 +1841,7 @@ void TQPainter::mapInv( int x, int y, int w, int h, if ( !txinv || txop == TxRotShear ) tqWarning( "TQPainter::mapInv: Internal error" ); #endif - if ( qt_old_transformations ) { + if ( tqt_old_transformations ) { double tx = im11()*x + idx(); double ty = im22()*y + idy(); double tw = im11()*w; diff --git a/src/kernel/tqpainter_x11.cpp b/src/kernel/tqpainter_x11.cpp index 4ccdf16ce..3ff19ff70 100644 --- a/src/kernel/tqpainter_x11.cpp +++ b/src/kernel/tqpainter_x11.cpp @@ -86,7 +86,7 @@ public: void clearWFlags( WFlags f ) { TQWidget::clearWFlags(f); } }; -void qt_erase_region( TQWidget* w, const TQRegion& region) +void tqt_erase_region( TQWidget* w, const TQRegion& region) { TQRegion reg = region; @@ -122,11 +122,11 @@ void qt_erase_region( TQWidget* w, const TQRegion& region) } } -void qt_erase_rect( TQWidget* w, const TQRect& r) +void tqt_erase_rect( TQWidget* w, const TQRect& r) { if ( TQPainter::redirect(w) || w == paintEventDevice || w->backgroundOrigin() != TQWidget::WidgetOrigin ) - qt_erase_region( w, r ); + tqt_erase_region( w, r ); else XClearArea( w->x11Display(), w->winId(), r.x(), r.y(), r.width(), r.height(), False ); diff --git a/src/kernel/tqpalette.cpp b/src/kernel/tqpalette.cpp index 7fc7dff8c..1e4dfab89 100644 --- a/src/kernel/tqpalette.cpp +++ b/src/kernel/tqpalette.cpp @@ -229,7 +229,7 @@ TQColorGroup& TQColorGroup::operator =(const TQColorGroup& other) return *this; } -static TQColor qt_mix_colors( TQColor a, TQColor b) +static TQColor tqt_mix_colors( TQColor a, TQColor b) { return TQColor( (a.red() + b.red()) / 2, (a.green() + b.green()) / 2, (a.blue() + b.blue()) / 2 ); } @@ -260,7 +260,7 @@ static TQColor qt_mix_colors( TQColor a, TQColor b) br[ButtonText] = text; br[Base] = base; br[Background] = background; - br[Midlight] = qt_mix_colors( br[Button].color(), br[Light].color() ); + br[Midlight] = tqt_mix_colors( br[Button].color(), br[Light].color() ); br[Shadow] = TQt::black; br[Highlight] = TQt::darkBlue; br[HighlightedText] = TQt::white; @@ -292,7 +292,7 @@ TQColorGroup::TQColorGroup( const TQColor &foreground, const TQColor &background br[ButtonText] = br[Text]; br[Base] = TQBrush(base); br[Background] = TQBrush(background); - br[Midlight] = qt_mix_colors( br[Button].color(), br[Light].color() ); + br[Midlight] = tqt_mix_colors( br[Button].color(), br[Light].color() ); br[Shadow] = TQt::black; br[Highlight] = TQt::darkBlue; br[HighlightedText] = TQt::white; diff --git a/src/kernel/tqpixmap_x11.cpp b/src/kernel/tqpixmap_x11.cpp index f266fd934..28a182e20 100644 --- a/src/kernel/tqpixmap_x11.cpp +++ b/src/kernel/tqpixmap_x11.cpp @@ -128,7 +128,7 @@ static void tqt_cleanup_mitshm() } -static bool qt_create_mitshm_buffer( const TQPaintDevice* dev, int w, int h ) +static bool tqt_create_mitshm_buffer( const TQPaintDevice* dev, int w, int h ) { static int major, minor; static Bool pixmaps_ok; @@ -182,7 +182,7 @@ static bool qt_create_mitshm_buffer( const TQPaintDevice* dev, int w, int h ) // If extern, need a dummy. // -// static bool qt_create_mitshm_buffer( TQPaintDevice*, int, int ) +// static bool tqt_create_mitshm_buffer( TQPaintDevice*, int, int ) // { // return false; // } @@ -191,14 +191,14 @@ static bool qt_create_mitshm_buffer( const TQPaintDevice* dev, int w, int h ) #ifdef QT_MITSHM_CONVERSIONS -static bool qt_mitshm_error = false; -static int qt_mitshm_errorhandler( Display*, XErrorEvent* ) +static bool tqt_mitshm_error = false; +static int tqt_mitshm_errorhandler( Display*, XErrorEvent* ) { - qt_mitshm_error = true; + tqt_mitshm_error = true; return 0; } -static XImage* qt_XShmCreateImage( Display* dpy, Visual* visual, unsigned int depth, +static XImage* tqt_XShmCreateImage( Display* dpy, Visual* visual, unsigned int depth, int format, int /*offset*/, char* /*data*/, unsigned int width, unsigned int height, int /*bitmap_pad*/, int /*bytes_per_line*/, XShmSegmentInfo* shminfo ) { @@ -237,12 +237,12 @@ static XImage* qt_XShmCreateImage( Display* dpy, Visual* visual, unsigned int de shmctl( shminfo->shmid, IPC_RMID, 0 ); #endif if( shm_inited == 1 ) { // first time - XErrorHandler old_h = XSetErrorHandler( qt_mitshm_errorhandler ); + XErrorHandler old_h = XSetErrorHandler( tqt_mitshm_errorhandler ); XShmAttach( dpy, shminfo ); shm_inited = 2; XSync( dpy, False ); XSetErrorHandler( old_h ); - if( qt_mitshm_error ) { // oops ... perhaps we are remote? + if( tqt_mitshm_error ) { // oops ... perhaps we are remote? shm_inited = 0; XDestroyImage( xi ); shmdt( shminfo->shmaddr ); @@ -256,7 +256,7 @@ static XImage* qt_XShmCreateImage( Display* dpy, Visual* visual, unsigned int de return xi; } -static void qt_XShmDestroyImage( XImage* xi, XShmSegmentInfo* shminfo ) +static void tqt_XShmDestroyImage( XImage* xi, XShmSegmentInfo* shminfo ) { XShmDetach( TQPaintDevice::x11AppDisplay(), shminfo ); XDestroyImage( xi ); @@ -266,15 +266,15 @@ static void qt_XShmDestroyImage( XImage* xi, XShmSegmentInfo* shminfo ) #endif } -static XImage* qt_XShmGetImage( const TQPixmap* pix, int format, +static XImage* tqt_XShmGetImage( const TQPixmap* pix, int format, XShmSegmentInfo* shminfo ) { - XImage* xi = qt_XShmCreateImage( pix->x11Display(), (Visual*)pix->x11Visual(), + XImage* xi = tqt_XShmCreateImage( pix->x11Display(), (Visual*)pix->x11Visual(), pix->depth(), format, 0, 0, pix->width(), pix->height(), 32, 0, shminfo ); if( xi == NULL ) return NULL; if( XShmGetImage( pix->x11Display(), pix->handle(), xi, 0, 0, AllPlanes ) == False ) { - qt_XShmDestroyImage( xi, shminfo ); + tqt_XShmDestroyImage( xi, shminfo ); return NULL; } return xi; @@ -286,7 +286,7 @@ static XImage* qt_XShmGetImage( const TQPixmap* pix, int format, Internal functions *****************************************************************************/ -extern const uchar *qt_get_bitflip_array(); // defined in tqimage.cpp +extern const uchar *tqt_get_bitflip_array(); // defined in tqimage.cpp static uchar *flip_bits( const uchar *bits, int len ) { @@ -294,7 +294,7 @@ static uchar *flip_bits( const uchar *bits, int len ) const uchar *end = p + len; uchar *newdata = new uchar[len]; uchar *b = newdata; - const uchar *f = qt_get_bitflip_array(); + const uchar *f = tqt_get_bitflip_array(); while ( p < end ) *b++ = f[*p++]; return newdata; @@ -732,7 +732,7 @@ TQImage TQPixmap::convertToImage() const #endif if ( !xi ) { // fetch data from X server #ifdef QT_MITSHM_CONVERSIONS - xi = qt_XShmGetImage( this, mono ? XYPixmap : ZPixmap, &shminfo ); + xi = tqt_XShmGetImage( this, mono ? XYPixmap : ZPixmap, &shminfo ); if( xi ) { mitshm_ximage = true; } else @@ -753,7 +753,7 @@ TQImage TQPixmap::convertToImage() const if ( image.isNull() ) { // could not create image #ifdef QT_MITSHM_CONVERSIONS if( mitshm_ximage ) - qt_XShmDestroyImage( xi, &shminfo ); + tqt_XShmDestroyImage( xi, &shminfo ); else #endif qSafeXDestroyImage( xi ); @@ -770,7 +770,7 @@ TQImage TQPixmap::convertToImage() const #ifdef QT_MITSHM_CONVERSIONS bool mitshm_aximage = false; XShmSegmentInfo ashminfo; - axi = qt_XShmGetImage( alf, ZPixmap, &ashminfo ); + axi = tqt_XShmGetImage( alf, ZPixmap, &ashminfo ); if( axi ) { mitshm_aximage = true; } else @@ -791,7 +791,7 @@ TQImage TQPixmap::convertToImage() const #ifdef QT_MITSHM_CONVERSIONS if( mitshm_aximage ) - qt_XShmDestroyImage( axi, &ashminfo ); + tqt_XShmDestroyImage( axi, &ashminfo ); else #endif qSafeXDestroyImage( axi ); @@ -938,7 +938,7 @@ TQImage TQPixmap::convertToImage() const image.reset(); #ifdef QT_MITSHM_CONVERSIONS if( mitshm_ximage ) - qt_XShmDestroyImage( xi, &shminfo ); + tqt_XShmDestroyImage( xi, &shminfo ); else #endif qSafeXDestroyImage( xi ); @@ -1050,7 +1050,7 @@ TQImage TQPixmap::convertToImage() const if ( data->optim != BestOptim ) { // throw away image data #ifdef QT_MITSHM_CONVERSIONS if( mitshm_ximage ) - qt_XShmDestroyImage( xi, &shminfo ); + tqt_XShmDestroyImage( xi, &shminfo ); else #endif qSafeXDestroyImage( xi ); @@ -1058,7 +1058,7 @@ TQImage TQPixmap::convertToImage() const } else { // keep ximage data #ifdef QT_MITSHM_CONVERSIONS if( mitshm_ximage ) { // copy the XImage? - qt_XShmDestroyImage( xi, &shminfo ); + tqt_XShmDestroyImage( xi, &shminfo ); xi = 0; } #endif @@ -1180,7 +1180,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) uchar *p, *b, *end; uint y, count; if ( image.bitOrder() == TQImage::BigEndian ) { - const uchar *f = qt_get_bitflip_array(); + const uchar *f = tqt_get_bitflip_array(); b = tmp_bits; for ( y=0; ydata; @@ -1729,7 +1729,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) if ( !xi ) { // X image not created #ifdef QT_MITSHM_CONVERSIONS - xi = qt_XShmCreateImage( dpy, visual, dd, ZPixmap, 0, 0, w, h, 32, 0, &shminfo ); + xi = tqt_XShmCreateImage( dpy, visual, dd, ZPixmap, 0, 0, w, h, 32, 0, &shminfo ); if( xi != NULL ) mitshm_ximage = true; else @@ -1854,7 +1854,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) (HANDLE) XftDrawCreateAlpha( x11Display(), data->alphapm->hd, 8 ); #ifdef QT_MITSHM_CONVERSIONS - axi = qt_XShmCreateImage( x11Display(), (Visual*)x11Visual(), + axi = tqt_XShmCreateImage( x11Display(), (Visual*)x11Visual(), 8, ZPixmap, 0, 0, w, h, 8, 0, &ashminfo ); if( axi != NULL ) mitshm_aximage = true; @@ -1915,7 +1915,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) if ( data->optim != BestOptim ) { // throw away image #ifdef QT_MITSHM_CONVERSIONS if( mitshm_ximage ) - qt_XShmDestroyImage( xi, &shminfo ); + tqt_XShmDestroyImage( xi, &shminfo ); else #endif qSafeXDestroyImage( xi ); @@ -1923,7 +1923,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) } else { // keep ximage that we created #ifdef QT_MITSHM_CONVERSIONS if( mitshm_ximage ) { // copy the XImage? - qt_XShmDestroyImage( xi, &shminfo ); + tqt_XShmDestroyImage( xi, &shminfo ); xi = 0; } #endif @@ -1932,7 +1932,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) if( axi ) { #ifdef QT_MITSHM_CONVERSIONS if( mitshm_aximage ) - qt_XShmDestroyImage( axi, &ashminfo ); + tqt_XShmDestroyImage( axi, &ashminfo ); else #endif qSafeXDestroyImage(axi); @@ -2104,7 +2104,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const if (try_once) { try_once = false; if ( !xshminit ) - qt_create_mitshm_buffer( this, 800, 600 ); + tqt_create_mitshm_buffer( this, 800, 600 ); } bool use_mitshm = xshmimg && !depth1 && diff --git a/src/kernel/tqpngio.cpp b/src/kernel/tqpngio.cpp index 3bc0de639..998bdf11b 100644 --- a/src/kernel/tqpngio.cpp +++ b/src/kernel/tqpngio.cpp @@ -307,7 +307,7 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr, float sc #if defined(Q_C_CALLBACKS) extern "C" { #endif -static void CALLBACK_CALL_TYPE qt_png_warning(png_structp /*png_ptr*/, png_const_charp message) +static void CALLBACK_CALL_TYPE tqt_png_warning(png_structp /*png_ptr*/, png_const_charp message) { tqWarning("libpng warning: %s", message); } @@ -331,7 +331,7 @@ void read_png_image(TQImageIO* iio) return; } - png_set_error_fn(png_ptr, 0, 0, qt_png_warning); + png_set_error_fn(png_ptr, 0, 0, tqt_png_warning); info_ptr = png_create_info_struct(png_ptr); if (!info_ptr) { @@ -534,7 +534,7 @@ bool TQPNGImageWriter::writeImage(const TQImage& image, int quality_in, int off_ return false; } - png_set_error_fn(png_ptr, 0, 0, qt_png_warning); + png_set_error_fn(png_ptr, 0, 0, tqt_png_warning); info_ptr = png_create_info_struct(png_ptr); if (!info_ptr) { @@ -1120,7 +1120,7 @@ int TQPNGFormat::decode(TQImage& img, TQImageConsumer* cons, return -1; } - png_set_error_fn(png_ptr, 0, 0, qt_png_warning); + png_set_error_fn(png_ptr, 0, 0, tqt_png_warning); png_set_compression_level(png_ptr, 9); info_ptr = png_create_info_struct(png_ptr); @@ -1342,7 +1342,7 @@ void qInitPngIO() } } -void qt_zlib_compression_hack() +void tqt_zlib_compression_hack() { compress(0,0,0,0); uncompress(0,0,0,0); diff --git a/src/kernel/tqprinter_unix.cpp b/src/kernel/tqprinter_unix.cpp index e9caedc3d..0558a1d8b 100644 --- a/src/kernel/tqprinter_unix.cpp +++ b/src/kernel/tqprinter_unix.cpp @@ -41,7 +41,7 @@ #include "qplatformdefs.h" // POSIX Large File Support redefines open -> open64 -static inline int qt_open(const char *pathname, int flags, mode_t mode) +static inline int tqt_open(const char *pathname, int flags, mode_t mode) { return ::open(pathname, flags, mode); } #if defined(open) # undef open @@ -313,7 +313,7 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) if ( state == PST_IDLE ) { if ( output_file ) { int fd = 0; - fd = qt_open( output_filename.local8Bit(), + fd = tqt_open( output_filename.local8Bit(), O_CREAT | O_NOCTTY | O_TRUNC | O_WRONLY, 0666 ); if ( fd >= 0 ) { diff --git a/src/kernel/tqprocess_unix.cpp b/src/kernel/tqprocess_unix.cpp index e481c92c3..2d4057751 100644 --- a/src/kernel/tqprocess_unix.cpp +++ b/src/kernel/tqprocess_unix.cpp @@ -78,7 +78,7 @@ extern "C" { #endif // Q_C_CALLBACKS - QT_SIGNAL_RETTYPE qt_C_sigchldHnd(QT_SIGNAL_ARGS); + QT_SIGNAL_RETTYPE tqt_C_sigchldHnd(QT_SIGNAL_ARGS); #ifdef Q_C_CALLBACKS } @@ -288,7 +288,7 @@ TQProcessManager::TQProcessManager() : sn(0) #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcessManager: install a SIGCHLD handler" ); #endif - act.sa_handler = qt_C_sigchldHnd; + act.sa_handler = tqt_C_sigchldHnd; sigemptyset( &(act.sa_mask) ); sigaddset( &(act.sa_mask), SIGCHLD ); act.sa_flags = SA_NOCLDSTOP; @@ -556,7 +556,7 @@ void TQProcessPrivate::newProc( pid_t pid, TQProcess *process ) * sigchld handler callback * **********************************************************************/ -QT_SIGNAL_RETTYPE qt_C_sigchldHnd( QT_SIGNAL_ARGS ) +QT_SIGNAL_RETTYPE tqt_C_sigchldHnd( QT_SIGNAL_ARGS ) { if ( TQProcessPrivate::procManager == 0 ) return; diff --git a/src/kernel/tqpsprinter.cpp b/src/kernel/tqpsprinter.cpp index 4ab9404c6..d5dc4aee5 100644 --- a/src/kernel/tqpsprinter.cpp +++ b/src/kernel/tqpsprinter.cpp @@ -103,12 +103,12 @@ extern bool tqt_has_xft; #endif -static bool qt_gen_epsf = false; +static bool tqt_gen_epsf = false; static bool embedFonts = true; TQ_EXPORT void tqt_generate_epsf( bool b ) { - qt_gen_epsf = b; + tqt_gen_epsf = b; } static const char *const ps_header = @@ -5910,7 +5910,7 @@ void TQPSPrinterPrivate::emitHeader( bool finished ) int height = m.height(); bool fullPage = printer->fullPage(); if ( finished && pageCount == 1 && printer->numCopies() == 1 && - ( ( printer->fullPage() && qt_gen_epsf ) || + ( ( printer->fullPage() && tqt_gen_epsf ) || ( printer->outputToFile() && printer->outputFileName().endsWith( ".eps" ) ) ) ) { if ( !boundingBox.isValid() ) diff --git a/src/kernel/tqregion_x11.cpp b/src/kernel/tqregion_x11.cpp index d1e244ebe..0df69dd44 100644 --- a/src/kernel/tqregion_x11.cpp +++ b/src/kernel/tqregion_x11.cpp @@ -2341,7 +2341,7 @@ static TQRegionPrivate *PolygonRegion(TQPoint *Pts, int Count, int rule) } // END OF PolyReg.c extract -TQRegionPrivate *qt_bitmapToRegion(const TQBitmap& bitmap) +TQRegionPrivate *tqt_bitmapToRegion(const TQBitmap& bitmap) { TQImage image = bitmap.convertToImage(); @@ -2563,7 +2563,7 @@ TQRegion::TQRegion( const TQBitmap & bm ) data->is_null = false; data->rgn = 0; data->xrectangles = 0; - data->region = qt_bitmapToRegion(bm); + data->region = tqt_bitmapToRegion(bm); } } diff --git a/src/kernel/tqrichtext.cpp b/src/kernel/tqrichtext.cpp index a9e72febd..427434b37 100644 --- a/src/kernel/tqrichtext.cpp +++ b/src/kernel/tqrichtext.cpp @@ -6843,7 +6843,7 @@ bool TQTextDocument::hasPrefix( const TQChar* doc, int length, int pos, const TQ } #ifndef TQT_NO_TEXTCUSTOMITEM -static bool qt_is_cell_in_use( TQPtrList& cells, int row, int col ) +static bool tqt_is_cell_in_use( TQPtrList& cells, int row, int col ) { for ( TQTextTableCell* c = cells.first(); c; c = cells.next() ) { if ( row >= c->row() && row < c->row() + c->rowspan() @@ -6888,7 +6888,7 @@ TQTextCustomItem* TQTextDocument::parseTable( const TQMap &a } else if ( tagname == "td" || tagname == "th" ) { col++; - while ( qt_is_cell_in_use( multicells, row, col ) ) { + while ( tqt_is_cell_in_use( multicells, row, col ) ) { col++; } diff --git a/src/kernel/tqscriptengine.cpp b/src/kernel/tqscriptengine.cpp index 8c8fbe308..c5973a4ff 100644 --- a/src/kernel/tqscriptengine.cpp +++ b/src/kernel/tqscriptengine.cpp @@ -263,7 +263,7 @@ static inline void positionCluster(TQShaperItem *item, int gfrom, int glast) } -void qt_heuristicPosition(TQShaperItem *item) +void tqt_heuristicPosition(TQShaperItem *item) { int cEnd = -1; int i = item->num_glyphs; @@ -398,7 +398,7 @@ static bool basic_shape(TQShaperItem *item) return false; heuristicSetGlyphAttributes(item); - qt_heuristicPosition(item); + tqt_heuristicPosition(item); return true; } @@ -553,7 +553,7 @@ static bool hebrew_shape(TQShaperItem *item) if (item->attributes[i].mark) item->advances[i] = 0; } - qt_heuristicPosition(item); + tqt_heuristicPosition(item); if (item->length > 256) ::free(shapedChars); @@ -1618,7 +1618,7 @@ static bool arabic_shape(TQShaperItem *item) for (int i = 0; i < slen; ++i) if (item->attributes[i].mark) item->advances[i] = 0; - qt_heuristicPosition(item); + tqt_heuristicPosition(item); return true; } diff --git a/src/kernel/tqsimplerichtext.cpp b/src/kernel/tqsimplerichtext.cpp index b78d2ad28..c210f91e9 100644 --- a/src/kernel/tqsimplerichtext.cpp +++ b/src/kernel/tqsimplerichtext.cpp @@ -55,7 +55,7 @@ public: }; // Pull this private function in from tqglobal.cpp -extern unsigned int qt_int_sqrt( unsigned int n ); +extern unsigned int tqt_int_sqrt( unsigned int n ); void TQSimpleRichTextData::adjustSize(TQPainter *p) { TQFontMetrics fm( font ); @@ -63,11 +63,11 @@ void TQSimpleRichTextData::adjustSize(TQPainter *p) { int w = mw; doc->doLayout(p, w); if ( doc->widthUsed() != 0 ) { - w = qt_int_sqrt( 5 * doc->height() * doc->widthUsed() / 3 ); + w = tqt_int_sqrt( 5 * doc->height() * doc->widthUsed() / 3 ); doc->doLayout(p, TQMIN(w, mw)); if ( w*3 < 5*doc->height() ) { - w = qt_int_sqrt( 2 * doc->height() * doc->widthUsed() ); + w = tqt_int_sqrt( 2 * doc->height() * doc->widthUsed() ); doc->doLayout(p, TQMIN(w, mw)); } } diff --git a/src/kernel/tqsizegrip.cpp b/src/kernel/tqsizegrip.cpp index 0ee533955..3728688bd 100644 --- a/src/kernel/tqsizegrip.cpp +++ b/src/kernel/tqsizegrip.cpp @@ -57,7 +57,7 @@ bool tqt_mac_update_sizer(TQWidget *, int); //tqwidget_mac.cpp #endif -static TQWidget *qt_sizegrip_topLevelWidget( TQWidget* w) +static TQWidget *tqt_sizegrip_topLevelWidget( TQWidget* w) { TQWidget *p = w->parentWidget(); while ( !w->isTopLevel() && p && !p->inherits("TQWorkspace") ) { @@ -67,7 +67,7 @@ static TQWidget *qt_sizegrip_topLevelWidget( TQWidget* w) return w; } -static TQWidget* qt_sizegrip_workspace( TQWidget* w ) +static TQWidget *tqt_sizegrip_workspace( TQWidget* w ) { while ( w && !w->inherits("TQWorkspace" ) ) { if ( w->isTopLevel() ) @@ -121,14 +121,14 @@ TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name ) #endif setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); #if defined(TQ_WS_X11) - if ( !qt_sizegrip_workspace( this ) ) { + if ( !tqt_sizegrip_workspace( this ) ) { WId id = winId(); XChangeProperty(tqt_xdisplay(), topLevelWidget()->winId(), tqt_sizegrip, XA_WINDOW, 32, PropModeReplace, (unsigned char *)&id, 1); } #endif - tlw = qt_sizegrip_topLevelWidget( this ); + tlw = tqt_sizegrip_topLevelWidget( this ); if ( tlw ) tlw->installEventFilter( this ); installEventFilter( this ); //for binary compatibility fix in 4.0 with an event() ### @@ -177,7 +177,7 @@ void TQSizeGrip::paintEvent( TQPaintEvent *e ) void TQSizeGrip::mousePressEvent( TQMouseEvent * e ) { p = e->globalPos(); - s = qt_sizegrip_topLevelWidget(this)->size(); + s = tqt_sizegrip_topLevelWidget(this)->size(); } @@ -190,13 +190,13 @@ void TQSizeGrip::mouseMoveEvent( TQMouseEvent * e ) if ( e->state() != LeftButton ) return; - TQWidget* tlw = qt_sizegrip_topLevelWidget(this); + TQWidget* tlw = tqt_sizegrip_topLevelWidget(this); if ( tlw->testWState(WState_ConfigPending) ) return; TQPoint np( e->globalPos() ); - TQWidget* ws = qt_sizegrip_workspace( this ); + TQWidget* ws = tqt_sizegrip_workspace( this ); if ( ws ) { TQPoint tmp( ws->mapFromGlobal( np ) ); if ( tmp.x() > ws->width() ) @@ -268,8 +268,8 @@ bool TQSizeGrip::eventFilter( TQObject *o, TQEvent *e ) switch(e->type()) { case TQEvent::Hide: case TQEvent::Show: - if(!TQApplication::closingDown() && parentWidget() && !qt_sizegrip_workspace(this)) { - if(TQWidget *w = qt_sizegrip_topLevelWidget(this)) { + if(!TQApplication::closingDown() && parentWidget() && !tqt_sizegrip_workspace(this)) { + if(TQWidget *w = tqt_sizegrip_topLevelWidget(this)) { if(w->isTopLevel()) tqt_mac_update_sizer(w, e->type() == TQEvent::Hide ? -1 : 1); } diff --git a/src/kernel/tqsound.cpp b/src/kernel/tqsound.cpp index 5e7a1c826..07da8bf4f 100644 --- a/src/kernel/tqsound.cpp +++ b/src/kernel/tqsound.cpp @@ -71,11 +71,11 @@ void TQAuServer::play(const TQString& filename) play(&s); } -extern TQAuServer* qt_new_audio_server(); +extern TQAuServer* tqt_new_audio_server(); static TQAuServer& server() { - if (!servers) qt_new_audio_server(); + if (!servers) tqt_new_audio_server(); return *servers->first(); } diff --git a/src/kernel/tqsound_x11.cpp b/src/kernel/tqsound_x11.cpp index 84999b79f..471ca34f2 100644 --- a/src/kernel/tqsound_x11.cpp +++ b/src/kernel/tqsound_x11.cpp @@ -265,7 +265,7 @@ TQAuServerNull::TQAuServerNull(TQObject* parent) : } -TQAuServer* qt_new_audio_server() +TQAuServer* tqt_new_audio_server() { #ifdef QT_NAS_SUPPORT TQAuServer* s=new TQAuServerNAS(tqApp); diff --git a/src/kernel/tqthread_unix.cpp b/src/kernel/tqthread_unix.cpp index ba744d011..1c10d0780 100644 --- a/src/kernel/tqthread_unix.cpp +++ b/src/kernel/tqthread_unix.cpp @@ -52,7 +52,7 @@ typedef pthread_mutex_t Q_MUTEX_T; #include #include -static TQMutexPool *qt_thread_mutexpool = 0; +static TQMutexPool *tqt_thread_mutexpool = 0; #if defined(Q_C_CALLBACKS) extern "C" { @@ -110,7 +110,7 @@ void TQThreadInstance::init(unsigned int stackSize) cleanupType = TQThread::CleanupMergeObjects; // threads have not been initialized yet, do it now - if (! qt_thread_mutexpool) TQThread::initialize(); + if (! tqt_thread_mutexpool) TQThread::initialize(); } void TQThreadInstance::deinit() @@ -178,7 +178,7 @@ void TQThreadInstance::finishCoreThread(TQThreadInstance *d) { TQMutex *TQThreadInstance::mutex() const { - return qt_thread_mutexpool ? qt_thread_mutexpool->get( (void *) this ) : 0; + return tqt_thread_mutexpool ? tqt_thread_mutexpool->get( (void *) this ) : 0; } void TQThreadInstance::terminate() @@ -211,8 +211,8 @@ void TQThread::initialize() { if ( ! tqt_global_mutexpool ) tqt_global_mutexpool = new TQMutexPool( true, 73 ); - if ( ! qt_thread_mutexpool ) - qt_thread_mutexpool = new TQMutexPool( false, 127 ); + if ( ! tqt_thread_mutexpool ) + tqt_thread_mutexpool = new TQMutexPool( false, 127 ); } /*! \internal @@ -221,9 +221,9 @@ void TQThread::initialize() void TQThread::cleanup() { delete tqt_global_mutexpool; - delete qt_thread_mutexpool; + delete tqt_thread_mutexpool; tqt_global_mutexpool = 0; - qt_thread_mutexpool = 0; + tqt_thread_mutexpool = 0; } /*! diff --git a/src/kernel/tqtranslator.cpp b/src/kernel/tqtranslator.cpp index 31f9b8338..2cfaa1a06 100644 --- a/src/kernel/tqtranslator.cpp +++ b/src/kernel/tqtranslator.cpp @@ -41,7 +41,7 @@ #include "qplatformdefs.h" // POSIX Large File Support redefines open -> open64 -static inline int qt_open(const char *pathname, int flags, mode_t mode) +static inline int tqt_open(const char *pathname, int flags, mode_t mode) { return ::open(pathname, flags, mode); } #if defined(open) # undef open @@ -340,7 +340,7 @@ public: */ #if defined(TQ_WS_WIN) -extern int qt_ntfs_permission_lookup; +extern int tqt_ntfs_permission_lookup; #endif /*! @@ -353,7 +353,7 @@ TQTranslator::TQTranslator( TQObject * parent, const char * name ) { d = new TQTranslatorPrivate; #if defined(TQ_WS_WIN) - d->oldPermissionLookup = qt_ntfs_permission_lookup; + d->oldPermissionLookup = tqt_ntfs_permission_lookup; #endif } @@ -438,7 +438,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory, TQString::fromLatin1( "_." ) : search_delimiters; #if defined(TQ_WS_WIN) - qt_ntfs_permission_lookup--; + tqt_ntfs_permission_lookup--; #endif for ( ;; ) { TQFileInfo fi; @@ -463,8 +463,8 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory, // no truncations? fail if ( rightmost == 0 ) { #if defined(TQ_WS_WIN) - if (d->oldPermissionLookup != qt_ntfs_permission_lookup) - qt_ntfs_permission_lookup++; + if (d->oldPermissionLookup != tqt_ntfs_permission_lookup) + tqt_ntfs_permission_lookup++; #endif return false; } @@ -472,8 +472,8 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory, fname.truncate( rightmost ); } #if defined(TQ_WS_WIN) - if (d->oldPermissionLookup != qt_ntfs_permission_lookup) - qt_ntfs_permission_lookup++; + if (d->oldPermissionLookup != tqt_ntfs_permission_lookup) + tqt_ntfs_permission_lookup++; #endif // realname is now the fully qualified name of a readable file. @@ -489,7 +489,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory, int f; - f = qt_open( TQFile::encodeName(realname), O_RDONLY, 0666 ); + f = tqt_open( TQFile::encodeName(realname), O_RDONLY, 0666 ); if ( f < 0 ) { // tqDebug( "can't open %s: %s", realname.ascii(), strerror( errno ) ); return false; diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp index 38333aef4..15df9edea 100644 --- a/src/kernel/tqwidget.cpp +++ b/src/kernel/tqwidget.cpp @@ -516,7 +516,7 @@ inline bool TQWidgetMapper::remove( WId id ) TQWidget utility functions *****************************************************************************/ -static TQFont qt_naturalWidgetFont( TQWidget* w ) { +static TQFont tqt_naturalWidgetFont( TQWidget* w ) { TQFont naturalfont = TQApplication::font( w ); if ( ! w->isTopLevel() ) { if ( ! naturalfont.isCopyOf( TQApplication::font() ) ) @@ -528,7 +528,7 @@ static TQFont qt_naturalWidgetFont( TQWidget* w ) { } #ifndef TQT_NO_PALETTE -static TQPalette qt_naturalWidgetPalette( TQWidget* w ) { +static TQPalette tqt_naturalWidgetPalette( TQWidget* w ) { TQPalette naturalpalette = TQApplication::palette( w ); if ( !w->isTopLevel() && naturalpalette.isCopyOf( TQApplication::palette() ) ) naturalpalette = w->parentWidget()->palette(); @@ -536,7 +536,7 @@ static TQPalette qt_naturalWidgetPalette( TQWidget* w ) { } #endif -TQSize qt_naturalWidgetSize( TQWidget *w ) { +TQSize tqt_naturalWidgetSize( TQWidget *w ) { TQSize s = w->sizeHint(); TQSizePolicy::ExpandData exp; #ifndef TQT_NO_LAYOUT @@ -2931,7 +2931,7 @@ void TQWidget::setPalette( const TQPalette &palette ) void TQWidget::unsetPalette() { // reset the palette - setPalette( qt_naturalWidgetPalette( this ) ); + setPalette( tqt_naturalWidgetPalette( this ) ); own_palette = false; } @@ -2989,7 +2989,7 @@ void TQWidget::setFont( const TQFont &font ) if ( fnt == font && fnt.d->mask == font.d->mask ) return; TQFont old = fnt; - fnt = font.resolve( qt_naturalWidgetFont( this ) ); + fnt = font.resolve( tqt_naturalWidgetFont( this ) ); #if defined(TQ_WS_X11) // make sure the font set on this widget is associated with the correct screen fnt.x11SetScreen( x11Screen() ); @@ -3012,7 +3012,7 @@ void TQWidget::setFont( const TQFont &font ) void TQWidget::unsetFont() { // reset the font - setFont( qt_naturalWidgetFont( this ) ); + setFont( tqt_naturalWidgetFont( this ) ); own_font = false; } @@ -3788,7 +3788,7 @@ TQSize TQWidget::frameSize() const Recursive function that updates \a widget and all its children, if they have some parent background origin. */ -static void qt_update_bg_recursive( TQWidget *widget ) +static void tqt_update_bg_recursive( TQWidget *widget ) { if ( !widget || widget->isHidden() || widget->backgroundOrigin() == TQWidget::WidgetOrigin || !widget->backgroundPixmap() ) return; @@ -3801,7 +3801,7 @@ static void qt_update_bg_recursive( TQWidget *widget ) while ( (widget = (TQWidget*)it.current()) ) { ++it; if ( widget->isWidgetType() && !widget->isHidden() && !widget->isTopLevel() && !widget->testWFlags(TQt::WSubWindow) ) - qt_update_bg_recursive( widget ); + tqt_update_bg_recursive( widget ); } } TQApplication::postEvent( widget, new TQPaintEvent( widget->clipRegion(), !widget->testWFlags(TQt::WRepaintNoErase) ) ); @@ -3820,7 +3820,7 @@ void TQWidget::move( int x, int y ) y + geometry().y() - TQWidget::y(), width(), height(), true ); if ( isVisible() && oldp != pos() ) - qt_update_bg_recursive( this ); + tqt_update_bg_recursive( this ); } /*! @@ -3845,7 +3845,7 @@ void TQWidget::setGeometry( int x, int y, int w, int h ) internalSetGeometry( x, y, w, h, true ); setWState( WState_Resized ); if ( isVisible() && oldp != pos() ) - qt_update_bg_recursive( this ); + tqt_update_bg_recursive( this ); } /*! @@ -3990,7 +3990,7 @@ void TQWidget::show() // do this before sending the posted resize events. Otherwise // the layout would catch the resize event and may expand the // minimum size. - TQSize s = qt_naturalWidgetSize( this ); + TQSize s = tqt_naturalWidgetSize( this ); if ( !s.isEmpty() ) resize( s ); } @@ -4896,7 +4896,7 @@ bool TQWidget::event( TQEvent *e ) // fall through case TQEvent::ApplicationFontChange: if ( own_font ) - setFont( fnt.resolve( qt_naturalWidgetFont( this ) ) ); + setFont( fnt.resolve( tqt_naturalWidgetFont( this ) ) ); else unsetFont(); break; @@ -5985,7 +5985,7 @@ void TQWidget::reparent( TQWidget *parent, WFlags f, const TQPoint &p, if (!own_font) unsetFont(); else - setFont( fnt.resolve( qt_naturalWidgetFont( this ) ) ); + setFont( fnt.resolve( tqt_naturalWidgetFont( this ) ) ); #ifndef TQT_NO_PALETTE if (!own_palette) unsetPalette(); diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp index ab56678e1..7404470ba 100644 --- a/src/kernel/tqwidget_x11.cpp +++ b/src/kernel/tqwidget_x11.cpp @@ -195,17 +195,17 @@ const uint stdDesktopEventMask = // X event mask The qt_ functions below are implemented in tqwidgetcreate_x11.cpp. */ -Window qt_XCreateWindow( const TQWidget *creator, +Window tqt_XCreateWindow( const TQWidget *creator, Display *display, Window parent, int x, int y, uint w, uint h, int borderwidth, int depth, uint windowclass, Visual *visual, ulong valuemask, XSetWindowAttributes *attributes ); -Window qt_XCreateSimpleWindow( const TQWidget *creator, +Window tqt_XCreateSimpleWindow( const TQWidget *creator, Display *display, Window parent, int x, int y, uint w, uint h, int borderwidth, ulong border, ulong background ); -void qt_XDestroyWindow( const TQWidget *destroyer, +void tqt_XDestroyWindow( const TQWidget *destroyer, Display *display, Window window ); TQ_EXPORT void tqt_x11_enforce_cursor( TQWidget * w ) @@ -441,7 +441,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) } } else { if ( x11DefaultVisual() && x11DefaultColormap() ) { - id = (WId)qt_XCreateSimpleWindow( this, dpy, parentw, + id = (WId)tqt_XCreateSimpleWindow( this, dpy, parentw, crect.left(), crect.top(), crect.width(), crect.height(), 0, @@ -451,7 +451,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) wsa.background_pixel = bg_col.pixel(x11Screen()); wsa.border_pixel = black.pixel(x11Screen()); wsa.colormap = (Colormap)x11Colormap(); - id = (WId)qt_XCreateWindow( this, dpy, parentw, + id = (WId)tqt_XCreateWindow( this, dpy, parentw, crect.left(), crect.top(), crect.width(), crect.height(), 0, x11Depth(), InputOutput, @@ -767,7 +767,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) } if ( destroyw ) - qt_XDestroyWindow( this, dpy, destroyw ); + tqt_XDestroyWindow( this, dpy, destroyw ); #if !defined(TQT_NO_IM_EXTENSIONS) ic = 0; @@ -828,7 +828,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows ) tqt_dnd_enable( this, false ); } else { if ( destroyWindow ) - qt_XDestroyWindow( this, x11Display(), winid ); + tqt_XDestroyWindow( this, x11Display(), winid ); } #ifndef TQT_NO_XSYNC destroySyncCounter(); @@ -976,7 +976,7 @@ void TQWidget::reparentSys( TQWidget *parent, WFlags f, const TQPoint &p, bool s if ( showIt ) show(); if ( old_winid ) - qt_XDestroyWindow( this, dpy, old_winid ); + tqt_XDestroyWindow( this, dpy, old_winid ); if ( setcurs ) setCursor(oldcurs); @@ -2385,13 +2385,13 @@ void TQWidget::setBaseSize( int basew, int baseh ) void TQWidget::erase( int x, int y, int w, int h ) { - extern void qt_erase_rect( TQWidget*, const TQRect& ); // in qpainer_x11.cpp + extern void tqt_erase_rect( TQWidget*, const TQRect& ); // in qpainer_x11.cpp if ( w < 0 ) w = crect.width() - x; if ( h < 0 ) h = crect.height() - y; if ( w != 0 && h != 0 ) - qt_erase_rect( this, TQRect(x, y, w, h ) ); + tqt_erase_rect( this, TQRect(x, y, w, h ) ); } /*! @@ -2405,8 +2405,8 @@ void TQWidget::erase( int x, int y, int w, int h ) void TQWidget::erase( const TQRegion& reg ) { - extern void qt_erase_region( TQWidget*, const TQRegion& ); // in qpainer_x11.cpp - qt_erase_region( this, reg ); + extern void tqt_erase_region( TQWidget*, const TQRegion& ); // in qpainer_x11.cpp + tqt_erase_region( this, reg ); } /*! diff --git a/src/kernel/tqwidgetcreate_x11.cpp b/src/kernel/tqwidgetcreate_x11.cpp index 33ec8c20f..e1cb6b396 100644 --- a/src/kernel/tqwidgetcreate_x11.cpp +++ b/src/kernel/tqwidgetcreate_x11.cpp @@ -48,7 +48,7 @@ custom versions. */ -Window qt_XCreateWindow( const TQWidget*, Display *display, Window parent, +Window tqt_XCreateWindow( const TQWidget*, Display *display, Window parent, int x, int y, uint w, uint h, int borderwidth, int depth, uint windowclass, Visual *visual, @@ -59,7 +59,7 @@ Window qt_XCreateWindow( const TQWidget*, Display *display, Window parent, } -Window qt_XCreateSimpleWindow( const TQWidget*, Display *display, Window parent, +Window tqt_XCreateSimpleWindow( const TQWidget*, Display *display, Window parent, int x, int y, uint w, uint h, int borderwidth, ulong border, ulong background ) { @@ -68,7 +68,7 @@ Window qt_XCreateSimpleWindow( const TQWidget*, Display *display, Window parent, } -void qt_XDestroyWindow( const TQWidget*, Display *display, Window window ) +void tqt_XDestroyWindow( const TQWidget*, Display *display, Window window ) { XDestroyWindow( display, window ); } diff --git a/src/kernel/tqwmatrix.cpp b/src/kernel/tqwmatrix.cpp index 0c5fddc67..33f043e75 100644 --- a/src/kernel/tqwmatrix.cpp +++ b/src/kernel/tqwmatrix.cpp @@ -157,7 +157,7 @@ double qsincos( double, bool calcCos ); // defined in tqpainter_x11.cpp \sa TQPainter::setWorldMatrix(), TQPixmap::xForm() */ -bool qt_old_transformations = true; +bool tqt_old_transformations = true; /*! \enum TQWMatrix::TransformationMode @@ -216,9 +216,9 @@ bool qt_old_transformations = true; void TQWMatrix::setTransformationMode( TQWMatrix::TransformationMode m ) { if ( m == TQWMatrix::Points ) - qt_old_transformations = true; + tqt_old_transformations = true; else - qt_old_transformations = false; + tqt_old_transformations = false; } @@ -229,7 +229,7 @@ void TQWMatrix::setTransformationMode( TQWMatrix::TransformationMode m ) */ TQWMatrix::TransformationMode TQWMatrix::transformationMode() { - return (qt_old_transformations ? TQWMatrix::Points : TQWMatrix::Areas ); + return (tqt_old_transformations ? TQWMatrix::Points : TQWMatrix::Areas ); } @@ -437,7 +437,7 @@ void TQWMatrix::map( int x, int y, int *tx, int *ty ) const TQRect TQWMatrix::mapRect( const TQRect &rect ) const { TQRect result; - if( qt_old_transformations ) { + if( tqt_old_transformations ) { if ( _m12 == 0.0F && _m21 == 0.0F ) { result = TQRect( map(rect.topLeft()), map(rect.bottomRight()) ).normalize(); } else { @@ -520,7 +520,7 @@ struct TQWMDoublePoint { */ TQPointArray TQWMatrix::operator *( const TQPointArray &a ) const { - if( qt_old_transformations ) { + if( tqt_old_transformations ) { TQPointArray result = a.copy(); int x, y; for ( int i=0; i<(int)result.size(); i++ ) { @@ -596,7 +596,7 @@ TQRegion TQWMatrix::operator * (const TQRect &rect ) const if ( isIdentity() ) { result = rect; } else if ( _m12 == 0.0F && _m21 == 0.0F ) { - if( qt_old_transformations ) { + if( tqt_old_transformations ) { result = TQRect( map(rect.topLeft()), map(rect.bottomRight()) ).normalize(); } else { int x = tqRound( _m11*rect.x() + _dx ); @@ -631,7 +631,7 @@ TQRegion TQWMatrix::operator * (const TQRect &rect ) const TQPointArray TQWMatrix::mapToPolygon( const TQRect &rect ) const { TQPointArray a( 4 ); - if ( qt_old_transformations ) { + if ( tqt_old_transformations ) { a = TQPointArray( rect ); return operator *( a ); } diff --git a/src/tools/tqfile_unix.cpp b/src/tools/tqfile_unix.cpp index 96e947f97..b5b34eae9 100644 --- a/src/tools/tqfile_unix.cpp +++ b/src/tools/tqfile_unix.cpp @@ -41,7 +41,7 @@ #include "qplatformdefs.h" // POSIX Large File Support redefines open -> open64 -static inline int qt_open(const char *pathname, int flags, mode_t mode) +static inline int tqt_open(const char *pathname, int flags, mode_t mode) { return ::open(pathname, flags, mode); } #if defined(open) # undef open @@ -216,7 +216,7 @@ bool TQFile::open( int m ) if ( isAsynchronous() ) oflags |= OPEN_ASYNC; #endif - fd = qt_open( TQFile::encodeName(fn), oflags, 0666 ); + fd = tqt_open( TQFile::encodeName(fn), oflags, 0666 ); if ( fd != -1 ) { // open successful ::fstat( fd, &st ); // get the stat for later usage diff --git a/src/tools/tqglobal.cpp b/src/tools/tqglobal.cpp index ef3f8911e..6f8a1cd62 100644 --- a/src/tools/tqglobal.cpp +++ b/src/tools/tqglobal.cpp @@ -840,11 +840,11 @@ TQtMsgHandler qInstallMsgHandler( TQtMsgHandler h ) Deliberately not exported as part of the TQt API, but used in tqsimplerichtext.cpp */ -unsigned int qt_int_sqrt( unsigned int n ) +unsigned int tqt_int_sqrt( unsigned int n ) { // n must be in the range 0...UINT_MAX/2-1 if ( n >= ( UINT_MAX>>2 ) ) { - unsigned int r = 2 * qt_int_sqrt( n / 4 ); + unsigned int r = 2 * tqt_int_sqrt( n / 4 ); unsigned int r2 = r + 1; return ( n >= r2 * r2 ) ? r2 : r; } diff --git a/src/tools/tqsettings.cpp b/src/tools/tqsettings.cpp index 90ee84fc5..e961da12a 100644 --- a/src/tools/tqsettings.cpp +++ b/src/tools/tqsettings.cpp @@ -42,7 +42,7 @@ #include // POSIX Large File Support redefines open -> open64 -static inline int qt_open( const char *pathname, int flags, mode_t mode ) +static inline int tqt_open( const char *pathname, int flags, mode_t mode ) { return ::open( pathname, flags, mode ); } #if defined(open) # undef open @@ -278,7 +278,7 @@ static HANDLE openlock( const TQString &name, int type ) TQString lockfile = info.dirPath() + "/." + info.fileName() + ".lock"; // open the lockfile - HANDLE fd = qt_open( TQFile::encodeName( lockfile ), + HANDLE fd = tqt_open( TQFile::encodeName( lockfile ), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR ); if ( fd < 0 ) { diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h index a976c506d..82312b2f8 100644 --- a/tools/assistant/mainwindow.ui.h +++ b/tools/assistant/mainwindow.ui.h @@ -47,7 +47,7 @@ TQPtrList *MainWindow::windows = 0; #if defined(TQ_WS_WIN) -extern TQ_EXPORT int qt_ntfs_permission_lookup; +extern TQ_EXPORT int tqt_ntfs_permission_lookup; #endif void MainWindow::init() @@ -55,7 +55,7 @@ void MainWindow::init() #if defined(TQ_WS_WIN) // Workaround for TQMimeSourceFactory failing in TQFileInfo::isReadable() for // certain user configs. See task: 34372 - qt_ntfs_permission_lookup = 0; + tqt_ntfs_permission_lookup = 0; #endif setupCompleted = false; -- cgit v1.2.3