author | kergoth <kergoth> | 2003-03-26 21:54:15 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-03-26 21:54:15 (UTC) |
commit | 17ac2947f6485a31db216c431fa667192f1fc8a0 (patch) (unidiff) | |
tree | 10ce97adf691c750b71628ea0b2536567a4d593f | |
parent | 8c1acc27882a79ea9f1ee9b9be708b9bbab052ba (diff) | |
download | opie-17ac2947f6485a31db216c431fa667192f1fc8a0.zip opie-17ac2947f6485a31db216c431fa667192f1fc8a0.tar.gz opie-17ac2947f6485a31db216c431fa667192f1fc8a0.tar.bz2 |
Use QObject::tr rather than qApp->translate
-rw-r--r-- | libopie/odevice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index d5e3c5c..80975c9 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -273,13 +273,13 @@ void ODevice::init ( ) | |||
273 | for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) { | 273 | for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) { |
274 | i_button *ib = ipaq_buttons + i; | 274 | i_button *ib = ipaq_buttons + i; |
275 | ODeviceButton b; | 275 | ODeviceButton b; |
276 | 276 | ||
277 | if (( ib-> model & Model_iPAQ_H36xx ) == Model_iPAQ_H36xx ) { | 277 | if (( ib-> model & Model_iPAQ_H36xx ) == Model_iPAQ_H36xx ) { |
278 | b. setKeycode ( ib-> code ); | 278 | b. setKeycode ( ib-> code ); |
279 | b. setUserText ( qApp-> translate ( "Button", ib-> utext )); | 279 | b. setUserText ( QObject::tr ( "Button", ib-> utext )); |
280 | b. setPixmap ( Resource::loadPixmap ( ib-> pix )); | 280 | b. setPixmap ( Resource::loadPixmap ( ib-> pix )); |
281 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction )); | 281 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction )); |
282 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction )); | 282 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction )); |
283 | d-> m_buttons. append ( b ); | 283 | d-> m_buttons. append ( b ); |
284 | } | 284 | } |
285 | } | 285 | } |
@@ -631,13 +631,13 @@ void iPAQ::init ( ) | |||
631 | for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) { | 631 | for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) { |
632 | i_button *ib = ipaq_buttons + i; | 632 | i_button *ib = ipaq_buttons + i; |
633 | ODeviceButton b; | 633 | ODeviceButton b; |
634 | 634 | ||
635 | if (( ib-> model & d-> m_model ) == d-> m_model ) { | 635 | if (( ib-> model & d-> m_model ) == d-> m_model ) { |
636 | b. setKeycode ( ib-> code ); | 636 | b. setKeycode ( ib-> code ); |
637 | b. setUserText ( qApp-> translate ( "Button", ib-> utext )); | 637 | b. setUserText ( QObject::tr ( "Button", ib-> utext )); |
638 | b. setPixmap ( Resource::loadPixmap ( ib-> pix )); | 638 | b. setPixmap ( Resource::loadPixmap ( ib-> pix )); |
639 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction )); | 639 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction )); |
640 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction )); | 640 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction )); |
641 | 641 | ||
642 | d-> m_buttons. append ( b ); | 642 | d-> m_buttons. append ( b ); |
643 | } | 643 | } |
@@ -996,13 +996,13 @@ void Zaurus::init ( ) | |||
996 | 996 | ||
997 | for ( uint i = 0; i < ( sizeof( z_buttons ) / sizeof( z_button )); i++ ) { | 997 | for ( uint i = 0; i < ( sizeof( z_buttons ) / sizeof( z_button )); i++ ) { |
998 | z_button *zb = z_buttons + i; | 998 | z_button *zb = z_buttons + i; |
999 | ODeviceButton b; | 999 | ODeviceButton b; |
1000 | 1000 | ||
1001 | b. setKeycode ( zb-> code ); | 1001 | b. setKeycode ( zb-> code ); |
1002 | b. setUserText ( qApp-> translate ( "Button", zb-> utext )); | 1002 | b. setUserText ( QObject::tr ( "Button", zb-> utext )); |
1003 | b. setPixmap ( Resource::loadPixmap ( zb-> pix )); | 1003 | b. setPixmap ( Resource::loadPixmap ( zb-> pix )); |
1004 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( zb-> fpressedservice ), zb-> fpressedaction )); | 1004 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( zb-> fpressedservice ), zb-> fpressedaction )); |
1005 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( zb-> fheldservice ), zb-> fheldaction )); | 1005 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( zb-> fheldservice ), zb-> fheldaction )); |
1006 | 1006 | ||
1007 | d-> m_buttons. append ( b ); | 1007 | d-> m_buttons. append ( b ); |
1008 | } | 1008 | } |