Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 19:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove default QClipboard::Mode enum cases

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-04-04 07:49:04 +00:00
parent f57762835f
commit 0fbdf5a2e3
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/gui/kernel/qclipboard_x11.cpp
View file

@ -440,12 +440,14 @@ void QClipboard::clear(Mode mode)
bool QClipboard::ownsMode(Mode mode) const bool QClipboard::ownsMode(Mode mode) const
{ {
if (mode == Clipboard) switch (mode) {
return clipboardData()->timestamp != CurrentTime; case QClipboard::Clipboard:
else if(mode == Selection) return clipboardData()->timestamp != CurrentTime;
return selectionData()->timestamp != CurrentTime; case QClipboard::Selection:
else return selectionData()->timestamp != CurrentTime;
return false; }
Q_UNREACHABLE();
} }
static Bool checkForClipboardEvents(Display *, XEvent *e, XPointer) static Bool checkForClipboardEvents(Display *, XEvent *e, XPointer)
@ -1022,10 +1024,6 @@ QClipboardWatcher::QClipboardWatcher(QClipboard::Mode mode)
case QClipboard::Clipboard: case QClipboard::Clipboard:
atom = ATOM(CLIPBOARD); atom = ATOM(CLIPBOARD);
break; break;
default:
qWarning("QClipboardWatcher: Internal error: Unsupported clipboard mode");
break;
} }
setupOwner(); setupOwner();
@ -1167,15 +1165,12 @@ const QMimeData* QClipboard::mimeData(Mode mode) const
{ {
QClipboardData *d = 0; QClipboardData *d = 0;
switch (mode) { switch (mode) {
case Selection: case QClipboard::Selection:
d = selectionData(); d = selectionData();
break; break;
case Clipboard: case QClipboard::Clipboard:
d = clipboardData(); d = clipboardData();
break; break;
default:
qWarning("QClipboard::mimeData: unsupported mode '%d'", mode);
return 0;
} }
if (! d->source() && ! timer_event_clear) { if (! d->source() && ! timer_event_clear) {
@ -1209,21 +1204,17 @@ void QClipboard::setMimeData(QMimeData* src, Mode mode)
Atom atom, sentinel_atom; Atom atom, sentinel_atom;
QClipboardData *d; QClipboardData *d;
switch (mode) { switch (mode) {
case Selection: case QClipboard::Selection:
atom = XA_PRIMARY; atom = XA_PRIMARY;
sentinel_atom = ATOM(_QT_SELECTION_SENTINEL); sentinel_atom = ATOM(_QT_SELECTION_SENTINEL);
d = selectionData(); d = selectionData();
break; break;
case Clipboard: case QClipboard::Clipboard:
atom = ATOM(CLIPBOARD); atom = ATOM(CLIPBOARD);
sentinel_atom = ATOM(_QT_CLIPBOARD_SENTINEL); sentinel_atom = ATOM(_QT_CLIPBOARD_SENTINEL);
d = clipboardData(); d = clipboardData();
break; break;
default:
qWarning("QClipboard::setMimeData: unsupported mode '%d'", mode);
return;
} }
Display *dpy = qt_x11Data->display; Display *dpy = qt_x11Data->display;