Differential D8881 Diff 22567 umbrello/dotgenerator.cpp

Changeset View

Standalone View

View Options

umbrello/dotgenerator.cpp

Show First 20 Lines • Show All 185 Lines • ▼ Show 20 Line(s)
186 * @param scene The diagram 186​ * @param scene The diagram
187 * @param configFiles will contain the collected list of config files 187​ * @param configFiles will contain the collected list of config files
188 * @return true if collecting succeeds 188​ * @return true if collecting succeeds
189 */ 189​ */
190bool DotGenerator::availableConfigFiles(UMLScene *scene, QHash<QString, QString> &configFiles) 190​bool DotGenerator::availableConfigFiles(UMLScene *scene, QHash<QString, QString> &configFiles)
191{ 191​{
192 QString diagramType = Uml::DiagramType::toString(scene->type()).toLower(); 192​ QString diagramType = Uml::DiagramType::toString(scene->type()).toLower();
193#if QT_VERSION >= 0x050000 193​#if QT_VERSION >= 0x050000
194 QStringList fileNames = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QString::fromLatin1("umbrello/layouts/%1*.desktop").arg(diagramType)); 194​ QStringList fileNames = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QString::fromLatin1("umbrello5/layouts/%1*.desktop").arg(diagramType));
195#else 195​#else
196 KStandardDirs dirs; 196​ KStandardDirs dirs;
197 197​
198 QStringList fileNames = dirs.findAllResources("data", QString::fromLatin1("umbrello/layouts/%1*.desktop").arg(diagramType)); 198​ QStringList fileNames = dirs.findAllResources("data", QString::fromLatin1("umbrello/layouts/%1*.desktop").arg(diagramType));
199#endif 199​#endif
200 foreach(const QString &fileName, fileNames) { 200​ foreach(const QString &fileName, fileNames) {
201 QFileInfo fi(fileName); 201​ QFileInfo fi(fileName);
202 QString baseName; 202​ QString baseName;
Show All 23 Lines223{
226 if (!variant.isEmpty()) 226​ if (!variant.isEmpty())
227 fileNames << QString::fromLatin1("%1-%2.desktop").arg(diagramType).arg(variant); 227​ fileNames << QString::fromLatin1("%1-%2.desktop").arg(diagramType).arg(variant);
228 fileNames << QString::fromLatin1("%1-default.desktop").arg(diagramType); 228​ fileNames << QString::fromLatin1("%1-default.desktop").arg(diagramType);
229 fileNames << QLatin1String("default.desktop"); 229​ fileNames << QLatin1String("default.desktop");
230 230​
231 QString configFileName; 231​ QString configFileName;
232 foreach(const QString &fileName, fileNames) { 232​ foreach(const QString &fileName, fileNames) {
233#if QT_VERSION >= 0x050000 233​#if QT_VERSION >= 0x050000
234 configFileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QString::fromLatin1("umbrello/layouts/%1").arg(fileName)); 234​ configFileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QString::fromLatin1("umbrello5/layouts/%1").arg(fileName));
235#else 235​#else
236 configFileName = KStandardDirs::locate("data", QString::fromLatin1("umbrello/layouts/%1").arg(fileName)); 236​ configFileName = KStandardDirs::locate("data", QString::fromLatin1("umbrello/layouts/%1").arg(fileName));
237#endif 237​#endif
238 if (!configFileName.isEmpty()) 238​ if (!configFileName.isEmpty())
239 break; 239​ break;
240 } 240​ }
241 241​
242 if (configFileName.isEmpty()) { 242​ if (configFileName.isEmpty()) {
▲ Show 20 Lines • Show All 258 Lines • Show Last 20 Lines