#include <qfile.h>
#include <qdatetime.h>
#include <qfileinfo.h>
-#include <qvarlengtharray.h>
#include <mach/mach.h>
#include <sys/types.h>
#include <qdebug.h>
#include <qfile.h>
#include <qsocketnotifier.h>
-#include <qvarlengtharray.h>
#include <sys/types.h>
#include <sys/event.h>
#include "qfile.h"
#include "qdir.h"
#include "qdatetime.h"
-#include "qvarlengtharray.h"
#include <sys/mman.h>
#include <stdlib.h>
#include "qfile.h"
#include "qdir.h"
-#include "qvarlengtharray.h"
#include "qdatetime.h"
#include "qt_windows.h"
#include "qstring.h"
#include "qstringlist.h"
#include "qstack.h"
-#include "qvarlengtharray.h"
#include "qdebug.h"
#include "qlocale_tools_p.h"
#ifndef QT_BOOTSTRAPPED
been called).
*/
-/*!
- \reimp
-*/
-bool QAbstractState::event(QEvent *e)
-{
- return QObject::event(e);
-}
-
#include "moc_qabstractstate.h"
QT_END_NAMESPACE
virtual void onEntry(QEvent *event) = 0;
virtual void onExit(QEvent *event) = 0;
- bool event(QEvent *e);
-
protected:
QAbstractState(QAbstractStatePrivate &dd, QState *parent);
Q_UNUSED(event);
}
-/*!
- \reimp
-*/
-bool QEventTransition::event(QEvent *e)
-{
- return QAbstractTransition::event(e);
-}
-
QT_END_NAMESPACE
#include "moc_qeventtransition.h"
bool eventTest(QEvent *event);
void onTransition(QEvent *event);
- bool event(QEvent *e);
-
protected:
QEventTransition(QEventTransitionPrivate &dd, QState *parent);
QEventTransition(QEventTransitionPrivate &dd, QObject *object,
Q_UNUSED(event);
}
-/*!
- \reimp
-*/
-bool QFinalState::event(QEvent *e)
-{
- return QAbstractState::event(e);
-}
-
#include "moc_qfinalstate.h"
QT_END_NAMESPACE
void onEntry(QEvent *event);
void onExit(QEvent *event);
- bool event(QEvent *e);
-
private:
Q_DISABLE_COPY(QFinalState)
Q_DECLARE_PRIVATE(QFinalState)
Q_UNUSED(event);
}
-/*!
- \reimp
-*/
-bool QHistoryState::event(QEvent *e)
-{
- return QAbstractState::event(e);
-}
-
#include "moc_qhistorystate.h"
QT_END_NAMESPACE
void onEntry(QEvent *event);
void onExit(QEvent *event);
- bool event(QEvent *e);
-
private:
Q_DISABLE_COPY(QHistoryState)
Q_DECLARE_PRIVATE(QHistoryState)
Q_UNUSED(event);
}
-/*!
- \reimp
-*/
-bool QSignalTransition::event(QEvent *e)
-{
- return QAbstractTransition::event(e);
-}
-
void QSignalTransitionPrivate::callOnTransition(QEvent *e)
{
Q_Q(QSignalTransition);
bool eventTest(QEvent *event);
void onTransition(QEvent *event);
- bool event(QEvent *e);
-
private:
Q_DISABLE_COPY(QSignalTransition)
Q_DECLARE_PRIVATE(QSignalTransition)
bool wait(QMutex *mutex, unsigned long time = ULONG_MAX)
{
- Q_UNUSED(mutex);
- Q_UNUSED(time);
- return true;
+ Q_UNUSED(mutex);
+ Q_UNUSED(time);
+ return true;
}
void wakeOne() {}
return 0;
#if defined(_MSC_VER) && _MSC_VER >= 1400
int len = qstrlen(src);
- // This is actually not secure!!! It will be fixed
- // properly in a later release!
+ // This is actually not secure!!! It will be fixed
+ // properly in a later release!
if (len >= 0 && strcpy_s(dst, len+1, src) == 0)
- return dst;
+ return dst;
return 0;
#else
return strcpy(dst, src);
*/
qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const
{
- qint64 diff = other.t1 - t1;
- return diff;
+ return other.t1 - t1;
}
/*!
static int monotonicClockAvailable = false;
#endif
-#ifdef Q_CC_GNU
-# define is_likely(x) __builtin_expect((x), 1)
-#else
-# define is_likely(x) (x)
-#endif
#define load_acquire(x) ((volatile const int&)(x))
#define store_release(x,v) ((volatile int&)(x) = (v))
-static void unixCheckClockType()
+static inline void unixCheckClockType()
{
#if (_POSIX_MONOTONIC_CLOCK-0 == 0)
- if (is_likely(load_acquire(monotonicClockChecked)))
+ if (Q_LIKELY(load_acquire(monotonicClockChecked)))
return;
# if defined(_SC_MONOTONIC_CLOCK)
{
#if (_POSIX_MONOTONIC_CLOCK-0 >= 0)
unixCheckClockType();
- if (is_likely(monotonicClockAvailable)) {
+ if (Q_LIKELY(monotonicClockAvailable)) {
timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
*sec = ts.tv_sec;
#include <QtCore/qpointer.h>
#include <QtCore/qreadwritelock.h>
#include <QtCore/qstringlist.h>
-#include <QtCore/qvarlengtharray.h>
#include <QtCore/qvector.h>
#include <qdbusmessage.h>
#include "qdbuserror.h"
#include <qdebug.h>
-#include <qvarlengtharray.h>
#include "qdbusmessage.h"
#include "qdbusmessage_p.h"
#include "qdeclarativeglobalscriptclass_p.h"
#include <qscriptengine.h>
-#include <QtCore/qvarlengtharray.h>
-#include <QtCore/qdebug.h>
+#include <qdebug.h>
#include <qscriptdeclarativeclass_p.h>
#include <QtCore/QString>
#include <QtCore/QStack>
-#include <QtCore/QVarLengthArray>
QT_BEGIN_NAMESPACE
#include "qwidget.h"
#include "qpointer.h"
#include "qmetaobject.h"
-#include "qvarlengtharray.h"
QT_BEGIN_NAMESPACE
#include <qstringlist.h>
#include <qaction.h>
#include <qtextcodec.h>
-#include <qvarlengtharray.h>
#include <qdesktopwidget.h>
#include <stdlib.h>
#include <qabstracteventdispatcher.h>
#include <QtCore/qstack.h>
#include <QtCore/qtimer.h>
#include <QtCore/qvariant.h>
-#include <QtCore/qvarlengtharray.h>
#include <QtCore/qnumeric.h>
#include <QtGui/qapplication.h>
#include <QtGui/qbitmap.h>
#include <QtCore/qset.h>
#include <QtCore/qstack.h>
#include <QtCore/qtimer.h>
-#include <QtCore/qvarlengtharray.h>
#include <QtCore/qmetaobject.h>
#include <QtGui/qapplication.h>
#include <QtGui/qdesktopwidget.h>
#include "qpainter.h"
#include "qpixmap.h"
#include "qpixmapfilter_p.h"
-#include "qvarlengtharray.h"
#include "qapplication_p.h"
#include "qgraphicssystem_p.h"
#include <qstack.h>
#include <qtextcodec.h>
#include <qwidget.h>
-#include <qvarlengtharray.h>
#include <qdebug.h>
#include <qcoreapplication.h>
#include <qmath.h>
#include "qpathclipper_p.h"
#include <qbezier_p.h>
-#include <qdatabuffer_p.h>
#include <qnumeric_p.h>
#include <qmath.h>
QDataBuffer<Line *> m_active;
- template <typename T>
- friend void qScanConvert(QScanConverter &d, T allVertical);
+ friend void qScanConvert(QScanConverter &d, bool allVertical);
};
class QRasterizerPrivate
// split control points b[0] ... b[3] into
// left (b[0] ... b[3]) and right (b[3] ... b[6])
-static void split(QT_FT_Vector *b)
+static inline void split(QT_FT_Vector *b)
{
b[6] = b[3];
return a->x < b->x;
}
-template <bool B>
-struct QBoolToType
-{
- inline bool operator()() const
- {
- return B;
- }
-};
-
// should be a member function but VC6 doesn't support member template functions
-template <typename T>
-void qScanConvert(QScanConverter &d, T allVertical)
+void qScanConvert(QScanConverter &d, bool allVertical)
{
if (!d.m_lines.size()) {
d.m_active.reset();
for (int y = d.m_lines.first().top; y <= d.m_bottom; ++y) {
for (; line < d.m_lines.size() && d.m_lines.at(line).top == y; ++line) {
// add node to active list
- if (allVertical()) {
+ if (allVertical) {
QScanConverter::Line *l = &d.m_lines.at(line);
d.m_active.resize(d.m_active.size() + 1);
int j;
}
int numActive = d.m_active.size();
- if (!allVertical()) {
+ if (!allVertical) {
// use insertion sort instead of qSort, as the active edge list is quite small
// and in the average case already sorted
for (int i = 1; i < numActive; ++i) {
d.m_active.resize(--numActive);
--i;
- } else if (!allVertical())
+ } else if (!allVertical)
node->x += node->delta;
}
}
break;
}
}
- if (allVertical)
- qScanConvert(*this, QBoolToType<true>());
- else
- qScanConvert(*this, QBoolToType<false>());
+ qScanConvert(*this, allVertical);
} else {
for (int chunkTop = m_top; chunkTop <= m_bottom; chunkTop += CHUNK_SIZE) {
prepareChunk();
#include "qdebug.h"
#include "qalgorithms.h"
#include "qapplication.h"
-#include "qvarlengtharray.h" // here or earlier - workaround for VC++6
#include "qthread.h"
#include "qmutex.h"
#include "qunicodetables_p.h"
#include <qpainter_p.h>
#include "qpaintengine.h"
-#include "qvarlengtharray.h"
#include <qpaintengine_raster_p.h>
#include <qnativeimage_p.h>
#include "QtCore/qglobal.h"
#include "QtCore/qatomic.h"
-#include <QtCore/qvarlengtharray.h>
#include "qfont_p.h"
#ifdef Q_WS_WIN
#include "QtCore/qlist.h"
#include "QtCore/qmap.h"
#include "QtCore/qpointer.h"
-#include "QtCore/qvarlengtharray.h"
#include "QtCore/qdatastream.h"
QT_BEGIN_NAMESPACE
#include <qstatusbar.h>
#include <qstring.h>
#include <qstyle.h>
-#include <qvarlengtharray.h>
#include <qstack.h>
#include <qmap.h>
#include <qtimer.h>
#include <qpainter_p.h>
#include <qfontengine_p.h>
#include <qpixmapdata_gl_p.h>
-#include <qdatabuffer_p.h>
#include <qstatictext_p.h>
#include <qtriangulator_p.h>
#include <QtGui/qpainter.h>
#include <QtGui/qpainterpath.h>
#include <QtGui/qbezier_p.h>
-// FIXME: generate <QtGui/qdatabuffer_p.h>
-#include <qdatabuffer_p.h>
+#include <QtGui/qdatabuffer_p.h>
#include <QtCore/qbitarray.h>
#include <QtCore/qvarlengtharray.h>
#include <QtCore/qqueue.h>
#include <qevent.h>
#include <qgl_p.h>
#include <qcolormap.h>
-#include <qvarlengtharray.h>
#include <qdebug.h>
#include <qapplication.h>
#include <qdesktopwidget>