buffereddatastream.cpp		buffereddatastream.cpp
	skipping to change at line 96		skipping to change at line 96
	}		}
	return QIODevice::timerEvent(event);		return QIODevice::timerEvent(event);
	}		}
	void BufferedDataStream::incomingDataReady()		void BufferedDataStream::incomingDataReady()
	{		{
	Q_D(BufferedDataStream);		Q_D(BufferedDataStream);
	int bytes = device()->bytesAvailable();		int bytes = device()->bytesAvailable();
	d->ensureSize(bytes);		d->ensureSize(bytes);
	device()->read(d->buffer.data() + d->offset + d->len, bytes);		device()->read(d->buffer.data() + d->offset + d->len, bytes);
	// qDebug("< \"%s\"", QByteArray(d->buffer.constData() + d->offset + d- >len, bytes).constData());		// Logger::debug("< \"%s\"", QByteArray(d->buffer.constData() + d->offs et + d->len, bytes).constData());
	d->len += bytes;		d->len += bytes;
	emit readyRead();		emit readyRead();
	}		}
	qint64 BufferedDataStream::writeData(const char *data, qint64 len)		qint64 BufferedDataStream::writeData(const char *data, qint64 len)
	{		{
	Q_D(BufferedDataStream);		Q_D(BufferedDataStream);
	if (len <= 0)		if (len <= 0)
	return 0;		return 0;
	d->outBuffer.append(data, len);		d->outBuffer.append(data, len);
	skipping to change at line 118		skipping to change at line 118
	d->timer.start(0, this);		d->timer.start(0, this);
	return len;		return len;
	}		}
	void BufferedDataStream::flush()		void BufferedDataStream::flush()
	{		{
	Q_D(BufferedDataStream);		Q_D(BufferedDataStream);
	foreach (XmlStreamHandler *handler, *d->handlers)		foreach (XmlStreamHandler *handler, *d->handlers)
	handler->handleOutgoingData(d->outBuffer.constData(), d->out Buffer.size());		handler->handleOutgoingData(d->outBuffer.constData(), d->out Buffer.size());
	device()->write(d->outBuffer.constData(), d->outBuffer.size());		device()->write(d->outBuffer.constData(), d->outBuffer.size());
	// qDebug("> \"%s\"", d->outBuffer.constData());		// Logger::debug("> \"%s\"", d->outBuffer.constData());
	d->outBuffer.clear();		d->outBuffer.clear();
	}		}
	qint64 BufferedDataStream::readData(char *data, qint64 maxlen)		qint64 BufferedDataStream::readData(char *data, qint64 maxlen)
	{		{
	Q_D(BufferedDataStream);		Q_D(BufferedDataStream);
	int len = qMin<int>(maxlen, d->len);		int len = qMin<int>(maxlen, d->len);
	qMemCopy(data, d->buffer.data() + d->offset, len);		qMemCopy(data, d->buffer.data() + d->offset, len);
	// foreach (XmlStreamHandler *handler, *d->handlers)		// foreach (XmlStreamHandler *handler, *d->handlers)
	// handler->handleIncomingData(d->buffer.data() + d->offset, le n);		// handler->handleIncomingData(d->buffer.data() + d->offset, le n);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/