From 17c2eb37ef09351c0949005cfc11fc5de74a72a4 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 21 Nov 2017 16:56:32 +0000 Subject: [PATCH] Accept a const QWidget* in RichResource functions --- qrenderdoc/Code/Interface/QRDInterface.cpp | 2 +- qrenderdoc/Code/Interface/QRDInterface.h | 2 +- qrenderdoc/Code/QRDUtils.cpp | 9 +++++---- qrenderdoc/Code/QRDUtils.h | 7 ++++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/qrenderdoc/Code/Interface/QRDInterface.cpp b/qrenderdoc/Code/Interface/QRDInterface.cpp index 2faefc305..9db5ceba0 100644 --- a/qrenderdoc/Code/Interface/QRDInterface.cpp +++ b/qrenderdoc/Code/Interface/QRDInterface.cpp @@ -132,7 +132,7 @@ QString ConfigFilePath(const QString &filename) return QDir::cleanPath(dir.absoluteFilePath(filename)); } -ICaptureContext *getCaptureContext(QWidget *widget) +ICaptureContext *getCaptureContext(const QWidget *widget) { void *ctxptr = NULL; diff --git a/qrenderdoc/Code/Interface/QRDInterface.h b/qrenderdoc/Code/Interface/QRDInterface.h index 4f6423438..979a0a38c 100644 --- a/qrenderdoc/Code/Interface/QRDInterface.h +++ b/qrenderdoc/Code/Interface/QRDInterface.h @@ -1794,4 +1794,4 @@ This may return ``None`` if no capture context can be found. :return: The capture context associated with this widget, if one unambiguously exists. :rtype: CaptureContext )"); -ICaptureContext *getCaptureContext(QWidget *widget); \ No newline at end of file +ICaptureContext *getCaptureContext(const QWidget *widget); \ No newline at end of file diff --git a/qrenderdoc/Code/QRDUtils.cpp b/qrenderdoc/Code/QRDUtils.cpp index fb329dbfc..b8b17d01b 100644 --- a/qrenderdoc/Code/QRDUtils.cpp +++ b/qrenderdoc/Code/QRDUtils.cpp @@ -79,7 +79,7 @@ struct RichResourceText // cache the context once we've obtained it. ICaptureContext *ctxptr = NULL; - void cacheDocument(QWidget *widget) + void cacheDocument(const QWidget *widget) { if(!ctxptr) ctxptr = getCaptureContext(widget); @@ -216,7 +216,7 @@ bool RichResourceTextCheck(const QVariant &var) return var.userType() == qMetaTypeId(); } -void RichResourceTextPaint(QWidget *owner, QPainter *painter, QRect rect, QFont font, +void RichResourceTextPaint(const QWidget *owner, QPainter *painter, QRect rect, QFont font, QPalette palette, bool mouseOver, QPoint mousePos, const QVariant &var) { RichResourceTextPtr linkedText = var.value(); @@ -280,7 +280,7 @@ void RichResourceTextPaint(QWidget *owner, QPainter *painter, QRect rect, QFont } } -int RichResourceTextWidthHint(QWidget *owner, const QVariant &var) +int RichResourceTextWidthHint(const QWidget *owner, const QVariant &var) { RichResourceTextPtr linkedText = var.value(); @@ -289,7 +289,8 @@ int RichResourceTextWidthHint(QWidget *owner, const QVariant &var) return linkedText->doc.idealWidth(); } -bool RichResourceTextMouseEvent(QWidget *owner, const QVariant &var, QRect rect, QMouseEvent *event) +bool RichResourceTextMouseEvent(const QWidget *owner, const QVariant &var, QRect rect, + QMouseEvent *event) { // only process clicks or moves if(event->type() != QEvent::MouseButtonRelease && event->type() != QEvent::MouseMove) diff --git a/qrenderdoc/Code/QRDUtils.h b/qrenderdoc/Code/QRDUtils.h index f6ab19b6c..00879326d 100644 --- a/qrenderdoc/Code/QRDUtils.h +++ b/qrenderdoc/Code/QRDUtils.h @@ -133,17 +133,18 @@ void RichResourceTextInitialise(QVariant &var); bool RichResourceTextCheck(const QVariant &var); // paint the given variant containing rich text with the given parameters. -void RichResourceTextPaint(QWidget *owner, QPainter *painter, QRect rect, QFont font, +void RichResourceTextPaint(const QWidget *owner, QPainter *painter, QRect rect, QFont font, QPalette palette, bool mouseOver, QPoint mousePos, const QVariant &var); // gives the width for a size hint for the rich text (since it might be larger than the original // text) -int RichResourceTextWidthHint(QWidget *owner, const QVariant &var); +int RichResourceTextWidthHint(const QWidget *owner, const QVariant &var); // handle a mouse event on some rich resource text. // returns true if the event is processed - for mouse move events, this means that the mouse is over // a resource link (which can be used to change the cursor to a pointing hand, for example). -bool RichResourceTextMouseEvent(QWidget *owner, const QVariant &var, QRect rect, QMouseEvent *event); +bool RichResourceTextMouseEvent(const QWidget *owner, const QVariant &var, QRect rect, + QMouseEvent *event); // register runtime conversions for custom Qt metatypes void RegisterMetatypeConversions();