Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/fluxer/katie

Browse source
This commit is contained in:
Ivailo Monev 2016-06-08 12:15:16 +03:00
commit f0c624d4fc
22 changed files with 24 additions and 334 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mkspecs/linux/linux.cmake
View file

@ -1,11 +1,10 @@
if("${KATIE_COMPILER}" MATCHES "(gcc|clang)")
set(KATIE_CXXFLAGS
${KATIE_CXXFLAGS}
-fPIC
-fvisibility=hidden -fvisibility-inlines-hidden
-Wformat -Werror=format-security
-Wreturn-type -Wundef -Wunused -Wparentheses
# -Wall -fno-strict-aliasing -Wcast-align -Wchar-subscripts
-Wall -Wundef -Wunused
# -fno-strict-aliasing -Wcast-align
# -Wmissing-noreturn -Winit-self -Winline -Wcast-qual
)
set(KATIE_LDFLAGS

35
src/core/io/qdebug.h
View file

@ -144,13 +144,8 @@ inline QDebug &QDebug::operator=(const QDebug &other)
return *this;
}
#if defined(FORCE_UREF)
template <class T>
inline QDebug &operator<<(QDebug debug, const QList<T> &list)
#else
template <class T>
inline QDebug operator<<(QDebug debug, const QList<T> &list)
#endif
{
debug.nospace() << '(';
for (Q_TYPENAME QList<T>::size_type i = 0; i < list.count(); ++i) {
@ -162,25 +157,15 @@ inline QDebug operator<<(QDebug debug, const QList<T> &list)
return debug.space();
}
#if defined(FORCE_UREF)
template <typename T>
inline QDebug &operator<<(QDebug debug, const QVector<T> &vec)
#else
template <typename T>
inline QDebug operator<<(QDebug debug, const QVector<T> &vec)
#endif
{
debug.nospace() << "QVector";
return operator<<(debug, vec.toList());
}
#if defined(FORCE_UREF)
template <class aKey, class aT>
inline QDebug &operator<<(QDebug debug, const QMap<aKey, aT> &map)
#else
template <class aKey, class aT>
inline QDebug operator<<(QDebug debug, const QMap<aKey, aT> &map)
#endif
{
debug.nospace() << "QMap(";
for (typename QMap<aKey, aT>::const_iterator it = map.constBegin();
@ -191,13 +176,8 @@ inline QDebug operator<<(QDebug debug, const QMap<aKey, aT> &map)
return debug.space();
}
#if defined(FORCE_UREF)
template <class aKey, class aT>
inline QDebug &operator<<(QDebug debug, const QHash<aKey, aT> &hash)
#else
template <class aKey, class aT>
inline QDebug operator<<(QDebug debug, const QHash<aKey, aT> &hash)
#endif
{
debug.nospace() << "QHash(";
for (typename QHash<aKey, aT>::const_iterator it = hash.constBegin();
@ -207,13 +187,8 @@ inline QDebug operator<<(QDebug debug, const QHash<aKey, aT> &hash)
return debug.space();
}
#if defined(FORCE_UREF)
template <class T1, class T2>
inline QDebug &operator<<(QDebug debug, const QPair<T1, T2> &pair)
#else
template <class T1, class T2>
inline QDebug operator<<(QDebug debug, const QPair<T1, T2> &pair)
#endif
{
debug.nospace() << "QPair(" << pair.first << ',' << pair.second << ')';
return debug.space();
@ -226,13 +201,8 @@ inline QDebug operator<<(QDebug debug, const QSet<T> &set)
return operator<<(debug, set.toList());
}
#if defined(FORCE_UREF)
template <class T>
inline QDebug &operator<<(QDebug debug, const QContiguousCache<T> &cache)
#else
template <class T>
inline QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache)
#endif
{
debug.nospace() << "QContiguousCache(";
for (int i = cache.firstIndex(); i <= cache.lastIndex(); ++i) {
@ -244,13 +214,8 @@ inline QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache)
return debug.space();
}
#if defined(FORCE_UREF)
template <class T>
inline QDebug &operator<<(QDebug debug, const QFlags<T> &flags)
#else
template <class T>
inline QDebug operator<<(QDebug debug, const QFlags<T> &flags)
#endif
{
debug.nospace() << "QFlags(";
bool needSeparator = false;

7
src/core/kernel/qobjectdefs.h
View file

@ -280,6 +280,9 @@ public:
{}
};
struct QMetaObject;
typedef const QMetaObject& (*QMetaObjectAccessor)();
struct Q_CORE_EXPORT QMetaObject
{
const char *className() const;
@ -442,7 +445,11 @@ struct Q_CORE_EXPORT QMetaObject
const uint *data;
typedef void (*StaticMetacallFunction)(QObject *, QMetaObject::Call, int, void **);
StaticMetacallFunction static_metacall;
#ifdef Q_NO_DATA_RELOCATION
const QMetaObjectAccessor *relatedMetaObjects;
#else
const QMetaObject **relatedMetaObjects;
#endif
void *extradata; //reserved for future use
} d;
};

1
src/core/thread/qmutex.h
View file

@ -143,7 +143,6 @@ class QMutexData
public:
QAtomicInt contenders;
const uint recursive : 1;
uint reserved : 31;
protected:
QMutexData(QMutex::RecursionMode mode);
~QMutexData();

2
src/core/tools/qbytearray.cpp
View file

@ -168,7 +168,7 @@ char *qstrncpy(char *dst, const char *src, uint len)
if (!src || !dst)
return 0;
#if defined(_MSC_VER) && _MSC_VER >= 1400
strncpy_s(dst, len, src, len-1);
strncpy_s(dst, len, src, len-1);
#else
strncpy(dst, src, len);
#endif

3
src/core/tools/qbytearray.h
View file

@ -128,9 +128,6 @@ private:
struct Data {
QBasicAtomicInt ref;
int alloc, size;
// ### Qt 5.0: We need to add the missing capacity bit
// (like other tool classes have), to maintain the
// reserved memory on resize.
char *data;
char array[1];
};

2
src/core/tools/qcontiguouscache.h
View file

@ -61,7 +61,6 @@ struct Q_CORE_EXPORT QContiguousCacheData
int start;
int offset;
uint sharable : 1;
uint reserved : 31;
// total is 24 bytes (HP-UX aCC: 40 bytes)
// the next entry is already aligned to 8 bytes
@ -190,7 +189,6 @@ void QContiguousCache<T>::detach_helper()
x.d->offset = d->offset;
x.d->alloc = d->alloc;
x.d->sharable = true;
x.d->reserved = 0;
T *dest = x.p->array + x.d->start;
T *src = p->array + d->start;

3
src/core/tools/qhash.cpp
View file

@ -166,7 +166,7 @@ static int countBits(int hint)
const int MinNumBits = 4;
QHashData QHashData::shared_null = {
0, 0, Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0, MinNumBits, 0, 0, true, false, 0
0, 0, Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0, MinNumBits, 0, 0, true, false
};
void *QHashData::allocateNode(int nodeAlign)
@ -204,7 +204,6 @@ QHashData *QHashData::detach_helper(void (*node_duplicate)(Node *, void *),
d->numBuckets = numBuckets;
d->sharable = true;
d->strictAlignment = nodeAlign > 8;
d->reserved = 0;
if (numBuckets) {
QT_TRY {

1
src/core/tools/qhash.h
View file

@ -122,7 +122,6 @@ struct Q_CORE_EXPORT QHashData
int numBuckets;
uint sharable : 1;
uint strictAlignment : 1;
uint reserved : 30;
void *allocateNode(int nodeAlign = 0);
void freeNode(void *node);

3
src/core/tools/qmap.cpp
View file

@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
QMapData QMapData::shared_null = {
&shared_null,
{ &shared_null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0, 0, false, true, false, 0
Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0, 0, false, true, false
};
QMapData *QMapData::createData(int alignment)
@ -70,7 +70,6 @@ QMapData *QMapData::createData(int alignment)
d->insertInOrder = false;
d->sharable = true;
d->strictAlignment = alignment > 8;
d->reserved = 0;
return d;
}

1
src/core/tools/qmap.h
View file

@ -74,7 +74,6 @@ struct Q_CORE_EXPORT QMapData
uint insertInOrder : 1;
uint sharable : 1;
uint strictAlignment : 1;
uint reserved : 29;
static QMapData *createData(int alignment = 0);
void continueFreeData(int offset);

2
src/core/tools/qvector.cpp
View file

@ -45,7 +45,7 @@
QT_BEGIN_NAMESPACE
QVectorData QVectorData::shared_null = { Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0, true, false, 0 };
QVectorData QVectorData::shared_null = { Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0, true, false };
QVectorData *QVectorData::allocate(int size)
{

9
src/core/tools/qvector.h
View file

@ -57,16 +57,8 @@ struct Q_CORE_EXPORT QVectorData
QBasicAtomicInt ref;
int alloc;
int size;
#if defined(QT_ARCH_SPARC) && defined(Q_CC_GNU) && defined(__LP64__) && defined(QT_BOOTSTRAPPED)
// workaround for bug in gcc 3.4.2
uint sharable;
uint capacity;
uint reserved;
#else
uint sharable : 1;
uint capacity : 1;
uint reserved : 30;
#endif
static QVectorData shared_null;
static QVectorData *allocate(int size);
@ -495,7 +487,6 @@ void QVector<T>::realloc(int asize, int aalloc)
x.d->alloc = aalloc;
x.d->sharable = true;
x.d->capacity = d->capacity;
x.d->reserved = 0;
}
if (QTypeInfo<T>::isComplex) {

1
src/declarative/qml/qdeclarativeengine.cpp
View file

@ -636,7 +636,6 @@ QDeclarativeEngine::QDeclarativeEngine(QObject *parent)
*/
QDeclarativeEngine::~QDeclarativeEngine()
{
Q_D(QDeclarativeEngine);
}
/*! \fn void QDeclarativeEngine::quit()

165
src/declarative/qml/qdeclarativewatcher.cpp
View file

@ -1,165 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the QtDeclarative module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "qdeclarativewatcher_p.h"
#include "qdeclarativeexpression.h"
#include "qdeclarativecontext.h"
#include "qdeclarative.h"
#include "qdeclarativeproperty_p.h"
#include "qdeclarativevaluetype_p.h"
#include <QtCore/qmetaobject.h>
#include <QtCore/qdebug.h>
QT_BEGIN_NAMESPACE
class QDeclarativeWatchProxy : public QObject
{
Q_OBJECT
public:
QDeclarativeWatchProxy(int id,
QObject *object,
int debugId,
const QMetaProperty &prop,
QDeclarativeWatcher *parent = 0);
QDeclarativeWatchProxy(int id,
QDeclarativeExpression *exp,
int debugId,
QDeclarativeWatcher *parent = 0);
public slots:
void notifyValueChanged();
private:
friend class QDeclarativeWatcher;
int m_id;
QDeclarativeWatcher *m_watch;
QObject *m_object;
int m_debugId;
QMetaProperty m_property;
QDeclarativeExpression *m_expr;
};
QDeclarativeWatchProxy::QDeclarativeWatchProxy(int id,
QDeclarativeExpression *exp,
int debugId,
QDeclarativeWatcher *parent)
: QObject(parent), m_id(id), m_watch(parent), m_object(0), m_debugId(debugId), m_expr(exp)
{
QObject::connect(m_expr, SIGNAL(valueChanged()), this, SLOT(notifyValueChanged()));
}
QDeclarativeWatchProxy::QDeclarativeWatchProxy(int id,
QObject *object,
int debugId,
const QMetaProperty &prop,
QDeclarativeWatcher *parent)
: QObject(parent), m_id(id), m_watch(parent), m_object(object), m_debugId(debugId), m_property(prop), m_expr(0)
{
static int refreshIdx = -1;
if(refreshIdx == -1)
refreshIdx = QDeclarativeWatchProxy::staticMetaObject.indexOfMethod("notifyValueChanged()");
if (prop.hasNotifySignal())
QDeclarativePropertyPrivate::connect(m_object, prop.notifySignalIndex(), this, refreshIdx);
}
void QDeclarativeWatchProxy::notifyValueChanged()
{
QVariant v;
if (m_expr)
v = m_expr->evaluate();
else if (QDeclarativeValueTypeFactory::isValueType(m_property.userType()))
v = m_property.read(m_object);
emit m_watch->propertyChanged(m_id, m_debugId, m_property, v);
}
QDeclarativeWatcher::QDeclarativeWatcher(QObject *parent)
: QObject(parent)
{
}
bool QDeclarativeWatcher::addWatch(int id, quint32 debugId)
{
#pragma stub
return false;
}
bool QDeclarativeWatcher::addWatch(int id, quint32 debugId, const QByteArray &property)
{
#pragma stub
return false;
}
bool QDeclarativeWatcher::addWatch(int id, quint32 objectId, const QString &expr)
{
#pragma stub
return false;
}
void QDeclarativeWatcher::removeWatch(int id)
{
if (!m_proxies.contains(id))
return;
QList<QPointer<QDeclarativeWatchProxy> > proxies = m_proxies.take(id);
qDeleteAll(proxies);
}
void QDeclarativeWatcher::addPropertyWatch(int id, QObject *object, quint32 debugId, const QMetaProperty &property)
{
QDeclarativeWatchProxy *proxy = new QDeclarativeWatchProxy(id, object, debugId, property, this);
m_proxies[id].append(proxy);
proxy->notifyValueChanged();
}
QT_END_NAMESPACE
#include <moc_qdeclarativewatcher.cpp>
#include <moc_qdeclarativewatcher_p.h>

94
src/declarative/qml/qdeclarativewatcher_p.h
View file

@ -1,94 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the QtDeclarative module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QDECLARATIVEWATCHER_P_H
#define QDECLARATIVEWATCHER_P_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
#include <QtCore/qobject.h>
#include <QtCore/qlist.h>
#include <QtCore/qpair.h>
#include <QtCore/qhash.h>
#include <QtCore/qset.h>
#include <QtCore/qpointer.h>
QT_BEGIN_NAMESPACE
class QDeclarativeWatchProxy;
class QDeclarativeExpression;
class QDeclarativeContext;
class QMetaProperty;
class QDeclarativeWatcher : public QObject
{
Q_OBJECT
public:
QDeclarativeWatcher(QObject * = 0);
bool addWatch(int id, quint32 objectId);
bool addWatch(int id, quint32 objectId, const QByteArray &property);
bool addWatch(int id, quint32 objectId, const QString &expr);
void removeWatch(int id);
Q_SIGNALS:
void propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value);
private:
friend class QDeclarativeWatchProxy;
void addPropertyWatch(int id, QObject *object, quint32 objectId, const QMetaProperty &property);
QHash<int, QList<QPointer<QDeclarativeWatchProxy> > > m_proxies;
};
QT_END_NAMESPACE
#endif // QDECLARATIVEWATCHER_P_H

2
src/declarative/qml/qml.cmake
View file

@ -49,7 +49,6 @@ set(DECLARATIVE_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativexmlhttprequest_p.h
${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativesqldatabase_p.h
${CMAKE_CURRENT_SOURCE_DIR}/qml/qmetaobjectbuilder_p.h
${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativewatcher_p.h
${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativecleanup_p.h
${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativepropertycache_p.h
${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativenotifier_p.h
@ -121,7 +120,6 @@ set(DECLARATIVE_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativexmlhttprequest.cpp
${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativesqldatabase.cpp
${CMAKE_CURRENT_SOURCE_DIR}/qml/qmetaobjectbuilder.cpp
${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativewatcher.cpp
${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativecleanup.cpp
${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativepropertycache.cpp
${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativenotifier.cpp

4
src/gui/graphicsview/qgraphicsview.cpp
View file

@ -1100,8 +1100,8 @@ void QGraphicsViewPrivate::updateInputMethodSensitivity()
if (!proxy) {
q->setInputMethodHints(focusItem->inputMethodHints());
} else if (QWidget *widget = proxy->widget()) {
if (QWidget *fw = widget->focusWidget())
widget = fw;
if (QWidget *fw = widget->focusWidget())
widget = fw;
q->setInputMethodHints(widget->inputMethodHints());
} else {
q->setInputMethodHints(0);

6
src/gui/itemviews/qtreeview.cpp
View file

@ -1816,11 +1816,11 @@ void QTreeView::drawBranches(QPainter *painter, const QRect &rect,
*/
void QTreeView::mousePressEvent(QMouseEvent *event)
{
Q_D(QTreeView);
Q_D(QTreeView);
bool handled = false;
if (style()->styleHint(QStyle::SH_ListViewExpand_SelectMouseType, 0, this) == QEvent::MouseButtonPress)
handled = d->expandOrCollapseItemAtPos(event->pos());
if (!handled && d->itemDecorationAt(event->pos()) == -1)
if (!handled && d->itemDecorationAt(event->pos()) == -1)
QAbstractItemView::mousePressEvent(event);
}
@ -2526,7 +2526,7 @@ void QTreeView::columnCountChanged(int oldCount, int newCount)
if (isVisible())
updateGeometries();
viewport()->update();
viewport()->update();
}
/*!

4
src/gui/widgets/qcombobox.cpp
View file

@ -2759,8 +2759,8 @@ bool QComboBox::event(QEvent *event)
case QEvent::HoverEnter:
case QEvent::HoverLeave:
case QEvent::HoverMove:
if (const QHoverEvent *he = static_cast<const QHoverEvent *>(event))
d->updateHoverControl(he->pos());
if (const QHoverEvent *he = static_cast<const QHoverEvent *>(event))
d->updateHoverControl(he->pos());
break;
case QEvent::ShortcutOverride:
if (d->lineEdit)

4
src/gui/widgets/qscrollbar.cpp
View file

@ -472,8 +472,8 @@ bool QScrollBar::event(QEvent *event)
case QEvent::HoverEnter:
case QEvent::HoverLeave:
case QEvent::HoverMove:
if (const QHoverEvent *he = static_cast<const QHoverEvent *>(event))
d_func()->updateHoverControl(he->pos());
if (const QHoverEvent *he = static_cast<const QHoverEvent *>(event))
d_func()->updateHoverControl(he->pos());
break;
#ifndef QT_NO_WHEELEVENT
case QEvent::Wheel: {

4
src/gui/widgets/qtoolbutton.cpp
View file

@ -972,8 +972,8 @@ bool QToolButton::event(QEvent *event)
case QEvent::HoverEnter:
case QEvent::HoverLeave:
case QEvent::HoverMove:
if (const QHoverEvent *he = static_cast<const QHoverEvent *>(event))
d_func()->updateHoverControl(he->pos());
if (const QHoverEvent *he = static_cast<const QHoverEvent *>(event))
d_func()->updateHoverControl(he->pos());
break;
default:
break;