From 7421a0e88208a9afe0ab360a0646bf81a84d2290 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 5 Sep 2018 14:48:30 +0200 Subject: winrt platform plugin: Fix clang warnings Fixed warnings: - missing override specifier - 0 as nullptr constant - implicit change of signedness - non portable path to header file Change-Id: I6977bc561176ac7804ac01325b84c15ba849bbf2 Reviewed-by: Miguel Costa Reviewed-by: Andre de la Rocha Reviewed-by: Friedemann Kleint --- .../platforms/winrt/qwinrtfiledialoghelper.cpp | 30 ++++++++++------------ 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'src/plugins/platforms/winrt/qwinrtfiledialoghelper.cpp') diff --git a/src/plugins/platforms/winrt/qwinrtfiledialoghelper.cpp b/src/plugins/platforms/winrt/qwinrtfiledialoghelper.cpp index 3c90334c8c..114d6dacd8 100644 --- a/src/plugins/platforms/winrt/qwinrtfiledialoghelper.cpp +++ b/src/plugins/platforms/winrt/qwinrtfiledialoghelper.cpp @@ -51,7 +51,7 @@ #include #include #include -#include +#include using namespace Microsoft::WRL; using namespace Microsoft::WRL::Wrappers; @@ -73,12 +73,12 @@ class WindowsStringVector : public RuntimeClass> public: HRESULT __stdcall GetAt(quint32 index, HSTRING *item) { - *item = impl.at(index); + *item = impl.at(int(index)); return S_OK; } HRESULT __stdcall get_Size(quint32 *size) { - *size = impl.size(); + *size = quint32(impl.size()); return S_OK; } HRESULT __stdcall GetView(IVectorView **view) @@ -108,7 +108,7 @@ public: HRESULT hr = WindowsDuplicateString(item, &newItem); if (FAILED(hr)) return hr; - impl[index] = newItem; + impl[int(index)] = newItem; return S_OK; } HRESULT __stdcall InsertAt(quint32 index, HSTRING item) @@ -117,12 +117,12 @@ public: HRESULT hr = WindowsDuplicateString(item, &newItem); if (FAILED(hr)) return hr; - impl.insert(index, newItem); + impl.insert(int(index), newItem); return S_OK; } HRESULT __stdcall RemoveAt(quint32 index) { - WindowsDeleteString(impl.takeAt(index)); + WindowsDeleteString(impl.takeAt(int(index))); return S_OK; } HRESULT __stdcall Append(HSTRING item) @@ -164,7 +164,7 @@ static bool initializePicker(HSTRING runtimeId, T **picker, const QSharedPointer if (options->isLabelExplicitlySet(QFileDialogOptions::Accept)) { const QString labelText = options->labelText(QFileDialogOptions::Accept); HStringReference labelTextRef(reinterpret_cast(labelText.utf16()), - labelText.length()); + uint(labelText.length())); hr = (*picker)->put_CommitButtonText(labelTextRef.Get()); RETURN_FALSE_IF_FAILED("Failed to set commit button text"); } @@ -188,7 +188,7 @@ static bool initializeOpenPickerOptions(T *picker, const QSharedPointer 1 && filter.startsWith(QLatin1Char('*'))) ? 1 : 0; HStringReference filterRef(reinterpret_cast(filter.utf16() + offset), - filter.length() - offset); + uint(filter.length() - offset)); hr = filters->Append(filterRef.Get()); if (FAILED(hr)) { qWarning("Failed to add named file filter \"%s\": %s", @@ -290,16 +290,12 @@ QWinRTFileDialogHelper::QWinRTFileDialogHelper() d->shown = false; } -QWinRTFileDialogHelper::~QWinRTFileDialogHelper() -{ -} - void QWinRTFileDialogHelper::exec() { Q_D(QWinRTFileDialogHelper); if (!d->shown) - show(Qt::Dialog, Qt::ApplicationModal, 0); + show(Qt::Dialog, Qt::ApplicationModal, nullptr); d->loop.exec(); } @@ -369,7 +365,7 @@ bool QWinRTFileDialogHelper::show(Qt::WindowFlags windowFlags, Qt::WindowModalit // Remove leading star const int starOffset = (filter.length() > 1 && filter.startsWith(QLatin1Char('*'))) ? 1 : 0; HStringReference filterRef(reinterpret_cast(filter.utf16() + starOffset), - filter.length() - starOffset); + uint(filter.length() - starOffset)); hr = entry->Append(filterRef.Get()); if (FAILED(hr)) { qWarning("Failed to add named file filter \"%s\": %s", @@ -379,7 +375,7 @@ bool QWinRTFileDialogHelper::show(Qt::WindowFlags windowFlags, Qt::WindowModalit const int offset = namedFilter.indexOf(QLatin1String(" (")); const QString filterTitle = namedFilter.mid(0, offset); HStringReference namedFilterRef(reinterpret_cast(filterTitle.utf16()), - filterTitle.length()); + uint(filterTitle.length())); boolean replaced; hr = choices->Insert(namedFilterRef.Get(), entry.Get(), &replaced); // Only print a warning as * or *.* is not a valid choice on Windows 10 @@ -396,7 +392,7 @@ bool QWinRTFileDialogHelper::show(Qt::WindowFlags windowFlags, Qt::WindowModalit if (!suffix.startsWith(QLatin1Char('.'))) suffix.prepend(QLatin1Char('.')); HStringReference nativeSuffix(reinterpret_cast(suffix.utf16()), - suffix.length()); + uint(suffix.length())); hr = picker->put_DefaultFileExtension(nativeSuffix.Get()); RETURN_FALSE_IF_FAILED_WITH_ARGS("Failed to set default file extension \"%s\"", qPrintable(suffix)); } @@ -404,7 +400,7 @@ bool QWinRTFileDialogHelper::show(Qt::WindowFlags windowFlags, Qt::WindowModalit const QString suggestedName = QFileInfo(d->saveFileName.toLocalFile()).fileName(); if (!suggestedName.isEmpty()) { HStringReference nativeSuggestedName(reinterpret_cast(suggestedName.utf16()), - suggestedName.length()); + uint(suggestedName.length())); hr = picker->put_SuggestedFileName(nativeSuggestedName.Get()); RETURN_FALSE_IF_FAILED("Failed to set suggested file name"); } -- cgit v1.2.3