whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cosmetic changes

bb10
Lars Knoll 2011-06-08 13:46:09 +02:00
parent b6b244efda
commit f2ff9036ae
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/xcb/qxcbclipboard.cpp
View File

@ -186,7 +186,7 @@ QMimeData * QXcbClipboard::mimeData(QClipboard::Mode mode)
} else if (mode == QClipboard::Selection) {
if (!m_xSelection) {
m_xSelection = new QXcbClipboardMime(mode, this);
}
}
xcb_window_t clipboardOwner = getSelectionOwner(XCB_ATOM_PRIMARY);
if (clipboardOwner == owner()) {
return m_clientSelection;
@ -336,10 +336,10 @@ xcb_atom_t QXcbClipboard::sendSelection(QMimeData *d, xcb_atom_t target, xcb_win
QString fmt = QXcbMime::mimeAtomToString(connection(), target);
if (fmt.isEmpty()) { // Not a MIME type we have
qDebug() << "QClipboard: send_selection(): converting to type '%s' is not supported" << fmt.data();
// qDebug() << "QClipboard: send_selection(): converting to type" << connection()->atomName(target) << "is not supported";
return XCB_NONE;
}
qDebug() << "QClipboard: send_selection(): converting to type '%s'" << fmt.data();
// qDebug() << "QClipboard: send_selection(): converting to type" << fmt;
if (QXcbMime::mimeDataForAtom(connection(), target, d, &data, &atomFormat, &dataFormat)) {
@ -356,7 +356,7 @@ xcb_atom_t QXcbClipboard::sendSelection(QMimeData *d, xcb_atom_t target, xcb_win
atom(QXcbAtom::INCR), 32, 1, (const void *)&bytes);
// (void)new QClipboardINCRTransaction(window, property, atomFormat, dataFormat, data, increment);
qDebug() << "not implemented INCRT just YET!";
qWarning() << "not implemented INCR just YET!";
return property;
}

2
src/plugins/platforms/xcb/qxcbmime.cpp
View File

@ -64,7 +64,7 @@ QXcbMime::~QXcbMime()
QString QXcbMime::mimeAtomToString(QXcbConnection *connection, xcb_atom_t a)
{
if (a == XCB_NONE)
return 0;
return QString();
// special cases for string type
if (a == XCB_ATOM_STRING