Skip to content

Commit a850550

Browse files
committed
Make File constructor explicit
1 parent 21304a7 commit a850550

3 files changed

Lines changed: 23 additions & 15 deletions

File tree

modules/yup_core/native/yup_Files_android.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,12 @@ File AndroidContentUriResolver::getLocalFileFromContentUri (const URL& url)
251251
if (type == "image")
252252
type = "images";
253253

254-
return getCursorDataColumn (URL ("content://media/external/" + type + "/media"),
255-
"_id=?",
256-
StringArray { mediaId });
254+
return File (getCursorDataColumn (URL ("content://media/external/" + type + "/media"),
255+
"_id=?",
256+
StringArray { mediaId }));
257257
}
258258

259-
return getCursorDataColumn (url);
259+
return File (getCursorDataColumn (url));
260260
}
261261

262262
String AndroidContentUriResolver::getFileNameFromContentUri (const URL& url)
@@ -745,7 +745,7 @@ static File getAppDataDir (bool dataDir)
745745
LocalRef<jobject> applicationInfo (env->CallObjectMethod (getAppContext().get(), AndroidContext.getApplicationInfo));
746746
LocalRef<jobject> jString (env->GetObjectField (applicationInfo.get(), dataDir ? AndroidApplicationInfo.dataDir : AndroidApplicationInfo.publicSourceDir));
747747

748-
return { yupString ((jstring) jString.get()) };
748+
return File (yupString ((jstring) jString.get()));
749749
}
750750

751751
File File::getSpecialLocation (const SpecialLocationType type)

modules/yup_core/native/yup_Files_apple.mm

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ bool openDocument(const String& fileName, const String& parameters, const Array<
163163
StringArray params;
164164
params.addTokens(parameters, true);
165165

166-
NSMutableArray* paramArray = [NSMutableArray array];
166+
NSMutableArray* paramArray = [NSMutableArray array];
167167
for (int i = 0; i < params.size(); ++i)
168168
[paramArray addObject:yupStringToNS(params[i])];
169169

170-
NSMutableDictionary* envDict = [NSMutableDictionary dictionary];
170+
NSMutableDictionary* envDict = [NSMutableDictionary dictionary];
171171
if (environment)
172172
{
173173
for (int i = 0; i < environment->size(); ++i)
@@ -202,7 +202,7 @@ bool openDocument(const String& fileName, const String& parameters, const Array<
202202

203203
YUP_BEGIN_IGNORE_DEPRECATION_WARNINGS
204204

205-
NSMutableDictionary* dict = [NSMutableDictionary dictionary];
205+
NSMutableDictionary* dict = [NSMutableDictionary dictionary];
206206

207207
if (params.size())
208208
{
@@ -306,14 +306,15 @@ bool openDocument(const String& fileName, const String& parameters, const Array<
306306
case userDocumentsDirectory:
307307
resultPath = MacFileHelpers::getIOSSystemLocation(NSDocumentDirectory);
308308
break;
309+
309310
case userDesktopDirectory:
310311
resultPath = MacFileHelpers::getIOSSystemLocation(NSDesktopDirectory);
311312
break;
312313

313314
case tempDirectory:
314315
{
315316
File tmp(MacFileHelpers::getIOSSystemLocation(NSCachesDirectory));
316-
tmp = tmp.getChildFile(yup_getExecutableFile().getFileNameWithoutExtension());
317+
tmp = tmp.getChildFile(File(yup_getExecutableFile().getFileNameWithoutExtension()));
317318
tmp.createDirectory();
318319
return tmp.getFullPathName();
319320
}
@@ -322,6 +323,7 @@ bool openDocument(const String& fileName, const String& parameters, const Array<
322323
case userDocumentsDirectory:
323324
resultPath = "~/Documents";
324325
break;
326+
325327
case userDesktopDirectory:
326328
resultPath = "~/Desktop";
327329
break;
@@ -336,21 +338,27 @@ bool openDocument(const String& fileName, const String& parameters, const Array<
336338
case userMusicDirectory:
337339
resultPath = "~/Music";
338340
break;
341+
339342
case userMoviesDirectory:
340343
resultPath = "~/Movies";
341344
break;
345+
342346
case userPicturesDirectory:
343347
resultPath = "~/Pictures";
344348
break;
349+
345350
case userApplicationDataDirectory:
346351
resultPath = "~/Library";
347352
break;
353+
348354
case commonApplicationDataDirectory:
349355
resultPath = "/Library";
350356
break;
357+
351358
case commonDocumentsDirectory:
352359
resultPath = "/Users/Shared";
353360
break;
361+
354362
case globalApplicationsDirectory:
355363
resultPath = "/Applications";
356364
break;
@@ -481,11 +489,11 @@ bool openDocument(const String& fileName, const String& parameters, const Array<
481489
{
482490
YUP_AUTORELEASEPOOL
483491
{
484-
enumerator = [[NSFileManager defaultManager] enumeratorAtPath:yupStringToNS(directory.getFullPathName())];
485-
}
486-
}
487-
488-
~Pimpl() = default;
492+
enumerator = [[NSFileManager defaultManager] enumeratorAtPath:yupStringToNS(directory.getFullPathName())];
493+
}
494+
}
495+
496+
~Pimpl() = default;
489497

490498
bool next(String& filenameFound,
491499
bool* const isDir,

modules/yup_core/native/yup_Files_wasm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ File File::getSpecialLocation (const SpecialLocationType type)
135135
}
136136
*/
137137

138-
return { "/" };
138+
return File ("/");
139139
}
140140

141141
//==============================================================================

0 commit comments

Comments
 (0)