handwriting: qtopia 1.6 merge

all: someone made all inputmethod name()s untranslateable. This cured a
symptom (opie crashing), but it was not real a bug-fix. I have marked them
as translateable again and found no problems doing so.

1 files changed, 1 insertions, 2 deletions

diff --git a/inputmethods/handwriting/handwritingimpl.cpp b/inputmethods/handwriting/handwritingimpl.cpp
index 0ea140c..c39e1aa 100644
--- a/inputmethods/handwriting/handwritingimpl.cpp
+++ b/inputmethods/handwriting/handwritingimpl.cpp
@@ -54,61 +54,60 @@ HandwritingImpl::HandwritingImpl()
     : input(0), icn(0), ref(0)
 {
 }
 
 HandwritingImpl::~HandwritingImpl()
 {
     delete input;
     delete icn;
 }
 
 QWidget *HandwritingImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !input )
 	input = new QIMPenInput( parent, "Handwriting", f );
     return input;
 }
 
 void HandwritingImpl::resetState()
 {
     if ( input )
 	input->resetState();
 }
 
 QPixmap *HandwritingImpl::icon()
 {
     if ( !icn )
 	icn = new QPixmap( (const char **)pen_xpm );
     return icn;
 }
 
 QString HandwritingImpl::name()
 {
-    // return qApp->translate( "InputMethods", "Handwriting" );
-    return "Handwriting";
+    return qApp->translate( "InputMethods", "Handwriting" );
 }
 
 void HandwritingImpl::onKeyPress( QObject *receiver, const char *slot )
 {
     if ( input )
 	QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
 }
 
 #ifndef QT_NO_COMPONENT
 QRESULT HandwritingImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
 	*iface = this;
     else if ( uuid == IID_InputMethod )
 	*iface = this;
 
     if ( *iface )
 	(*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( HandwritingImpl )
 }
 #endif