Replace QCFString::to(CF/NS/Q)String usage with QString methods

Slims down QCFString and leaves only one implementation of converting
back and forth between CF/NS strings and QStrings.

Change-Id: I068568ffa25e6f4f6d6c99dcf47078b7a8e70e10
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

1 files changed, 23 insertions, 23 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
index 0375dd85f2..ef102990b4 100644
--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
@@ -145,14 +145,14 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSOpenSavePanelDelegate);
 
     QFileInfo sel(selectFile);
     if (sel.isDir() && !sel.isBundle()){
-        mCurrentDir = [QCFString::toNSString(sel.absoluteFilePath()) retain];
+        mCurrentDir = [sel.absoluteFilePath().toNSString() retain];
         mCurrentSelection = new QString;
     } else {
-        mCurrentDir = [QCFString::toNSString(sel.absolutePath()) retain];
+        mCurrentDir = [sel.absolutePath().toNSString() retain];
         mCurrentSelection = new QString(sel.absoluteFilePath());
     }
 
-    [mSavePanel setTitle:QCFString::toNSString(options->windowTitle())];
+    [mSavePanel setTitle:options->windowTitle().toNSString()];
     [self createPopUpButton:selectedVisualNameFilter hideDetails:options->testOption(QFileDialogOptions::HideNameFilterDetails)];
     [self createTextField];
     [self createAccessory];
