From 1626f794e41934282a77811826b9298be5f3e6c3 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Wed, 8 Apr 2026 03:37:43 +0300 Subject: q => tq rebranding: rename internal symbols used only on mac All the symbols are used only on mac and are internal so they won't affect API/ABI on X11. The rename was done with next script: grep -horE '\/t&/g'! > /tmp/qt-rename.sed grep -horE '\/t&/g'! >> /tmp/qt-rename.sed find * -type f -exec sed -i -f /tmp/qt-rename.sed '{}' \+ Signed-off-by: Alexander Golubev --- doc/html/tqcursor-h.html | 2 +- doc/html/tqeventloop-h.html | 2 +- doc/html/tqmenubar-h.html | 6 +++--- doc/html/tqpainter-h.html | 2 +- doc/html/tqregion-h.html | 6 +++--- doc/html/tqwidget-h.html | 14 +++++++------- src/kernel/tqcursor.h | 2 +- src/kernel/tqeventloop.h | 2 +- src/kernel/tqpainter.h | 2 +- src/kernel/tqregion.h | 6 +++--- src/kernel/tqsizegrip.cpp | 4 ++-- src/kernel/tqwidget.h | 14 +++++++------- src/widgets/tqmenubar.h | 6 +++--- 13 files changed, 34 insertions(+), 34 deletions(-) diff --git a/doc/html/tqcursor-h.html b/doc/html/tqcursor-h.html index 4f0cc469b..ec120f78b 100644 --- a/doc/html/tqcursor-h.html +++ b/doc/html/tqcursor-h.html @@ -150,7 +150,7 @@ private: TQCursorData *data; TQCursor *find_cur(int); #if defined(TQ_WS_MAC) - friend void qt_mac_set_cursor(const TQCursor *c, const Point *p); + friend void tqt_mac_set_cursor(const TQCursor *c, const Point *p); #endif }; diff --git a/doc/html/tqeventloop-h.html b/doc/html/tqeventloop-h.html index 6262140ab..d63329e1e 100644 --- a/doc/html/tqeventloop-h.html +++ b/doc/html/tqeventloop-h.html @@ -137,7 +137,7 @@ signals: private: #if defined(TQ_WS_MAC) - friend TQMAC_PASCAL void qt_mac_select_timer_callbk(EventLoopTimerRef, void *); + friend TQMAC_PASCAL void tqt_mac_select_timer_callbk(EventLoopTimerRef, void *); int macHandleSelect(timeval *); void macHandleTimer(TimerInfo *); #endif // TQ_WS_MAC diff --git a/doc/html/tqmenubar-h.html b/doc/html/tqmenubar-h.html index 1d9d0761a..ea69f65b8 100644 --- a/doc/html/tqmenubar-h.html +++ b/doc/html/tqmenubar-h.html @@ -198,15 +198,15 @@ private: #if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE) friend class TQWidget; friend class TQApplication; - friend void qt_mac_set_modal_state(bool, TQMenuBar *); + friend void tqt_mac_set_modal_state(bool, TQMenuBar *); void macCreateNativeMenubar(); void macRemoveNativeMenubar(); void macDirtyNativeMenubar(); #if !defined(TQMAC_QMENUBAR_NO_EVENT) - static void qt_mac_install_menubar_event(MenuRef); - static OSStatus qt_mac_menubar_event(EventHandlerCallRef, EventRef, void *); + static void tqt_mac_install_menubar_event(MenuRef); + static OSStatus tqt_mac_menubar_event(EventHandlerCallRef, EventRef, void *); #endif virtual void macWidgetChangedWindow(); bool syncPopups(MenuRef ret, TQPopupMenu *d); diff --git a/doc/html/tqpainter-h.html b/doc/html/tqpainter-h.html index badfb005f..5806847a7 100644 --- a/doc/html/tqpainter-h.html +++ b/doc/html/tqpainter-h.html @@ -430,7 +430,7 @@ protected: #elif defined(TQ_WS_MAC) TQt::HANDLE hd; // handle to drawable void initPaintDevice(bool force=false, TQPoint *off=NULL, TQRegion *rgn=NULL); - friend const TQRegion &qt_mac_update_painter(TQPainter *, bool); + friend const TQRegion &tqt_mac_update_painter(TQPainter *, bool); friend class TQFontEngineMac; friend class TQMacPainter; #endif diff --git a/doc/html/tqregion-h.html b/doc/html/tqregion-h.html index 1a801e0bc..77dc102e0 100644 --- a/doc/html/tqregion-h.html +++ b/doc/html/tqregion-h.html @@ -171,9 +171,9 @@ private: bool is_null; } *data; #if defined(TQ_WS_MAC) - friend struct qt_mac_rgn_data_cache; - friend TQRegionData *qt_mac_get_rgn_data(); - friend void qt_mac_free_rgn_data(TQRegionData *); + friend struct tqt_mac_rgn_data_cache; + friend TQRegionData *tqt_mac_get_rgn_data(); + friend void tqt_mac_free_rgn_data(TQRegionData *); void rectifyRegion(); #elif defined(TQ_WS_WIN) friend class TQETWidget; diff --git a/doc/html/tqwidget-h.html b/doc/html/tqwidget-h.html index ad946496a..9323a9b94 100644 --- a/doc/html/tqwidget-h.html +++ b/doc/html/tqwidget-h.html @@ -607,15 +607,15 @@ private: void propagateUpdates(bool update_rgn=true); void update( const TQRegion& ); //friends, way too many - fix this immediately! - friend void qt_clean_root_win(); - friend bool qt_recreate_root_win(); + friend void tqt_clean_root_win(); + friend bool tqt_recreate_root_win(); friend TQPoint posInWindow(TQWidget *); - friend bool qt_mac_update_sizer(TQWidget *, int); - friend TQWidget *qt_recursive_match(TQWidget *widg, int x, int y); - friend bool qt_paint_children(TQWidget *,TQRegion &, uchar ops); + friend bool tqt_mac_update_sizer(TQWidget *, int); + friend TQWidget *tqt_recursive_match(TQWidget *widg, int x, int y); + friend bool tqt_paint_children(TQWidget *,TQRegion &, uchar ops); friend TQMAC_PASCAL OSStatus tqt_window_event(EventHandlerCallRef er, EventRef event, void *); - friend void qt_event_request_updates(TQWidget *, const TQRegion &, bool subtract); - friend bool qt_window_rgn(WId, short, RgnHandle, bool); + friend void tqt_event_request_updates(TQWidget *, const TQRegion &, bool subtract); + friend bool tqt_window_rgn(WId, short, RgnHandle, bool); friend class TQDragManager; #endif diff --git a/src/kernel/tqcursor.h b/src/kernel/tqcursor.h index 9ff7d1b70..def1b8624 100644 --- a/src/kernel/tqcursor.h +++ b/src/kernel/tqcursor.h @@ -115,7 +115,7 @@ private: TQCursorData *data; TQCursor *find_cur(int); #if defined(TQ_WS_MAC) - friend void qt_mac_set_cursor(const TQCursor *c, const Point *p); + friend void tqt_mac_set_cursor(const TQCursor *c, const Point *p); #endif }; diff --git a/src/kernel/tqeventloop.h b/src/kernel/tqeventloop.h index 311f03c91..8ae467f2b 100644 --- a/src/kernel/tqeventloop.h +++ b/src/kernel/tqeventloop.h @@ -111,7 +111,7 @@ signals: private: #if defined(TQ_WS_MAC) - friend TQMAC_PASCAL void qt_mac_select_timer_callbk(EventLoopTimerRef, void *); + friend TQMAC_PASCAL void tqt_mac_select_timer_callbk(EventLoopTimerRef, void *); int macHandleSelect(timeval *); void macHandleTimer(TimerInfo *); #endif // TQ_WS_MAC diff --git a/src/kernel/tqpainter.h b/src/kernel/tqpainter.h index 67dae0f6f..739c1226a 100644 --- a/src/kernel/tqpainter.h +++ b/src/kernel/tqpainter.h @@ -395,7 +395,7 @@ protected: #elif defined(TQ_WS_MAC) TQt::HANDLE hd; // handle to drawable void initPaintDevice(bool force=false, TQPoint *off=NULL, TQRegion *rgn=NULL); - friend const TQRegion &qt_mac_update_painter(TQPainter *, bool); + friend const TQRegion &tqt_mac_update_painter(TQPainter *, bool); friend class TQFontEngineMac; friend class TQMacPainter; #endif diff --git a/src/kernel/tqregion.h b/src/kernel/tqregion.h index ff56ad665..bc3445b78 100644 --- a/src/kernel/tqregion.h +++ b/src/kernel/tqregion.h @@ -136,9 +136,9 @@ private: bool is_null; } *data; #if defined(TQ_WS_MAC) - friend struct qt_mac_rgn_data_cache; - friend TQRegionData *qt_mac_get_rgn_data(); - friend void qt_mac_free_rgn_data(TQRegionData *); + friend struct tqt_mac_rgn_data_cache; + friend TQRegionData *tqt_mac_get_rgn_data(); + friend void tqt_mac_free_rgn_data(TQRegionData *); void rectifyRegion(); #elif defined(TQ_WS_WIN) friend class TQETWidget; diff --git a/src/kernel/tqsizegrip.cpp b/src/kernel/tqsizegrip.cpp index ead2494be..0ee533955 100644 --- a/src/kernel/tqsizegrip.cpp +++ b/src/kernel/tqsizegrip.cpp @@ -53,7 +53,7 @@ extern Atom tqt_sizegrip; // defined in tqapplication_x11.cpp #include "tqobjectlist.h" #include "tqt_windows.h" #elif defined(TQ_WS_MAC) -bool qt_mac_update_sizer(TQWidget *, int); //tqwidget_mac.cpp +bool tqt_mac_update_sizer(TQWidget *, int); //tqwidget_mac.cpp #endif @@ -271,7 +271,7 @@ bool TQSizeGrip::eventFilter( TQObject *o, TQEvent *e ) if(!TQApplication::closingDown() && parentWidget() && !qt_sizegrip_workspace(this)) { if(TQWidget *w = qt_sizegrip_topLevelWidget(this)) { if(w->isTopLevel()) - qt_mac_update_sizer(w, e->type() == TQEvent::Hide ? -1 : 1); + tqt_mac_update_sizer(w, e->type() == TQEvent::Hide ? -1 : 1); } } break; diff --git a/src/kernel/tqwidget.h b/src/kernel/tqwidget.h index 399c30b10..933ac9313 100644 --- a/src/kernel/tqwidget.h +++ b/src/kernel/tqwidget.h @@ -616,15 +616,15 @@ private: void propagateUpdates(bool update_rgn=true); void update( const TQRegion& ); //friends, way too many - fix this immediately! - friend void qt_clean_root_win(); - friend bool qt_recreate_root_win(); + friend void tqt_clean_root_win(); + friend bool tqt_recreate_root_win(); friend TQPoint posInWindow(TQWidget *); - friend bool qt_mac_update_sizer(TQWidget *, int); - friend TQWidget *qt_recursive_match(TQWidget *widg, int x, int y); - friend bool qt_paint_children(TQWidget *,TQRegion &, uchar ops); + friend bool tqt_mac_update_sizer(TQWidget *, int); + friend TQWidget *tqt_recursive_match(TQWidget *widg, int x, int y); + friend bool tqt_paint_children(TQWidget *,TQRegion &, uchar ops); friend TQMAC_PASCAL OSStatus tqt_window_event(EventHandlerCallRef er, EventRef event, void *); - friend void qt_event_request_updates(TQWidget *, const TQRegion &, bool subtract); - friend bool qt_window_rgn(WId, short, RgnHandle, bool); + friend void tqt_event_request_updates(TQWidget *, const TQRegion &, bool subtract); + friend bool tqt_window_rgn(WId, short, RgnHandle, bool); friend class TQDragManager; #endif diff --git a/src/widgets/tqmenubar.h b/src/widgets/tqmenubar.h index 2d55ef883..5d988fe01 100644 --- a/src/widgets/tqmenubar.h +++ b/src/widgets/tqmenubar.h @@ -163,15 +163,15 @@ private: #if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE) friend class TQWidget; friend class TQApplication; - friend void qt_mac_set_modal_state(bool, TQMenuBar *); + friend void tqt_mac_set_modal_state(bool, TQMenuBar *); void macCreateNativeMenubar(); void macRemoveNativeMenubar(); void macDirtyNativeMenubar(); #if !defined(TQMAC_QMENUBAR_NO_EVENT) - static void qt_mac_install_menubar_event(MenuRef); - static OSStatus qt_mac_menubar_event(EventHandlerCallRef, EventRef, void *); + static void tqt_mac_install_menubar_event(MenuRef); + static OSStatus tqt_mac_menubar_event(EventHandlerCallRef, EventRef, void *); #endif virtual void macWidgetChangedWindow(); bool syncPopups(MenuRef ret, TQPopupMenu *d); -- cgit v1.2.3