Commit 49f05ff0 authored by Primrose Mbanefo's avatar Primrose Mbanefo
Browse files

Ovi Store Wizard: Coding style

parent 8d9ccf8e
......@@ -151,7 +151,7 @@ void S60PublisherOvi::completeCreation()
m_createSisProc->setWorkingDirectory(m_qt4bc->buildDirectory());
}
QString S60PublisherOvi::getGlobalVendorNameFromProFile()
QString S60PublisherOvi::globalVendorName()
{
QStringList vendorinfos = m_reader->values("vendorinfo");
......@@ -163,7 +163,7 @@ QString S60PublisherOvi::getGlobalVendorNameFromProFile()
return QString();
}
QString S60PublisherOvi::getLocalisedVendorNamesFromProFile()
QString S60PublisherOvi::localisedVendorNames()
{
QStringList vendorinfos = m_reader->values("vendorinfo");
QString result;
......@@ -192,12 +192,12 @@ bool S60PublisherOvi::isVendorNameValid(const QString &vendorName)
return true;
}
QString S60PublisherOvi::getQtVersionFromProFile()
QString S60PublisherOvi::qtVersion()
{
return m_qt4bc->qtVersion()->displayName();
}
QString S60PublisherOvi::getUID3FromProFile()
QString S60PublisherOvi::uid3()
{
return m_reader->value("TARGET.UID3");
}
......@@ -224,7 +224,7 @@ bool S60PublisherOvi::isKnownSymbianSignedUID3(const QString &uid3)
return ok && (hex >= SymbianSignedUnprotectedStart && hex <= SymbianSignedUnprotectedEnd);
}
QString S60PublisherOvi::getCapabilitiesFromProFile()
QString S60PublisherOvi::capabilities()
{
return m_reader->values("TARGET.CAPABILITY").join(", ");
}
......@@ -346,7 +346,7 @@ void S60PublisherOvi::endBuild(int result)
emit progressReport(tr("Done!\n"), m_commandColor);
}
QString S60PublisherOvi::getCreatedSisFileContainingFolder()
QString S60PublisherOvi::createdSisFileContainingFolder()
{
QString fileNamePostFix = QLatin1String("_installer_unsigned.sis");
if (m_qt4bc->qtVersion()->qtVersion() == QtVersionNumber(4,6,3) )
......@@ -358,7 +358,7 @@ QString S60PublisherOvi::getCreatedSisFileContainingFolder()
return fi.exists() ? QDir::toNativeSeparators(m_qt4bc->buildDirectory()) : QString();
}
QString S60PublisherOvi::getCreatedSisFilePath()
QString S60PublisherOvi::createdSisFilePath()
{
QString fileNamePostFix = QLatin1String("_installer_unsigned.sis");
if (m_qt4bc->qtVersion()->qtVersion() == QtVersionNumber(4,6,3) )
......
......@@ -104,26 +104,26 @@ public:
void cleanUp();
void completeCreation();
QString getGlobalVendorNameFromProFile();
QString getLocalisedVendorNamesFromProFile();
QString globalVendorName();
QString localisedVendorNames();
bool isVendorNameValid(const QString &vendorName);
QString getQtVersionFromProFile();
QString qtVersion();
QString getUID3FromProFile();
QString uid3();
bool isUID3Valid(const QString &uid3);
bool isTestUID3(const QString &uid3);
bool isKnownSymbianSignedUID3(const QString &uid3);
QString getCapabilitiesFromProFile();
QString capabilities();
bool isCapabilityOneOf(const QString &capability, CapabilityLevel level);
void updateProFile();
void updateProFile(const QString &var, const QString &values);
void buildSis();
QString getCreatedSisFileContainingFolder();
QString getCreatedSisFilePath();
QString createdSisFileContainingFolder();
QString createdSisFilePath();
bool hasSucceeded();
......
......@@ -78,7 +78,7 @@ void S60PublishingResultsPageOvi::updateResultsPage(const QString& status, QColo
void S60PublishingResultsPageOvi::openFileLocation()
{
#ifdef Q_OS_WIN
QProcess::startDetached("explorer /select,"+ m_publisher->getCreatedSisFilePath());
QProcess::startDetached("explorer /select,"+ m_publisher->createdSisFilePath());
#else
QDesktopServices::openUrl(QUrl("file:///" + m_publisher->getCreatedSisFileContainingFolder()));
#endif
......
......@@ -76,26 +76,26 @@ void S60PublishingSisSettingsPageOvi::initializePage()
showWarningsForUnenforcableChecks();
//Check Global Vendor Name
ui->globalVendorNameLineEdit->setText(m_publisher->getGlobalVendorNameFromProFile());
ui->globalVendorNameLineEdit->setText(m_publisher->globalVendorName());
globalVendorNameChanged();
connect(ui->globalVendorNameLineEdit,SIGNAL(textChanged(QString)),SLOT(globalVendorNameChanged()));
//Check Localised Vendor Names
ui->localisedVendorNamesLineEdit->setText(m_publisher->getLocalisedVendorNamesFromProFile());
ui->localisedVendorNamesLineEdit->setText(m_publisher->localisedVendorNames());
localisedVendorNamesChanged();
connect(ui->localisedVendorNamesLineEdit,SIGNAL(textChanged(QString)),SLOT(localisedVendorNamesChanged()));
//Check Qt Version Used in Builds
ui->qtVersionDisplayLabel->setText(m_publisher->getQtVersionFromProFile());
ui->qtVersionDisplayLabel->setText(m_publisher->qtVersion());
qtVersionChanged();
//Check UID3
ui->uid3LineEdit->setText(m_publisher->getUID3FromProFile());
ui->uid3LineEdit->setText(m_publisher->uid3());
uid3Changed();
connect(ui->uid3LineEdit,SIGNAL(textChanged(QString)),SLOT(uid3Changed()));
//Check for capabilities which are not signed for
ui->capabilitiesDisplayLabel->setText(m_publisher->getCapabilitiesFromProFile());
ui->capabilitiesDisplayLabel->setText(m_publisher->capabilities());
capabilitiesChanged();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment