Use QObject::tr rather than qApp->translate

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
@@ -271,17 +271,17 @@ void ODevice::init ( )
 	// Simulation uses iPAQ 3660 device buttons
 
 	for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) {
 		i_button *ib = ipaq_buttons + i;	
 		ODeviceButton b;
 		
 		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 ));
 			d-> m_buttons. append ( b );
 		}
 	}
 	reloadButtonMapping ( );
 }
@@ -629,17 +629,17 @@ void iPAQ::init ( )
 	m_power_timer = 0;
 	
 	for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) {
 		i_button *ib = ipaq_buttons + i;	
 		ODeviceButton b;
 		
 		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 ));
                                         
 			d-> m_buttons. append ( b );
 		}
 	}
 	reloadButtonMapping ( );
@@ -994,17 +994,17 @@ void Zaurus::init ( )
 			break;
 	}
 
 	for ( uint i = 0; i < ( sizeof( z_buttons ) / sizeof( z_button )); i++ ) {
 		z_button *zb = z_buttons + i;	
 		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 ));
                                         
 		d-> m_buttons. append ( b );
 	}
 	reloadButtonMapping ( );