diff --git a/config.cc b/config.cc index abcbdd8c..d118cf07 100644 --- a/config.cc +++ b/config.cc @@ -193,7 +193,7 @@ Programs makeDefaultPrograms() Programs programs; // The following list doesn't make a lot of sense under Windows -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN programs.push_back( Program( false, Program::Audio, "428b4c2b905ef568a43d9a16f59559b0", "Festival", "festival --tts", "" ) ); programs.push_back( Program( false, Program::Audio, "2cf8b3a60f27e1ac812de0b57c148340", "Espeak", "espeak %GDWORD%", "" ) ); programs.push_back( Program( false, Program::Html, "4f898f7582596cea518c6b0bfdceb8b3", "Manpages", "man -a --html=/bin/cat %GDWORD%", "" ) ); diff --git a/hotkeywrapper.cc b/hotkeywrapper.cc index 28939b0b..dbbf47d0 100644 --- a/hotkeywrapper.cc +++ b/hotkeywrapper.cc @@ -128,7 +128,7 @@ bool HotkeyWrapper::checkState(quint32 vk, quint32 mod) if (hs.key == vk && hs.modifier == mod) { - #ifdef Q_WS_WIN32 + #ifdef Q_OS_WIN32 // If that was a copy-to-clipboard shortcut, re-emit it back so it could // reach its original destination so it could be acted upon. if ( ( vk == VK_INSERT || vk == 'c' || vk == 'C' ) && mod == MOD_CONTROL ) diff --git a/mainwindow.cc b/mainwindow.cc index 6f6ee307..af5ee8ff 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -2557,13 +2557,13 @@ void MainWindow::checkForNewRelease() #ifdef Q_WS_X11 "x11" #endif -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC "mac" #endif #ifdef Q_WS_QWS "qws" #endif -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN "win" #endif ) ); diff --git a/scanpopup.cc b/scanpopup.cc index 7f130fd9..e85fcda3 100644 --- a/scanpopup.cc +++ b/scanpopup.cc @@ -25,7 +25,7 @@ using std::wstring; /// in their behavior on those platforms. static Qt::WindowFlags popupWindowFlags = -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint #else Qt::Popup @@ -322,7 +322,7 @@ void ScanPopup::translateWord( QString const & word ) inputWord = str; engagePopup( false, -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN true // We only focus popup under Windows when activated via Ctrl+C+C // -- on Linux it already has an implicit focus #else diff --git a/translatebox.cc b/translatebox.cc index 2c5d2ced..19f3042d 100644 --- a/translatebox.cc +++ b/translatebox.cc @@ -20,7 +20,7 @@ namespace CompletionList::CompletionList(TranslateBox * parent) : WordList(parent), translateBox(parent) { -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN setWindowFlags(Qt::ToolTip); #else setParent( parent->window() );