Use QObject::tr rather than qApp->translate

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
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
@@ -276,7 +276,7 @@ void ODevice::init ( )
                
                        if (( ib-> model & Model_iPAQ_H36xx ) == Model_iPAQ_H36xx ) {   
                        b. setKeycode ( ib-> code );
-                        b. setUserText ( qApp-> translate ( "Button", ib-> utext ));
+                        b. setUserText ( QObject::tr ( "Button", ib-> utext ));
                        b. setPixmap ( Resource::loadPixmap ( ib-> pix ));
                        b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction ));
                        b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction ));
@@ -634,7 +634,7 @@ void iPAQ::init ( )
                
                        if (( ib-> model & d-> m_model ) == d-> m_model ) {     
                        b. setKeycode ( ib-> code );
-                        b. setUserText ( qApp-> translate ( "Button", ib-> utext ));
+                        b. setUserText ( QObject::tr ( "Button", ib-> utext ));
                        b. setPixmap ( Resource::loadPixmap ( ib-> pix ));
                        b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction ));
                        b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction ));
@@ -999,7 +999,7 @@ void Zaurus::init ( )
                ODeviceButton b;
                
                b. setKeycode ( zb-> code );
-                b. setUserText ( qApp-> translate ( "Button", zb-> utext ));
+                b. setUserText ( QObject::tr ( "Button", zb-> utext ));
                b. setPixmap ( Resource::loadPixmap ( zb-> pix ));
                b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( zb-> fpressedservice ), zb-> fpressedaction ));
                b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( zb-> fheldservice ), zb-> fheldaction ));
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

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index d5e3c5c..80975c9 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp
@@ -276,7 +276,7 @@ void ODevice::init ( )
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 ));
@@ -634,7 +634,7 @@ void iPAQ::init ( )
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 ));
@@ -999,7 +999,7 @@ void Zaurus::init ( )
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 ));