diff options
Diffstat (limited to 'tools')
29 files changed, 134 insertions, 134 deletions
diff --git a/tools/assistant/docuparser.h b/tools/assistant/docuparser.h index 919c3145..bb8fd322 100644 --- a/tools/assistant/docuparser.h +++ b/tools/assistant/docuparser.h @@ -48,7 +48,7 @@ struct ContentItem { TQString title; TQString reference; int depth; - Q_DUMMY_COMPARISON_OPERATOR(ContentItem) + TQ_DUMMY_COMPARISON_OPERATOR(ContentItem) }; TQDataStream &operator>>( TQDataStream &s, ContentItem &ci ); diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp index 00ab8cdc..30692ad5 100644 --- a/tools/assistant/helpdialogimpl.cpp +++ b/tools/assistant/helpdialogimpl.cpp @@ -100,7 +100,7 @@ struct IndexKeyword { bool operator>( const IndexKeyword &ik ) const { return keyword.lower() > ik.keyword.lower(); } - Q_DUMMY_COMPARISON_OPERATOR( IndexKeyword ) + TQ_DUMMY_COMPARISON_OPERATOR( IndexKeyword ) TQString keyword; TQString link; }; diff --git a/tools/designer/designer/command.h b/tools/designer/designer/command.h index 6fc0aa5c..12d51800 100644 --- a/tools/designer/designer/command.h +++ b/tools/designer/designer/command.h @@ -781,7 +781,7 @@ public: { TQString text; TQPixmap pix; - Q_DUMMY_COMPARISON_OPERATOR( Item ) + TQ_DUMMY_COMPARISON_OPERATOR( Item ) }; PopulateListBoxCommand( const TQString &n, FormWindow *fw, @@ -805,7 +805,7 @@ public: { TQString text; TQPixmap pix; - Q_DUMMY_COMPARISON_OPERATOR( Item ) + TQ_DUMMY_COMPARISON_OPERATOR( Item ) }; PopulateIconViewCommand( const TQString &n, FormWindow *fw, @@ -863,7 +863,7 @@ public: { TQString text; TQPixmap pix; - Q_DUMMY_COMPARISON_OPERATOR( Row ) + TQ_DUMMY_COMPARISON_OPERATOR( Row ) }; struct Column @@ -871,7 +871,7 @@ public: TQString text; TQPixmap pix; TQString field; - Q_DUMMY_COMPARISON_OPERATOR( Column ) + TQ_DUMMY_COMPARISON_OPERATOR( Column ) }; PopulateTableCommand( const TQString &n, FormWindow *fw, TQTable *t, diff --git a/tools/designer/designer/designerapp.cpp b/tools/designer/designer/designerapp.cpp index bea6ac4a..2eba6e50 100644 --- a/tools/designer/designer/designerapp.cpp +++ b/tools/designer/designer/designerapp.cpp @@ -53,7 +53,7 @@ void set_splash_status( const TQString &txt ) if ( !splash ) return; TQString splashText = "Licensed to " - + TQString::fromLatin1( QT_PRODUCT_LICENSEE ) + "\n" + + TQString::fromLatin1( TQT_PRODUCT_LICENSEE ) + "\n" + txt; splash->message( splashText, TQt::AlignRight|TQt::AlignTop ); } diff --git a/tools/designer/designer/designerappiface.h b/tools/designer/designer/designerappiface.h index fef579db..90f46f22 100644 --- a/tools/designer/designer/designerappiface.h +++ b/tools/designer/designer/designerappiface.h @@ -72,7 +72,7 @@ public: TQRESULT queryInterface( const TQUuid &uuid, TQUnknownInterface** iface ); - Q_REFCOUNT + TQ_REFCOUNT private: MainWindow *mainWindow; diff --git a/tools/designer/designer/editfunctionsimpl.h b/tools/designer/designer/editfunctionsimpl.h index e661dedd..cc166176 100644 --- a/tools/designer/designer/editfunctionsimpl.h +++ b/tools/designer/designer/editfunctionsimpl.h @@ -84,7 +84,7 @@ private: TQString type; TQString oldType; - Q_DUMMY_COMPARISON_OPERATOR( FunctItem ) + TQ_DUMMY_COMPARISON_OPERATOR( FunctItem ) }; void changeItem( TQListViewItem *item, Attribute a, const TQString &nV ); diff --git a/tools/designer/designer/hierarchyview.h b/tools/designer/designer/hierarchyview.h index faa097e0..a7d88fd4 100644 --- a/tools/designer/designer/hierarchyview.h +++ b/tools/designer/designer/hierarchyview.h @@ -236,7 +236,7 @@ private: TQListView *lv; TQInterfacePtr<ClassBrowserInterface> iface; - Q_DUMMY_COMPARISON_OPERATOR( ClassBrowser ) + TQ_DUMMY_COMPARISON_OPERATOR( ClassBrowser ) }; FormWindow *formwindow; HierarchyList *listview; diff --git a/tools/designer/designer/layout.h b/tools/designer/designer/layout.h index c9dab83a..129e1f1f 100644 --- a/tools/designer/designer/layout.h +++ b/tools/designer/designer/layout.h @@ -185,7 +185,7 @@ public: int column; int rowspan; int colspan; - Q_DUMMY_COMPARISON_OPERATOR( Item ) + TQ_DUMMY_COMPARISON_OPERATOR( Item ) }; TQMap<TQWidget*, Item> items; diff --git a/tools/designer/designer/listvieweditorimpl.h b/tools/designer/designer/listvieweditorimpl.h index 194e1f81..9281319d 100644 --- a/tools/designer/designer/listvieweditorimpl.h +++ b/tools/designer/designer/listvieweditorimpl.h @@ -87,7 +87,7 @@ private: TQString text; TQPixmap pixmap; bool clickable, resizable; - Q_DUMMY_COMPARISON_OPERATOR( Column ) + TQ_DUMMY_COMPARISON_OPERATOR( Column ) }; private: diff --git a/tools/designer/designer/mainwindow.h b/tools/designer/designer/mainwindow.h index db7fb14a..45722b37 100644 --- a/tools/designer/designer/mainwindow.h +++ b/tools/designer/designer/mainwindow.h @@ -373,7 +373,7 @@ private: TQString title; TQObject *receiver; const char *init_slot, *accept_slot; - Q_DUMMY_COMPARISON_OPERATOR( Tab ) + TQ_DUMMY_COMPARISON_OPERATOR( Tab ) }; private: diff --git a/tools/designer/designer/pixmapcollection.h b/tools/designer/designer/pixmapcollection.h index 8b89824e..afff12d9 100644 --- a/tools/designer/designer/pixmapcollection.h +++ b/tools/designer/designer/pixmapcollection.h @@ -50,7 +50,7 @@ public: TQPixmap pix; TQString name; TQString absname; - Q_DUMMY_COMPARISON_OPERATOR( Pixmap ) + TQ_DUMMY_COMPARISON_OPERATOR( Pixmap ) }; PixmapCollection( Project *pro ); diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp index ab9ac9d1..ef1b39e9 100644 --- a/tools/designer/designer/resource.cpp +++ b/tools/designer/designer/resource.cpp @@ -113,92 +113,92 @@ static struct { int key; const char* name; } keyname[] = { - { TQt::Key_Space, QT_TRANSLATE_NOOP( "TQAccel", "Space" ) }, - { TQt::Key_Escape, QT_TRANSLATE_NOOP( "TQAccel", "Esc" ) }, - { TQt::Key_Tab, QT_TRANSLATE_NOOP( "TQAccel", "Tab" ) }, - { TQt::Key_Backtab, QT_TRANSLATE_NOOP( "TQAccel", "Backtab" ) }, - { TQt::Key_Backspace, QT_TRANSLATE_NOOP( "TQAccel", "Backspace" ) }, - { TQt::Key_Return, QT_TRANSLATE_NOOP( "TQAccel", "Return" ) }, - { TQt::Key_Enter, QT_TRANSLATE_NOOP( "TQAccel", "Enter" ) }, - { TQt::Key_Insert, QT_TRANSLATE_NOOP( "TQAccel", "Ins" ) }, - { TQt::Key_Delete, QT_TRANSLATE_NOOP( "TQAccel", "Del" ) }, - { TQt::Key_Pause, QT_TRANSLATE_NOOP( "TQAccel", "Pause" ) }, - { TQt::Key_Print, QT_TRANSLATE_NOOP( "TQAccel", "Print" ) }, - { TQt::Key_SysReq, QT_TRANSLATE_NOOP( "TQAccel", "SysReq" ) }, - { TQt::Key_Home, QT_TRANSLATE_NOOP( "TQAccel", "Home" ) }, - { TQt::Key_End, QT_TRANSLATE_NOOP( "TQAccel", "End" ) }, - { TQt::Key_Left, QT_TRANSLATE_NOOP( "TQAccel", "Left" ) }, - { TQt::Key_Up, QT_TRANSLATE_NOOP( "TQAccel", "Up" ) }, - { TQt::Key_Right, QT_TRANSLATE_NOOP( "TQAccel", "Right" ) }, - { TQt::Key_Down, QT_TRANSLATE_NOOP( "TQAccel", "Down" ) }, - { TQt::Key_Prior, QT_TRANSLATE_NOOP( "TQAccel", "PgUp" ) }, - { TQt::Key_Next, QT_TRANSLATE_NOOP( "TQAccel", "PgDown" ) }, - { TQt::Key_CapsLock, QT_TRANSLATE_NOOP( "TQAccel", "CapsLock" ) }, - { TQt::Key_NumLock, QT_TRANSLATE_NOOP( "TQAccel", "NumLock" ) }, - { TQt::Key_ScrollLock, QT_TRANSLATE_NOOP( "TQAccel", "ScrollLock" ) }, - { TQt::Key_Menu, QT_TRANSLATE_NOOP( "TQAccel", "Menu" ) }, - { TQt::Key_Help, QT_TRANSLATE_NOOP( "TQAccel", "Help" ) }, + { TQt::Key_Space, TQT_TRANSLATE_NOOP( "TQAccel", "Space" ) }, + { TQt::Key_Escape, TQT_TRANSLATE_NOOP( "TQAccel", "Esc" ) }, + { TQt::Key_Tab, TQT_TRANSLATE_NOOP( "TQAccel", "Tab" ) }, + { TQt::Key_Backtab, TQT_TRANSLATE_NOOP( "TQAccel", "Backtab" ) }, + { TQt::Key_Backspace, TQT_TRANSLATE_NOOP( "TQAccel", "Backspace" ) }, + { TQt::Key_Return, TQT_TRANSLATE_NOOP( "TQAccel", "Return" ) }, + { TQt::Key_Enter, TQT_TRANSLATE_NOOP( "TQAccel", "Enter" ) }, + { TQt::Key_Insert, TQT_TRANSLATE_NOOP( "TQAccel", "Ins" ) }, + { TQt::Key_Delete, TQT_TRANSLATE_NOOP( "TQAccel", "Del" ) }, + { TQt::Key_Pause, TQT_TRANSLATE_NOOP( "TQAccel", "Pause" ) }, + { TQt::Key_Print, TQT_TRANSLATE_NOOP( "TQAccel", "Print" ) }, + { TQt::Key_SysReq, TQT_TRANSLATE_NOOP( "TQAccel", "SysReq" ) }, + { TQt::Key_Home, TQT_TRANSLATE_NOOP( "TQAccel", "Home" ) }, + { TQt::Key_End, TQT_TRANSLATE_NOOP( "TQAccel", "End" ) }, + { TQt::Key_Left, TQT_TRANSLATE_NOOP( "TQAccel", "Left" ) }, + { TQt::Key_Up, TQT_TRANSLATE_NOOP( "TQAccel", "Up" ) }, + { TQt::Key_Right, TQT_TRANSLATE_NOOP( "TQAccel", "Right" ) }, + { TQt::Key_Down, TQT_TRANSLATE_NOOP( "TQAccel", "Down" ) }, + { TQt::Key_Prior, TQT_TRANSLATE_NOOP( "TQAccel", "PgUp" ) }, + { TQt::Key_Next, TQT_TRANSLATE_NOOP( "TQAccel", "PgDown" ) }, + { TQt::Key_CapsLock, TQT_TRANSLATE_NOOP( "TQAccel", "CapsLock" ) }, + { TQt::Key_NumLock, TQT_TRANSLATE_NOOP( "TQAccel", "NumLock" ) }, + { TQt::Key_ScrollLock, TQT_TRANSLATE_NOOP( "TQAccel", "ScrollLock" ) }, + { TQt::Key_Menu, TQT_TRANSLATE_NOOP( "TQAccel", "Menu" ) }, + { TQt::Key_Help, TQT_TRANSLATE_NOOP( "TQAccel", "Help" ) }, // Multimedia keys - { TQt::Key_Back, QT_TRANSLATE_NOOP( "TQAccel", "Back" ) }, - { TQt::Key_Forward, QT_TRANSLATE_NOOP( "TQAccel", "Forward" ) }, - { TQt::Key_Stop, QT_TRANSLATE_NOOP( "TQAccel", "Stop" ) }, - { TQt::Key_Refresh, QT_TRANSLATE_NOOP( "TQAccel", "Refresh" ) }, - { TQt::Key_VolumeDown, QT_TRANSLATE_NOOP( "TQAccel", "Volume Down" ) }, - { TQt::Key_VolumeMute, QT_TRANSLATE_NOOP( "TQAccel", "Volume Mute" ) }, - { TQt::Key_VolumeUp, QT_TRANSLATE_NOOP( "TQAccel", "Volume Up" ) }, - { TQt::Key_BassBoost, QT_TRANSLATE_NOOP( "TQAccel", "Bass Boost" ) }, - { TQt::Key_BassUp, QT_TRANSLATE_NOOP( "TQAccel", "Bass Up" ) }, - { TQt::Key_BassDown, QT_TRANSLATE_NOOP( "TQAccel", "Bass Down" ) }, - { TQt::Key_TrebleUp, QT_TRANSLATE_NOOP( "TQAccel", "Treble Up" ) }, - { TQt::Key_TrebleDown, QT_TRANSLATE_NOOP( "TQAccel", "Treble Down" ) }, - { TQt::Key_MediaPlay, QT_TRANSLATE_NOOP( "TQAccel", "Media Play" ) }, - { TQt::Key_MediaStop, QT_TRANSLATE_NOOP( "TQAccel", "Media Stop" ) }, - { TQt::Key_MediaPrev, QT_TRANSLATE_NOOP( "TQAccel", "Media Previous" ) }, - { TQt::Key_MediaNext, QT_TRANSLATE_NOOP( "TQAccel", "Media Next" ) }, - { TQt::Key_MediaRecord, QT_TRANSLATE_NOOP( "TQAccel", "Media Record" ) }, - { TQt::Key_HomePage, QT_TRANSLATE_NOOP( "TQAccel", "Home" ) }, - { TQt::Key_Favorites, QT_TRANSLATE_NOOP( "TQAccel", "Favorites" ) }, - { TQt::Key_Search, QT_TRANSLATE_NOOP( "TQAccel", "Search" ) }, - { TQt::Key_Standby, QT_TRANSLATE_NOOP( "TQAccel", "Standby" ) }, - { TQt::Key_OpenUrl, QT_TRANSLATE_NOOP( "TQAccel", "Open URL" ) }, - { TQt::Key_LaunchMail, QT_TRANSLATE_NOOP( "TQAccel", "Launch Mail" ) }, - { TQt::Key_LaunchMedia, QT_TRANSLATE_NOOP( "TQAccel", "Launch Media" ) }, - { TQt::Key_Launch0, QT_TRANSLATE_NOOP( "TQAccel", "Launch (0)" ) }, - { TQt::Key_Launch1, QT_TRANSLATE_NOOP( "TQAccel", "Launch (1)" ) }, - { TQt::Key_Launch2, QT_TRANSLATE_NOOP( "TQAccel", "Launch (2)" ) }, - { TQt::Key_Launch3, QT_TRANSLATE_NOOP( "TQAccel", "Launch (3)" ) }, - { TQt::Key_Launch4, QT_TRANSLATE_NOOP( "TQAccel", "Launch (4)" ) }, - { TQt::Key_Launch5, QT_TRANSLATE_NOOP( "TQAccel", "Launch (5)" ) }, - { TQt::Key_Launch6, QT_TRANSLATE_NOOP( "TQAccel", "Launch (6)" ) }, - { TQt::Key_Launch7, QT_TRANSLATE_NOOP( "TQAccel", "Launch (7)" ) }, - { TQt::Key_Launch8, QT_TRANSLATE_NOOP( "TQAccel", "Launch (8)" ) }, - { TQt::Key_Launch9, QT_TRANSLATE_NOOP( "TQAccel", "Launch (9)" ) }, - { TQt::Key_LaunchA, QT_TRANSLATE_NOOP( "TQAccel", "Launch (A)" ) }, - { TQt::Key_LaunchB, QT_TRANSLATE_NOOP( "TQAccel", "Launch (B)" ) }, - { TQt::Key_LaunchC, QT_TRANSLATE_NOOP( "TQAccel", "Launch (C)" ) }, - { TQt::Key_LaunchD, QT_TRANSLATE_NOOP( "TQAccel", "Launch (D)" ) }, - { TQt::Key_LaunchE, QT_TRANSLATE_NOOP( "TQAccel", "Launch (E)" ) }, - { TQt::Key_LaunchF, QT_TRANSLATE_NOOP( "TQAccel", "Launch (F)" ) }, - { TQt::Key_MonBrightnessUp, QT_TRANSLATE_NOOP( "TQAccel", "Monitor Brightness Up" ) }, - { TQt::Key_MonBrightnessDown, QT_TRANSLATE_NOOP( "TQAccel", "Monitor Brightness Down" ) }, - { TQt::Key_KeyboardLightOnOff, QT_TRANSLATE_NOOP( "TQAccel", "Keyboard Light On Off" ) }, - { TQt::Key_KeyboardBrightnessUp, QT_TRANSLATE_NOOP( "TQAccel", "Keyboard Brightness Up" ) }, - { TQt::Key_KeyboardBrightnessDown, QT_TRANSLATE_NOOP( "TQAccel", "Keyboard Brightness Down" ) }, + { TQt::Key_Back, TQT_TRANSLATE_NOOP( "TQAccel", "Back" ) }, + { TQt::Key_Forward, TQT_TRANSLATE_NOOP( "TQAccel", "Forward" ) }, + { TQt::Key_Stop, TQT_TRANSLATE_NOOP( "TQAccel", "Stop" ) }, + { TQt::Key_Refresh, TQT_TRANSLATE_NOOP( "TQAccel", "Refresh" ) }, + { TQt::Key_VolumeDown, TQT_TRANSLATE_NOOP( "TQAccel", "Volume Down" ) }, + { TQt::Key_VolumeMute, TQT_TRANSLATE_NOOP( "TQAccel", "Volume Mute" ) }, + { TQt::Key_VolumeUp, TQT_TRANSLATE_NOOP( "TQAccel", "Volume Up" ) }, + { TQt::Key_BassBoost, TQT_TRANSLATE_NOOP( "TQAccel", "Bass Boost" ) }, + { TQt::Key_BassUp, TQT_TRANSLATE_NOOP( "TQAccel", "Bass Up" ) }, + { TQt::Key_BassDown, TQT_TRANSLATE_NOOP( "TQAccel", "Bass Down" ) }, + { TQt::Key_TrebleUp, TQT_TRANSLATE_NOOP( "TQAccel", "Treble Up" ) }, + { TQt::Key_TrebleDown, TQT_TRANSLATE_NOOP( "TQAccel", "Treble Down" ) }, + { TQt::Key_MediaPlay, TQT_TRANSLATE_NOOP( "TQAccel", "Media Play" ) }, + { TQt::Key_MediaStop, TQT_TRANSLATE_NOOP( "TQAccel", "Media Stop" ) }, + { TQt::Key_MediaPrev, TQT_TRANSLATE_NOOP( "TQAccel", "Media Previous" ) }, + { TQt::Key_MediaNext, TQT_TRANSLATE_NOOP( "TQAccel", "Media Next" ) }, + { TQt::Key_MediaRecord, TQT_TRANSLATE_NOOP( "TQAccel", "Media Record" ) }, + { TQt::Key_HomePage, TQT_TRANSLATE_NOOP( "TQAccel", "Home" ) }, + { TQt::Key_Favorites, TQT_TRANSLATE_NOOP( "TQAccel", "Favorites" ) }, + { TQt::Key_Search, TQT_TRANSLATE_NOOP( "TQAccel", "Search" ) }, + { TQt::Key_Standby, TQT_TRANSLATE_NOOP( "TQAccel", "Standby" ) }, + { TQt::Key_OpenUrl, TQT_TRANSLATE_NOOP( "TQAccel", "Open URL" ) }, + { TQt::Key_LaunchMail, TQT_TRANSLATE_NOOP( "TQAccel", "Launch Mail" ) }, + { TQt::Key_LaunchMedia, TQT_TRANSLATE_NOOP( "TQAccel", "Launch Media" ) }, + { TQt::Key_Launch0, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (0)" ) }, + { TQt::Key_Launch1, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (1)" ) }, + { TQt::Key_Launch2, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (2)" ) }, + { TQt::Key_Launch3, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (3)" ) }, + { TQt::Key_Launch4, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (4)" ) }, + { TQt::Key_Launch5, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (5)" ) }, + { TQt::Key_Launch6, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (6)" ) }, + { TQt::Key_Launch7, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (7)" ) }, + { TQt::Key_Launch8, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (8)" ) }, + { TQt::Key_Launch9, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (9)" ) }, + { TQt::Key_LaunchA, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (A)" ) }, + { TQt::Key_LaunchB, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (B)" ) }, + { TQt::Key_LaunchC, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (C)" ) }, + { TQt::Key_LaunchD, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (D)" ) }, + { TQt::Key_LaunchE, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (E)" ) }, + { TQt::Key_LaunchF, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (F)" ) }, + { TQt::Key_MonBrightnessUp, TQT_TRANSLATE_NOOP( "TQAccel", "Monitor Brightness Up" ) }, + { TQt::Key_MonBrightnessDown, TQT_TRANSLATE_NOOP( "TQAccel", "Monitor Brightness Down" ) }, + { TQt::Key_KeyboardLightOnOff, TQT_TRANSLATE_NOOP( "TQAccel", "Keyboard Light On Off" ) }, + { TQt::Key_KeyboardBrightnessUp, TQT_TRANSLATE_NOOP( "TQAccel", "Keyboard Brightness Up" ) }, + { TQt::Key_KeyboardBrightnessDown, TQT_TRANSLATE_NOOP( "TQAccel", "Keyboard Brightness Down" ) }, // -------------------------------------------------------------- // More consistent namings - { TQt::Key_Print, QT_TRANSLATE_NOOP( "TQAccel", "Print Screen" ) }, - { TQt::Key_Prior, QT_TRANSLATE_NOOP( "TQAccel", "Page Up" ) }, - { TQt::Key_Next, QT_TRANSLATE_NOOP( "TQAccel", "Page Down" ) }, - { TQt::Key_CapsLock, QT_TRANSLATE_NOOP( "TQAccel", "Caps Lock" ) }, - { TQt::Key_NumLock, QT_TRANSLATE_NOOP( "TQAccel", "Num Lock" ) }, - { TQt::Key_NumLock, QT_TRANSLATE_NOOP( "TQAccel", "Number Lock" ) }, - { TQt::Key_ScrollLock, QT_TRANSLATE_NOOP( "TQAccel", "Scroll Lock" ) }, - { TQt::Key_Insert, QT_TRANSLATE_NOOP( "TQAccel", "Insert" ) }, - { TQt::Key_Delete, QT_TRANSLATE_NOOP( "TQAccel", "Delete" ) }, - { TQt::Key_Escape, QT_TRANSLATE_NOOP( "TQAccel", "Escape" ) }, - { TQt::Key_SysReq, QT_TRANSLATE_NOOP( "TQAccel", "System Request" ) }, + { TQt::Key_Print, TQT_TRANSLATE_NOOP( "TQAccel", "Print Screen" ) }, + { TQt::Key_Prior, TQT_TRANSLATE_NOOP( "TQAccel", "Page Up" ) }, + { TQt::Key_Next, TQT_TRANSLATE_NOOP( "TQAccel", "Page Down" ) }, + { TQt::Key_CapsLock, TQT_TRANSLATE_NOOP( "TQAccel", "Caps Lock" ) }, + { TQt::Key_NumLock, TQT_TRANSLATE_NOOP( "TQAccel", "Num Lock" ) }, + { TQt::Key_NumLock, TQT_TRANSLATE_NOOP( "TQAccel", "Number Lock" ) }, + { TQt::Key_ScrollLock, TQT_TRANSLATE_NOOP( "TQAccel", "Scroll Lock" ) }, + { TQt::Key_Insert, TQT_TRANSLATE_NOOP( "TQAccel", "Insert" ) }, + { TQt::Key_Delete, TQT_TRANSLATE_NOOP( "TQAccel", "Delete" ) }, + { TQt::Key_Escape, TQT_TRANSLATE_NOOP( "TQAccel", "Escape" ) }, + { TQt::Key_SysReq, TQT_TRANSLATE_NOOP( "TQAccel", "System Request" ) }, { 0, 0 } }; diff --git a/tools/designer/editor/conf.h b/tools/designer/editor/conf.h index aad97ddb..dee40d65 100644 --- a/tools/designer/editor/conf.h +++ b/tools/designer/editor/conf.h @@ -43,7 +43,7 @@ struct ConfigStyle TQFont font; TQColor color; - Q_DUMMY_COMPARISON_OPERATOR( ConfigStyle ) + TQ_DUMMY_COMPARISON_OPERATOR( ConfigStyle ) }; struct Config diff --git a/tools/designer/editor/parenmatcher.h b/tools/designer/editor/parenmatcher.h index 805aca58..14eba438 100644 --- a/tools/designer/editor/parenmatcher.h +++ b/tools/designer/editor/parenmatcher.h @@ -48,7 +48,7 @@ struct Paren TQChar chr; int pos; - Q_DUMMY_COMPARISON_OPERATOR( Paren ) + TQ_DUMMY_COMPARISON_OPERATOR( Paren ) }; typedef TQValueList<Paren> ParenList; diff --git a/tools/designer/examples/opengl/main.cpp b/tools/designer/examples/opengl/main.cpp index 5e9fd117..81a4b4ef 100644 --- a/tools/designer/examples/opengl/main.cpp +++ b/tools/designer/examples/opengl/main.cpp @@ -202,7 +202,7 @@ public: OpenGLWidgetInterface(); TQRESULT queryInterface( const TQUuid&, TQUnknownInterface ** ); - Q_REFCOUNT; + TQ_REFCOUNT; TQStringList featureList() const; @@ -266,7 +266,7 @@ TQString OpenGLWidgetInterface::includeFile( const TQString &description ) const TQString OpenGLWidgetInterface::toolTip( const TQString &description ) const { if ( description == "GLWidget" ) - return QT_TR_NOOP("OpenGL Widget"); + return TQT_TR_NOOP("OpenGL Widget"); return TQString::null; } diff --git a/tools/designer/plugins/cppeditor/common.cpp b/tools/designer/plugins/cppeditor/common.cpp index 63f15528..02c80de1 100644 --- a/tools/designer/plugins/cppeditor/common.cpp +++ b/tools/designer/plugins/cppeditor/common.cpp @@ -45,7 +45,7 @@ public: virtual ~CommonInterface(); TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); - Q_REFCOUNT; + TQ_REFCOUNT; TQString name() const { return "C++"; } TQString description() const { return "C++ Integration"; } diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h index 2a48277b..d1270141 100644 --- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h +++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h @@ -52,7 +52,7 @@ public: virtual ~EditorInterfaceImpl(); TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); - Q_REFCOUNT; + TQ_REFCOUNT; TQWidget *editor( bool readonly, TQWidget *parent, TQUnknownInterface *designerIface ); diff --git a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.h b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.h index be3e2189..73163dcb 100644 --- a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.h +++ b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.h @@ -47,7 +47,7 @@ public: Source create( const TQString &templ, TQUnknownInterface *appIface ); TQString language( const TQString &templ ) const; - Q_REFCOUNT + TQ_REFCOUNT }; diff --git a/tools/designer/plugins/dlg/main.cpp b/tools/designer/plugins/dlg/main.cpp index 37d54c53..2aa9cef5 100644 --- a/tools/designer/plugins/dlg/main.cpp +++ b/tools/designer/plugins/dlg/main.cpp @@ -43,7 +43,7 @@ public: DlgFilter(); TQRESULT queryInterface( const TQUuid&, TQUnknownInterface **iface ); - Q_REFCOUNT; + TQ_REFCOUNT; TQStringList featureList() const; TQStringList import( const TQString& filter, const TQString& filename ); diff --git a/tools/designer/plugins/glade/main.cpp b/tools/designer/plugins/glade/main.cpp index 1913fd36..e0df6460 100644 --- a/tools/designer/plugins/glade/main.cpp +++ b/tools/designer/plugins/glade/main.cpp @@ -43,7 +43,7 @@ public: GladeFilter(); TQRESULT queryInterface( const TQUuid&, TQUnknownInterface **iface ); - Q_REFCOUNT; + TQ_REFCOUNT; TQStringList featureList() const; TQStringList import( const TQString& filter, const TQString& filename ); diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp index e5ccdce2..d12cd12c 100644 --- a/tools/designer/plugins/kdevdlg/main.cpp +++ b/tools/designer/plugins/kdevdlg/main.cpp @@ -46,7 +46,7 @@ public: KDevDlgFilter(); TQRESULT queryInterface( const TQUuid&, TQUnknownInterface **iface ); - Q_REFCOUNT; + TQ_REFCOUNT; TQStringList featureList() const; TQStringList import( const TQString& filter, const TQString& filename ); diff --git a/tools/designer/plugins/rc/main.cpp b/tools/designer/plugins/rc/main.cpp index 6ff2fda1..9825ea64 100644 --- a/tools/designer/plugins/rc/main.cpp +++ b/tools/designer/plugins/rc/main.cpp @@ -44,7 +44,7 @@ public: RCFilter(); TQRESULT queryInterface( const TQUuid&, TQUnknownInterface **iface ); - Q_REFCOUNT; + TQ_REFCOUNT; TQStringList featureList() const; TQStringList import( const TQString& filter, const TQString& filename ); diff --git a/tools/designer/plugins/rc/rc2ui.cpp b/tools/designer/plugins/rc/rc2ui.cpp index 9730b806..3189dde0 100644 --- a/tools/designer/plugins/rc/rc2ui.cpp +++ b/tools/designer/plugins/rc/rc2ui.cpp @@ -814,7 +814,7 @@ bool RC2UI::makeIcon() /*! Writes a stringtable from the input stream to a c++ header file. - All strings are assigned using QT_TR_NOOP to enable easy translation. + All strings are assigned using TQT_TR_NOOP to enable easy translation. */ bool RC2UI::makeStringTable() @@ -859,7 +859,7 @@ bool RC2UI::makeStringTable() ID = parseNext(line, ' '); value = parseNext(line).stripWhiteSpace(); - *out << "static const TQString " << ID << "= QT_TR_NOOP(" << value << ");" << endl; + *out << "static const TQString " << ID << "= TQT_TR_NOOP(" << value << ");" << endl; } while ( line != "END" ); diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp index 159252a4..ed0a36e3 100644 --- a/tools/designer/plugins/wizards/main.cpp +++ b/tools/designer/plugins/wizards/main.cpp @@ -48,7 +48,7 @@ public: virtual ~StandardTemplateWizardInterface(); TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); - Q_REFCOUNT; + TQ_REFCOUNT; TQStringList featureList() const; diff --git a/tools/designer/uic/uic.h b/tools/designer/uic/uic.h index fd616ecd..f7e62f6e 100644 --- a/tools/designer/uic/uic.h +++ b/tools/designer/uic/uic.h @@ -128,7 +128,7 @@ private: { TQString header; TQString location; - Q_DUMMY_COMPARISON_OPERATOR(CustomInclude) + TQ_DUMMY_COMPARISON_OPERATOR(CustomInclude) }; TQValueList<Buddy> buddies; diff --git a/tools/designer/uilib/ntqwidgetfactory.h b/tools/designer/uilib/ntqwidgetfactory.h index 5b7e97c3..19bf1834 100644 --- a/tools/designer/uilib/ntqwidgetfactory.h +++ b/tools/designer/uilib/ntqwidgetfactory.h @@ -152,7 +152,7 @@ private: TQString name; TQPixmap pix; TQString field; - Q_DUMMY_COMPARISON_OPERATOR( Field ) + TQ_DUMMY_COMPARISON_OPERATOR( Field ) }; struct SqlWidgetConnection @@ -163,7 +163,7 @@ private: TQString conn; TQString table; TQMap<TQString, TQString> *dbControls; - Q_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection ) + TQ_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection ) }; TQValueList<Image> images; diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf index 311ac40b..31225a6a 100644 --- a/tools/linguist/book/linguist-programmer.leaf +++ b/tools/linguist/book/linguist-programmer.leaf @@ -241,7 +241,7 @@ understood as meaning \c MyNamespace::MyClass::tr(). If the quoted text is not in a member function of a QObject subclass, use either the tr() function of an appropriate class, or the -QApplication::translate() function directly: +QApplication::translate() function directly: \code void some_global_function( LoginWidget *logwid ) @@ -258,30 +258,30 @@ QApplication::translate() function directly: } \endcode -\section3 Using QT_TR_NOOP() and QT_TRANSLATE_NOOP() +\section3 Using TQT_TR_NOOP() and TQT_TRANSLATE_NOOP() If you need to have translatable text completely outside a function, -there are two macros to help: QT_TR_NOOP() and QT_TRANSLATE_NOOP(). +there are two macros to help: TQT_TR_NOOP() and TQT_TRANSLATE_NOOP(). These macros merely mark the text for extraction by \l{lupdate}. -The macros expand to just the text (without the context). +The macros expand to just the text (without the context). -Example of QT_TR_NOOP(): +Example of TQT_TR_NOOP(): \code QString FriendlyConversation::greeting( int greet_type ) { static const char* greeting_strings[] = { - QT_TR_NOOP( "Hello" ), - QT_TR_NOOP( "Goodbye" ) + TQT_TR_NOOP( "Hello" ), + TQT_TR_NOOP( "Goodbye" ) }; return tr( greeting_strings[greet_type] ); } \endcode -Example of QT_TRANSLATE_NOOP(): +Example of TQT_TRANSLATE_NOOP(): \code static const char* greeting_strings[] = { - QT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ), - QT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" ) + TQT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ), + TQT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" ) }; QString FriendlyConversation::greeting( int greet_type ) @@ -337,7 +337,7 @@ English version}, above, shows the English version. \index QTranslator -This line includes the definition of the \l QTranslator class. +This line includes the definition of the \l QTranslator class. Objects of this class provide translations for user-visible text. \skipto QTranslator @@ -590,7 +590,7 @@ version}, above, the central widget with the four buttons is an When \l lupdate is run it not only extracts the source texts but it also groups them into contexts. A context is the name of the class in which the source text appears. Thus, in this example, "ArrowPad" is a -context: it is the context of the texts in the \c ArrowPad class. +context: it is the context of the texts in the \c ArrowPad class. The \c TQ_OBJECT macro defines \c tr(x) in \c ArrowPad like this \index QApplication!translate() @@ -796,7 +796,7 @@ then the example. What effect did this change have? \index Canada \index French Canada -Set \c LANG=fr_CA (French Canada) and run the example program again. +Set \c LANG=fr_CA (French Canada) and run the example program again. Explain why the result is the same as with \c LANG=fr. Change one of the accelerators in the Dutch translation to eliminate the @@ -926,7 +926,7 @@ translation file based on the current locale. We will use the translations in the \c tt3_pt.ts file that is provided. -Set the \c LANG environment variable to \c pt, and then run \c tt3. +Set the \c LANG environment variable to \c pt, and then run \c tt3. You should still see the English version, as shown in the \e {Tutorial 3 Screenshot, "Troll Print 1.0", English version}, above. Now run \l lrelease, e.g. \c {lrelease tt3.pro}, and then run the @@ -1031,7 +1031,7 @@ Try adding these comments to some source files, particularly to dialog classes, describing the navigation necessary to reach the dialogs. You could also add them to the example files, e.g. \c mainwindow.cpp and \c printpanel.cpp are appropriate files. Run \l -lupdate and then start \e {Qt Linguist} and load in \c tt3_pt.ts. +lupdate and then start \e {Qt Linguist} and load in \c tt3_pt.ts. You should see the comments in the \e {Source text and comments} area as you browse through the list of source texts. diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp index cd532d56..ea0a6fa7 100644 --- a/tools/linguist/linguist/msgedit.cpp +++ b/tools/linguist/linguist/msgedit.cpp @@ -88,12 +88,12 @@ TQString richText( const TQString& text ) { const char backTab[] = "\a\b\f\n\r\t"; const char * const friendlyBackTab[] = { - QT_TRANSLATE_NOOP( "MessageEditor", "bell" ), - QT_TRANSLATE_NOOP( "MessageEditor", "backspace" ), - QT_TRANSLATE_NOOP( "MessageEditor", "new page" ), - QT_TRANSLATE_NOOP( "MessageEditor", "new line" ), - QT_TRANSLATE_NOOP( "MessageEditor", "carriage return" ), - QT_TRANSLATE_NOOP( "MessageEditor", "tab" ) + TQT_TRANSLATE_NOOP( "MessageEditor", "bell" ), + TQT_TRANSLATE_NOOP( "MessageEditor", "backspace" ), + TQT_TRANSLATE_NOOP( "MessageEditor", "new page" ), + TQT_TRANSLATE_NOOP( "MessageEditor", "new line" ), + TQT_TRANSLATE_NOOP( "MessageEditor", "carriage return" ), + TQT_TRANSLATE_NOOP( "MessageEditor", "tab" ) }; TQString rich; diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp index 9eefed74..57a9e586 100644 --- a/tools/qconfig/main.cpp +++ b/tools/qconfig/main.cpp @@ -388,7 +388,7 @@ template <class K, class D> TQValueList<K> keys(TQMap<K,D> map) { TQValueList<K> result; - for (Q_TYPENAME TQMap<K,D>::ConstIterator it = map.begin(); it!=map.end(); ++it) + for (TQ_TYPENAME TQMap<K,D>::ConstIterator it = map.begin(); it!=map.end(); ++it) result.append(it.key()); return result; } |