From 0145916fb6a60f36ae6f8a66edacee4970c938d8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 2 Feb 2019 15:50:13 +0100 Subject: [PATCH] Unindent contents of anonymous namespaces No real changes, only formatting. --- src/qt/dataobj.cpp | 54 ++++++------- src/qt/dnd.cpp | 184 +++++++++++++++++++++++---------------------- 2 files changed, 121 insertions(+), 117 deletions(-) diff --git a/src/qt/dataobj.cpp b/src/qt/dataobj.cpp index b0b3b09ade..82d8cb88e9 100644 --- a/src/qt/dataobj.cpp +++ b/src/qt/dataobj.cpp @@ -17,36 +17,38 @@ namespace { - wxString DataFormatIdToMimeType(wxDataFormatId formatId) + +wxString DataFormatIdToMimeType(wxDataFormatId formatId) +{ + switch ( formatId ) { - switch ( formatId ) - { - case wxDF_TEXT: return "text/plain"; - case wxDF_BITMAP: return "image/bmp"; - case wxDF_TIFF: return "image/tiff"; - case wxDF_WAVE: return "audio/x-wav"; - case wxDF_UNICODETEXT: return "text/plain"; - case wxDF_HTML: return "text/html"; - case wxDF_METAFILE: - case wxDF_SYLK: - case wxDF_DIF: - case wxDF_OEMTEXT: - case wxDF_DIB: - case wxDF_PALETTE: - case wxDF_PENDATA: - case wxDF_RIFF: - case wxDF_ENHMETAFILE: - case wxDF_FILENAME: - case wxDF_LOCALE: - case wxDF_PRIVATE: - case wxDF_INVALID: - case wxDF_MAX: - default: - return ""; - } + case wxDF_TEXT: return "text/plain"; + case wxDF_BITMAP: return "image/bmp"; + case wxDF_TIFF: return "image/tiff"; + case wxDF_WAVE: return "audio/x-wav"; + case wxDF_UNICODETEXT: return "text/plain"; + case wxDF_HTML: return "text/html"; + case wxDF_METAFILE: + case wxDF_SYLK: + case wxDF_DIF: + case wxDF_OEMTEXT: + case wxDF_DIB: + case wxDF_PALETTE: + case wxDF_PENDATA: + case wxDF_RIFF: + case wxDF_ENHMETAFILE: + case wxDF_FILENAME: + case wxDF_LOCALE: + case wxDF_PRIVATE: + case wxDF_INVALID: + case wxDF_MAX: + default: + return ""; } } +} // anonymous namespace + wxDataFormat::wxDataFormat(wxDataFormatId formatId) { SetType(formatId); diff --git a/src/qt/dnd.cpp b/src/qt/dnd.cpp index 8186a3d951..a5d3f5d962 100644 --- a/src/qt/dnd.cpp +++ b/src/qt/dnd.cpp @@ -23,102 +23,104 @@ namespace { - wxDragResult DropActionToDragResult(Qt::DropAction action) - { - switch ( action ) - { - case Qt::IgnoreAction: - return wxDragCancel; - case Qt::CopyAction: - return wxDragCopy; - case Qt::MoveAction: - case Qt::TargetMoveAction: - return wxDragMove; - case Qt::LinkAction: - return wxDragLink; - } - wxFAIL_MSG("Illegal drop action"); - return wxDragNone; +wxDragResult DropActionToDragResult(Qt::DropAction action) +{ + switch ( action ) + { + case Qt::IgnoreAction: + return wxDragCancel; + case Qt::CopyAction: + return wxDragCopy; + case Qt::MoveAction: + case Qt::TargetMoveAction: + return wxDragMove; + case Qt::LinkAction: + return wxDragLink; } - Qt::DropAction DragResultToDropAction(wxDragResult result) - { - switch ( result ) - { - case wxDragCopy: - return Qt::CopyAction; - case wxDragMove: - return Qt::MoveAction; - case wxDragLink: - return Qt::LinkAction; - case wxDragError: - case wxDragNone: - case wxDragCancel: - return Qt::IgnoreAction; - } - - wxFAIL_MSG("Illegal drag result"); - return Qt::IgnoreAction; - } - - void AddDataFormat(wxDataObject* dataObject, - QMimeData* mimeData, - const wxDataFormat& format) - { - const size_t data_size = dataObject->GetDataSize(format); - - QByteArray data(static_cast(data_size), Qt::Initialization()); - dataObject->GetDataHere(format, data.data()); - - mimeData->setData(wxQtConvertString(format.GetMimeType()), data); - } - - QMimeData* CreateMimeData(wxDataObject* dataObject) - { - QMimeData* mimeData = new QMimeData(); - - const size_t count = dataObject->GetFormatCount(); - - wxScopedArray array(dataObject->GetFormatCount()); - dataObject->GetAllFormats(array.get()); - - for ( size_t i = 0; i < count; i++ ) - { - AddDataFormat(dataObject, mimeData, array[i]); - } - - return mimeData; - } - - void SetDragCursor(QDrag& drag, - const wxCursor& cursor, - Qt::DropAction action) - { - if ( cursor.IsOk() ) - drag.setDragCursor(cursor.GetHandle().pixmap(), action); - } - - class PendingMimeDataSetter - { - public: - PendingMimeDataSetter(const QMimeData*& targetMimeData, - const QMimeData* mimeData) - : m_targetMimeData(targetMimeData) - { - m_targetMimeData = mimeData; - } - - ~PendingMimeDataSetter() - { - m_targetMimeData = NULL; - } - - private: - const QMimeData*& m_targetMimeData; - }; + wxFAIL_MSG("Illegal drop action"); + return wxDragNone; } +Qt::DropAction DragResultToDropAction(wxDragResult result) +{ + switch ( result ) + { + case wxDragCopy: + return Qt::CopyAction; + case wxDragMove: + return Qt::MoveAction; + case wxDragLink: + return Qt::LinkAction; + case wxDragError: + case wxDragNone: + case wxDragCancel: + return Qt::IgnoreAction; + } + + wxFAIL_MSG("Illegal drag result"); + return Qt::IgnoreAction; +} + +void AddDataFormat(wxDataObject* dataObject, + QMimeData* mimeData, + const wxDataFormat& format) +{ + const size_t data_size = dataObject->GetDataSize(format); + + QByteArray data(static_cast(data_size), Qt::Initialization()); + dataObject->GetDataHere(format, data.data()); + + mimeData->setData(wxQtConvertString(format.GetMimeType()), data); +} + +QMimeData* CreateMimeData(wxDataObject* dataObject) +{ + QMimeData* mimeData = new QMimeData(); + + const size_t count = dataObject->GetFormatCount(); + + wxScopedArray array(dataObject->GetFormatCount()); + dataObject->GetAllFormats(array.get()); + + for ( size_t i = 0; i < count; i++ ) + { + AddDataFormat(dataObject, mimeData, array[i]); + } + + return mimeData; +} + +void SetDragCursor(QDrag& drag, + const wxCursor& cursor, + Qt::DropAction action) +{ + if ( cursor.IsOk() ) + drag.setDragCursor(cursor.GetHandle().pixmap(), action); +} + +class PendingMimeDataSetter +{ +public: + PendingMimeDataSetter(const QMimeData*& targetMimeData, + const QMimeData* mimeData) + : m_targetMimeData(targetMimeData) + { + m_targetMimeData = mimeData; + } + + ~PendingMimeDataSetter() + { + m_targetMimeData = NULL; + } + +private: + const QMimeData*& m_targetMimeData; +}; + +} // anonymous namespace + class wxDropTarget::Impl : public QObject { public: