author | sandman <sandman> | 2002-10-04 01:22:10 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-04 01:22:10 (UTC) |
commit | e2f23d8a5169ffef63dcbbac920f68ef0f113792 (patch) (unidiff) | |
tree | e9ce43f61cd4332bfb055bf820ca5816477ac278 /noncore | |
parent | 587124a7c62abd6f0fd38da6958adbd2587f3b9f (diff) | |
download | opie-e2f23d8a5169ffef63dcbbac920f68ef0f113792.zip opie-e2f23d8a5169ffef63dcbbac920f68ef0f113792.tar.gz opie-e2f23d8a5169ffef63dcbbac920f68ef0f113792.tar.bz2 |
small changes to support Qtopia 1.6 styles (even BC)
-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 | |||
@@ -139,3 +139,3 @@ void Appearance::loadStyles ( QListBox *list ) | |||
139 | 139 | ||
140 | if ( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) | 140 | if (( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) && iface ) |
141 | list-> insertItem ( new StyleListItem ( lib, iface )); | 141 | 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: | |||
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 | } |
@@ -68,3 +68,3 @@ public: | |||
68 | { | 68 | { |
69 | return ( m_settings_if ); | 69 | return m_settings_if ? m_settings_if-> hasSettings ( ) : false; |
70 | } | 70 | } |
@@ -93,3 +93,2 @@ public: | |||
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 |
@@ -107,3 +106,3 @@ private: | |||
107 | StyleInterface *m_style_if; | 106 | StyleInterface *m_style_if; |
108 | StyleSettingsInterface *m_settings_if; | 107 | StyleExtendedInterface *m_settings_if; |
109 | 108 | ||