fix mac build and fix native file selector

3nids · 3nids · commit a893f52ffcf4 · 2018-08-03T08:50:32.000+02:00
diff --git a/src/native/CMakeLists.txt b/src/native/CMakeLists.txt
@@ -116,7 +116,7 @@ ELSE(NOT APPLE)
     FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
     MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
     MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
-    MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_native
+    MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis3_native
     BUILD_WITH_INSTALL_RPATH TRUE
     PUBLIC_HEADER "${QGIS_NATIVE_HDRS}"
     LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"
diff --git a/src/native/mac/qgsmacnative.h b/src/native/mac/qgsmacnative.h
@@ -20,6 +20,9 @@
 
 #include "qgsnative.h"
 
+class QString;
+
+
 class NATIVE_EXPORT QgsMacNative : public QgsNative
 {
   public:
diff --git a/src/native/mac/qgsmacnative.mm b/src/native/mac/qgsmacnative.mm
@@ -18,26 +18,26 @@
 #include "qgsmacnative.h"
 
 #include <Cocoa/Cocoa.h>
+#include <QString>
 
 QgsMacNative::~QgsMacNative()
 {
 }
 
-const char* QgsMacNative::currentAppLocalizedName()
+const char *QgsMacNative::currentAppLocalizedName()
 {
   return [[[NSRunningApplication currentApplication] localizedName] UTF8String];
 }
 
 void QgsMacNative::currentAppActivateIgnoringOtherApps()
 {
-  // valid for Mac OS X >= 10.6
   [[NSRunningApplication currentApplication] activateWithOptions:
-    (NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)];
+                                             ( NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps )];
 }
 
-void openFileExplorerAndSelectFile( const QString &path )
+void QgsMacNative::openFileExplorerAndSelectFile( const QString &path )
 {
-  NSString* pathStr = [[NSString alloc] initWithUTF8String:path.toUtf8().data()];
-  NSArray *fileURLs = [NSArray arrayWithObjects:pathStr, /* ... */ nil];
+  NSString *pathStr = [[NSString alloc] initWithUTF8String:path.toUtf8().data()];
+  NSArray *fileURLs = [NSArray arrayWithObjects:[NSURL fileURLWithPath:pathStr], nil];
   [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:fileURLs];
 }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@`
`20`	`20`
`21`	`21`	`#include "qgsnative.h"`
`22`	`22`
	`23`	`+class QString;`
	`24`	`+`
	`25`	`+`
`23`	`26`	`class NATIVE_EXPORT QgsMacNative : public QgsNative`
`24`	`27`	`{`
`25`	`28`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -18,26 +18,26 @@`
`18`	`18`	`#include "qgsmacnative.h"`
`19`	`19`
`20`	`20`	`#include <Cocoa/Cocoa.h>`
	`21`	`+#include <QString>`
`21`	`22`
`22`	`23`	`QgsMacNative::~QgsMacNative()`
`23`	`24`	`{`
`24`	`25`	`}`
`25`	`26`
`26`		`-const char* QgsMacNative::currentAppLocalizedName()`
	`27`	`+const char *QgsMacNative::currentAppLocalizedName()`
`27`	`28`	`{`
`28`	`29`	`return [[[NSRunningApplication currentApplication] localizedName] UTF8String];`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`void QgsMacNative::currentAppActivateIgnoringOtherApps()`
`32`	`33`	`{`
`33`		`- // valid for Mac OS X >= 10.6`
`34`	`34`	`[[NSRunningApplication currentApplication] activateWithOptions:`
`35`		`- (NSApplicationActivateAllWindows \| NSApplicationActivateIgnoringOtherApps)];`
	`35`	`+ ( NSApplicationActivateAllWindows \| NSApplicationActivateIgnoringOtherApps )];`
`36`	`36`	`}`
`37`	`37`
`38`		`-void openFileExplorerAndSelectFile( const QString &path )`
	`38`	`+void QgsMacNative::openFileExplorerAndSelectFile( const QString &path )`
`39`	`39`	`{`
`40`		`- NSString* pathStr = [[NSString alloc] initWithUTF8String:path.toUtf8().data()];`
`41`		`- NSArray fileURLs = [NSArray arrayWithObjects:pathStr, / ... */ nil];`
	`40`	`+ NSString *pathStr = [[NSString alloc] initWithUTF8String:path.toUtf8().data()];`
	`41`	`+ NSArray *fileURLs = [NSArray arrayWithObjects:[NSURL fileURLWithPath:pathStr], nil];`
`42`	`42`	`[[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:fileURLs];`
`43`	`43`	`}`