Diffstat (limited to 'noncore/settings/appearance2/appearance.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 2 |
1 files changed, 1 insertions, 1 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 | |||
@@ -116,49 +116,49 @@ void Appearance::loadStyles ( QListBox *list ) | |||
116 | #else | 116 | #else |
117 | list->insertItem( new StyleListItem ( "Windows", new QWindowsStyle ( ))); | 117 | list->insertItem( new StyleListItem ( "Windows", new QWindowsStyle ( ))); |
118 | list->insertItem( new StyleListItem ( "Light", new LightStyle ( ))); | 118 | list->insertItem( new StyleListItem ( "Light", new LightStyle ( ))); |
119 | #ifndef QT_NO_STYLE_MOTIF | 119 | #ifndef QT_NO_STYLE_MOTIF |
120 | list->insertItem( new StyleListItem ( "Motif", new QMotifStyle ( ))); | 120 | list->insertItem( new StyleListItem ( "Motif", new QMotifStyle ( ))); |
121 | #endif | 121 | #endif |
122 | #ifndef QT_NO_STYLE_MOTIFPLUS | 122 | #ifndef QT_NO_STYLE_MOTIFPLUS |
123 | list->insertItem( new StyleListItem ( "MotifPlus", new QMotifPlusStyle ( ))); | 123 | list->insertItem( new StyleListItem ( "MotifPlus", new QMotifPlusStyle ( ))); |
124 | #endif | 124 | #endif |
125 | #ifndef QT_NO_STYLE_PLATINUM | 125 | #ifndef QT_NO_STYLE_PLATINUM |
126 | list->insertItem( new StyleListItem ( "Platinum", new QPlatinumStyle ( ))); | 126 | list->insertItem( new StyleListItem ( "Platinum", new QPlatinumStyle ( ))); |
127 | #endif | 127 | #endif |
128 | #endif | 128 | #endif |
129 | list->insertItem( new StyleListItem ( "QPE", new QPEStyle ( ))); | 129 | list->insertItem( new StyleListItem ( "QPE", new QPEStyle ( ))); |
130 | 130 | ||
131 | #if QT_VERSION < 300 | 131 | #if QT_VERSION < 300 |
132 | { | 132 | { |
133 | QString path = QPEApplication::qpeDir() + "/plugins/styles/"; | 133 | QString path = QPEApplication::qpeDir() + "/plugins/styles/"; |
134 | QStringList sl = QDir ( path, "lib*.so" ). entryList ( ); | 134 | QStringList sl = QDir ( path, "lib*.so" ). entryList ( ); |
135 | 135 | ||
136 | for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) { | 136 | for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) { |
137 | QLibrary *lib = new QLibrary ( path + "/" + *it ); | 137 | QLibrary *lib = new QLibrary ( path + "/" + *it ); |
138 | StyleInterface *iface; | 138 | StyleInterface *iface; |
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 )); |
142 | else | 142 | else |
143 | delete lib; | 143 | delete lib; |
144 | } | 144 | } |
145 | } | 145 | } |
146 | 146 | ||
147 | #endif | 147 | #endif |
148 | } | 148 | } |
149 | 149 | ||
150 | void Appearance::loadDecos ( QListBox *list ) | 150 | void Appearance::loadDecos ( QListBox *list ) |
151 | { | 151 | { |
152 | list-> insertItem ( new DecoListItem ( "QPE" )); | 152 | list-> insertItem ( new DecoListItem ( "QPE" )); |
153 | 153 | ||
154 | { | 154 | { |
155 | QString path = QPEApplication::qpeDir() + "/plugins/decorations/"; | 155 | QString path = QPEApplication::qpeDir() + "/plugins/decorations/"; |
156 | QStringList sl = QDir ( path, "lib*.so" ). entryList ( ); | 156 | QStringList sl = QDir ( path, "lib*.so" ). entryList ( ); |
157 | 157 | ||
158 | for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) { | 158 | for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) { |
159 | QLibrary *lib = new QLibrary ( path + "/" + *it ); | 159 | QLibrary *lib = new QLibrary ( path + "/" + *it ); |
160 | WindowDecorationInterface *iface; | 160 | WindowDecorationInterface *iface; |
161 | 161 | ||
162 | if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK ) | 162 | if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK ) |
163 | list-> insertItem ( new DecoListItem ( lib, iface )); | 163 | list-> insertItem ( new DecoListItem ( lib, iface )); |
164 | else | 164 | else |