3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-23 06:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed some OSX Objective C warnings.

Browse source
This commit is contained in:
Vojtech Bubnik 2021-02-09 19:51:56 +01:00
parent 20456b45e5
commit 2393d64a5a
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/InstanceCheckMac.mm
View file

@ -57,7 +57,7 @@ void OtherInstanceMessageHandler::register_for_messages(const std::string &versi
m_impl_osx = [[OtherInstanceMessageHandlerMac alloc] init]; m_impl_osx = [[OtherInstanceMessageHandlerMac alloc] init];
if(m_impl_osx) { if(m_impl_osx) {
NSString *nsver = [NSString stringWithCString:version_hash.c_str() encoding:[NSString defaultCStringEncoding]]; NSString *nsver = [NSString stringWithCString:version_hash.c_str() encoding:[NSString defaultCStringEncoding]];
[m_impl_osx add_observer:nsver]; [(id)m_impl_osx add_observer:nsver];
} }
} }
@ -65,7 +65,7 @@ void OtherInstanceMessageHandler::unregister_for_messages()
{ {
//NSLog(@"unreegistering other instance messages"); //NSLog(@"unreegistering other instance messages");
if (m_impl_osx) { if (m_impl_osx) {
[m_impl_osx release]; [(id)m_impl_osx release];
m_impl_osx = nullptr; m_impl_osx = nullptr;
} else { } else {
NSLog(@"warning: unregister instance InstanceCheck notifications not required"); NSLog(@"warning: unregister instance InstanceCheck notifications not required");
@ -75,7 +75,7 @@ void OtherInstanceMessageHandler::unregister_for_messages()
void OtherInstanceMessageHandler::bring_instance_forward() void OtherInstanceMessageHandler::bring_instance_forward()
{ {
if (m_impl_osx) { if (m_impl_osx) {
[m_impl_osx bring_forward]; [(id)m_impl_osx bring_forward];
} }
} }
}//namespace GUI }//namespace GUI

10
src/slic3r/GUI/RemovableDriveManagerMM.mm
View file

@ -69,7 +69,7 @@ static void unmount_callback(DADiskRef disk, DADissenterRef dissenter, void *con
} }
if (err == 0) { if (err == 0) {
CFTypeRef mediaEjectableKey = CFDictionaryGetValue(descDict,kDADiskDescriptionMediaEjectableKey); CFTypeRef mediaEjectableKey = CFDictionaryGetValue(descDict,kDADiskDescriptionMediaEjectableKey);
BOOL ejectable = [mediaEjectableKey boolValue]; BOOL ejectable = [(id)mediaEjectableKey boolValue];
CFTypeRef deviceProtocolName = CFDictionaryGetValue(descDict,kDADiskDescriptionDeviceProtocolKey); CFTypeRef deviceProtocolName = CFDictionaryGetValue(descDict,kDADiskDescriptionDeviceProtocolKey);
CFTypeRef deviceModelKey = CFDictionaryGetValue(descDict, kDADiskDescriptionDeviceModelKey); CFTypeRef deviceModelKey = CFDictionaryGetValue(descDict, kDADiskDescriptionDeviceModelKey);
@ -124,13 +124,13 @@ void RemovableDriveManager::register_window_osx()
assert(m_impl_osx == nullptr); assert(m_impl_osx == nullptr);
m_impl_osx = [[RemovableDriveManagerMM alloc] init]; m_impl_osx = [[RemovableDriveManagerMM alloc] init];
if (m_impl_osx) if (m_impl_osx)
[m_impl_osx add_unmount_observer]; [(id)m_impl_osx add_unmount_observer];
} }
void RemovableDriveManager::unregister_window_osx() void RemovableDriveManager::unregister_window_osx()
{ {
if (m_impl_osx) { if (m_impl_osx) {
[m_impl_osx release]; [(id)m_impl_osx release];
m_impl_osx = nullptr; m_impl_osx = nullptr;
} }
} }
@ -144,7 +144,7 @@ void RemovableDriveManager::list_devices(std::vector<DriveData> &out) const
{ {
assert(m_impl_osx != nullptr); assert(m_impl_osx != nullptr);
if (m_impl_osx) { if (m_impl_osx) {
NSArray* devices = [m_impl_osx list_dev]; NSArray* devices = [(id)m_impl_osx list_dev];
for (NSString* volumePath in devices) for (NSString* volumePath in devices)
search_for_drives_internal::inspect_file(std::string([volumePath UTF8String]), "/Volumes", out); search_for_drives_internal::inspect_file(std::string([volumePath UTF8String]), "/Volumes", out);
} }
@ -156,7 +156,7 @@ void RemovableDriveManager::eject_device(const std::string &path)
assert(m_impl_osx != nullptr); assert(m_impl_osx != nullptr);
if (m_impl_osx) { if (m_impl_osx) {
NSString * pth = [NSString stringWithCString:path.c_str() encoding:[NSString defaultCStringEncoding]]; NSString * pth = [NSString stringWithCString:path.c_str() encoding:[NSString defaultCStringEncoding]];
[m_impl_osx eject_drive:pth]; [(id)m_impl_osx eject_drive:pth];
} }
} }

2
src/slic3r/Utils/RetinaHelperImpl.mm
View file

@ -19,7 +19,7 @@ RetinaHelper::RetinaHelper(wxWindow *window)
RetinaHelper::~RetinaHelper() RetinaHelper::~RetinaHelper()
{ {
[m_self release]; [(id)m_self release];
} }
void RetinaHelper::set_use_retina(bool aValue) void RetinaHelper::set_use_retina(bool aValue)