2 files changed, 30 insertions, 73 deletions

diff --git a/noncore/styles/theme/plugin.cpp b/noncore/styles/theme/plugin.cpp
index 4383693..2560720 100644
--- a/noncore/styles/theme/plugin.cpp
+++ b/noncore/styles/theme/plugin.cpp
@@ -1,111 +1,81 @@
+#include <qapplication.h>
+
 #include "othemestyle.h"
 #include "themeset.h"
 #include "plugin.h"
 
 
 
 ThemeInterface::ThemeInterface ( ) :  ref ( 0 )
 {
+        m_widget = 0;
 }
     
 ThemeInterface::~ThemeInterface ( )
 {
 }
         
-QStyle *ThemeInterface::create ( )
+QStyle *ThemeInterface::style ( )
 {
         return new OThemeStyle ( "" );
 }
 
-QString ThemeInterface::name ( )
-{
-        return QObject::tr( "Themed style", "name" );
-}
-
-QString ThemeInterface::description ( )
-{
-        return QObject::tr( "KDE2 theme compatible style engine", "description" );
-}
-
-QCString ThemeInterface::key ( )
-{
-        return QCString ( "theme" );
-}
-
-unsigned int ThemeInterface::version ( )
+QString ThemeInterface::name ( ) const
 {
-        return 100; // 1.0.0 (\d+.\d.\d)
+        return qApp-> translate ( "Styles", "Themed style" );
 }
 
-QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
+QString ThemeInterface::description ( ) const
 {
-        static ThemeSettingsInterface *setiface = 0;
-
-        *iface = 0;
-        
-        if ( uuid == IID_QUnknown )
-                *iface = this;
-        else if ( uuid == IID_Style )
-                *iface = this;
-        else if ( uuid == IID_StyleSettings ) {
-                if ( !setiface )
-                        setiface = new ThemeSettingsInterface ( );
-                *iface = setiface;
-        }
-        
-        if ( *iface )
-                (*iface)-> addRef ( );
-                
-        return QS_OK;
+        return qApp-> translate ( "Styles", "KDE2 theme compatible style engine" );
 }
 
-Q_EXPORT_INTERFACE()
+bool ThemeInterface::hasSettings ( ) const
 {
-        Q_CREATE_INSTANCE( ThemeInterface )
+        return true;
 }
 
-
-ThemeSettingsInterface::ThemeSettingsInterface ( ) :  ref ( 0 )
-{
-        m_widget = 0;
-}
-    
-ThemeSettingsInterface::~ThemeSettingsInterface ( )
-{
-}
-        
-QWidget *ThemeSettingsInterface::create ( QWidget *parent, const char *name )
+QWidget *ThemeInterface::create ( QWidget *parent, const char *name )
 {
         m_widget = new ThemeSettings ( parent, name ? name : "THEME-SETTINGS" );
                 
         return m_widget;
 }
 
-bool ThemeSettingsInterface::accept ( )
+bool ThemeInterface::accept ( )
 {
         if ( !m_widget )
                 return false;
 
         return m_widget-> writeConfig ( );
 }
 
-void ThemeSettingsInterface::reject ( )
+void ThemeInterface::reject ( )
 {
 }
 
-QRESULT ThemeSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
+
+QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
         *iface = 0;
         
-        
         if ( uuid == IID_QUnknown )
                 *iface = this;
-        else if ( uuid == IID_StyleSettings )
+        else if ( uuid == IID_Style )
+                *iface = this;
+        else if ( uuid == IID_StyleExtended )
                 *iface = this;
         
         if ( *iface )
                 (*iface)-> addRef ( );
                 
         return QS_OK;
 }
 
+Q_EXPORT_INTERFACE()
+{
+        Q_CREATE_INSTANCE( ThemeInterface )
+}
+
+
+
diff --git a/noncore/styles/theme/plugin.h b/noncore/styles/theme/plugin.h
index d13fc5d..60cae97 100644
--- a/noncore/styles/theme/plugin.h
+++ b/noncore/styles/theme/plugin.h
@@ -2,40 +2,27 @@
 #define __OPIE_THEME_PLUGIN_H__
 
 #include <qpe/styleinterface.h>
 
 class ThemeSettings;
 
-class ThemeInterface : public StyleInterface {
+class ThemeInterface : public StyleExtendedInterface {
 public:
         ThemeInterface ( );
         virtual ~ThemeInterface ( );
         
         QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
         Q_REFCOUNT
                 
-        virtual QStyle *create ( );
+        virtual QStyle *style ( );
+        virtual QString name ( ) const;
         
-        virtual QString description ( );
-        virtual QString name ( );
-        virtual QCString key ( );
+        virtual QString description ( ) const;
         
-        virtual unsigned int version ( );
+        virtual bool hasSettings ( ) const;
         
-private:
-        ulong ref;
-};
-
-class ThemeSettingsInterface : public StyleSettingsInterface {
-public:
-        ThemeSettingsInterface ( );
-        virtual ~ThemeSettingsInterface ( );
-
-        QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
-        Q_REFCOUNT
-       
         virtual QWidget *create ( QWidget *parent, const char *name = 0 );
     
         virtual bool accept ( );            
         virtual void reject ( );
         
 private: