projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master <-> api_changes
[profile/ivi/qtdeclarative.git]
/
tools
/
qmlprofiler
/
profiledata.h
diff --git
a/tools/qmlprofiler/profiledata.h
b/tools/qmlprofiler/profiledata.h
index
4dd12f7
..
f5d7269
100644
(file)
--- a/
tools/qmlprofiler/profiledata.h
+++ b/
tools/qmlprofiler/profiledata.h
@@
-47,11
+47,11
@@
#include <QtCore/QObject>
#include <QtCore/QHash>
#include <QtCore/QObject>
#include <QtCore/QHash>
-struct
Declarative
Event;
+struct
Qml
Event;
struct V8Event;
struct V8Event;
-typedef QHash<QString,
DeclarativeEvent *> Declarative
EventHash;
-typedef QList<
DeclarativeEvent *> Declarative
Events;
+typedef QHash<QString,
QmlEvent *> Qml
EventHash;
+typedef QList<
QmlEvent *> Qml
Events;
typedef QList<V8Event *> V8Events;
struct EventLocation
typedef QList<V8Event *> V8Events;
struct EventLocation
@@
-64,32
+64,32
@@
struct EventLocation
int column;
};
int column;
};
-struct
Declarative
EventSub {
-
DeclarativeEventSub(Declarative
Event *from)
+struct
Qml
EventSub {
+
QmlEventSub(Qml
Event *from)
: reference(from), duration(0), calls(0), inLoopPath(false)
{}
: reference(from), duration(0), calls(0), inLoopPath(false)
{}
-
DeclarativeEventSub(Declarative
EventSub *from)
+
QmlEventSub(Qml
EventSub *from)
: reference(from->reference), duration(from->duration),
calls(from->calls), inLoopPath(from->inLoopPath)
{}
: reference(from->reference), duration(from->duration),
calls(from->calls), inLoopPath(from->inLoopPath)
{}
-
Declarative
Event *reference;
+
Qml
Event *reference;
qint64 duration;
qint64 calls;
bool inLoopPath;
};
qint64 duration;
qint64 calls;
bool inLoopPath;
};
-struct
Declarative
Event
+struct
Qml
Event
{
{
-
Declarative
Event();
- ~
Declarative
Event();
+
Qml
Event();
+ ~
Qml
Event();
QString displayname;
QString eventHashStr;
QString details;
EventLocation location;
QQmlProfilerService::RangeType eventType;
QString displayname;
QString eventHashStr;
QString details;
EventLocation location;
QQmlProfilerService::RangeType eventType;
- QHash <QString,
Declarative
EventSub *> parentHash;
- QHash <QString,
Declarative
EventSub *> childrenHash;
+ QHash <QString,
Qml
EventSub *> parentHash;
+ QHash <QString,
Qml
EventSub *> childrenHash;
qint64 duration;
qint64 calls;
qint64 minTime;
qint64 duration;
qint64 calls;
qint64 minTime;
@@
-100,7
+100,7
@@
struct DeclarativeEvent
int eventId;
bool isBindingLoop;
int eventId;
bool isBindingLoop;
-
DeclarativeEvent &operator=(const Declarative
Event &ref);
+
QmlEvent &operator=(const Qml
Event &ref);
};
struct V8EventSub {
};
struct V8EventSub {
@@
-143,8
+143,8
@@
public:
explicit ProfileData(QObject *parent = 0);
~ProfileData();
explicit ProfileData(QObject *parent = 0);
~ProfileData();
-
DeclarativeEvents getDeclarative
Events() const;
-
DeclarativeEvent *declarative
Event(int eventId) const;
+
QmlEvents getQml
Events() const;
+
QmlEvent *qml
Event(int eventId) const;
const V8Events& getV8Events() const;
V8Event *v8Event(int eventId) const;
const V8Events& getV8Events() const;
V8Event *v8Event(int eventId) const;
@@
-184,7
+184,7
@@
public:
Q_INVOKABLE qint64 traceStartTime() const;
Q_INVOKABLE qint64 traceEndTime() const;
Q_INVOKABLE qint64 traceDuration() const;
Q_INVOKABLE qint64 traceStartTime() const;
Q_INVOKABLE qint64 traceEndTime() const;
Q_INVOKABLE qint64 traceDuration() const;
- Q_INVOKABLE qint64
declarative
MeasuredTime() const;
+ Q_INVOKABLE qint64
qml
MeasuredTime() const;
Q_INVOKABLE qint64 v8MeasuredTime() const;
void showErrorDialog(const QString &st ) const;
Q_INVOKABLE qint64 v8MeasuredTime() const;
void showErrorDialog(const QString &st ) const;
@@
-205,7
+205,7
@@
signals:
public slots:
void clear();
public slots:
void clear();
- void add
Declarative
Event(QQmlProfilerService::RangeType type,
+ void add
Qml
Event(QQmlProfilerService::RangeType type,
qint64 startTime, qint64 length,
const QStringList &data,
const EventLocation &location);
qint64 startTime, qint64 length,
const QStringList &data,
const EventLocation &location);