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

Replace Q_WS_WIN with appropriate guards to account for Qt5.

Browse Source 
This commit replaces almost all occurrences of Q_WS_WIN to comply
with Qt5. The remaining occurrences should *not* be replaced,
because the guarded code won't compile on Qt5.
This commit is contained in:
Enrico Forestieri 2014-08-25 19:27:45 +02:00
parent 565260126e
commit 4521fc757b
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt4/FileDialog.cpp
View File

@ -35,7 +35,7 @@
*
* Therefore there is a tradeoff in enabling or disabling this (JMarc)
*/
#if defined(Q_WS_MACX) || (defined(Q_WS_WIN) && !defined(Q_OS_CYGWIN))
#if defined(Q_WS_MACX) || defined(Q_OS_WIN)
#define USE_NATIVE_FILEDIALOG 1
#endif

2
src/frontends/qt4/GuiClipboard.cpp
View File

@ -541,7 +541,7 @@ bool GuiClipboard::hasInternal() const
// are notified of changes. However, on Windows ownership is
// emulated by Qt through the OleIsCurrentClipboard() API, while
// on Mac OS X we deal with this issue by ourself.
#if (defined(Q_WS_X11) || defined(Q_WS_WIN))
#if defined(Q_WS_X11) || defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)
return true;
#else
return false;

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

@ -448,7 +448,7 @@ GuiView::GuiView(int id)
// We don't want to keep the window in memory if it is closed.
setAttribute(Qt::WA_DeleteOnClose, true);
#if (!defined(Q_WS_WIN) && !defined(Q_WS_MACX))
#if !(defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)) && !defined(Q_WS_MACX)
// QIcon::fromTheme was introduced in Qt 4.6
#if (QT_VERSION >= 0x040600)
// assign an icon to main form. We do not do it under Qt/Win or Qt/Mac,

4
src/frontends/qt4/Menus.cpp
View File

@ -1774,7 +1774,7 @@ void Menu::Impl::populate(QMenu & qMenu, MenuDefinition const & menu)
}
}
#if defined(Q_WS_WIN) && (QT_VERSION >= 0x040600)
#if (defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)) && (QT_VERSION >= 0x040600)
class AlwaysMnemonicStyle : public QProxyStyle {
public:
int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0,
@ -1794,7 +1794,7 @@ public:
Menu::Menu(GuiView * gv, QString const & name, bool top_level, bool keyboard)
: QMenu(gv), d(new Menu::Impl)
{
#if defined(Q_WS_WIN) && (QT_VERSION >= 0x040600)
#if (defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)) && (QT_VERSION >= 0x040600)
if (keyboard)
setStyle(new AlwaysMnemonicStyle);
#else

2
src/frontends/qt4/qt_helpers.cpp
View File

@ -301,7 +301,7 @@ QString const externalLineEnding(docstring const & str)
#ifdef Q_WS_MACX
// The MAC clipboard uses \r for lineendings, and we use \n
return toqstr(subst(str, '\n', '\r'));
#elif defined(Q_WS_WIN)
#elif defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)
// Windows clipboard uses \r\n for lineendings, and we use \n
return toqstr(subst(str, from_ascii("\n"), from_ascii("\r\n")));
#else