Diffstat (limited to 'noncore/settings/appearance2/stylelistitem.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/appearance2/stylelistitem.h | 9 |
1 files changed, 4 insertions, 5 deletions
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 | |||
@@ -48,9 +48,9 @@ public: | |||
48 | m_lib = lib; | 48 | m_lib = lib; |
49 | m_style_if = iface; | 49 | m_style_if = iface; |
50 | m_settings_if = 0; | 50 | m_settings_if = 0; |
51 | m_style = iface-> create ( ); | 51 | m_style = iface-> style ( ); |
52 | 52 | ||
53 | iface-> queryInterface ( IID_StyleSettings, (QUnknownInterface **) &m_settings_if ); | 53 | iface-> queryInterface ( IID_StyleExtended, (QUnknownInterface **) &m_settings_if ); |
54 | } | 54 | } |
55 | 55 | ||
56 | virtual ~StyleListItem ( ) | 56 | virtual ~StyleListItem ( ) |
@@ -66,7 +66,7 @@ public: | |||
66 | 66 | ||
67 | bool hasSettings ( ) const | 67 | bool hasSettings ( ) const |
68 | { | 68 | { |
69 | return ( m_settings_if ); | 69 | return m_settings_if ? m_settings_if-> hasSettings ( ) : false; |
70 | } | 70 | } |
71 | 71 | ||
72 | QWidget *settings ( QWidget *parent ) | 72 | QWidget *settings ( QWidget *parent ) |
@@ -91,7 +91,6 @@ public: | |||
91 | { | 91 | { |
92 | if ( m_lib ) | 92 | if ( m_lib ) |
93 | return QFileInfo ( m_lib-> library ( )). fileName ( ); | 93 | return QFileInfo ( m_lib-> library ( )). fileName ( ); |
94 | //return QString ( m_style_if-> key ( )); | ||
95 | else | 94 | else |
96 | return text ( ); | 95 | return text ( ); |
97 | } | 96 | } |
@@ -105,7 +104,7 @@ private: | |||
105 | QLibrary *m_lib; | 104 | QLibrary *m_lib; |
106 | QStyle *m_style; | 105 | QStyle *m_style; |
107 | StyleInterface *m_style_if; | 106 | StyleInterface *m_style_if; |
108 | StyleSettingsInterface *m_settings_if; | 107 | StyleExtendedInterface *m_settings_if; |
109 | 108 | ||
110 | }; | 109 | }; |
111 | 110 | ||