Guest User

Untitled

a guest
Jun 18th, 2018
71
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 6.06 KB | None | 0 0
  1. diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm
  2. index 87850a7..ed5e348 100644
  3. --- a/src/gui/dialogs/qfiledialog_mac.mm
  4. +++ b/src/gui/dialogs/qfiledialog_mac.mm
  5. @@ -148,7 +148,7 @@ QT_USE_NAMESPACE
  6. }
  7.  
  8. [mSavePanel setLevel:NSModalPanelWindowLevel];
  9. - [mSavePanel setDelegate:self];
  10. + [mSavePanel setDelegate:(id)self];
  11. mQDirFilter = new QT_PREPEND_NAMESPACE(QDir::Filters)(qDirFilter);
  12. mFileOptions = new QT_PREPEND_NAMESPACE(QFileDialog::Options)(fileOptions);
  13. mFileMode = fileMode;
  14. diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm
  15. index 9c63dfa..12cea19 100644
  16. --- a/src/gui/dialogs/qfontdialog_mac.mm
  17. +++ b/src/gui/dialogs/qfontdialog_mac.mm
  18. @@ -500,7 +500,7 @@ void QFontDialogPrivate::setFont(void *delegate, const QFont &font)
  19.  
  20. #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
  21. if (qstrcmp(fe->name(), "CoreText") == 0) {
  22. - nsFont = reinterpret_cast<const NSFont *>(static_cast<QCoreTextFontEngineMulti *>(fe)->ctfont);
  23. + nsFont = (NSFont *)reinterpret_cast<const NSFont *>(static_cast<QCoreTextFontEngineMulti *>(fe)->ctfont);
  24. } else
  25. #endif
  26. {
  27. diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm
  28. index dd819e5..48a59a5 100644
  29. --- a/src/gui/kernel/qapplication_mac.mm
  30. +++ b/src/gui/kernel/qapplication_mac.mm
  31. @@ -1244,7 +1244,7 @@ void qt_init(QApplicationPrivate *priv, int)
  32. #ifdef QT_MAC_USE_COCOA
  33. NSApplication *cocoaApp = [QNSApplication sharedApplication];
  34. QMacCocoaAutoReleasePool pool;
  35. - NSObject *oldDelegate = [cocoaApp delegate];
  36. + id oldDelegate = [cocoaApp delegate];
  37. QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) *newDelegate = [QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate];
  38. Q_ASSERT(newDelegate);
  39. [newDelegate setQtPrivate:priv];
  40. diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm
  41. index 8d38f45..90b9437 100644
  42. --- a/src/gui/kernel/qcocoamenuloader_mac.mm
  43. +++ b/src/gui/kernel/qcocoamenuloader_mac.mm
  44. @@ -70,7 +70,7 @@ QT_USE_NAMESPACE
  45. showAllItem = [[appMenu itemWithTitle:@"Show All"] retain];
  46.  
  47. // Get the names in the nib to match the app name set by Qt.
  48. - NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName()));
  49. + NSString *appName = (NSString *)reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName()));
  50. [quitItem setTitle:[[quitItem title] stringByReplacingOccurrencesOfString:@"NewApplication"
  51. withString:appName]];
  52. [hideItem setTitle:[[hideItem title] stringByReplacingOccurrencesOfString:@"NewApplication"
  53. diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
  54. index a552ce7..ad9f899 100644
  55. --- a/src/gui/kernel/qcocoaview_mac.mm
  56. +++ b/src/gui/kernel/qcocoaview_mac.mm
  57. @@ -1386,7 +1386,7 @@ static int qCocoaViewCount = 0;
  58. QString selectedText(qwidget->inputMethodQuery(Qt::ImCurrentSelection).toString());
  59. if (!selectedText.isEmpty()) {
  60. QCFString string(selectedText.mid(theRange.location, theRange.length));
  61. - const NSString *tmpString = reinterpret_cast<const NSString *>((CFStringRef)string);
  62. + NSString *tmpString = (NSString *)reinterpret_cast<const NSString *>((CFStringRef)string);
  63. return [[[NSAttributedString alloc] initWithString:tmpString] autorelease];
  64. } else {
  65. return nil;
  66. diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
  67. index 3945754..5fe25d2 100644
  68. --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
  69. +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
  70. @@ -1331,7 +1331,7 @@ QString qt_mac_get_pasteboardString(OSPasteboardRef paste)
  71. if (PasteboardCopyName (paste, &pbname)) {
  72. pb = [NSPasteboard generalPasteboard];
  73. } else {
  74. - pb = [NSPasteboard pasteboardWithName:reinterpret_cast<const NSString *>(pbname)];
  75. + pb = [NSPasteboard pasteboardWithName:(NSString *)pbname];
  76. CFRelease (pbname);
  77. }
  78. if (pb) {
  79. diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
  80. index 1e2aa9f..dc7a895 100644
  81. --- a/src/gui/kernel/qwidget_mac.mm
  82. +++ b/src/gui/kernel/qwidget_mac.mm
  83. @@ -3175,7 +3175,7 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
  84. NSButton *iconButton = [qt_mac_window_for(q) standardWindowButton:NSWindowDocumentIconButton];
  85. if (iconButton == nil) {
  86. QCFString string(q->windowTitle());
  87. - const NSString *tmpString = reinterpret_cast<const NSString *>((CFStringRef)string);
  88. + NSString *tmpString = (NSString *)reinterpret_cast<const NSString *>((CFStringRef)string);
  89. [qt_mac_window_for(q) setRepresentedURL:[NSURL fileURLWithPath:tmpString]];
  90. iconButton = [qt_mac_window_for(q) standardWindowButton:NSWindowDocumentIconButton];
  91. }
  92. diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
  93. index 844e38b..e2eafd6 100644
  94. --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
  95. +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
  96. @@ -850,7 +850,7 @@ quint64 QCoreWlanEngine::bytesReceived(const QString &id)
  97. return getBytes(interfaceStr,true);
  98. }
  99.  
  100. -quint64 QCoreWlanEngine::startTime(const QString &id)
  101. +quint64 QCoreWlanEngine::startTime(const QString &ident)
  102. {
  103. QMutexLocker locker(&mutex);
  104. QMacCocoaAutoReleasePool pool;
  105. @@ -884,8 +884,8 @@ quint64 QCoreWlanEngine::startTime(const QString &id)
  106. bool ok = false;
  107. for(int i = 0; i < dictSize; i++) {
  108. if([ssidStr isEqualToString:keys[i]]) {
  109. - const QString ident = QString::number(qHash(QLatin1String("corewlan:") + qt_mac_NSStringToQString(objects[i])));
  110. - if(ident == id) {
  111. + const QString curident = QString::number(qHash(QLatin1String("corewlan:") + qt_mac_NSStringToQString(objects[i])));
  112. + if(curident == ident) {
  113. ok = true;
  114. }
  115. }
Add Comment
Please, Sign In to add comment