- ported all OPIE styles to the new Qtopia compatible style interface

- some cleanup in liquid (unused code)

2 files changed, 7 insertions, 24 deletions

diff --git a/noncore/styles/metal/plugin.cpp b/noncore/styles/metal/plugin.cpp
index 1db4aac..4c9f64d 100644
--- a/noncore/styles/metal/plugin.cpp
+++ b/noncore/styles/metal/plugin.cpp
@@ -1,3 +1,5 @@
+#include <qapplication.h>
+
 #include "metal.h"
 #include "plugin.h"
 
@@ -10,30 +12,16 @@ MetalInterface::~MetalInterface ( )
 {
 }
         
-QStyle *MetalInterface::create ( )
+QStyle *MetalInterface::style ( )
 {
         return new MetalStyle ( );
 }
 
-QString MetalInterface::name ( )
+QString MetalInterface::name ( ) const
 {
-        return QObject::tr( "Metal", "name" );
+        return qApp-> translate ( "Styles", "Metal" );
 }
 
-QString MetalInterface::description ( )
-{
-        return QObject::tr( "Metal style", "description" );
-}
-
-QCString MetalInterface::key ( )
-{
-        return QCString ( "metal" );
-}
-
-unsigned int MetalInterface::version ( )
-{
-        return 100; // 1.0.0 (\d+.\d.\d)
-}
 
 QRESULT MetalInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
diff --git a/noncore/styles/metal/plugin.h b/noncore/styles/metal/plugin.h
index f61c833..545aea9 100644
--- a/noncore/styles/metal/plugin.h
+++ b/noncore/styles/metal/plugin.h
@@ -12,13 +12,8 @@ public:
         QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
         Q_REFCOUNT
                 
-        virtual QStyle *create ( );
-        
-        virtual QString description ( );
-        virtual QString name ( );
-        virtual QCString key ( );
-        
-        virtual unsigned int version ( );
+                virtual QStyle *style ( );
+        virtual QString name ( ) const;
         
 private:
         ulong ref;