ifdef Q_?S_* cleanup

- clear up some Q_OS_LINUX vs. Q_OS_UNIX
- clear up Q_WS_* vs. Q_OS_* (relatively theoretical exercise)
- use proper #if-#else cascades instead of free-standing #ifs
This commit is contained in:
Oswald Buddenhagen
2009-06-03 20:45:49 +02:00
parent 3df7a2c301
commit d2a8449bea
37 changed files with 110 additions and 118 deletions

View File

@@ -146,7 +146,7 @@ void TextEditorActionHandler::createActions()
m_visualizeWhitespaceAction->setCheckable(true);
command = am->registerAction(m_visualizeWhitespaceAction,
TextEditor::Constants::VISUALIZE_WHITESPACE, m_contextId);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
command->setDefaultKeySequence(QKeySequence(tr("Ctrl+E, Ctrl+V")));
#endif
advancedMenu->addAction(command, Core::Constants::G_EDIT_FORMAT);
@@ -162,7 +162,7 @@ void TextEditorActionHandler::createActions()
m_textWrappingAction = new QAction(tr("Enable Text &Wrapping"), this);
m_textWrappingAction->setCheckable(true);
command = am->registerAction(m_textWrappingAction, TextEditor::Constants::TEXT_WRAPPING, m_contextId);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
command->setDefaultKeySequence(QKeySequence(tr("Ctrl+E, Ctrl+W")));
#endif
advancedMenu->addAction(command, Core::Constants::G_EDIT_FORMAT);