Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unindent contents of anonymous namespaces

Browse Source 
No real changes, only formatting.
This commit is contained in:
Vadim Zeitlin
2019-02-02 15:50:13 +01:00
parent 111a37fd73
commit 0145916fb6
2 changed files with 121 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/qt/dataobj.cpp
View File

@@ -17,36 +17,38 @@
namespace 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_TEXT: return "text/plain"; case wxDF_TIFF: return "image/tiff";
case wxDF_BITMAP: return "image/bmp"; case wxDF_WAVE: return "audio/x-wav";
case wxDF_TIFF: return "image/tiff"; case wxDF_UNICODETEXT: return "text/plain";
case wxDF_WAVE: return "audio/x-wav"; case wxDF_HTML: return "text/html";
case wxDF_UNICODETEXT: return "text/plain"; case wxDF_METAFILE:
case wxDF_HTML: return "text/html"; case wxDF_SYLK:
case wxDF_METAFILE: case wxDF_DIF:
case wxDF_SYLK: case wxDF_OEMTEXT:
case wxDF_DIF: case wxDF_DIB:
case wxDF_OEMTEXT: case wxDF_PALETTE:
case wxDF_DIB: case wxDF_PENDATA:
case wxDF_PALETTE: case wxDF_RIFF:
case wxDF_PENDATA: case wxDF_ENHMETAFILE:
case wxDF_RIFF: case wxDF_FILENAME:
case wxDF_ENHMETAFILE: case wxDF_LOCALE:
case wxDF_FILENAME: case wxDF_PRIVATE:
case wxDF_LOCALE: case wxDF_INVALID:
case wxDF_PRIVATE: case wxDF_MAX:
case wxDF_INVALID: default:
case wxDF_MAX: return "";
default:
return "";
}
} }
} }
} // anonymous namespace
wxDataFormat::wxDataFormat(wxDataFormatId formatId) wxDataFormat::wxDataFormat(wxDataFormatId formatId)
{ {
SetType(formatId); SetType(formatId);

184
src/qt/dnd.cpp
View File

@@ -23,102 +23,104 @@
namespace 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"); wxDragResult DropActionToDragResult(Qt::DropAction action)
return wxDragNone; {
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) wxFAIL_MSG("Illegal drop action");
{ return wxDragNone;
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<int>(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<wxDataFormat> 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;
};
} }
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<int>(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<wxDataFormat> 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 class wxDropTarget::Impl : public QObject
{ {
public: public: