aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced Q_WS_WIN32 with Q_OS_WIN.

Browse Source 
--HG--
branch : feature
This commit is contained in:
dismine 2014-02-21 16:58:07 +02:00
parent 41c80d040f
commit ccbd9415f0
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dialogs/app/dialogpatternproperties.cpp
View File

@ -39,7 +39,7 @@ DialogPatternProperties::DialogPatternProperties(VDomDocument *doc, QWidget *par
QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(),
QApplication::applicationName()); QApplication::applicationName());
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN
QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USERNAME").constData())).toString(); QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USERNAME").constData())).toString();
#else #else
QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USER").constData())).toString(); QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USER").constData())).toString();

2
src/dialogs/app/dialogstandardmeasurements.cpp
View File

@ -105,7 +105,7 @@ void DialogStandardMeasurements::CheckState()
void DialogStandardMeasurements::LoadStandardTables() void DialogStandardMeasurements::LoadStandardTables()
{ {
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN
const QString pathToTables = QString("/standard_tables"); const QString pathToTables = QString("/standard_tables");
#else #else
#ifdef QT_DEBUG #ifdef QT_DEBUG

2
src/dialogs/app/pages.cpp
View File

@ -222,7 +222,7 @@ QGroupBox *PatternPage::UserGroup()
userName = new QLineEdit; userName = new QLineEdit;
Q_CHECK_PTR(userName); Q_CHECK_PTR(userName);
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN
QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USERNAME").constData())).toString(); QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USERNAME").constData())).toString();
#else #else
QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USER").constData())).toString(); QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USER").constData())).toString();

4
src/main.cpp
View File

@ -33,7 +33,7 @@
#include "tablewindow.h" #include "tablewindow.h"
#include "options.h" #include "options.h"
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN
const QString translationsPath = QString("/translations"); const QString translationsPath = QString("/translations");
#else #else
#ifdef QT_DEBUG #ifdef QT_DEBUG
@ -94,7 +94,7 @@ int main(int argc, char *argv[])
app.installTranslator(&qtTranslator); app.installTranslator(&qtTranslator);
QTranslator appTranslator; QTranslator appTranslator;
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN
appTranslator.load("valentina_" + checkedLocale, "."+translationsPath); appTranslator.load("valentina_" + checkedLocale, "."+translationsPath);
#else #else
#ifdef QT_DEBUG #ifdef QT_DEBUG

2
src/tablewindow.cpp
View File

@ -513,7 +513,7 @@ void TableWindow::PdfToPs(const QString &name, const QStringList &params) const
QProcess proc; QProcess proc;
QString program; QString program;
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN
program = "pdftops.exe"; program = "pdftops.exe";
#else #else
program = "pdftops"; program = "pdftops";