Change Q_WS_MAC to Q_OS_MAC, Change Q_WS_WIN* to Q_OS_WIN*

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%", "" ) );

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 )

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
           ) );

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

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() );