From 17ac2947f6485a31db216c431fa667192f1fc8a0 Mon Sep 17 00:00:00 2001 From: kergoth Date: Wed, 26 Mar 2003 21:54:15 +0000 Subject: Use QObject::tr rather than qApp->translate --- 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 )); -- cgit v0.9.0.2