From f7ab0f18c064fd89c92508bb14ce51ffb6a33469 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Wed, 8 Apr 2026 03:59:53 +0300 Subject: q => tq rebranding: rename internal qt symbols from private headers All the symbols are internal and shouldn't affect API/ABI. Some symbols are skipped due to being mentioned also in public headers. grep -horE '\/t&/g'! > /tmp/qt-rename.sed find * -type f -exec sed -i -f /tmp/qt-rename.sed '{}' \+ Signed-off-by: Alexander Golubev --- src/kernel/tqcolor_p.cpp | 10 +++++----- src/kernel/tqcolor_p.h | 6 +++--- src/kernel/tqcolor_x11.cpp | 8 ++++---- src/kernel/tqeventloop_x11.cpp | 2 +- src/kernel/tqeventloop_x11_glib.cpp | 2 +- src/kernel/tqt_x11_p.h | 6 +++--- src/tools/tqcomlibrary.cpp | 16 ++++++++-------- src/tools/tqcomlibrary_p.h | 2 +- src/tools/tqdir.cpp | 22 +++++++++++----------- src/tools/tqdir_p.h | 10 +++++----- src/tools/tqdir_unix.cpp | 8 ++++---- 11 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/kernel/tqcolor_p.cpp b/src/kernel/tqcolor_p.cpp index 3d29be385..9f4fb62cb 100644 --- a/src/kernel/tqcolor_p.cpp +++ b/src/kernel/tqcolor_p.cpp @@ -730,7 +730,7 @@ static int rgb_cmp( const void *d1, const void *d2 ) } #endif -bool qt_get_named_rgb( const char *name, TQRgb* rgb ) +bool tqt_get_named_rgb( const char *name, TQRgb* rgb ) { TQ_LONG len = strlen(name)+1; char *name_no_space = (char *)malloc(len); @@ -755,10 +755,10 @@ bool qt_get_named_rgb( const char *name, TQRgb* rgb ) } } -uint qt_get_rgb_val( const char *name ) +uint tqt_get_rgb_val( const char *name ) { TQRgb r = 0; - qt_get_named_rgb(name,&r); + tqt_get_named_rgb(name,&r); return r; } #ifndef TQT_NO_STRINGLIST @@ -774,12 +774,12 @@ TQStringList TQColor::colorNames() #endif #else -bool qt_get_named_rgb( const char *, TQRgb* ) +bool tqt_get_named_rgb( const char *, TQRgb* ) { return false; } -uint qt_get_rgb_val( const char * ) +uint tqt_get_rgb_val( const char * ) { return 0; } diff --git a/src/kernel/tqcolor_p.h b/src/kernel/tqcolor_p.h index 136c3e741..1285102b1 100644 --- a/src/kernel/tqcolor_p.h +++ b/src/kernel/tqcolor_p.h @@ -59,8 +59,8 @@ #ifndef QT_H #endif // QT_H -extern uint qt_get_rgb_val( const char *name ); -extern bool qt_get_named_rgb( const char *, TQRgb* ); -extern void qt_reset_color_avail(); +extern uint tqt_get_rgb_val( const char *name ); +extern bool tqt_get_named_rgb( const char *, TQRgb* ); +extern void tqt_reset_color_avail(); #endif diff --git a/src/kernel/tqcolor_x11.cpp b/src/kernel/tqcolor_x11.cpp index 8efb20bc6..8ffd8205c 100644 --- a/src/kernel/tqcolor_x11.cpp +++ b/src/kernel/tqcolor_x11.cpp @@ -53,7 +53,7 @@ When there are no more colors, TQColor::alloc() will set the colors_avail flag to false and try to find the nearest color. NOTE: From deep within the event loop, the colors_avail flag is reset to - true (calls the function qt_reset_color_avail()), because some other + true (calls the function tqt_reset_color_avail()), because some other application might free its colors, thereby making them available for this TQt application. *****************************************************************************/ @@ -114,7 +114,7 @@ static TQColorScreenData **screendata = 0; // array of screendata pointers approximation when there are no more colors left to allocate. */ -void qt_reset_color_avail() +void tqt_reset_color_avail() { int i; for ( i = 0; i < screencount; i++ ) { @@ -633,9 +633,9 @@ void TQColor::setSystemNamedColor( const TQString& name ) // the window system's interface for translating names to rgb values... // we do this so that things like tquic can load an XPM file with named colors // and convert it to a png without having to use window system functions... - d.argb = qt_get_rgb_val( name.latin1() ); + d.argb = tqt_get_rgb_val( name.latin1() ); TQRgb rgb; - if ( qt_get_named_rgb( name.latin1(), &rgb ) ) { + if ( tqt_get_named_rgb( name.latin1(), &rgb ) ) { setRgb( tqRed(rgb), tqGreen(rgb), tqBlue(rgb) ); if ( colormodel == d8 ) { d.d8.invalid = false; diff --git a/src/kernel/tqeventloop_x11.cpp b/src/kernel/tqeventloop_x11.cpp index ec7778234..1d4c6529e 100644 --- a/src/kernel/tqeventloop_x11.cpp +++ b/src/kernel/tqeventloop_x11.cpp @@ -402,7 +402,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) } // color approx. optimization - only on X11 - qt_reset_color_avail(); + tqt_reset_color_avail(); // return true if we handled events, false otherwise return (nevents > 0); diff --git a/src/kernel/tqeventloop_x11_glib.cpp b/src/kernel/tqeventloop_x11_glib.cpp index 552eb108b..1c744d43c 100644 --- a/src/kernel/tqeventloop_x11_glib.cpp +++ b/src/kernel/tqeventloop_x11_glib.cpp @@ -625,7 +625,7 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) { if (hasPendingEvents()) { // color approx. optimization - only on X11 - qt_reset_color_avail(); + tqt_reset_color_avail(); #if defined(TQT_THREAD_SUPPORT) if (locker.mutex()) locker.mutex()->unlock(); diff --git a/src/kernel/tqt_x11_p.h b/src/kernel/tqt_x11_p.h index b84bfca4b..9a0b6ad51 100644 --- a/src/kernel/tqt_x11_p.h +++ b/src/kernel/tqt_x11_p.h @@ -63,9 +63,9 @@ #if defined(_XLIB_H_) // crude hack, but... #error "cannot include before this file" #endif -#define XRegisterIMInstantiateCallback qt_XRegisterIMInstantiateCallback -#define XUnregisterIMInstantiateCallback qt_XUnregisterIMInstantiateCallback -#define XSetIMValues qt_XSetIMValues +#define XRegisterIMInstantiateCallback tqt_XRegisterIMInstantiateCallback +#define XUnregisterIMInstantiateCallback tqt_XUnregisterIMInstantiateCallback +#define XSetIMValues tqt_XSetIMValues #include #undef XRegisterIMInstantiateCallback #undef XUnregisterIMInstantiateCallback diff --git a/src/tools/tqcomlibrary.cpp b/src/tools/tqcomlibrary.cpp index 19c03c019..832d79556 100644 --- a/src/tools/tqcomlibrary.cpp +++ b/src/tools/tqcomlibrary.cpp @@ -60,7 +60,7 @@ TQComLibrary::TQComLibrary( const TQString &filename ) - : TQLibrary( filename ), entry( 0 ), libiface( 0 ), qt_version( 0 ) + : TQLibrary( filename ), entry( 0 ), libiface( 0 ), tqt_version( 0 ) { } @@ -413,7 +413,7 @@ void TQComLibrary::createInstanceInternal() if ( reg.count() == 4 ) { // check timestamp if ( lastModified == reg[3] ) { - qt_version = reg[0].toUInt(0, 16); + tqt_version = reg[0].toUInt(0, 16); flags = reg[1].toUInt(0, 16); key = reg[2].latin1(); @@ -425,7 +425,7 @@ void TQComLibrary::createInstanceInternal() #if defined(Q_OS_UNIX) if ( ! query_done ) { // get the query information directly from the plugin without loading - if ( qt_unix_query( library(), &qt_version, &flags, &key ) ) { + if ( qt_unix_query( library(), &tqt_version, &flags, &key ) ) { // info read succesfully from library query_done = true; } @@ -446,8 +446,8 @@ void TQComLibrary::createInstanceInternal() if ( !ucmQueryVerificationdataProc || !qt_parse_pattern( ucmQueryVerificationdataProc(), - &qt_version, &flags, &key ) ) { - qt_version = flags = 0; + &tqt_version, &flags, &key ) ) { + tqt_version = flags = 0; key = "unknown"; } else { query_done = true; @@ -456,7 +456,7 @@ void TQComLibrary::createInstanceInternal() #endif // Q_OS_UNIX TQStringList queried; - queried << TQString::number( qt_version,16 ) + queried << TQString::number( tqt_version,16 ) << TQString::number( flags, 16 ) << key << lastModified; @@ -477,7 +477,7 @@ void TQComLibrary::createInstanceInternal() return; } - if ( ! qt_verify( library(), qt_version, flags, key, warn_mismatch ) ) { + if ( ! qt_verify( library(), tqt_version, flags, key, warn_mismatch ) ) { unload(); return; } else if ( !isLoaded() ) { @@ -523,7 +523,7 @@ uint TQComLibrary::qtVersion() { if ( !entry ) createInstanceInternal(); - return entry ? qt_version : 0; + return entry ? tqt_version : 0; } diff --git a/src/tools/tqcomlibrary_p.h b/src/tools/tqcomlibrary_p.h index e803a236c..83d06361f 100644 --- a/src/tools/tqcomlibrary_p.h +++ b/src/tools/tqcomlibrary_p.h @@ -73,7 +73,7 @@ private: TQUnknownInterface *entry; TQLibraryInterface *libiface; - uint qt_version; + uint tqt_version; }; diff --git a/src/tools/tqdir.cpp b/src/tools/tqdir.cpp index 5e276dfc1..76347b810 100644 --- a/src/tools/tqdir.cpp +++ b/src/tools/tqdir.cpp @@ -1159,7 +1159,7 @@ TQDir TQDir::root() \sa home() */ -TQValueList qt_makeFilterList( const TQString &filter ) +TQValueList tqt_makeFilterList( const TQString &filter ) { TQValueList regExps; if ( filter.isEmpty() ) @@ -1179,7 +1179,7 @@ TQValueList qt_makeFilterList( const TQString &filter ) return regExps; } -bool qt_matchFilterList( const TQValueList& filters, +bool tqt_matchFilterList( const TQValueList& filters, const TQString &fileName ) { TQValueList::ConstIterator rit = filters.begin(); @@ -1227,7 +1227,7 @@ bool TQDir::match( const TQStringList &filters, const TQString &fileName ) bool TQDir::match( const TQString &filter, const TQString &fileName ) { - return qt_matchFilterList( qt_makeFilterList(filter), fileName ); + return tqt_matchFilterList( tqt_makeFilterList(filter), fileName ); } @@ -1301,16 +1301,16 @@ TQString TQDir::cleanDirPath( const TQString &filePath ) return newPath; } -int qt_cmp_si_sortSpec; +int tqt_cmp_si_sortSpec; #if defined(Q_C_CALLBACKS) extern "C" { #endif #ifdef Q_OS_TEMP -int __cdecl qt_cmp_si( const void *n1, const void *n2 ) +int __cdecl tqt_cmp_si( const void *n1, const void *n2 ) #else -int qt_cmp_si( const void *n1, const void *n2 ) +int tqt_cmp_si( const void *n1, const void *n2 ) #endif { if ( !n1 || !n2 ) @@ -1319,12 +1319,12 @@ int qt_cmp_si( const void *n1, const void *n2 ) TQDirSortItem* f1 = (TQDirSortItem*)n1; TQDirSortItem* f2 = (TQDirSortItem*)n2; - if ( qt_cmp_si_sortSpec & TQDir::DirsFirst ) + if ( tqt_cmp_si_sortSpec & TQDir::DirsFirst ) if ( f1->item->isDir() != f2->item->isDir() ) return f1->item->isDir() ? -1 : 1; int r = 0; - int sortBy = qt_cmp_si_sortSpec & TQDir::SortByMask; + int sortBy = tqt_cmp_si_sortSpec & TQDir::SortByMask; switch ( sortBy ) { case TQDir::Time: @@ -1339,7 +1339,7 @@ int qt_cmp_si( const void *n1, const void *n2 ) if ( r == 0 && sortBy != TQDir::Unsorted ) { // Still not sorted - sort by name - bool ic = qt_cmp_si_sortSpec & TQDir::IgnoreCase; + bool ic = tqt_cmp_si_sortSpec & TQDir::IgnoreCase; if ( f1->filename_cache.isNull() ) f1->filename_cache = ic ? f1->item->fileName().lower() @@ -1348,7 +1348,7 @@ int qt_cmp_si( const void *n1, const void *n2 ) f2->filename_cache = ic ? f2->item->fileName().lower() : f2->item->fileName(); - r = qt_cmp_si_sortSpec & TQDir::LocaleAware + r = tqt_cmp_si_sortSpec & TQDir::LocaleAware ? f1->filename_cache.localeAwareCompare(f2->filename_cache) : f1->filename_cache.compare(f2->filename_cache); } @@ -1358,7 +1358,7 @@ int qt_cmp_si( const void *n1, const void *n2 ) r = (char*)n1 - (char*)n2; } - if ( qt_cmp_si_sortSpec & TQDir::Reversed ) + if ( tqt_cmp_si_sortSpec & TQDir::Reversed ) return -r; else return r; diff --git a/src/tools/tqdir_p.h b/src/tools/tqdir_p.h index d6c6fb2e8..031d60e9f 100644 --- a/src/tools/tqdir_p.h +++ b/src/tools/tqdir_p.h @@ -59,19 +59,19 @@ #include "tqvaluelist.h" #endif // QT_H -extern TQValueList qt_makeFilterList( const TQString & ); -extern bool qt_matchFilterList( const TQValueList &, const TQString & ); +extern TQValueList tqt_makeFilterList( const TQString & ); +extern bool tqt_matchFilterList( const TQValueList &, const TQString & ); -extern int qt_cmp_si_sortSpec; +extern int tqt_cmp_si_sortSpec; #if defined(Q_C_CALLBACKS) extern "C" { #endif #ifdef Q_OS_TEMP -extern int __cdecl qt_cmp_si( const void *, const void * ); +extern int __cdecl tqt_cmp_si( const void *, const void * ); #else -extern int qt_cmp_si( const void *, const void * ); +extern int tqt_cmp_si( const void *, const void * ); #endif #if defined(Q_C_CALLBACKS) diff --git a/src/tools/tqdir_unix.cpp b/src/tools/tqdir_unix.cpp index f58b20875..bead1b1d5 100644 --- a/src/tools/tqdir_unix.cpp +++ b/src/tools/tqdir_unix.cpp @@ -219,7 +219,7 @@ bool TQDir::readDirEntries( const TQString &nameFilter, fiList->clear(); } - TQValueList filters = qt_makeFilterList( nameFilter ); + TQValueList filters = tqt_makeFilterList( nameFilter ); bool doDirs = (filterSpec & Dirs) != 0; bool doFiles = (filterSpec & Files) != 0; @@ -250,7 +250,7 @@ bool TQDir::readDirEntries( const TQString &nameFilter, { TQString fn = TQFile::decodeName(file->d_name); fi.setFile( *this, fn ); - if ( !qt_matchFilterList(filters, fn) && !(allDirs && fi.isDir()) ) + if ( !tqt_matchFilterList(filters, fn) && !(allDirs && fi.isDir()) ) continue; if ( (doDirs && fi.isDir()) || (doFiles && fi.isFile()) || (doSystem && (!fi.isFile() && !fi.isDir())) ) { @@ -282,8 +282,8 @@ bool TQDir::readDirEntries( const TQString &nameFilter, i=0; for (itm = fiList->first(); itm; itm = fiList->next()) si[i++].item = itm; - qt_cmp_si_sortSpec = sortSpec; - qsort( si, i, sizeof(si[0]), qt_cmp_si ); + tqt_cmp_si_sortSpec = sortSpec; + qsort( si, i, sizeof(si[0]), tqt_cmp_si ); // put them back in the list fiList->setAutoDelete( false ); fiList->clear(); -- cgit v1.2.3