Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm
- index 87850a7..ed5e348 100644
- --- a/src/gui/dialogs/qfiledialog_mac.mm
- +++ b/src/gui/dialogs/qfiledialog_mac.mm
- @@ -148,7 +148,7 @@ QT_USE_NAMESPACE
- }
- [mSavePanel setLevel:NSModalPanelWindowLevel];
- - [mSavePanel setDelegate:self];
- + [mSavePanel setDelegate:(id)self];
- mQDirFilter = new QT_PREPEND_NAMESPACE(QDir::Filters)(qDirFilter);
- mFileOptions = new QT_PREPEND_NAMESPACE(QFileDialog::Options)(fileOptions);
- mFileMode = fileMode;
- diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm
- index 9c63dfa..12cea19 100644
- --- a/src/gui/dialogs/qfontdialog_mac.mm
- +++ b/src/gui/dialogs/qfontdialog_mac.mm
- @@ -500,7 +500,7 @@ void QFontDialogPrivate::setFont(void *delegate, const QFont &font)
- #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
- if (qstrcmp(fe->name(), "CoreText") == 0) {
- - nsFont = reinterpret_cast<const NSFont *>(static_cast<QCoreTextFontEngineMulti *>(fe)->ctfont);
- + nsFont = (NSFont *)reinterpret_cast<const NSFont *>(static_cast<QCoreTextFontEngineMulti *>(fe)->ctfont);
- } else
- #endif
- {
- diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm
- index dd819e5..48a59a5 100644
- --- a/src/gui/kernel/qapplication_mac.mm
- +++ b/src/gui/kernel/qapplication_mac.mm
- @@ -1244,7 +1244,7 @@ void qt_init(QApplicationPrivate *priv, int)
- #ifdef QT_MAC_USE_COCOA
- NSApplication *cocoaApp = [QNSApplication sharedApplication];
- QMacCocoaAutoReleasePool pool;
- - NSObject *oldDelegate = [cocoaApp delegate];
- + id oldDelegate = [cocoaApp delegate];
- QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) *newDelegate = [QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate];
- Q_ASSERT(newDelegate);
- [newDelegate setQtPrivate:priv];
- diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm
- index 8d38f45..90b9437 100644
- --- a/src/gui/kernel/qcocoamenuloader_mac.mm
- +++ b/src/gui/kernel/qcocoamenuloader_mac.mm
- @@ -70,7 +70,7 @@ QT_USE_NAMESPACE
- showAllItem = [[appMenu itemWithTitle:@"Show All"] retain];
- // Get the names in the nib to match the app name set by Qt.
- - NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName()));
- + NSString *appName = (NSString *)reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName()));
- [quitItem setTitle:[[quitItem title] stringByReplacingOccurrencesOfString:@"NewApplication"
- withString:appName]];
- [hideItem setTitle:[[hideItem title] stringByReplacingOccurrencesOfString:@"NewApplication"
- diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
- index a552ce7..ad9f899 100644
- --- a/src/gui/kernel/qcocoaview_mac.mm
- +++ b/src/gui/kernel/qcocoaview_mac.mm
- @@ -1386,7 +1386,7 @@ static int qCocoaViewCount = 0;
- QString selectedText(qwidget->inputMethodQuery(Qt::ImCurrentSelection).toString());
- if (!selectedText.isEmpty()) {
- QCFString string(selectedText.mid(theRange.location, theRange.length));
- - const NSString *tmpString = reinterpret_cast<const NSString *>((CFStringRef)string);
- + NSString *tmpString = (NSString *)reinterpret_cast<const NSString *>((CFStringRef)string);
- return [[[NSAttributedString alloc] initWithString:tmpString] autorelease];
- } else {
- return nil;
- diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
- index 3945754..5fe25d2 100644
- --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
- +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
- @@ -1331,7 +1331,7 @@ QString qt_mac_get_pasteboardString(OSPasteboardRef paste)
- if (PasteboardCopyName (paste, &pbname)) {
- pb = [NSPasteboard generalPasteboard];
- } else {
- - pb = [NSPasteboard pasteboardWithName:reinterpret_cast<const NSString *>(pbname)];
- + pb = [NSPasteboard pasteboardWithName:(NSString *)pbname];
- CFRelease (pbname);
- }
- if (pb) {
- diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
- index 1e2aa9f..dc7a895 100644
- --- a/src/gui/kernel/qwidget_mac.mm
- +++ b/src/gui/kernel/qwidget_mac.mm
- @@ -3175,7 +3175,7 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
- NSButton *iconButton = [qt_mac_window_for(q) standardWindowButton:NSWindowDocumentIconButton];
- if (iconButton == nil) {
- QCFString string(q->windowTitle());
- - const NSString *tmpString = reinterpret_cast<const NSString *>((CFStringRef)string);
- + NSString *tmpString = (NSString *)reinterpret_cast<const NSString *>((CFStringRef)string);
- [qt_mac_window_for(q) setRepresentedURL:[NSURL fileURLWithPath:tmpString]];
- iconButton = [qt_mac_window_for(q) standardWindowButton:NSWindowDocumentIconButton];
- }
- diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
- index 844e38b..e2eafd6 100644
- --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
- +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
- @@ -850,7 +850,7 @@ quint64 QCoreWlanEngine::bytesReceived(const QString &id)
- return getBytes(interfaceStr,true);
- }
- -quint64 QCoreWlanEngine::startTime(const QString &id)
- +quint64 QCoreWlanEngine::startTime(const QString &ident)
- {
- QMutexLocker locker(&mutex);
- QMacCocoaAutoReleasePool pool;
- @@ -884,8 +884,8 @@ quint64 QCoreWlanEngine::startTime(const QString &id)
- bool ok = false;
- for(int i = 0; i < dictSize; i++) {
- if([ssidStr isEqualToString:keys[i]]) {
- - const QString ident = QString::number(qHash(QLatin1String("corewlan:") + qt_mac_NSStringToQString(objects[i])));
- - if(ident == id) {
- + const QString curident = QString::number(qHash(QLatin1String("corewlan:") + qt_mac_NSStringToQString(objects[i])));
- + if(curident == ident) {
- ok = true;
- }
- }
Add Comment
Please, Sign In to add comment