← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qt3d-opensource-src/vivid-proposed

« back to all changes in this revision

Viewing changes to src/threed/geometry/qlogicalvertex.h

  • Committer: Package Import Robot
  • Author(s): Timo Jyrinki
  • Date: 2013-08-02 11:10:16 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20130802111016-r3cjsz79ulbawpgv
Tags: 5.0~git20130731-0ubuntu1
* New upstream snapshot release
* Improve override_dh_auto_install, use --fail-missing
* Drop patches:
  - add_GPL_license_file.patch, merged upstream
  - add_module_version.patch, added upstream
  - disable_conflicting_examples.patch, not needed anymore
* Refresh link_against_system_zlib.patch
* Add bug link to workaround_zlib_linking_issue.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/threed/geometry/qlogicalvertex.h
45
45
#include <Qt3D/qgeometrydata.h>
46
46
#include <Qt3D/qcustomdataarray.h>
47
47
 
48
 
QT_BEGIN_HEADER
49
 
 
50
48
QT_BEGIN_NAMESPACE
51
49
 
52
50
// uncomment this to perform heavy checking of QLogicalVertex
111
109
{
112
110
}
113
111
 
114
 
inline QLogicalVertex::QLogicalVertex(QGeometryData data, int index)
115
 
    : m_data(data)
116
 
    , m_index(index)
 
112
inline QLogicalVertex::QLogicalVertex(QGeometryData data_, int index_)
 
113
    : m_data(data_)
 
114
    , m_index(index_)
117
115
{
118
 
    Q_ASSERT(index < data.count());
 
116
    Q_ASSERT(index_ < data_.count());
119
117
#ifdef QT3D_DEBUG_QLOGICALVERTEX
120
118
    data.check();
121
119
#endif
142
140
    m_data.appendTexCoord(t);
143
141
}
144
142
 
145
 
inline QLogicalVertex::QLogicalVertex(const QVector3D &a, QColor4ub color)
 
143
inline QLogicalVertex::QLogicalVertex(const QVector3D &a, QColor4ub color_)
146
144
    : m_index(0)
147
145
{
148
146
    m_data.appendVertex(a);
149
 
    m_data.appendColor(color);
 
147
    m_data.appendColor(color_);
150
148
}
151
149
 
152
150
inline const QVector3D &QLogicalVertex::vertex() const
327
325
 
328
326
QT_END_NAMESPACE
329
327
 
330
 
QT_END_HEADER
331
 
 
332
328
#endif // QLOGICALVERTEX_H