summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qwindowsmime.cpp
diff options
context:
space:
mode:
authorDavid Faure <david.faure@kdab.com>2014-11-05 16:50:56 +0100
committerDavid Faure <david.faure@kdab.com>2014-11-11 17:26:50 +0100
commit8bed6b6a7ffd3961f3da726d551f5e2563d95965 (patch)
treee9e305f7fcbebc1902a8f43890881b67a85cacd4 /src/plugins/platforms/windows/qwindowsmime.cpp
parenta4a33a284f579c94fbb344e4908781a6e6337c63 (diff)
qwindowmime.cpp: fix typo, remove unused variable
Change-Id: If557b191ea7be95a6c9e71069eb1e744f3e73b47 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsmime.cpp')
-rw-r--r--src/plugins/platforms/windows/qwindowsmime.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
index f8cf3c0246..2de1477f29 100644
--- a/src/plugins/platforms/windows/qwindowsmime.cpp
+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
@@ -791,7 +791,6 @@ QVariant QWindowsMimeURI::convertToMime(const QString &mimeType, LPDATAOBJECT pD
{
if (mimeType == QLatin1String("text/uri-list")) {
if (canGetData(CF_HDROP, pDataObj)) {
- QByteArray texturi;
QList<QVariant> urls;
QByteArray data = getData(CF_HDROP, pDataObj);
@@ -1354,7 +1353,7 @@ bool QLastResortMimes::canConvertToMime(const QString &mimeType, IDataObject *pD
int cf = RegisterClipboardFormat(reinterpret_cast<const wchar_t *> (clipFormat.utf16()));
return canGetData(cf, pDataObj);
} else if (formats.keys(mimeType).isEmpty()) {
- // if it is not in there then register it an see if we can get it
+ // if it is not in there then register it and see if we can get it
int cf = QWindowsMime::registerMimeType(mimeType);
return canGetData(cf, pDataObj);
} else {