diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2014-02-21 22:33:45 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-25 10:07:21 +0100 |
| commit | 63ea1f8b4c081f3889d8fa729e1700ad30a50b8c (patch) | |
| tree | 7d075642533f1e013a8679963cb21fa2edc0e9ae /src/macextras/qmacfunctions_mac.mm | |
| parent | 219ae0067c382f12734ad8be23faffe12cda87ab (diff) | |
Removed duplicate NSString NSURL conversion functionsv5.3.0-alpha1
Currently there's a duplication of the QString <-> NSString and
QUrl <-> NSURL functions.
This patch removes the private implementation and updates the code to
to use QtCore's functions directly.
Change-Id: I8fa613ac6753cc16fedd208f676f39ee2fec6bfa
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/macextras/qmacfunctions_mac.mm')
| -rw-r--r-- | src/macextras/qmacfunctions_mac.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/macextras/qmacfunctions_mac.mm b/src/macextras/qmacfunctions_mac.mm index 88ebb61..38f941f 100644 --- a/src/macextras/qmacfunctions_mac.mm +++ b/src/macextras/qmacfunctions_mac.mm @@ -45,6 +45,8 @@ #include "qmacfunctions.h" #include "qmacfunctions_p.h" +#include <QtCore/QString> + #if QT_VERSION > QT_VERSION_CHECK(5, 0, 0) #include <QtGui/QWindow> #include <QtWidgets/QMenu> @@ -104,7 +106,7 @@ CGContextRef currentCGContext() */ void setBadgeLabelText(const QString &text) { - [[[NSApplication sharedApplication] dockTile] setBadgeLabel:toNSString(text)]; + [[[NSApplication sharedApplication] dockTile] setBadgeLabel:text.toNSString()]; } /*! @@ -114,7 +116,7 @@ void setBadgeLabelText(const QString &text) */ QString badgeLabelText() { - return fromNSString([[[NSApplication sharedApplication] dockTile] badgeLabel]); + return QString::fromNSString([[[NSApplication sharedApplication] dockTile] badgeLabel]); } } // namespace QtMac |