feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Ovi Store Wizard: minor changes

Browse Source 
"char" -> 'char'
This commit is contained in:
Primrose Mbanefo
2011-03-01 17:37:55 +01:00
parent 583cf29891
commit b5d37862f4
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp
View File

@@ -156,8 +156,8 @@ QString S60PublisherOvi::globalVendorName()
QStringList vendorinfos = m_reader->values("vendorinfo"); QStringList vendorinfos = m_reader->values("vendorinfo");
foreach (QString vendorinfo, vendorinfos) { foreach (QString vendorinfo, vendorinfos) {
if (vendorinfo.startsWith(":")) { if (vendorinfo.startsWith(':')) {
return vendorinfo.remove(":").remove("\"").trimmed(); return vendorinfo.remove(':').remove("\"").trimmed();
} }
} }
return QString(); return QString();
@@ -170,8 +170,8 @@ QString S60PublisherOvi::localisedVendorNames()
QStringList localisedVendorNames; QStringList localisedVendorNames;
foreach (QString vendorinfo, vendorinfos) { foreach (QString vendorinfo, vendorinfos) {
if (vendorinfo.startsWith("%")) { if (vendorinfo.startsWith('%')) {
localisedVendorNames = vendorinfo.remove("%{").remove("}").split(","); localisedVendorNames = vendorinfo.remove("%{").remove('}').split(',');
foreach (QString localisedVendorName, localisedVendorNames) { foreach (QString localisedVendorName, localisedVendorNames) {
if (!result.isEmpty()) if (!result.isEmpty())
result.append(", "); result.append(", ");
@@ -288,7 +288,7 @@ void S60PublisherOvi::runQMake()
const ProjectExplorer::ProcessParameters * const qmakepp = qmakeStep->processParameters(); const ProjectExplorer::ProcessParameters * const qmakepp = qmakeStep->processParameters();
runStep(QProcess::NormalExit, runStep(QProcess::NormalExit,
"Running QMake", "Running QMake",
qmakepp->effectiveCommand() + QLatin1String(" ") + qmakepp->arguments(), qmakepp->effectiveCommand() + ' ' + qmakepp->arguments(),
m_qmakeProc, m_qmakeProc,
NULL); NULL);
} }
@@ -300,7 +300,7 @@ void S60PublisherOvi::runBuild(int result)
const ProjectExplorer::ProcessParameters * const makepp = makeStep->processParameters(); const ProjectExplorer::ProcessParameters * const makepp = makeStep->processParameters();
runStep(result, runStep(result,
"Running Build Steps", "Running Build Steps",
makepp->effectiveCommand() + QLatin1String(" ") + makepp->arguments(), makepp->effectiveCommand() + ' ' + makepp->arguments(),
m_buildProc, m_buildProc,
m_qmakeProc); m_qmakeProc);
} }
@@ -324,8 +324,8 @@ void S60PublisherOvi::runCreateSis(int result)
void S60PublisherOvi::endBuild(int result) void S60PublisherOvi::endBuild(int result)
{ {
// show what happened in last step // show what happened in last step
emit progressReport(QString(m_createSisProc->readAllStandardOutput() + "\n"), m_okColor); emit progressReport(QString(m_createSisProc->readAllStandardOutput() + '\n'), m_okColor);
emit progressReport(QString(m_createSisProc->readAllStandardError() + "\n"), m_errorColor); emit progressReport(QString(m_createSisProc->readAllStandardError() + '\n'), m_errorColor);
QString fileNamePostFix = QLatin1String("_installer_unsigned.sis"); QString fileNamePostFix = QLatin1String("_installer_unsigned.sis");
if (m_qt4bc->qtVersion()->qtVersion() == QtVersionNumber(4,6,3) ) if (m_qt4bc->qtVersion()->qtVersion() == QtVersionNumber(4,6,3) )
@@ -367,7 +367,7 @@ QString S60PublisherOvi::createdSisFilePath()
QString resultFile = m_qt4bc->buildDirectory() + "/" + m_qt4project->displayName() + fileNamePostFix; QString resultFile = m_qt4bc->buildDirectory() + "/" + m_qt4project->displayName() + fileNamePostFix;
QFileInfo fi(resultFile); QFileInfo fi(resultFile);
return fi.exists() ? QDir::toNativeSeparators(m_qt4bc->buildDirectory()+ "/" + m_qt4project->displayName() + fileNamePostFix) : QString(); return fi.exists() ? QDir::toNativeSeparators(m_qt4bc->buildDirectory()+ '/' + m_qt4project->displayName() + fileNamePostFix) : QString();
} }
bool S60PublisherOvi::hasSucceeded() bool S60PublisherOvi::hasSucceeded()
@@ -380,14 +380,14 @@ void S60PublisherOvi::runStep(int result, const QString& buildStep, const QStrin
// todo react to readyRead() instead of reading all at the end // todo react to readyRead() instead of reading all at the end
// show what happened in last step // show what happened in last step
if (prevProc) { if (prevProc) {
emit progressReport(QString(prevProc->readAllStandardOutput() + "\n"), m_okColor); emit progressReport(QString(prevProc->readAllStandardOutput() + '\n'), m_okColor);
emit progressReport(QString(prevProc->readAllStandardError() + "\n"), m_errorColor); emit progressReport(QString(prevProc->readAllStandardError() + '\n'), m_errorColor);
} }
// if the last state finished ok then run the build. // if the last state finished ok then run the build.
if (result == QProcess::NormalExit) { if (result == QProcess::NormalExit) {
emit progressReport(buildStep + "\n", m_commandColor); emit progressReport(buildStep + '\n', m_commandColor);
emit progressReport(command + "\n", m_commandColor); emit progressReport(command + '\n', m_commandColor);
currProc->start(command); currProc->start(command);
} else { } else {

4
src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp
View File

@@ -146,7 +146,7 @@ void S60PublishingSisSettingsPageOvi::globalVendorNameChanged()
void S60PublishingSisSettingsPageOvi::localisedVendorNamesChanged() void S60PublishingSisSettingsPageOvi::localisedVendorNamesChanged()
{ {
QStringList localisedVendorNames = ui->localisedVendorNamesLineEdit->text().split(","); QStringList localisedVendorNames = ui->localisedVendorNamesLineEdit->text().split(',');
bool settingState = true; bool settingState = true;
QStringList wrongVendorNames; QStringList wrongVendorNames;
@@ -217,7 +217,7 @@ void S60PublishingSisSettingsPageOvi::uid3Changed()
void S60PublishingSisSettingsPageOvi::capabilitiesChanged() void S60PublishingSisSettingsPageOvi::capabilitiesChanged()
{ {
QStringList capabilities = ui->capabilitiesDisplayLabel->text().split(","); QStringList capabilities = ui->capabilitiesDisplayLabel->text().split(',');
QString errorMessage; QString errorMessage;
//Check for certified Signed capabilities //Check for certified Signed capabilities