summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-06-08 13:46:09 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-06-08 13:46:09 +0200
commitf2ff9036ae072b638742a1166b7f424d949c597d (patch)
treeecf82014fae203e0d4da70f18c3580ba3ae757f7 /src/plugins
parentb6b244efda313b3e617afa57bb8c947582fc4003 (diff)
cosmetic changes
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/xcb/qxcbclipboard.cpp8
-rw-r--r--src/plugins/platforms/xcb/qxcbmime.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp
index 6bebfc83d2..e25192fcd7 100644
--- a/src/plugins/platforms/xcb/qxcbclipboard.cpp
+++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp
@@ -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;
}
diff --git a/src/plugins/platforms/xcb/qxcbmime.cpp b/src/plugins/platforms/xcb/qxcbmime.cpp
index 1538982cee..d4f80ca09d 100644
--- a/src/plugins/platforms/xcb/qxcbmime.cpp
+++ b/src/plugins/platforms/xcb/qxcbmime.cpp
@@ -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