small changes to support Qtopia 1.6 styles (even BC)

2 files changed, 5 insertions, 6 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 8cd54a2..4132b30 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -136,9 +136,9 @@ void Appearance::loadStyles ( QListBox *list )
                 for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
                         QLibrary *lib = new QLibrary ( path + "/" + *it );
                         StyleInterface *iface;
 
-                        if ( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK )
+                        if (( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) && iface )
                                 list-> insertItem ( new StyleListItem ( lib, iface ));
                         else
                                 delete lib;
                 }
diff --git a/noncore/settings/appearance2/stylelistitem.h b/noncore/settings/appearance2/stylelistitem.h
index e261511..caefad8 100644
--- a/noncore/settings/appearance2/stylelistitem.h
+++ b/noncore/settings/appearance2/stylelistitem.h
@@ -47,11 +47,11 @@ public:
         {
                 m_lib = lib;
                 m_style_if = iface;
                 m_settings_if = 0;
-                m_style = iface-> create ( );
+                m_style = iface-> style ( );
                 
-                        iface-> queryInterface ( IID_StyleSettings, (QUnknownInterface **) &m_settings_if );    
+                iface-> queryInterface ( IID_StyleExtended, (QUnknownInterface **) &m_settings_if );
         }
         
         virtual ~StyleListItem ( )
         {
@@ -65,9 +65,9 @@ public:
         }
         
         bool hasSettings ( ) const
         {
-                return ( m_settings_if );
+                return m_settings_if ? m_settings_if-> hasSettings ( ) : false;
         }
 
         QWidget *settings ( QWidget *parent )
         {
@@ -90,9 +90,8 @@ public:
         QString key ( )
         {
                 if ( m_lib )
                         return QFileInfo ( m_lib-> library ( )). fileName ( );
-                        //return QString ( m_style_if-> key ( ));
                 else
                         return text ( );
         }
         
@@ -104,9 +103,9 @@ public:
 private:
         QLibrary *m_lib;
         QStyle *m_style;
         StyleInterface *m_style_if;
-        StyleSettingsInterface *m_settings_if;
+        StyleExtendedInterface *m_settings_if;
 
 };