diff options
Diffstat (limited to 'src/libs/installer/component_p.h')
-rw-r--r-- | src/libs/installer/component_p.h | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/src/libs/installer/component_p.h b/src/libs/installer/component_p.h index 241888a3f..821e891d7 100644 --- a/src/libs/installer/component_p.h +++ b/src/libs/installer/component_p.h @@ -47,13 +47,13 @@ #include <QtCore/QPointer> #include <QtCore/QStringList> #include <QtCore/QUrl> - -#include <QtScript/QScriptEngine> +#include <QScriptValue> namespace QInstaller { class Component; class PackageManagerCore; +class ScriptEngine; class ComponentPrivate { @@ -63,9 +63,7 @@ public: explicit ComponentPrivate(PackageManagerCore *core, Component *qq); ~ComponentPrivate(); - QScriptEngine *scriptEngine(); - - void setProperty(QScriptValue &scriptValue, const QString &propertyName, int value); + ScriptEngine *scriptEngine() const; PackageManagerCore *m_core; Component *m_parentComponent; @@ -82,25 +80,18 @@ public: QString m_componentName; QUrl m_repositoryUrl; QString m_localTempPath; - QScriptValue m_scriptComponent; + QScriptValue m_scriptContext; QHash<QString, QString> m_vars; QList<Component*> m_childComponents; QList<Component*> m_allChildComponents; QList<Component*> m_virtualChildComponents; QStringList m_downloadableArchives; QStringList m_stopProcessForUpdateRequests; - QHash<QString, bool> m_unexistingScriptMethods; QHash<QString, QPointer<QWidget> > m_userInterfaces; // < display name, < file name, file content > > QHash<QString, QPair<QString, QString> > m_licenses; QList<QPair<QString, bool> > m_pathesForUninstallation; - -private: - QScriptValue getDesktopServices(); - -private: - QScriptEngine* m_scriptEngine; }; @@ -111,24 +102,24 @@ class INSTALLER_EXPORT ComponentModelHelper public: enum Roles { LocalDisplayVersion = Qt::UserRole + 1, - RemoteDisplayVersion = LocalDisplayVersion + 1, - UncompressedSize = RemoteDisplayVersion + 1 + RemoteDisplayVersion, + ReleaseDate, + UncompressedSize }; enum Column { NameColumn = 0, InstalledVersionColumn, NewVersionColumn, + ReleaseDateColumn, UncompressedSizeColumn }; explicit ComponentModelHelper(); int childCount() const; - int indexInParent() const; - - QList<Component*> childs() const; Component* childAt(int index) const; + QList<Component*> childItems() const; bool isEnabled() const; void setEnabled(bool enabled); |