| -rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 2 | ||||
| -rw-r--r-- | noncore/settings/appearance2/stylelistitem.h | 9 |
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 @@ -138,5 +138,5 @@ void Appearance::loadStyles ( QListBox *list ) 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 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 @@ -49,7 +49,7 @@ public: 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 ); } @@ -67,5 +67,5 @@ public: bool hasSettings ( ) const { - return ( m_settings_if ); + return m_settings_if ? m_settings_if-> hasSettings ( ) : false; } @@ -92,5 +92,4 @@ public: if ( m_lib ) return QFileInfo ( m_lib-> library ( )). fileName ( ); - //return QString ( m_style_if-> key ( )); else return text ( ); @@ -106,5 +105,5 @@ private: QStyle *m_style; StyleInterface *m_style_if; - StyleSettingsInterface *m_settings_if; + StyleExtendedInterface *m_settings_if; }; |