pedantic warnings fixed
This commit is contained in:
parent
234939238b
commit
06b07839b3
@ -79,8 +79,8 @@ class FlatMap
|
|||||||
|
|
||||||
inline typename std::vector< T >::iterator lowerBound( const Key& key ) const
|
inline typename std::vector< T >::iterator lowerBound( const Key& key ) const
|
||||||
{
|
{
|
||||||
auto cmp = []( const T& entry, const Key& key )
|
auto cmp = []( const T& entry, const Key& k )
|
||||||
{ return entry.key() < key; };
|
{ return entry.key() < k; };
|
||||||
|
|
||||||
auto& entries = const_cast< std::vector< T >& >( m_entries );
|
auto& entries = const_cast< std::vector< T >& >( m_entries );
|
||||||
return std::lower_bound( entries.begin(), entries.end(), key, cmp );
|
return std::lower_bound( entries.begin(), entries.end(), key, cmp );
|
||||||
|
@ -234,7 +234,8 @@ float qskConstrainedRadians( float radians )
|
|||||||
return radians;
|
return radians;
|
||||||
}
|
}
|
||||||
|
|
||||||
// do not export;
|
QSK_HIDDEN_EXTERNAL_BEGIN
|
||||||
|
|
||||||
bool qskHasEnvironment( const char* env )
|
bool qskHasEnvironment( const char* env )
|
||||||
{
|
{
|
||||||
bool ok;
|
bool ok;
|
||||||
@ -247,3 +248,5 @@ bool qskHasEnvironment( const char* env )
|
|||||||
auto result = qgetenv( env );
|
auto result = qgetenv( env );
|
||||||
return !result.isEmpty() && result != "false";
|
return !result.isEmpty() && result != "false";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QSK_HIDDEN_EXTERNAL_END
|
||||||
|
@ -43,6 +43,13 @@
|
|||||||
#define QSK_QT_PRIVATE_END \
|
#define QSK_QT_PRIVATE_END \
|
||||||
QT_WARNING_POP
|
QT_WARNING_POP
|
||||||
|
|
||||||
|
#define QSK_HIDDEN_EXTERNAL_BEGIN \
|
||||||
|
QT_WARNING_PUSH \
|
||||||
|
QT_WARNING_DISABLE_GCC("-Wmissing-declarations")
|
||||||
|
|
||||||
|
#define QSK_HIDDEN_EXTERNAL_END \
|
||||||
|
QT_WARNING_POP
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
|
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
|
||||||
using QskHashValue = uint;
|
using QskHashValue = uint;
|
||||||
#else
|
#else
|
||||||
|
@ -84,6 +84,8 @@ namespace
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QSK_HIDDEN_EXTERNAL_BEGIN
|
||||||
|
|
||||||
QLocale qskInheritedLocale( const QObject* object )
|
QLocale qskInheritedLocale( const QObject* object )
|
||||||
{
|
{
|
||||||
VisitorLocale visitor;
|
VisitorLocale visitor;
|
||||||
@ -101,6 +103,16 @@ void qskInheritLocale( QObject* object, const QLocale& locale )
|
|||||||
QskObjectTree::traverseDown( object, visitor );
|
QskObjectTree::traverseDown( object, visitor );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void qskInheritSection( QskControl* control, QskAspect::Section section )
|
||||||
|
{
|
||||||
|
VisitorSection visitor;
|
||||||
|
visitor.setResolveValue( section );
|
||||||
|
|
||||||
|
QskObjectTree::traverseDown( control, visitor );
|
||||||
|
}
|
||||||
|
|
||||||
|
QSK_HIDDEN_EXTERNAL_END
|
||||||
|
|
||||||
static QskAspect::Section qskInheritedSection( const QskControl* control )
|
static QskAspect::Section qskInheritedSection( const QskControl* control )
|
||||||
{
|
{
|
||||||
VisitorSection visitor;
|
VisitorSection visitor;
|
||||||
@ -110,14 +122,6 @@ static QskAspect::Section qskInheritedSection( const QskControl* control )
|
|||||||
return visitor.resolveValue();
|
return visitor.resolveValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
void qskInheritSection( QskControl* control, QskAspect::Section section )
|
|
||||||
{
|
|
||||||
VisitorSection visitor;
|
|
||||||
visitor.setResolveValue( section );
|
|
||||||
|
|
||||||
QskObjectTree::traverseDown( control, visitor );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Qt 5.12:
|
Qt 5.12:
|
||||||
sizeof( QQuickItemPrivate::ExtraData ) -> 184
|
sizeof( QQuickItemPrivate::ExtraData ) -> 184
|
||||||
|
@ -1136,10 +1136,14 @@ QSGNode* QskItem::updateItemPaintNode( QSGNode* node )
|
|||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QSK_HIDDEN_EXTERNAL_BEGIN
|
||||||
|
|
||||||
void qskUpdateItemFlags()
|
void qskUpdateItemFlags()
|
||||||
{
|
{
|
||||||
if ( qskRegistry )
|
if ( qskRegistry )
|
||||||
qskRegistry->updateItemFlags();
|
qskRegistry->updateItemFlags();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QSK_HIDDEN_EXTERNAL_END
|
||||||
|
|
||||||
#include "moc_QskItem.cpp"
|
#include "moc_QskItem.cpp"
|
||||||
|
@ -257,12 +257,12 @@ void QskItemAnchors::addAnchors( Qt::Corner corner,
|
|||||||
QQuickItem* settledItem, Qt::Corner settledItemCorner )
|
QQuickItem* settledItem, Qt::Corner settledItemCorner )
|
||||||
{
|
{
|
||||||
auto anchorPoint =
|
auto anchorPoint =
|
||||||
[]( Qt::Corner corner, Qt::Orientation orientation )
|
[]( Qt::Corner cn, Qt::Orientation orientation )
|
||||||
{
|
{
|
||||||
if ( orientation == Qt::Horizontal )
|
if ( orientation == Qt::Horizontal )
|
||||||
return ( corner & 0x1 ) ? Qt::AnchorRight : Qt::AnchorLeft;
|
return ( cn & 0x1 ) ? Qt::AnchorRight : Qt::AnchorLeft;
|
||||||
else
|
else
|
||||||
return ( corner >= 0x2 ) ? Qt::AnchorBottom : Qt::AnchorTop;
|
return ( cn >= 0x2 ) ? Qt::AnchorBottom : Qt::AnchorTop;
|
||||||
};
|
};
|
||||||
|
|
||||||
addAnchor( anchorPoint( corner, Qt::Horizontal ),
|
addAnchor( anchorPoint( corner, Qt::Horizontal ),
|
||||||
|
@ -126,6 +126,8 @@ static inline QskSkinlet* qskNewSkinlet( const QMetaObject* metaObject, QskSkin*
|
|||||||
|
|
||||||
// also used in QskSkinTransition.cpp TODO ...
|
// also used in QskSkinTransition.cpp TODO ...
|
||||||
|
|
||||||
|
QSK_HIDDEN_EXTERNAL_BEGIN
|
||||||
|
|
||||||
QFont qskResolvedFont( const QHash< QskFontRole, QFont >& fontTable,
|
QFont qskResolvedFont( const QHash< QskFontRole, QFont >& fontTable,
|
||||||
const QskFontRole& fontRole )
|
const QskFontRole& fontRole )
|
||||||
{
|
{
|
||||||
@ -140,6 +142,8 @@ QFont qskResolvedFont( const QHash< QskFontRole, QFont >& fontTable,
|
|||||||
return QGuiApplication::font();
|
return QGuiApplication::font();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QSK_HIDDEN_EXTERNAL_END
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
class SkinletData
|
class SkinletData
|
||||||
|
@ -482,6 +482,8 @@ void QskWindow::resetLocale()
|
|||||||
qskResolveLocale( this );
|
qskResolveLocale( this );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QSK_HIDDEN_EXTERNAL_BEGIN
|
||||||
|
|
||||||
bool qskInheritLocale( QskWindow* window, const QLocale& locale )
|
bool qskInheritLocale( QskWindow* window, const QLocale& locale )
|
||||||
{
|
{
|
||||||
auto d = static_cast< QskWindowPrivate* >( QQuickWindowPrivate::get( window ) );
|
auto d = static_cast< QskWindowPrivate* >( QQuickWindowPrivate::get( window ) );
|
||||||
@ -495,6 +497,8 @@ bool qskInheritLocale( QskWindow* window, const QLocale& locale )
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QSK_HIDDEN_EXTERNAL_END
|
||||||
|
|
||||||
static void qskResolveLocale( QskWindow* window )
|
static void qskResolveLocale( QskWindow* window )
|
||||||
{
|
{
|
||||||
auto d = static_cast< QskWindowPrivate* >( QQuickWindowPrivate::get( window ) );
|
auto d = static_cast< QskWindowPrivate* >( QQuickWindowPrivate::get( window ) );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user