Diffstat (limited to 'noncore/settings/appearance2/stylelistitem.h') (more/less context) (show 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 | |||
@@ -45,15 +45,15 @@ public: | |||
45 | 45 | ||
46 | StyleListItem ( QLibrary *lib, StyleInterface *iface ) : QListBoxText ( iface-> name ( )) | 46 | StyleListItem ( QLibrary *lib, StyleInterface *iface ) : QListBoxText ( iface-> name ( )) |
47 | { | 47 | { |
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 ( ) |
57 | { | 57 | { |
58 | delete m_style; | 58 | delete m_style; |
59 | 59 | ||
@@ -63,13 +63,13 @@ public: | |||
63 | m_style_if-> release ( ); | 63 | m_style_if-> release ( ); |
64 | delete m_lib; | 64 | delete m_lib; |
65 | } | 65 | } |
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 ) |
73 | { | 73 | { |
74 | return m_settings_if ? m_settings_if-> create ( parent ) : 0; | 74 | return m_settings_if ? m_settings_if-> create ( parent ) : 0; |
75 | } | 75 | } |
@@ -88,13 +88,12 @@ public: | |||
88 | } | 88 | } |
89 | 89 | ||
90 | QString key ( ) | 90 | QString key ( ) |
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 | } |
98 | 97 | ||
99 | QStyle *style ( ) | 98 | QStyle *style ( ) |
100 | { | 99 | { |
@@ -102,12 +101,12 @@ public: | |||
102 | } | 101 | } |
103 | 102 | ||
104 | private: | 103 | 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 | ||
112 | 111 | ||
113 | #endif | 112 | #endif |