diff options
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/ntqaccessible.h | 2 | ||||
| -rw-r--r-- | src/kernel/ntqiconset.h | 2 | ||||
| -rw-r--r-- | src/kernel/ntqobject.h | 4 | ||||
| -rw-r--r-- | src/kernel/ntqobjectdefs.h | 2 | ||||
| -rw-r--r-- | src/kernel/ntqpixmap.h | 2 | ||||
| -rw-r--r-- | src/kernel/qfontdatabase.cpp | 116 | ||||
| -rw-r--r-- | src/kernel/qiconset.cpp | 2 | ||||
| -rw-r--r-- | src/kernel/qimageformatplugin.cpp | 2 | ||||
| -rw-r--r-- | src/kernel/qkeysequence.cpp | 162 | ||||
| -rw-r--r-- | src/kernel/qrichtext.cpp | 4 | ||||
| -rw-r--r-- | src/kernel/qrichtext_p.h | 4 | ||||
| -rw-r--r-- | src/kernel/qscriptengine.cpp | 2 | ||||
| -rw-r--r-- | src/kernel/qtranslator.cpp | 2 |
13 files changed, 153 insertions, 153 deletions
diff --git a/src/kernel/ntqaccessible.h b/src/kernel/ntqaccessible.h index 4dccd594..7df830ff 100644 --- a/src/kernel/ntqaccessible.h +++ b/src/kernel/ntqaccessible.h @@ -277,7 +277,7 @@ public: virtual ~TQAccessibleObject(); TQRESULT queryInterface( const TQUuid &, TQUnknownInterface** ); - Q_REFCOUNT + TQ_REFCOUNT bool isValid() const; diff --git a/src/kernel/ntqiconset.h b/src/kernel/ntqiconset.h index 7576c9d0..3276f321 100644 --- a/src/kernel/ntqiconset.h +++ b/src/kernel/ntqiconset.h @@ -90,7 +90,7 @@ public: static const TQSize& iconSize( Size which ); #ifndef Q_QDOC - Q_DUMMY_COMPARISON_OPERATOR(TQIconSet) + TQ_DUMMY_COMPARISON_OPERATOR(TQIconSet) #endif private: diff --git a/src/kernel/ntqobject.h b/src/kernel/ntqobject.h index d65fe49d..c1760dfa 100644 --- a/src/kernel/ntqobject.h +++ b/src/kernel/ntqobject.h @@ -50,8 +50,8 @@ #include "ntqnamespace.h" #endif // QT_H -#define QT_TR_NOOP(x) (x) -#define QT_TRANSLATE_NOOP(scope,x) (x) +#define TQT_TR_NOOP(x) (x) +#define TQT_TRANSLATE_NOOP(scope,x) (x) class TQMetaObject; class TQVariant; diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h index 4e2fbddf..e274ee43 100644 --- a/src/kernel/ntqobjectdefs.h +++ b/src/kernel/ntqobjectdefs.h @@ -169,6 +169,6 @@ Q_EXPORT void *tqt_find_obj_child( TQObject *, const char *, const char * ); Q_EXPORT void *tqt_inheritedBy( TQMetaObject *super, const TQObject *cls ); template <typename T> -Q_INLINE_TEMPLATES T tqt_cast(const TQObject *object) +TQ_INLINE_TEMPLATES T tqt_cast(const TQObject *object) { return (T)tqt_inheritedBy( ((T)0)->staticMetaObject(), object ); } #endif // TQOBJECTDEFS_H diff --git a/src/kernel/ntqpixmap.h b/src/kernel/ntqpixmap.h index e1098878..5c23c751 100644 --- a/src/kernel/ntqpixmap.h +++ b/src/kernel/ntqpixmap.h @@ -176,7 +176,7 @@ public: #endif #ifndef Q_QDOC - Q_DUMMY_COMPARISON_OPERATOR(TQPixmap) + TQ_DUMMY_COMPARISON_OPERATOR(TQPixmap) #endif protected: diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp index 3d0b1b5a..fd57e179 100644 --- a/src/kernel/qfontdatabase.cpp +++ b/src/kernel/qfontdatabase.cpp @@ -1975,198 +1975,198 @@ TQString TQFontDatabase::scriptName(TQFont::Script script) switch (script) { case TQFont::Latin: - name = QT_TRANSLATE_NOOP("TQFont", "Latin"); + name = TQT_TRANSLATE_NOOP("TQFont", "Latin"); break; case TQFont::Greek: - name = QT_TRANSLATE_NOOP("TQFont", "Greek" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Greek" ); break; case TQFont::Cyrillic: - name = QT_TRANSLATE_NOOP("TQFont", "Cyrillic" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Cyrillic" ); break; case TQFont::Armenian: - name = QT_TRANSLATE_NOOP("TQFont", "Armenian" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Armenian" ); break; case TQFont::Georgian: - name = QT_TRANSLATE_NOOP("TQFont", "Georgian" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Georgian" ); break; case TQFont::Runic: - name = QT_TRANSLATE_NOOP("TQFont", "Runic" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Runic" ); break; case TQFont::Ogham: - name = QT_TRANSLATE_NOOP("TQFont", "Ogham" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Ogham" ); break; case TQFont::SpacingModifiers: - name = QT_TRANSLATE_NOOP("TQFont", "SpacingModifiers" ); + name = TQT_TRANSLATE_NOOP("TQFont", "SpacingModifiers" ); break; case TQFont::CombiningMarks: - name = QT_TRANSLATE_NOOP("TQFont", "CombiningMarks" ); + name = TQT_TRANSLATE_NOOP("TQFont", "CombiningMarks" ); break; case TQFont::Hebrew: - name = QT_TRANSLATE_NOOP("TQFont", "Hebrew" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Hebrew" ); break; case TQFont::Arabic: - name = QT_TRANSLATE_NOOP("TQFont", "Arabic" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Arabic" ); break; case TQFont::Syriac: - name = QT_TRANSLATE_NOOP("TQFont", "Syriac" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Syriac" ); break; case TQFont::Thaana: - name = QT_TRANSLATE_NOOP("TQFont", "Thaana" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Thaana" ); break; case TQFont::Devanagari: - name = QT_TRANSLATE_NOOP("TQFont", "Devanagari" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Devanagari" ); break; case TQFont::Bengali: - name = QT_TRANSLATE_NOOP("TQFont", "Bengali" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Bengali" ); break; case TQFont::Gurmukhi: - name = QT_TRANSLATE_NOOP("TQFont", "Gurmukhi" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Gurmukhi" ); break; case TQFont::Gujarati: - name = QT_TRANSLATE_NOOP("TQFont", "Gujarati" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Gujarati" ); break; case TQFont::Oriya: - name = QT_TRANSLATE_NOOP("TQFont", "Oriya" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Oriya" ); break; case TQFont::Tamil: - name = QT_TRANSLATE_NOOP("TQFont", "Tamil" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Tamil" ); break; case TQFont::Telugu: - name = QT_TRANSLATE_NOOP("TQFont", "Telugu" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Telugu" ); break; case TQFont::Kannada: - name = QT_TRANSLATE_NOOP("TQFont", "Kannada" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Kannada" ); break; case TQFont::Malayalam: - name = QT_TRANSLATE_NOOP("TQFont", "Malayalam" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Malayalam" ); break; case TQFont::Sinhala: - name = QT_TRANSLATE_NOOP("TQFont", "Sinhala" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Sinhala" ); break; case TQFont::Thai: - name = QT_TRANSLATE_NOOP("TQFont", "Thai" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Thai" ); break; case TQFont::Lao: - name = QT_TRANSLATE_NOOP("TQFont", "Lao" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Lao" ); break; case TQFont::Tibetan: - name = QT_TRANSLATE_NOOP("TQFont", "Tibetan" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Tibetan" ); break; case TQFont::Myanmar: - name = QT_TRANSLATE_NOOP("TQFont", "Myanmar" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Myanmar" ); break; case TQFont::Khmer: - name = QT_TRANSLATE_NOOP("TQFont", "Khmer" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Khmer" ); break; case TQFont::Han: - name = QT_TRANSLATE_NOOP("TQFont", "Han" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Han" ); break; case TQFont::Hiragana: - name = QT_TRANSLATE_NOOP("TQFont", "Hiragana" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Hiragana" ); break; case TQFont::Katakana: - name = QT_TRANSLATE_NOOP("TQFont", "Katakana" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Katakana" ); break; case TQFont::Hangul: - name = QT_TRANSLATE_NOOP("TQFont", "Hangul" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Hangul" ); break; case TQFont::Bopomofo: - name = QT_TRANSLATE_NOOP("TQFont", "Bopomofo" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Bopomofo" ); break; case TQFont::Yi: - name = QT_TRANSLATE_NOOP("TQFont", "Yi" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Yi" ); break; case TQFont::Ethiopic: - name = QT_TRANSLATE_NOOP("TQFont", "Ethiopic" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Ethiopic" ); break; case TQFont::Cherokee: - name = QT_TRANSLATE_NOOP("TQFont", "Cherokee" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Cherokee" ); break; case TQFont::CanadianAboriginal: - name = QT_TRANSLATE_NOOP("TQFont", "Canadian Aboriginal" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Canadian Aboriginal" ); break; case TQFont::Mongolian: - name = QT_TRANSLATE_NOOP("TQFont", "Mongolian" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Mongolian" ); break; case TQFont::CurrencySymbols: - name = QT_TRANSLATE_NOOP("TQFont", "Currency Symbols" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Currency Symbols" ); break; case TQFont::LetterlikeSymbols: - name = QT_TRANSLATE_NOOP("TQFont", "Letterlike Symbols" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Letterlike Symbols" ); break; case TQFont::NumberForms: - name = QT_TRANSLATE_NOOP("TQFont", "Number Forms" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Number Forms" ); break; case TQFont::MathematicalOperators: - name = QT_TRANSLATE_NOOP("TQFont", "Mathematical Operators" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Mathematical Operators" ); break; case TQFont::TechnicalSymbols: - name = QT_TRANSLATE_NOOP("TQFont", "Technical Symbols" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Technical Symbols" ); break; case TQFont::GeometricSymbols: - name = QT_TRANSLATE_NOOP("TQFont", "Geometric Symbols" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Geometric Symbols" ); break; case TQFont::MiscellaneousSymbols: - name = QT_TRANSLATE_NOOP("TQFont", "Miscellaneous Symbols" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Miscellaneous Symbols" ); break; case TQFont::EnclosedAndSquare: - name = QT_TRANSLATE_NOOP("TQFont", "Enclosed and Square" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Enclosed and Square" ); break; case TQFont::Braille: - name = QT_TRANSLATE_NOOP("TQFont", "Braille" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Braille" ); break; case TQFont::Unicode: - name = QT_TRANSLATE_NOOP("TQFont", "Unicode" ); + name = TQT_TRANSLATE_NOOP("TQFont", "Unicode" ); break; case TQFont::Tagalog: - name = QT_TRANSLATE_NOOP( "TQFont", "Tagalog" ); + name = TQT_TRANSLATE_NOOP( "TQFont", "Tagalog" ); break; case TQFont::Hanunoo: - name = QT_TRANSLATE_NOOP( "TQFont", "Hanunoo" ); + name = TQT_TRANSLATE_NOOP( "TQFont", "Hanunoo" ); break; case TQFont::Buhid: - name = QT_TRANSLATE_NOOP( "TQFont", "Buhid" ); + name = TQT_TRANSLATE_NOOP( "TQFont", "Buhid" ); break; case TQFont::Tagbanwa: - name = QT_TRANSLATE_NOOP( "TQFont", "Tagbanwa" ); + name = TQT_TRANSLATE_NOOP( "TQFont", "Tagbanwa" ); break; case TQFont::KatakanaHalfWidth: - name = QT_TRANSLATE_NOOP( "TQFont", "Katakana Half-Width Forms" ); + name = TQT_TRANSLATE_NOOP( "TQFont", "Katakana Half-Width Forms" ); break; case TQFont::Han_Japanese: - name = QT_TRANSLATE_NOOP( "TQFont", "Han (Japanese)" ); + name = TQT_TRANSLATE_NOOP( "TQFont", "Han (Japanese)" ); break; case TQFont::Han_SimplifiedChinese: - name = QT_TRANSLATE_NOOP( "TQFont", "Han (Simplified Chinese)" ); + name = TQT_TRANSLATE_NOOP( "TQFont", "Han (Simplified Chinese)" ); break; case TQFont::Han_TraditionalChinese: - name = QT_TRANSLATE_NOOP( "TQFont", "Han (Traditional Chinese)" ); + name = TQT_TRANSLATE_NOOP( "TQFont", "Han (Traditional Chinese)" ); break; case TQFont::Han_Korean: - name = QT_TRANSLATE_NOOP( "TQFont", "Han (Korean)" ); + name = TQT_TRANSLATE_NOOP( "TQFont", "Han (Korean)" ); break; default: - name = QT_TRANSLATE_NOOP( "TQFont", "Unknown Script" ); + name = TQT_TRANSLATE_NOOP( "TQFont", "Unknown Script" ); break; } diff --git a/src/kernel/qiconset.cpp b/src/kernel/qiconset.cpp index fa571c5d..43e74b2b 100644 --- a/src/kernel/qiconset.cpp +++ b/src/kernel/qiconset.cpp @@ -157,7 +157,7 @@ public: factory = newFactory; } - Q_DUMMY_COMPARISON_OPERATOR( TQIconSetPrivate ) + TQ_DUMMY_COMPARISON_OPERATOR( TQIconSetPrivate ) }; TQIconSetIcon *TQIconSetPrivate::icon( const TQIconSet *iconSet, diff --git a/src/kernel/qimageformatplugin.cpp b/src/kernel/qimageformatplugin.cpp index 9ad42a42..89d04960 100644 --- a/src/kernel/qimageformatplugin.cpp +++ b/src/kernel/qimageformatplugin.cpp @@ -86,7 +86,7 @@ public: virtual ~TQImageFormatPluginPrivate(); TQRESULT queryInterface( const TQUuid &iid, TQUnknownInterface **iface ); - Q_REFCOUNT; + TQ_REFCOUNT; TQStringList featureList() const; diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp index 00bdfd1f..e9fe4313 100644 --- a/src/kernel/qkeysequence.cpp +++ b/src/kernel/qkeysequence.cpp @@ -93,92 +93,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/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp index b6ca8720..3f1e4828 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/qrichtext.cpp @@ -1555,7 +1555,7 @@ struct Q_EXPORT TQTextDocumentTag { return *this; } - Q_DUMMY_COMPARISON_OPERATOR(TQTextDocumentTag) + TQ_DUMMY_COMPARISON_OPERATOR(TQTextDocumentTag) }; @@ -6563,7 +6563,7 @@ struct TQPixmapInt TQPixmapInt() : ref( 0 ) {} TQPixmap pm; int ref; - Q_DUMMY_COMPARISON_OPERATOR(TQPixmapInt) + TQ_DUMMY_COMPARISON_OPERATOR(TQPixmapInt) }; static TQMap<TQString, TQPixmapInt> *pixmap_map = 0; diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h index 4e26675a..4d88323a 100644 --- a/src/kernel/qrichtext_p.h +++ b/src/kernel/qrichtext_p.h @@ -760,7 +760,7 @@ struct Q_EXPORT TQTextDocumentSelection { TQTextCursor startCursor, endCursor; bool swapped; - Q_DUMMY_COMPARISON_OPERATOR(TQTextDocumentSelection) + TQ_DUMMY_COMPARISON_OPERATOR(TQTextDocumentSelection) }; #if defined(Q_TEMPLATEDLL) @@ -1128,7 +1128,7 @@ struct Q_EXPORT TQTextParagraphSelection { TQTextParagraphSelection() : start(0), end(0) { } int start, end; - Q_DUMMY_COMPARISON_OPERATOR(TQTextParagraphSelection) + TQ_DUMMY_COMPARISON_OPERATOR(TQTextParagraphSelection) }; struct Q_EXPORT TQTextLineStart diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp index 40111e2b..7cb8848f 100644 --- a/src/kernel/qscriptengine.cpp +++ b/src/kernel/qscriptengine.cpp @@ -98,7 +98,7 @@ private: }; template <class T> -Q_INLINE_TEMPLATES TQVarLengthArray<T>::TQVarLengthArray(int asize) +TQ_INLINE_TEMPLATES TQVarLengthArray<T>::TQVarLengthArray(int asize) : s(asize) { if (s > Prealloc) { ptr = reinterpret_cast<T *>(malloc(s * sizeof(T))); diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp index 9e429b78..7439cba4 100644 --- a/src/kernel/qtranslator.cpp +++ b/src/kernel/qtranslator.cpp @@ -182,7 +182,7 @@ public: bool operator<( const Offset&k ) const { return ( h != k.h ) ? h < k.h : o < k.o; } - Q_DUMMY_COMPARISON_OPERATOR(TQTranslatorPrivate::Offset) + TQ_DUMMY_COMPARISON_OPERATOR(TQTranslatorPrivate::Offset) uint h; uint o; }; |