uncrustified

This commit is contained in:
Uwe Rathmann 2019-01-07 09:13:53 +01:00
parent 4e54d1cb58
commit e1ca897478
18 changed files with 28 additions and 27 deletions

View File

@ -132,7 +132,8 @@ QSGNode* SpeedometerSkinlet::updateLabelsNode( const Speedometer* speedometer, Q
Speedometer::Panel ).marginsRemoved( panelMargins ); Speedometer::Panel ).marginsRemoved( panelMargins );
QPointF center = QPointF( panelRect.x() + panelRect.width() / 2, QPointF center = QPointF( panelRect.x() + panelRect.width() / 2,
panelRect.y() + panelRect.height() / 2 ); panelRect.y() + panelRect.height() / 2 );
auto radius = static_cast< float >( panelRect.width() / 2 ); auto radius = static_cast< float >( panelRect.width() / 2 );
const QMarginsF numbersMargins = speedometer->marginsHint( Speedometer::Labels ); const QMarginsF numbersMargins = speedometer->marginsHint( Speedometer::Labels );

View File

@ -191,7 +191,7 @@ void Box::setGradient(
} }
stops += QskGradientStop( 1.0, stops += QskGradientStop( 1.0,
pal.color( static_cast<Palette::Weight>( Palette::NumWeights - 1 ) ) ); pal.color( static_cast< Palette::Weight >( Palette::NumWeights - 1 ) ) );
setGradient( QskGradient( orientation, stops ) ); setGradient( QskGradient( orientation, stops ) );
} }

View File

@ -125,7 +125,7 @@ class Application : public QCoreApplication
#if 1 #if 1
m_invoker.addMethodCall( m_object, "print0(double,int)" ); m_invoker.addMethodCall( m_object, "print0(double,int)" );
m_invoker.addMethodCall( m_object, "print1(double,int)" ); m_invoker.addMethodCall( m_object, "print1(double,int)" );
m_invoker.addMethodCall( m_object, SLOT( print2( int, double ) ) ); m_invoker.addMethodCall( m_object, SLOT(print2(int,double)) );
m_invoker.addMethodCall( m_object, "print3(double)" ); m_invoker.addMethodCall( m_object, "print3(double)" );
m_invoker.addMethodCall( m_object, "print4(int)" ); m_invoker.addMethodCall( m_object, "print4(int)" );
m_invoker.addMethodCall( m_object, "print4(int)" ); m_invoker.addMethodCall( m_object, "print4(int)" );

View File

