break;
case QSGContext2D::Fill:
{
- bool hasPattern = p->brush().style() == Qt::TexturePattern;
QPainterPath path = takePath();
path.closeSubpath();
if (HAS_SHADOW(state.shadowOffsetX, state.shadowOffsetY, state.shadowBlur, state.shadowColor))
if (ts.height() > canvasSize.height())
ts.setHeight(canvasSize.height());
- bool canvasChanged = setCanvasSize(canvasSize);
- bool tileChanged = setTileSize(ts);
+ setCanvasSize(canvasSize);
+ setTileSize(ts);
if (canvasSize == canvasWindow.size()) {
m_tiledCanvas = false;
if (!state->m_frameWidth)
state->m_frameWidth = img.width() / state->frames();
- int imgHeight = state->frameHeight();
if (!state->m_frameHeight)
state->m_frameHeight = img.height();
return *(options.begin());
int option = -1;
qreal r =(qreal) qrand() / (qreal) RAND_MAX;
- qreal total;
+ qreal total = 0;
for (QSet<int>::const_iterator iter=options.constBegin();
iter!=options.constEnd(); iter++)
total += curState->m_to.value(m_states[(*iter)]->name()).toReal();
int spriteStart(int sprite=0);
int spriteFrames(int sprite=0);
int spriteDuration(int sprite=0);
- int spriteX(int sprite=0) { return 0; }//Currently all rows are 0 aligned, if we get more space efficient we might change this
+ int spriteX(int /* sprite */ = 0) { return 0; }//Currently all rows are 0 aligned, if we get more space efficient we might change this
int spriteY(int sprite=0);
int spriteWidth(int sprite=0);
int spriteHeight(int sprite=0);
case Qt::ImCursorPosition:
return QVariant(d->control->cursor());
case Qt::ImSurroundingText:
- if (d->control->echoMode() == QLineControl::PasswordEchoOnEdit && !d->control->passwordEchoEditing())
+ if (d->control->echoMode() == QLineControl::PasswordEchoOnEdit
+ && !d->control->passwordEchoEditing()) {
return QVariant(displayText());
- else
+ } else {
return QVariant(text());
+ }
case Qt::ImCurrentSelection:
return QVariant(selectedText());
case Qt::ImMaximumTextLength:
, system(sys)
, index(0)
, systemIndex(-1)
- , v8Datum(0)
, colorOwner(0)
, rotationOwner(0)
, deformationOwner(0)
, animationOwner(0)
+ , v8Datum(0)
{
x = 0;
y = 0;
}
QSGParticleSystem::QSGParticleSystem(QSGItem *parent) :
- QSGItem(parent), particleCount(0), m_running(true), m_paused(false)
- , m_nextIndex(0), m_componentComplete(false), stateEngine(0)
+ QSGItem(parent),
+ stateEngine(0),
+ m_running(true),
+ particleCount(0),
+ m_nextIndex(0),
+ m_componentComplete(false),
+ m_paused(false)
{
connect(&m_painterMapper, SIGNAL(mapped(QObject*)),
this, SLOT(loadPainter(QObject*)));
*/
QSGSpriteGoalAffector::QSGSpriteGoalAffector(QSGItem *parent) :
- QSGParticleAffector(parent), m_goalIdx(-1), m_jump(false), m_systemStates(false), m_lastEngine(0), m_notUsingEngine(false)
+ QSGParticleAffector(parent),
+ m_goalIdx(-1),
+ m_lastEngine(0),
+ m_jump(false),
+ m_systemStates(false),
+ m_notUsingEngine(false)
{
}
{
Q_ASSERT(index <= 0xFFFF);
- if (!notifyList || !(notifyList->connectionMask & (1 << (index % 64)))) {
+ if (!notifyList || !(notifyList->connectionMask & (1 << (quint64(index) % 64)))) {
return 0;
} else if (index < notifyList->notifiesSize) {
return notifyList->notifies[index];
Q_ASSERT(!endpoint->isConnected());
index = qMin(index, 0xFFFF - 1);
- notifyList->connectionMask |= (1 << (index % 64));
+ notifyList->connectionMask |= (1 << (quint64(index) % 64));
if (index < notifyList->notifiesSize) {
class QDeclarativeEngine;
-struct Q_DECLARATIVE_EXPORT QDeclarativeTypesExtensionInterface
+class Q_DECLARATIVE_EXPORT QDeclarativeTypesExtensionInterface
{
+public:
virtual ~QDeclarativeTypesExtensionInterface() {}
virtual void registerTypes(const char *uri) = 0;
};
-struct Q_DECLARATIVE_EXPORT QDeclarativeExtensionInterface : public QDeclarativeTypesExtensionInterface
+class Q_DECLARATIVE_EXPORT QDeclarativeExtensionInterface : public QDeclarativeTypesExtensionInterface
{
+public:
virtual ~QDeclarativeExtensionInterface() {}
virtual void initializeEngine(QDeclarativeEngine *engine, const char *uri) = 0;
};
// Extract method name
const char *signature = m.signature();
const char *cptr = signature;
- bool utf8 = false;
- while (*cptr != '(') { Q_ASSERT(*cptr != 0); utf8 |= *cptr & 0x80; ++cptr; }
+ char utf8 = 0;
+ while (*cptr != '(') {
+ Q_ASSERT(*cptr != 0);
+ utf8 |= *cptr & 0x80;
+ ++cptr;
+ }
Data *data = &methodIndexCache[ii - methodIndexCacheStart];
Data *sigdata = 0;
continue;
const char *str = p.name();
- bool utf8 = false;
+ char utf8 = 0;
const char *cptr = str;
- while (*cptr != 0) { utf8 |= *cptr & 0x80; ++cptr; }
+ while (*cptr != 0) {
+ utf8 |= *cptr & 0x80;
+ ++cptr;
+ }
Data *data = &propertyIndexCache[ii - propertyIndexCacheStart];
QV4Bindings *parent;
};
- struct Subscription : public QDeclarativeNotifierEndpoint
+ class Subscription : public QDeclarativeNotifierEndpoint
{
+ public:
Subscription() : bindings(0), method(-1) { callback = &subscriptionCallback; }
static void subscriptionCallback(QDeclarativeNotifierEndpoint *e);
QV4Bindings *bindings;
QV8ObjectResource *r = (QV8ObjectResource *)value->ToObject()->GetExternalResource();
if (r) {
switch (r->resourceType()) {
+ case QV8ObjectResource::Context2DStyleType:
+ case QV8ObjectResource::Context2DPixelArrayType:
+ case QV8ObjectResource::SignalHandlerType:
+ case QV8ObjectResource::IncubatorType:
+ case QV8ObjectResource::VisualDataItemType:
case QV8ObjectResource::ContextType:
case QV8ObjectResource::XMLHttpRequestType:
case QV8ObjectResource::DOMNodeType:
}
v8::Handle<v8::Value> QV8VariantWrapper::Getter(v8::Local<v8::String> /* property */,
- const v8::AccessorInfo &info)
+ const v8::AccessorInfo & /* info */)
{
return v8::Handle<v8::Value>();
}
v8::Handle<v8::Value> QV8VariantWrapper::Setter(v8::Local<v8::String> /* property */,
v8::Local<v8::Value> value,
- const v8::AccessorInfo &info)
+ const v8::AccessorInfo & /* info */)
{
return value;
}
{
#ifdef QSG_UPDATER_DEBUG
qDebug() << "leave geometry" << g;
+#else
+ Q_UNUSED(g)
#endif
}
\internal
*/
-int QSGVertexColorMaterial::compare(const QSGMaterial *other) const
+int QSGVertexColorMaterial::compare(const QSGMaterial * /* other */) const
{
return 0;
}
case Qt::ImCursorPosition:
return QVariant(d->control->cursor());
case Qt::ImSurroundingText:
- if (d->control->echoMode() == PasswordEchoOnEdit && !d->control->passwordEchoEditing())
+ if (d->control->echoMode() == QLineControl::PasswordEchoOnEdit
+ && !d->control->passwordEchoEditing())
return QVariant(displayText());
else
return QVariant(text());