Commit c8f19854 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Ovi publishing wizard: Header cleanup.

parent 665567fc
......@@ -36,18 +36,21 @@
#include "s60certificateinfo.h"
#include "s60manager.h"
#include <qt4projectmanager/qmakestep.h>
#include <qt4projectmanager/makestep.h>
#include <qt4projectmanager/qt4project.h>
#include <profilereader.h>
#include <projectexplorer/project.h>
#include <prowriter.h>
#include <qtversionmanager.h>
#include "qt4buildconfiguration.h"
#include "qmakestep.h"
#include "makestep.h"
#include "qt4project.h"
#include "qtversionmanager.h"
#include "profilereader.h"
#include "prowriter.h"
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/buildstep.h>
#include <utils/qtcassert.h>
#include "projectexplorer/buildsteplist.h"
#include "projectexplorer/buildstep.h"
#include "projectexplorer/abstractprocessstep.h"
#include <QtCore/QProcess>
namespace Qt4ProjectManager {
namespace Internal {
......@@ -151,7 +154,7 @@ void S60PublisherOvi::completeCreation()
m_createSisProc->setWorkingDirectory(m_qt4bc->buildDirectory());
}
QString S60PublisherOvi::globalVendorName()
QString S60PublisherOvi::globalVendorName() const
{
QStringList vendorinfos = m_reader->values("vendorinfo");
......@@ -163,7 +166,7 @@ QString S60PublisherOvi::globalVendorName()
return QString();
}
QString S60PublisherOvi::localisedVendorNames()
QString S60PublisherOvi::localisedVendorNames() const
{
QStringList vendorinfos = m_reader->values("vendorinfo");
QString result;
......@@ -183,7 +186,7 @@ QString S60PublisherOvi::localisedVendorNames()
return QString();
}
bool S60PublisherOvi::isVendorNameValid(const QString &vendorName)
bool S60PublisherOvi::isVendorNameValid(const QString &vendorName) const
{
//Check the given vendor name
foreach (const QString &rejectedVendorName, m_rejectedVendorNames)
......@@ -192,17 +195,17 @@ bool S60PublisherOvi::isVendorNameValid(const QString &vendorName)
return true;
}
QString S60PublisherOvi::qtVersion()
QString S60PublisherOvi::qtVersion() const
{
return m_qt4bc->qtVersion()->displayName();
}
QString S60PublisherOvi::uid3()
QString S60PublisherOvi::uid3() const
{
return m_reader->value("TARGET.UID3");
}
bool S60PublisherOvi::isUID3Valid(const QString &uid3)
bool S60PublisherOvi::isUID3Valid(const QString &uid3) const
{
bool ok;
ulong hex = uid3.trimmed().toULong(&ok, 0);
......@@ -210,26 +213,26 @@ bool S60PublisherOvi::isUID3Valid(const QString &uid3)
return ok && (hex >= AssignedRestrictedStart && hex <= AssignedRestrictedEnd);
}
bool S60PublisherOvi::isTestUID3(const QString &uid3)
bool S60PublisherOvi::isTestUID3(const QString &uid3) const
{
bool ok;
ulong hex = uid3.trimmed().toULong(&ok, 0);
return ok && (hex >= TestStart && hex <=TestEnd);
}
bool S60PublisherOvi::isKnownSymbianSignedUID3(const QString &uid3)
bool S60PublisherOvi::isKnownSymbianSignedUID3(const QString &uid3) const
{
bool ok;
ulong hex = uid3.trimmed().toULong(&ok, 0);
return ok && (hex >= SymbianSignedUnprotectedStart && hex <= SymbianSignedUnprotectedEnd);
}
QString S60PublisherOvi::capabilities()
QString S60PublisherOvi::capabilities() const
{
return m_reader->values("TARGET.CAPABILITY").join(", ");
}
bool S60PublisherOvi::isCapabilityOneOf(const QString &capability, CapabilityLevel level)
bool S60PublisherOvi::isCapabilityOneOf(const QString &capability, CapabilityLevel level) const
{
QStringList capabilitiesInLevel;
if (level == CertifiedSigned)
......
......@@ -34,16 +34,18 @@
#define S60PUBLISHEROVI_H
#include <QtCore/QObject>
#include <QtCore/QProcess>
#include <QtGui/QColor>
#include "qt4buildconfiguration.h"
QT_BEGIN_NAMESPACE
class QProcess;
QT_END_NAMESPACE
namespace ProjectExplorer {
class Project;
}
namespace Qt4ProjectManager {
class Qt4BuildConfiguration;
class Qt4Project;
namespace Internal {
class Qt4SymbianTarget;
......@@ -104,19 +106,19 @@ public:
void cleanUp();
void completeCreation();
QString globalVendorName();
QString localisedVendorNames();
bool isVendorNameValid(const QString &vendorName);
QString globalVendorName() const;
QString localisedVendorNames() const;
bool isVendorNameValid(const QString &vendorName) const;
QString qtVersion();
QString qtVersion() const;
QString uid3();
bool isUID3Valid(const QString &uid3);
bool isTestUID3(const QString &uid3);
bool isKnownSymbianSignedUID3(const QString &uid3);
QString uid3() const;
bool isUID3Valid(const QString &uid3) const;
bool isTestUID3(const QString &uid3) const;
bool isKnownSymbianSignedUID3(const QString &uid3) const;
QString capabilities();
bool isCapabilityOneOf(const QString &capability, CapabilityLevel level);
QString capabilities() const;
bool isCapabilityOneOf(const QString &capability, CapabilityLevel level) const;
void updateProFile();
void updateProFile(const QString &var, const QString &values);
......
......@@ -30,14 +30,17 @@
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#include "s60publishingbuildsettingspageovi.h"
#include "s60publisherovi.h"
#include "ui_s60publishingbuildsettingspageovi.h"
#include "qt4buildconfiguration.h"
#include "qt4projectmanagerconstants.h"
#include <QtGui/QAbstractButton>
#include <projectexplorer/project.h>
#include <projectexplorer/target.h>
#include <qt4projectmanagerconstants.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
#include <QtGui/QAbstractButton>
namespace Qt4ProjectManager {
namespace Internal {
......
......@@ -34,14 +34,8 @@
#ifndef S60PUBLISHINGBUILDSETTINGSPAGEOVI_H
#define S60PUBLISHINGBUILDSETTINGSPAGEOVI_H
#include "ui_s60publishingbuildsettingspageovi.h"
#include "qt4buildconfiguration.h"
#include <projectexplorer/buildconfiguration.h>
#include <QtGui/QWizardPage>
QT_BEGIN_NAMESPACE
namespace Ui {
class S60PublishingBuildSettingsPageOvi;
......@@ -50,6 +44,7 @@ QT_END_NAMESPACE
namespace ProjectExplorer {
class Project;
class BuildConfiguration;
}
namespace Qt4ProjectManager {
......
......@@ -32,9 +32,11 @@
**************************************************************************/
#include "s60publishingresultspageovi.h"
#include "s60publisherovi.h"
#include "ui_s60publishingresultspageovi.h"
#include <QDesktopServices>
#include <QtGui/QDesktopServices>
#include <QtGui/QAbstractButton>
#include <QtCore/QProcess>
namespace Qt4ProjectManager {
namespace Internal {
......
......@@ -34,8 +34,6 @@
#ifndef S60PUBLISHINGRESULTSPAGEOVI_H
#define S60PUBLISHINGRESULTSPAGEOVI_H
#include "ui_s60publishingresultspageovi.h"
#include <QWizardPage>
QT_BEGIN_NAMESPACE
......
......@@ -30,7 +30,9 @@
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#include "s60publishingsissettingspageovi.h"
#include "ui_s60publishingsissettingspageovi.h"
#include "s60publisherovi.h"
#include "s60certificateinfo.h"
......
......@@ -34,8 +34,6 @@
#ifndef S60PUBLISHINGSISSETTINGSPAGEOVI_H
#define S60PUBLISHINGSISSETTINGSPAGEOVI_H
#include "ui_s60publishingsissettingspageovi.h"
#include <QtGui/QWizardPage>
QT_BEGIN_NAMESPACE
......
......@@ -30,14 +30,15 @@
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#include "s60publishingwizardfactories.h"
#include "s60publishingwizardovi.h"
#include <projectexplorer/target.h>
#include <qt4projectmanager/qmakestep.h>
#include <qt4projectmanager/qt4project.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include "qmakestep.h"
#include "qt4project.h"
#include "qt4projectmanagerconstants.h"
#include <projectexplorer/target.h>
using namespace ProjectExplorer;
......
......@@ -38,8 +38,12 @@
** $QT_END_LICENSE$
**
****************************************************************************/
#include "s60publishingwizardovi.h"
#include "s60publisherovi.h"
#include "s60publishingbuildsettingspageovi.h"
#include "s60publishingsissettingspageovi.h"
#include "s60publishingresultspageovi.h"
using namespace ProjectExplorer;
......
......@@ -42,11 +42,7 @@
#ifndef S60PUBLISHINGWIZARDOVI_H
#define S60PUBLISHINGWIZARDOVI_H
#include "s60publishingbuildsettingspageovi.h"
#include "s60publishingsissettingspageovi.h"
#include "s60publishingresultspageovi.h"
#include <QWizard>
#include <QtGui/QWizard>
namespace ProjectExplorer {
class Project;
......@@ -55,6 +51,9 @@ class Project;
namespace Qt4ProjectManager {
namespace Internal {
class S60PublisherOvi;
class S60PublishingBuildSettingsPageOvi;
class S60PublishingSisSettingsPageOvi;
class S60PublishingResultsPageOvi;
class S60PublishingWizardOvi : public QWizard
{
......@@ -68,8 +67,8 @@ private:
S60PublishingBuildSettingsPageOvi *m_buildSettingsPage;
S60PublishingSisSettingsPageOvi *m_sisSettingsPage;
S60PublishingResultsPageOvi *m_resultsPage;
};
} // namespace Internal
} // namespace Qt4ProjectManager
......
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