Differential D3627 Diff 8870 language/duchain/duchainutils.cpp

Changeset View

Standalone View

View Options

language/duchain/duchainutils.cpp

Show First 20 Lines • Show All 155 Lines • ▼ Show 20 Line(s)
156#define RETURN_CACHED_ICON(name) {static QIcon icon(QIcon( \ 156​#define RETURN_CACHED_ICON(name) {static QIcon icon(QIcon( \
157 QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kdevelop/pics/" name ".png"))\ 157​ QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kdevelop/pics/" name ".png"))\
158 ).pixmap(QSize(16, 16)));\ 158​ ).pixmap(QSize(16, 16)));\
159 return icon;} 159​ return icon;}
160 160​
161QIcon DUChainUtils::iconForProperties(KTextEditor::CodeCompletionModel::CompletionProperties p) 161​QIcon DUChainUtils::iconForProperties(KTextEditor::CodeCompletionModel::CompletionProperties p)
162{ 162​{
163 163​
164 if( (p & CodeCompletionModel::Variable) ) 164​ if( (p & CodeCompletionModel::Variable) )
mwolffUnsubmitted
Not Done

someone needs to add proper braces to this fugly function (separate patch)

mwolff: someone needs to add proper braces to this fugly function (separate patch)
165 if( (p & CodeCompletionModel::Protected) ) 165​ if( (p & CodeCompletionModel::Protected) )
166 RETURN_CACHED_ICON("CVprotected_var") 166​ RETURN_CACHED_ICON("CVprotected_var")
167 else if( p & CodeCompletionModel::Private ) 167​ else if( p & CodeCompletionModel::Private )
168 RETURN_CACHED_ICON("CVprivate_var") 168​ RETURN_CACHED_ICON("CVprivate_var")
169 else 169​ else
170 RETURN_CACHED_ICON("CVpublic_var") 170​ RETURN_CACHED_ICON("CVpublic_var")
171 else ​
172 if( (p & CodeCompletionModel::Union) && (p & CodeCompletionModel::Protected) ) ​
173 RETURN_CACHED_ICON("protected_union") ​
174 ​
175 else if( p & CodeCompletionModel::Enum ) 171​ else if( p & CodeCompletionModel::Enum )
176 if( p & CodeCompletionModel::Protected ) 172​ if( p & CodeCompletionModel::Protected )
177 RETURN_CACHED_ICON("protected_enum") 173​ RETURN_CACHED_ICON("protected_enum")
178 else if( p & CodeCompletionModel::Private ) 174​ else if( p & CodeCompletionModel::Private )
179 RETURN_CACHED_ICON("private_enum") 175​ RETURN_CACHED_ICON("private_enum")
180 else 176​ else
181 RETURN_CACHED_ICON("enum") 177​ RETURN_CACHED_ICON("enum")
182 178​
Show All 13 Lines185 else if( p & CodeCompletionModel::Slot )
196 else RETURN_CACHED_ICON("slot") 192​ else RETURN_CACHED_ICON("slot")
197 else if( p & CodeCompletionModel::Signal ) 193​ else if( p & CodeCompletionModel::Signal )
198 if( p & CodeCompletionModel::Protected ) 194​ if( p & CodeCompletionModel::Protected )
199 RETURN_CACHED_ICON("CVprotected_signal") 195​ RETURN_CACHED_ICON("CVprotected_signal")
200 else 196​ else
201 RETURN_CACHED_ICON("signal") 197​ RETURN_CACHED_ICON("signal")
202 198​
203 else if( p & CodeCompletionModel::Class ) 199​ else if( p & CodeCompletionModel::Class )
204 if( (p & CodeCompletionModel::Class) && (p & CodeCompletionModel::Protected) ) 200​ if( p & CodeCompletionModel::Protected )
205 RETURN_CACHED_ICON("protected_class") 201​ RETURN_CACHED_ICON("protected_class")
206 else if( (p & CodeCompletionModel::Class) && (p & CodeCompletionModel::Private) ) 202​ else if( p & CodeCompletionModel::Private )
207 RETURN_CACHED_ICON("private_class") 203​ RETURN_CACHED_ICON("private_class")
208 else 204​ else
209 RETURN_CACHED_ICON("code-class") 205​ RETURN_CACHED_ICON("code-class")
210 206​
211 else if( p & CodeCompletionModel::Union ) 207​ else if( p & CodeCompletionModel::Union )
212 if( p & CodeCompletionModel::Private ) 208​ if( p & CodeCompletionModel::Protected )
209​ RETURN_CACHED_ICON("protected_union")
210​ else if( p & CodeCompletionModel::Private )
213 RETURN_CACHED_ICON("private_union") 211​ RETURN_CACHED_ICON("private_union")
214 else 212​ else
215 RETURN_CACHED_ICON("union") 213​ RETURN_CACHED_ICON("union")
216 214​
217 else if( p & CodeCompletionModel::TypeAlias ) 215​ else if( p & CodeCompletionModel::TypeAlias )
218 if ((p & CodeCompletionModel::Const) /*|| (p & CodeCompletionModel::Volatile)*/) 216​ if ((p & CodeCompletionModel::Const) /*|| (p & CodeCompletionModel::Volatile)*/)
219 RETURN_CACHED_ICON("CVtypedef") 217​ RETURN_CACHED_ICON("CVtypedef")
220 else 218​ else
▲ Show 20 Lines • Show All 407 Lines • Show Last 20 Lines