From ccbd9415f0adb66147c319af8d2a82b375fbc934 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 21 Feb 2014 16:58:07 +0200 Subject: [PATCH] Replaced Q_WS_WIN32 with Q_OS_WIN. --HG-- branch : feature --- src/dialogs/app/dialogpatternproperties.cpp | 2 +- src/dialogs/app/dialogstandardmeasurements.cpp | 2 +- src/dialogs/app/pages.cpp | 2 +- src/main.cpp | 4 ++-- src/tablewindow.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dialogs/app/dialogpatternproperties.cpp b/src/dialogs/app/dialogpatternproperties.cpp index 82527f731..45deeecd4 100644 --- a/src/dialogs/app/dialogpatternproperties.cpp +++ b/src/dialogs/app/dialogpatternproperties.cpp @@ -39,7 +39,7 @@ DialogPatternProperties::DialogPatternProperties(VDomDocument *doc, QWidget *par QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), QApplication::applicationName()); -#ifdef Q_OS_WIN32 +#ifdef Q_OS_WIN QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USERNAME").constData())).toString(); #else QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USER").constData())).toString(); diff --git a/src/dialogs/app/dialogstandardmeasurements.cpp b/src/dialogs/app/dialogstandardmeasurements.cpp index d42aa12d9..65a40ea55 100644 --- a/src/dialogs/app/dialogstandardmeasurements.cpp +++ b/src/dialogs/app/dialogstandardmeasurements.cpp @@ -105,7 +105,7 @@ void DialogStandardMeasurements::CheckState() void DialogStandardMeasurements::LoadStandardTables() { -#ifdef Q_OS_WIN32 +#ifdef Q_OS_WIN const QString pathToTables = QString("/standard_tables"); #else #ifdef QT_DEBUG diff --git a/src/dialogs/app/pages.cpp b/src/dialogs/app/pages.cpp index f1772d289..3d12cbe90 100644 --- a/src/dialogs/app/pages.cpp +++ b/src/dialogs/app/pages.cpp @@ -222,7 +222,7 @@ QGroupBox *PatternPage::UserGroup() userName = new QLineEdit; Q_CHECK_PTR(userName); -#ifdef Q_OS_WIN32 +#ifdef Q_OS_WIN QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USERNAME").constData())).toString(); #else QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USER").constData())).toString(); diff --git a/src/main.cpp b/src/main.cpp index f64c4174b..5bb95aa51 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,7 +33,7 @@ #include "tablewindow.h" #include "options.h" -#ifdef Q_OS_WIN32 +#ifdef Q_OS_WIN const QString translationsPath = QString("/translations"); #else #ifdef QT_DEBUG @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) app.installTranslator(&qtTranslator); QTranslator appTranslator; -#ifdef Q_OS_WIN32 +#ifdef Q_OS_WIN appTranslator.load("valentina_" + checkedLocale, "."+translationsPath); #else #ifdef QT_DEBUG diff --git a/src/tablewindow.cpp b/src/tablewindow.cpp index 3af48a8e4..755050913 100644 --- a/src/tablewindow.cpp +++ b/src/tablewindow.cpp @@ -513,7 +513,7 @@ void TableWindow::PdfToPs(const QString &name, const QStringList ¶ms) const QProcess proc; QString program; -#ifdef Q_OS_WIN32 +#ifdef Q_OS_WIN program = "pdftops.exe"; #else program = "pdftops";