forked from qt-creator/qt-creator
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:
@@ -44,11 +44,10 @@
|
||||
#include <QtGui/QToolButton>
|
||||
#include <QtGui/QPushButton>
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
/*static*/ const char * const Core::Utils::PathChooser::browseButtonLabel =
|
||||
#ifdef Q_WS_MAC
|
||||
QT_TRANSLATE_NOOP("Core::Utils::PathChooser", "Choose...");
|
||||
#else
|
||||
/*static*/ const char * const Core::Utils::PathChooser::browseButtonLabel =
|
||||
QT_TRANSLATE_NOOP("Core::Utils::PathChooser", "Browse...");
|
||||
#endif
|
||||
|
||||
@@ -128,7 +127,7 @@ PathChooser::~PathChooser()
|
||||
|
||||
void PathChooser::addButton(const QString &text, QObject *receiver, const char *slotFunc)
|
||||
{
|
||||
#ifdef Q_OS_MAC
|
||||
#ifdef Q_WS_MAC
|
||||
QPushButton *button = new QPushButton;
|
||||
#else
|
||||
QToolButton *button = new QToolButton;
|
||||
|
||||
Reference in New Issue
Block a user