From 68125cfc7e31f521f078bff7ba3327e5a7d976ff Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Mon, 23 Oct 2017 10:19:49 +0200 Subject: [PATCH] more code to the public API --- src/controls/QskShortcut.cpp | 4 ++-- src/controls/QskSkinlet.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/controls/QskShortcut.cpp b/src/controls/QskShortcut.cpp index 37c29f8c..f11bd2bd 100644 --- a/src/controls/QskShortcut.cpp +++ b/src/controls/QskShortcut.cpp @@ -60,9 +60,9 @@ int QskShortcutHandler::addShortcut( QQuickWindow* window, const QKeySequence& k if ( window ) id = map().addShortcut( window, key, Qt::WindowShortcut, contextMatcher ); else - id = map().addShortcut( this, key, Qt::ApplicationShortcut, contextMatcher ); + id = map().addShortcut( this, key, Qt::ApplicationShortcut, contextMatcher ); - InvokeData& data = m_invokeDataMap[id]; + InvokeData& data = m_invokeDataMap[ id ]; data.receiver = receiver; data.method = method; data.connectionType = connectionType; diff --git a/src/controls/QskSkinlet.h b/src/controls/QskSkinlet.h index bf1a1fda..f2c50c09 100644 --- a/src/controls/QskSkinlet.h +++ b/src/controls/QskSkinlet.h @@ -66,6 +66,9 @@ public: static QSGNode* updateGraphicNode( const QskSkinnable*, QSGNode*, const QskGraphic&, const QskColorFilter&, const QRectF& ); + static QSGNode* updateBoxClipNode( const QskSkinnable*, QSGNode*, + const QRectF&, QskAspect::Subcontrol ); + protected: void setNodeRoles( const QVector< quint8 >& ); void appendNodeRoles( const QVector< quint8 >& ); @@ -85,9 +88,6 @@ protected: QSGNode* updateBoxClipNode( const QskSkinnable*, QSGNode*, QskAspect::Subcontrol ) const; - static QSGNode* updateBoxClipNode( const QskSkinnable*, QSGNode*, - const QRectF&, QskAspect::Subcontrol ); - QSGNode* updateTextNode( const QskSkinnable*, QSGNode*, const QString&, const QskTextOptions&, QskAspect::Subcontrol ) const;