Enable translations of startmenu-applets. Problem is, in Qt2, moc generates

the necessary tr() functions which adds the context (aka class name) and
then calls translate(). The startmenu applets don't use moc and therefore
don't get the appropriate tr() functions.

2 files changed, 13 insertions, 0 deletions

diff --git a/core/applets/homeapplet/home.cpp b/core/applets/homeapplet/home.cpp
index f94bc14..017de27 100644
--- a/core/applets/homeapplet/home.cpp
+++ b/core/applets/homeapplet/home.cpp
@@ -1,57 +1,68 @@
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
+#include <qapplication.h>
 #include <qiconset.h>
 #include <qpopupmenu.h>
 
 #include "home.h"
 
 
 HomeApplet::HomeApplet ( )
 	: QObject ( 0, "HomeApplet" ), ref ( 0 )
 {
 }
 
 HomeApplet::~HomeApplet ( )
 {
 }
 
 int HomeApplet::position ( ) const
 {
     return 4;
 }
 
 QString HomeApplet::name ( ) const
 {
 	return tr( "Home shortcut" );
 }
 
 QString HomeApplet::text ( ) const
 {
 	return tr( "Desktop" );
 }
 
+QString HomeApplet::tr( const char* s ) const
+{
+    return qApp->translate( "HomeApplet", s, 0 );
+}
+
+QString HomeApplet::tr( const char* s, const char* p ) const
+{
+    return qApp->translate( "HomeApplet", s, p );
+}
+
 QIconSet HomeApplet::icon ( ) const
 {
 	QPixmap pix;
 	QImage img = Resource::loadImage ( "home" );
 	
 	if ( !img. isNull ( ))
 		pix. convertFromImage ( img. smoothScale ( 14, 14 ));
 	return pix;
 }
 
 QPopupMenu *HomeApplet::popup ( QWidget * ) const
 {
 	return 0;
 }
 
 void HomeApplet::activated ( )
 {
 	// to desktop (home)
 	QCopEnvelope ( "QPE/Application/qpe", "raise()" );
 }
 
 
 QRESULT HomeApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
diff --git a/core/applets/homeapplet/home.h b/core/applets/homeapplet/home.h
index 7f4b630..64af97d 100644
--- a/core/applets/homeapplet/home.h
+++ b/core/applets/homeapplet/home.h
@@ -15,33 +15,35 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef __OPIE_HOME_APPLET_H__
 #define __OPIE_HOME_APPLET_H__
 
 #include <qpe/menuappletinterface.h>
 
 class HomeApplet : public QObject, public MenuAppletInterface
 {
 public:
     HomeApplet ( );
     virtual ~HomeApplet ( );
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual int position() const;
     
     virtual QString name ( ) const;
     virtual QIconSet icon ( ) const;
     virtual QString text ( ) const;
+    virtual QString tr( const char* ) const;
+    virtual QString tr( const char*, const char* ) const;
     virtual QPopupMenu *popup ( QWidget *parent ) const;
     
     virtual void activated ( );
 
 private:
     ulong ref;
 };
 
 #endif