summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/appearance2/appearance.cpp2
-rw-r--r--noncore/settings/appearance2/stylelistitem.h9
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
@@ -139,3 +139,3 @@ void Appearance::loadStyles ( QListBox *list )
- 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 ));
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
@@ -50,5 +50,5 @@ public:
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 );
}
@@ -68,3 +68,3 @@ public:
{
- return ( m_settings_if );
+ return m_settings_if ? m_settings_if-> hasSettings ( ) : false;
}
@@ -93,3 +93,2 @@ public:
return QFileInfo ( m_lib-> library ( )). fileName ( );
- //return QString ( m_style_if-> key ( ));
else
@@ -107,3 +106,3 @@ private:
StyleInterface *m_style_if;
- StyleSettingsInterface *m_settings_if;
+ StyleExtendedInterface *m_settings_if;