1 files changed, 26 insertions, 55 deletions

diff --git a/noncore/styles/liquid/plugin.cpp b/noncore/styles/liquid/plugin.cpp
index 5f4c8e5..0740420 100644
--- a/noncore/styles/liquid/plugin.cpp
+++ b/noncore/styles/liquid/plugin.cpp
@@ -1,3 +1,5 @@
+#include <qapplication.h>
+
 #include "liquid.h"
 #include "liquidset.h"
 #include "plugin.h"
@@ -6,82 +8,41 @@
 
 LiquidInterface::LiquidInterface ( ) :  ref ( 0 )
 {
+        m_widget = 0;
 }
     
 LiquidInterface::~LiquidInterface ( )
 {
 }
         
-QStyle *LiquidInterface::create ( )
+QStyle *LiquidInterface::style ( )
 {
         return new LiquidStyle ( );
 }
 
-QString LiquidInterface::name ( )
-{
-        return QObject::tr( "Liquid", "name" );
-}
-
-QString LiquidInterface::description ( )
-{
-        return QObject::tr( "High Performance Liquid style by Mosfet", "description" );
-}
-
-QCString LiquidInterface::key ( )
-{
-        return QCString ( "liquid" );
-}
-
-unsigned int LiquidInterface::version ( )
-{
-        return 100; // 1.0.0 (\d+.\d.\d)
-}
-
-QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
-{
-        static LiquidSettingsInterface *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 LiquidSettingsInterface ( );
-                *iface = setiface;
-        }
-        
-        if ( *iface )
-                (*iface)-> addRef ( );
-                
-        return QS_OK;
-}
-
-Q_EXPORT_INTERFACE()
+QString LiquidInterface::name ( ) const
 {
-        Q_CREATE_INSTANCE( LiquidInterface )
+        return qApp-> translate ( "Styles", "Liquid" );
 }
 
-
-LiquidSettingsInterface::LiquidSettingsInterface ( ) :  ref ( 0 )
+QString LiquidInterface::description ( ) const
 {
-        m_widget = 0;
+        return qApp-> translate ( "Styles", "High Performance Liquid style by Mosfet" );
 }
     
-LiquidSettingsInterface::~LiquidSettingsInterface ( )
+bool LiquidInterface::hasSettings ( ) const
 {
+        return true;
 }
         
-QWidget *LiquidSettingsInterface::create ( QWidget *parent, const char *name )
+QWidget *LiquidInterface::create ( QWidget *parent, const char *name )
 {
         m_widget = new LiquidSettings ( parent, name ? name : "LIQUID-SETTINGS" );
                 
         return m_widget;
 }
 
-bool LiquidSettingsInterface::accept ( )
+bool LiquidInterface::accept ( )
 {
         if ( !m_widget )
                 return false;
@@ -89,18 +50,20 @@ bool LiquidSettingsInterface::accept ( )
         return m_widget-> writeConfig ( );
 }
 
-void LiquidSettingsInterface::reject ( )
+void LiquidInterface::reject ( )
 {
 }
 
-QRESULT LiquidSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
+
+QRESULT LiquidInterface::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 )
@@ -109,5 +72,13 @@ QRESULT LiquidSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInt
         return QS_OK;
 }
 
+Q_EXPORT_INTERFACE()
+{
+        Q_CREATE_INSTANCE( LiquidInterface )
+}
+
+
+        
+
 // Hack for Retail Z experiments
 extern "C" { QStyle *allocate ( ) { return new LiquidStyle ( ); } }