Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
JennaHuntsman
XDG Integration
Commits
5330455e
Commit
5330455e
authored
3 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix more deprecation
parent
ffdc82db
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llappviewermacosx-objc.h
+0
-1
0 additions, 1 deletion
indra/newview/llappviewermacosx-objc.h
indra/newview/llappviewermacosx-objc.mm
+0
-41
0 additions, 41 deletions
indra/newview/llappviewermacosx-objc.mm
with
0 additions
and
42 deletions
indra/newview/llappviewermacosx-objc.h
+
0
−
1
View file @
5330455e
...
@@ -32,6 +32,5 @@
...
@@ -32,6 +32,5 @@
//Why? Because BOOL
//Why? Because BOOL
void
setCrashUserMetadataWrapper
(
const
std
::
string
&
userid
,
const
std
::
string
&
username
);
void
setCrashUserMetadataWrapper
(
const
std
::
string
&
userid
,
const
std
::
string
&
username
);
void
launchApplication
(
const
std
::
string
*
app_name
,
const
std
::
vector
<
std
::
string
>*
args
);
#endif // LL_LLAPPVIEWERMACOSX_OBJC_H
#endif // LL_LLAPPVIEWERMACOSX_OBJC_H
This diff is collapsed.
Click to expand it.
indra/newview/llappviewermacosx-objc.mm
+
0
−
41
View file @
5330455e
...
@@ -46,44 +46,3 @@ void setCrashUserMetadataWrapper(const std::string& userid, const std::string& u
...
@@ -46,44 +46,3 @@ void setCrashUserMetadataWrapper(const std::string& userid, const std::string& u
[
SentrySDK
setUser
:
user
];
[
SentrySDK
setUser
:
user
];
#endif
#endif
}
}
void
launchApplication
(
const
std
::
string
*
app_name
,
const
std
::
vector
<
std
::
string
>*
args
)
{
@autoreleasepool
{
if
(
app_name
->
empty
())
return
;
NSMutableString
*
app_name_ns
=
[
NSMutableString
stringWithString
:[[
NSBundle
mainBundle
]
resourcePath
]];
//Path to resource dir
[
app_name_ns
appendFormat
:
@"/%@"
,
[
NSString
stringWithCString
:
app_name
->
c_str
()
encoding:
[
NSString
defaultCStringEncoding
]]];
NSMutableArray
*
args_ns
=
[[
NSMutableArray
alloc
]
init
];
for
(
int
i
=
0
;
i
<
args
->
size
();
++
i
)
{
NSLog
(
@"Adding string %s"
,
(
*
args
)[
i
].
c_str
());
[
args_ns
addObject
:
[
NSString
stringWithCString
:(
*
args
)[
i
].
c_str
()
encoding:
[
NSString
defaultCStringEncoding
]]];
}
NSTask
*
task
=
[[
NSTask
alloc
]
init
];
NSBundle
*
bundle
=
[
NSBundle
bundleWithPath
:[[
NSWorkspace
sharedWorkspace
]
fullPathForApplication
:
app_name_ns
]];
@try
{
[
task
setLaunchPath
:[
bundle
executablePath
]];
}
@catch
(
NSException
*
theException
)
{
NSLog
(
@"Caught a %@ exception, bailing."
,
theException
);
return
;
}
[
task
setArguments
:
args_ns
];
[
task
launch
];
// NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
// NSURL *url = [NSURL fileURLWithPath:[workspace fullPathForApplication:app_name_ns]];
//
// NSError *error = nil;
// [workspace launchApplicationAtURL:url options:0 configuration:[NSDictionary dictionaryWithObject:args_ns forKey:NSWorkspaceLaunchConfigurationArguments] error:&error];
//TODO Handle error
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment