hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 04:24:09 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Change Q_WS_MAC to Q_OS_MAC, Change Q_WS_WIN* to Q_OS_WIN*

Browse source
This commit is contained in:
Timon Wong 2013-05-31 12:28:29 +08:00
parent 4b412f360c
commit d057752c74
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.cc
View file

@ -193,7 +193,7 @@ Programs makeDefaultPrograms()
Programs programs; Programs programs;
// The following list doesn't make a lot of sense under Windows // 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, "428b4c2b905ef568a43d9a16f59559b0", "Festival", "festival --tts", "" ) );
programs.push_back( Program( false, Program::Audio, "2cf8b3a60f27e1ac812de0b57c148340", "Espeak", "espeak %GDWORD%", "" ) ); 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%", "" ) ); programs.push_back( Program( false, Program::Html, "4f898f7582596cea518c6b0bfdceb8b3", "Manpages", "man -a --html=/bin/cat %GDWORD%", "" ) );

2
hotkeywrapper.cc
View file

@ -128,7 +128,7 @@ bool HotkeyWrapper::checkState(quint32 vk, quint32 mod)
if (hs.key == vk && hs.modifier == 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 // 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. // reach its original destination so it could be acted upon.
if ( ( vk == VK_INSERT || vk == 'c' || vk == 'C' ) && mod == MOD_CONTROL ) if ( ( vk == VK_INSERT || vk == 'c' || vk == 'C' ) && mod == MOD_CONTROL )

4
mainwindow.cc
View file

@ -2557,13 +2557,13 @@ void MainWindow::checkForNewRelease()
#ifdef Q_WS_X11 #ifdef Q_WS_X11
"x11" "x11"
#endif #endif
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
"mac" "mac"
#endif #endif
#ifdef Q_WS_QWS #ifdef Q_WS_QWS
"qws" "qws"
#endif #endif
#ifdef Q_WS_WIN #ifdef Q_OS_WIN
"win" "win"
#endif #endif
) ); ) );

4
scanpopup.cc
View file

@ -25,7 +25,7 @@ using std::wstring;
/// in their behavior on those platforms. /// in their behavior on those platforms.
static Qt::WindowFlags popupWindowFlags = static Qt::WindowFlags popupWindowFlags =
#ifdef Q_WS_WIN #ifdef Q_OS_WIN
Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint
#else #else
Qt::Popup Qt::Popup
@ -322,7 +322,7 @@ void ScanPopup::translateWord( QString const & word )
inputWord = str; inputWord = str;
engagePopup( false, engagePopup( false,
#ifdef Q_WS_WIN #ifdef Q_OS_WIN
true // We only focus popup under Windows when activated via Ctrl+C+C true // We only focus popup under Windows when activated via Ctrl+C+C
// -- on Linux it already has an implicit focus // -- on Linux it already has an implicit focus
#else #else

2
translatebox.cc
View file

@ -20,7 +20,7 @@ namespace
CompletionList::CompletionList(TranslateBox * parent) : WordList(parent), CompletionList::CompletionList(TranslateBox * parent) : WordList(parent),
translateBox(parent) translateBox(parent)
{ {
#ifdef Q_WS_WIN #ifdef Q_OS_WIN
setWindowFlags(Qt::ToolTip); setWindowFlags(Qt::ToolTip);
#else #else
setParent( parent->window() ); setParent( parent->window() );