@ -16,7 +16,7 @@
class WebView : public QQuickWebEngineView class WebView : public QQuickWebEngineView
{ {
public: public:
WebView( const char* url, QQuickItem* parent = nullptr ) WebView( const char* url, QQuickItem* parent = nullptr )
: WebView( parent ) : WebView( parent )
{ {

View File

@ -340,7 +340,7 @@ void QskQml::registerTypes()
QMetaType::registerConverter< qreal, QMarginsF >( QMetaType::registerConverter< qreal, QMarginsF >(
[]( qreal value ) { return QMarginsF( value, value, value, value ); } ); []( qreal value ) { return QMarginsF( value, value, value, value ); } );
qRegisterAnimationInterpolator<QMarginsF>( qRegisterAnimationInterpolator< QMarginsF >(
[]( const QMarginsF& from, const QMarginsF& to, qreal progress ) []( const QMarginsF& from, const QMarginsF& to, qreal progress )
{ {
return QVariant::fromValue( QMarginsF( return QVariant::fromValue( QMarginsF(

View File

@ -677,7 +677,7 @@ void QskMaterialSkin::initSubWindowHints()
setFontRole( Q::TitleBarText, QskSkin::SmallFont ); setFontRole( Q::TitleBarText, QskSkin::SmallFont );
setSkinHint( Q::TitleBarText | Alignment, setSkinHint( Q::TitleBarText | Alignment,
static_cast<int>( Qt::AlignLeft | Qt::AlignVCenter ) ); static_cast< int >( Qt::AlignLeft | Qt::AlignVCenter ) );
for ( auto subControl : { Q::Panel, Q::TitleBar, Q::TitleBarText } ) for ( auto subControl : { Q::Panel, Q::TitleBar, Q::TitleBarText } )
setAnimation( subControl | Color, qskDuration ); setAnimation( subControl | Color, qskDuration );

View File

@ -769,7 +769,7 @@ void QskSquiekSkin::initSubWindowHints()
setColor( Q::TitleBarText, pal.themeForeground ); setColor( Q::TitleBarText, pal.themeForeground );
setSkinHint( Q::TitleBarText | Alignment, setSkinHint( Q::TitleBarText | Alignment,
static_cast<int>( Qt::AlignLeft | Qt::AlignVCenter ) ); static_cast< int >( Qt::AlignLeft | Qt::AlignVCenter ) );
for ( auto subControl : { Q::Panel, Q::TitleBar, Q::TitleBarText } ) for ( auto subControl : { Q::Panel, Q::TitleBar, Q::TitleBarText } )
setAnimation( subControl | Color, qskDuration ); setAnimation( subControl | Color, qskDuration );

View File

@ -820,7 +820,7 @@ void QskControl::updateControlFlag( uint flag, bool on )
Q_D( QskControl ); Q_D( QskControl );
if ( ( flag > std::numeric_limits< controlFlags_t >::max() ) || if ( ( flag > std::numeric_limits< controlFlags_t >::max() ) ||
( bool( d->controlFlags & flag ) == on ) ) ( bool( d->controlFlags & flag ) == on ) )
{ {
return; return;
} }

View File

@ -204,7 +204,7 @@ void QskScrollAreaClipItem::updateNode( QSGNode* )
auto* d = QQuickItemPrivate::get( this ); auto* d = QQuickItemPrivate::get( this );
if ( QQuickItemPrivate::get( scrollArea() )->dirtyAttributes & if ( QQuickItemPrivate::get( scrollArea() )->dirtyAttributes &
QQuickItemPrivate::ContentUpdateMask ) QQuickItemPrivate::ContentUpdateMask )
{ {
/* /*
The update order depends on who calls update first and we The update order depends on who calls update first and we

View File

@ -775,10 +775,10 @@ QVariant QskTextInput::inputMethodQuery(
{ {
return locale(); return locale();
} }
case Qt::ImCursorRectangle:
#if QT_VERSION >= QT_VERSION_CHECK( 5, 7, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 5, 7, 0 )
case Qt::ImInputItemClipRectangle: case Qt::ImInputItemClipRectangle:
#endif #endif
case Qt::ImCursorRectangle:
{ {
QVariant v = m_data->textInput->inputMethodQuery( query, argument ); QVariant v = m_data->textInput->inputMethodQuery( query, argument );
#if 1 #if 1

View File

@ -60,10 +60,10 @@ class QSK_EXPORT QskBoxRenderer
inline bool operator==( const Quad& other ) const inline bool operator==( const Quad& other ) const
{ {
return return
( left == other.left ) && ( left == other.left ) &&
( right == other.right ) && ( right == other.right ) &&
( top == other.top ) && ( top == other.top ) &&
( bottom == other.bottom ); ( bottom == other.bottom );
} }
inline bool operator!=( const Quad& other ) const inline bool operator!=( const Quad& other ) const

View File

@ -11,7 +11,7 @@
class SKINNY_EXPORT SkinnyShapeProvider : public QskGraphicProvider class SKINNY_EXPORT SkinnyShapeProvider : public QskGraphicProvider
{ {
protected: protected:
const QskGraphic* loadGraphic( const QString& id ) const override final; const QskGraphic* loadGraphic( const QString& id ) const override final;
}; };

View File

@ -13,7 +13,7 @@ class SKINNY_EXPORT SkinnyShortcut : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
enum Type enum Type
{ {
Quit = 1 << 0, Quit = 1 << 0,
@ -31,7 +31,7 @@ public:
static void enable( Types ); static void enable( Types );
private: private:
SkinnyShortcut( QObject* parent = nullptr ); SkinnyShortcut( QObject* parent = nullptr );
void rotateSkin(); void rotateSkin();

View File

@ -11,14 +11,14 @@
class DoxDumper class DoxDumper
{ {
public: public:
DoxDumper(); DoxDumper();
int dump( const Interface&, FILE* ); int dump( const Interface&, FILE* );
int dumpCpp( const Interface&, FILE* ); int dumpCpp( const Interface&, FILE* );
int dumpQml( const Interface&, FILE* ); int dumpQml( const Interface&, FILE* );
private: private:
void doxPrintf( const char* format, ... ); void doxPrintf( const char* format, ... );
std::string expandedText( std::string expandedText(

View File

@ -11,7 +11,7 @@
class Property class Property
{ {
public: public:
std::string name; std::string name;
std::string type; std::string type;
@ -24,7 +24,7 @@ public:
class Enum class Enum
{ {
public: public:
std::string className; std::string className;
std::string qmlClassName; std::string qmlClassName;
std::string description; std::string description;
@ -32,7 +32,7 @@ public:
class Method class Method
{ {
public: public:
Method( int methodType = -1 ): Method( int methodType = -1 ):
type( methodType ) type( methodType )
{ {
@ -45,7 +45,7 @@ public:
class Interface class Interface
{ {
public: public:
std::string className; std::string className;
std::string baseName; std::string baseName;
std::string qmlClassName; std::string qmlClassName;

View File

@ -10,7 +10,7 @@
class ParserTree class ParserTree
{ {
public: public:
void beginScope( int token ); void beginScope( int token );
void addText( const char* ); void addText( const char* );
void endScope(); void endScope();
@ -20,7 +20,7 @@ public:
return m_interfaces; return m_interfaces;
} }
private: private:
int scope() const; int scope() const;
std::vector< Interface > m_interfaces; std::vector< Interface > m_interfaces;

View File

@ -3,7 +3,7 @@
* This file may be used under the terms of the QSkinny License, Version 1.0 * This file may be used under the terms of the QSkinny License, Version 1.0
*****************************************************************************/ *****************************************************************************/
#if defined(QSK_STANDALONE) #if defined( QSK_STANDALONE )
#include <QskGraphic.cpp> #include <QskGraphic.cpp>
#include <QskRgbValue.cpp> #include <QskRgbValue.cpp>
#include <QskColorFilter.cpp> #include <QskColorFilter.cpp>