@@ -203,12 +203,12 @@ static QString strippedText(QString s)
 
 - (NSString *)strip:(const QString &)label
 {
-    return QCFString::toNSString(strippedText(label));
+    return strippedText(label).toNSString();
 }
 
 - (void)closePanel
 {
-    *mCurrentSelection = QCFString::toQString([[mSavePanel URL] path]).normalized(QString::NormalizationForm_C);
+    *mCurrentSelection = QString::fromNSString([[mSavePanel URL] path]).normalized(QString::NormalizationForm_C);
     if ([mSavePanel respondsToSelector:@selector(close)])
         [mSavePanel close];
     if ([mSavePanel isSheet])
@@ -219,14 +219,14 @@ static QString strippedText(QString s)
 {
     if (mOpenPanel){
         QFileInfo info(*mCurrentSelection);
-        NSString *filepath = QCFString::toNSString(info.filePath());
+        NSString *filepath = info.filePath().toNSString();
         bool selectable = (mOptions->acceptMode() == QFileDialogOptions::AcceptSave)
             || [self panel:nil shouldShowFilename:filepath];
 
         [self updateProperties];
         QCocoaMenuBar::redirectKnownMenuItemsToFirstResponder();
         [mOpenPanel setAllowedFileTypes:nil];
-        [mSavePanel setNameFieldStringValue:selectable ? QT_PREPEND_NAMESPACE(QCFString::toNSString)(info.fileName()) : @""];
+        [mSavePanel setNameFieldStringValue:selectable ? info.fileName().toNSString() : @""];
 
         [mOpenPanel beginWithCompletionHandler:^(NSInteger result){
             mReturnCode = result;
@@ -239,12 +239,12 @@ static QString strippedText(QString s)
 - (BOOL)runApplicationModalPanel
 {
     QFileInfo info(*mCurrentSelection);
-    NSString *filepath = QCFString::toNSString(info.filePath());
+    NSString *filepath = info.filePath().toNSString();
     bool selectable = (mOptions->acceptMode() == QFileDialogOptions::AcceptSave)
         || [self panel:nil shouldShowFilename:filepath];
 
     [mSavePanel setDirectoryURL: [NSURL fileURLWithPath:mCurrentDir]];
-    [mSavePanel setNameFieldStringValue:selectable ? QCFString::toNSString(info.fileName()) : @""];
+    [mSavePanel setNameFieldStringValue:selectable ? info.fileName().toNSString() : @""];
 
     // Call processEvents in case the event dispatcher has been interrupted, and needs to do
     // cleanup of modal sessions. Do this before showing the native dialog, otherwise it will
@@ -266,7 +266,7 @@ static QString strippedText(QString s)
 - (void)showWindowModalSheet:(QWindow *)parent
 {
     QFileInfo info(*mCurrentSelection);
-    NSString *filepath = QCFString::toNSString(info.filePath());
+    NSString *filepath = info.filePath().toNSString();
     bool selectable = (mOptions->acceptMode() == QFileDialogOptions::AcceptSave)
         || [self panel:nil shouldShowFilename:filepath];
 
@@ -274,7 +274,7 @@ static QString strippedText(QString s)
     QCocoaMenuBar::redirectKnownMenuItemsToFirstResponder();
     [mSavePanel setDirectoryURL: [NSURL fileURLWithPath:mCurrentDir]];
 
-    [mSavePanel setNameFieldStringValue:selectable ? QCFString::toNSString(info.fileName()) : @""];
+    [mSavePanel setNameFieldStringValue:selectable ? info.fileName().toNSString() : @""];
     NSWindow *nsparent = static_cast<NSWindow *>(qGuiApp->platformNativeInterface()->nativeResourceForWindow("nswindow", parent));
 
     [mSavePanel beginSheetModalForWindow:nsparent completionHandler:^(NSInteger result){
@@ -321,7 +321,7 @@ static QString strippedText(QString s)
         }
     }
 
-    QString qtFileName = QFileInfo(QCFString::toQString(filename)).fileName();
+    QString qtFileName = QFileInfo(QString::fromNSString(filename)).fileName();
     // No filter means accept everything
     bool nameMatches = mSelectedNameFilter->isEmpty();
     // Check if the current file name filter accepts the file:
@@ -373,7 +373,7 @@ static QString strippedText(QString s)
     if (filters.size() > 0){
         for (int i=0; i<filters.size(); ++i) {
             QString filter = hideDetails ? [self removeExtensions:filters.at(i)] : filters.at(i);
-            [mPopUpButton addItemWithTitle:QCFString::toNSString(filter)];
+            [mPopUpButton addItemWithTitle:filter.toNSString()];
         }
         [mPopUpButton selectItemAtIndex:0];
         [mSavePanel setAccessoryView:mAccessoryView];
@@ -407,13 +407,13 @@ static QString strippedText(QString s)
         QList<QUrl> result;
         NSArray* array = [mOpenPanel URLs];
         for (NSUInteger i=0; i<[array count]; ++i) {
-            QString path = QCFString::toQString([[array objectAtIndex:i] path]).normalized(QString::NormalizationForm_C);
+            QString path = QString::fromNSString([[array objectAtIndex:i] path]).normalized(QString::NormalizationForm_C);
             result << QUrl::fromLocalFile(path);
         }
         return result;
     } else {
         QList<QUrl> result;
-        QString filename = QCFString::toQString([[mSavePanel URL] path]).normalized(QString::NormalizationForm_C);
+        QString filename = QString::fromNSString([[mSavePanel URL] path]).normalized(QString::NormalizationForm_C);
         result << QUrl::fromLocalFile(filename.remove(QLatin1String("___qt_very_unlikely_prefix_")));
         return result;
     }
@@ -436,8 +436,8 @@ static QString strippedText(QString s)
     [mSavePanel setCanCreateDirectories:!(mOptions->testOption(QFileDialogOptions::ReadOnly))];
     [mOpenPanel setAllowsMultipleSelection:(fileMode == QFileDialogOptions::ExistingFiles)];
     [mOpenPanel setResolvesAliases:!(mOptions->testOption(QFileDialogOptions::DontResolveSymlinks))];
-    [mOpenPanel setTitle:QCFString::toNSString(mOptions->windowTitle())];
-    [mSavePanel setTitle:QCFString::toNSString(mOptions->windowTitle())];
+    [mOpenPanel setTitle:mOptions->windowTitle().toNSString()];
+    [mSavePanel setTitle:mOptions->windowTitle().toNSString()];
     [mPopUpButton setHidden:chooseDirsOnly];    // TODO hide the whole sunken pane instead?
 
     QStringList ext = [self acceptableExtensionsForSave];
@@ -456,7 +456,7 @@ static QString strippedText(QString s)
 {
     Q_UNUSED(sender);
     if (mHelper && [mSavePanel isVisible]) {
-        QString selection = QCFString::toQString([[mSavePanel URL] path]);
+        QString selection = QString::fromNSString([[mSavePanel URL] path]);
         if (selection != mCurrentSelection) {
             *mCurrentSelection = selection;
             mHelper->QNSOpenSavePanelDelegate_selectionChanged(selection);
@@ -474,7 +474,7 @@ static QString strippedText(QString s)
 
     [mCurrentDir release];
     mCurrentDir = [path retain];
-    mHelper->QNSOpenSavePanelDelegate_directoryEntered(QCFString::toQString(mCurrentDir));
+    mHelper->QNSOpenSavePanelDelegate_directoryEntered(QString::fromNSString(mCurrentDir));
 }
 
 /*
@@ -537,7 +537,7 @@ static QString strippedText(QString s)
                 (filterToUse == -1 && currentFilter.startsWith(selectedFilter)))
                 filterToUse = i;
             QString filter = hideDetails ? [self removeExtensions:currentFilter] : currentFilter;
-            [mPopUpButton addItemWithTitle:QCFString::toNSString(filter)];
+            [mPopUpButton addItemWithTitle:filter.toNSString()];
         }
         if (filterToUse != -1)
             [mPopUpButton selectItemAtIndex:filterToUse];
@@ -609,7 +609,7 @@ void QCocoaFileDialogHelper::QNSOpenSavePanelDelegate_filterSelected(int menuInd
 void QCocoaFileDialogHelper::setDirectory(const QUrl &directory)
 {
     if (mDelegate)
-        [mDelegate->mSavePanel setDirectoryURL:[NSURL fileURLWithPath:QCFString::toNSString(directory.toLocalFile())]];
+        [mDelegate->mSavePanel setDirectoryURL:[NSURL fileURLWithPath:directory.toLocalFile().toNSString()]];
     else
         mDir = directory;
 }
@@ -617,7 +617,7 @@ void QCocoaFileDialogHelper::setDirectory(const QUrl &directory)
 QUrl QCocoaFileDialogHelper::directory() const
 {
     if (mDelegate) {
-        QString path = QCFString::toQString([[mDelegate->mSavePanel directoryURL] path]).normalized(QString::NormalizationForm_C);
+        QString path = QString::fromNSString([[mDelegate->mSavePanel directoryURL] path]).normalized(QString::NormalizationForm_C);
         return QUrl::fromLocalFile(path);
     }
     return mDir;
@@ -646,7 +646,7 @@ void QCocoaFileDialogHelper::setFilter()
     if (!mDelegate)
         return;
     const SharedPointerFileDialogOptions &opts = options();
-    [mDelegate->mSavePanel setTitle:QCFString::toNSString(opts->windowTitle())];
+    [mDelegate->mSavePanel setTitle:opts->windowTitle().toNSString()];
     if (opts->isLabelExplicitlySet(QFileDialogOptions::Accept))
         [mDelegate->mSavePanel setPrompt:[mDelegate strip:opts->labelText(QFileDialogOptions::Accept)]];
     if (opts->isLabelExplicitlySet(QFileDialogOptions::FileName))