anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove all uses of Q_WS_* macros

Browse Source 
They are only defined with Qt4.
This commit is contained in:
Jean-Marc Lasgouttes 2022-11-19 19:53:28 +01:00
parent 4310430a38
commit e11c7cb71d
4 changed files with 5 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/frontends/qt/GuiApplication.cpp
View File

@ -122,13 +122,7 @@
#include <QThreadPool>
#include <QWidget>
#ifdef Q_WS_X11
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <QX11Info>
#undef CursorShape
#undef None
#elif defined(QPA_XCB)
#if defined(QPA_XCB)
#include <xcb/xcb.h>
#ifdef HAVE_QT5_X11_EXTRAS
#include <QtX11Extras/QX11Info>
@ -173,7 +167,7 @@ namespace lyx {
frontend::Application * createApplication(int & argc, char * argv[])
{
#if !defined(Q_WS_X11) && !defined(QPA_XCB)
#if !defined(QPA_XCB)
// prune -geometry argument(s) by shifting
// the following ones 2 places down.
for (int i = 0 ; i < argc ; ++i) {
@ -1203,7 +1197,7 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
#endif
#endif
#if defined(Q_WS_X11) || defined(QPA_XCB)
#if defined(QPA_XCB)
// doubleClickInterval() is 400 ms on X11 which is just too long.
// On Windows and Mac OS X, the operating system's value is used.
// On Microsoft Windows, calling this function sets the double
@ -3496,56 +3490,7 @@ bool GuiApplication::longOperationStarted() {
//
// X11 specific stuff goes here...
#ifdef Q_WS_X11
bool GuiApplication::x11EventFilter(XEvent * xev)
{
if (!current_view_)
return false;
switch (xev->type) {
case SelectionRequest: {
if (xev->xselectionrequest.selection != XA_PRIMARY)
break;
LYXERR(Debug::SELECTION, "X requested selection.");
BufferView * bv = current_view_->currentBufferView();
if (bv) {
docstring const sel = bv->requestSelection();
if (!sel.empty()) {
d->selection_.put(sel);
// Refresh the selection request timestamp.
// We have to do this by ourselves as Qt seems
// not doing that, maybe because of our
// "persistent selection" implementation
// (see comments in GuiSelection.cpp).
XSelectionEvent nev;
nev.type = SelectionNotify;
nev.display = xev->xselectionrequest.display;
nev.requestor = xev->xselectionrequest.requestor;
nev.selection = xev->xselectionrequest.selection;
nev.target = xev->xselectionrequest.target;
nev.property = 0L; // None
nev.time = CurrentTime;
XSendEvent(QX11Info::display(),
nev.requestor, False, 0,
reinterpret_cast<XEvent *>(&nev));
return true;
}
}
break;
}
case SelectionClear: {
if (xev->xselectionclear.selection != XA_PRIMARY)
break;
LYXERR(Debug::SELECTION, "Lost selection.");
BufferView * bv = current_view_->currentBufferView();
if (bv)
bv->clearSelection();
break;
}
}
return false;
}
#elif defined(QPA_XCB)
#if defined(QPA_XCB)
bool GuiApplication::nativeEventFilter(const QByteArray & eventType,
void * message, long *)
{

4
src/frontends/qt/GuiApplication.h
View File

@ -117,9 +117,7 @@ public:
//@{
bool notify(QObject * receiver, QEvent * event) override;
void commitData(QSessionManager & sm);
#ifdef Q_WS_X11
bool x11EventFilter(XEvent * ev) override;
#elif defined(QPA_XCB)
#if defined(QPA_XCB)
virtual bool nativeEventFilter(const QByteArray & eventType, void * message,
long * result) override;
#endif

2
src/frontends/qt/GuiView.cpp
View File

@ -1493,9 +1493,7 @@ void GuiView::updateWindowTitle(GuiWorkArea * wa)
// buffer-save has changed too.
updateToolbars();
}
#ifndef Q_WS_MAC
title += from_ascii(" - LyX");
#endif
setWindowTitle(toqstr(title));
// Sets the path for the window: this is used by OSX to
// allow a context click on the title bar showing a menu

4
src/frontends/qt/GuiWorkArea.cpp
View File

@ -584,10 +584,6 @@ void GuiWorkArea::scrollTo(int value)
}
// Show the caret immediately after any operation.
startBlinkingCaret();
// FIXME QT5
#ifdef Q_WS_X11
QApplication::syncX();
#endif
}