10 changes: 5 additions & 5 deletions mythtv/libs/libmythui/mythrect.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ class MUI_PUBLIC MythRect : public QRect
const QString &sHeight, const QString &baseRes = QString());
explicit MythRect(QRect rect)
: QRect(rect) {}
MythRect& operator= (const QRect& other);
MythRect& operator= (QRect other);
bool operator== (const MythRect &other) const;

void Reset(void);
void CalculateArea(const QRect & parentArea);
void CalculateArea(QRect parentArea);
void CalculateArea(const MythRect & parentArea);

void NormRect(void);
Expand All @@ -52,7 +52,7 @@ class MUI_PUBLIC MythRect : public QRect
QString getHeight(void) const;

MythPoint topLeft(void) const;
void moveTopLeft(const QPoint &point);
void moveTopLeft(QPoint point);
void moveTopLeft(const MythPoint &point);
void moveLeft(const QString &sX);
void moveLeft(int X) { QRect::moveLeft(X); }
Expand Down Expand Up @@ -97,10 +97,10 @@ class MUI_PUBLIC MythPoint : public QPoint
explicit MythPoint(QPoint point)
: QPoint(point) {}

MythPoint& operator= (const QPoint& other);
MythPoint& operator= (QPoint other);

bool isValid(void) const { return m_valid; }
void CalculatePoint(const QRect & parentArea);
void CalculatePoint(QRect parentArea);
void CalculatePoint(const MythRect & parentArea);

void NormPoint(void);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythrender_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class MUI_PUBLIC MythRender : public ReferenceCounter
bool IsErrored(void) const { return m_errored; }
QSize GetSize(void) const { return m_size; }
virtual QStringList GetDescription(void) { return QStringList(); }
virtual void SetViewPort(const QRect&, bool = false) {}
virtual void SetViewPort(const QRect, bool = false) {}

protected:
~MythRender() override = default;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuianimation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <QDomDocument>

QRect UIEffects::GetExtent(const QSize &size) const
QRect UIEffects::GetExtent(const QSize size) const
{
int x = 0;
int y = 0;
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythuianimation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class UIEffects

UIEffects() = default;

QPointF GetCentre(const QRect &rect, int xoff, int yoff) const
QPointF GetCentre(const QRect rect, int xoff, int yoff) const
{
float x = static_cast<float>(xoff) + static_cast<float>(rect.left());
float y = static_cast<float>(yoff) + static_cast<float>(rect.top());
Expand All @@ -30,7 +30,7 @@ class UIEffects
return {x, y};
}

QRect GetExtent(const QSize &size) const;
QRect GetExtent(QSize size) const;

int m_alpha {255};
float m_hzoom {1.0F};
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuibuttonlist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ MythUIButtonList::MythUIButtonList(MythUIType *parent, const QString &name)
}

MythUIButtonList::MythUIButtonList(MythUIType *parent, const QString &name,
const QRect &area, bool showArrow,
const QRect area, bool showArrow,
bool showScrollBar)
: MythUIType(parent, name),
m_showArrow(showArrow), m_showScrollBar(showScrollBar)
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuibuttonlist.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class MUI_PUBLIC MythUIButtonList : public MythUIType
public:
MythUIButtonList(MythUIType *parent, const QString &name);
MythUIButtonList(MythUIType *parent, const QString &name,
const QRect &area, bool showArrow = true,
QRect area, bool showArrow = true,
bool showScrollBar = false);
~MythUIButtonList() override;

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuieditbar.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ void MythUIEditBar::Display(void)
}

void MythUIEditBar::AddBar(MythUIShape *_shape, MythUIImage *_image,
const QRect &area)
const QRect area)
{
MythUIType *add = GetNew(_shape, _image);

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuieditbar.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class MUI_PUBLIC MythUIEditBar : public MythUIType

private:

void AddBar(MythUIShape *shape, MythUIImage *image, const QRect &area);
void AddBar(MythUIShape *shape, MythUIImage *image, QRect area);
void AddMark(MythUIShape *shape, MythUIImage *image, int start, bool left);
MythUIType* GetNew(MythUIShape *shape, MythUIImage *image);
void CalcInverseRegions(void);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuiguidegrid.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ QPoint MythUIGuideGrid::GetRowAndColumn(QPoint position)
return {-1,-1};
}

void MythUIGuideGrid::SetProgramInfo(int row, int col, const QRect &area,
void MythUIGuideGrid::SetProgramInfo(int row, int col, const QRect area,
const QString &title, const QString &genre,
int arrow, int recType, int recStat,
bool selected)
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythui/mythuiguidegrid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ class MUI_PUBLIC MythUIGuideGrid : public MythUIType

void SetCategoryColors(const QMap<QString, QString> &catColors);

void SetTextOffset(const QPoint &to) { m_textOffset = to; }
void SetTextOffset(const QPoint to) { m_textOffset = to; }
void SetArrow(int direction, const QString &file);
void LoadImage(int recType, const QString &file);
void SetProgramInfo(int row, int col, const QRect &area,
void SetProgramInfo(int row, int col, QRect area,
const QString &title, const QString &genre,
int arrow, int recType, int recStat, bool selected);
void ResetData();
Expand All @@ -84,7 +84,7 @@ class MUI_PUBLIC MythUIGuideGrid : public MythUIType
{
public:
UIGTCon() { m_arrow = GridTimeNormal; m_recType = m_recStat = 0; };
UIGTCon(const QRect &drawArea, QString title,
UIGTCon(const QRect drawArea, QString title,
const QString &category, int arrow, int recType, int recStat) :
m_drawArea(drawArea), m_title(std::move(title)),
m_category(category.trimmed()), m_arrow(arrow),
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythuiimage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ void MythUIImage::SetAnimationFrames(const AnimationFrames& frames)
/**
* \brief Force the dimensions of the widget and image to the given size.
*/
void MythUIImage::ForceSize(const QSize &size)
void MythUIImage::ForceSize(const QSize size)
{
if (m_imageProperties.m_forceSize == size)
return;
Expand Down Expand Up @@ -935,7 +935,7 @@ void MythUIImage::SetSize(int width, int height)
/**
* \brief Set the size of the widget
*/
void MythUIImage::SetSize(const QSize &size)
void MythUIImage::SetSize(const QSize size)
{
QWriteLocker updateLocker(&d->m_updateLock);
MythUIType::SetSize(size);
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythui/mythuiimage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ImageProperties
rect = m_maskImage->rect();
return rect;
}
QImage GetMaskImageSubset(const QRect &imageArea)
QImage GetMaskImageSubset(QRect imageArea)
{
if (m_maskImage)
return m_maskImage->copy(imageArea);
Expand Down Expand Up @@ -156,8 +156,8 @@ class MUI_PUBLIC MythUIImage : public MythUIType
void Finalize(void) override; // MythUIType

void SetSize(int width, int height);
void SetSize(const QSize &size) override; // MythUIType
void ForceSize(const QSize &size);
void SetSize(QSize size) override; // MythUIType
void ForceSize(QSize size);

void SetCropRect(int x, int y, int width, int height);
void SetCropRect(const MythRect &rect);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythuiscreenbounds.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ QRect MythUIScreenBounds::GetUIScreenRect()
return m_uiScreenRect;
}

void MythUIScreenBounds::SetUIScreenRect(const QRect& Rect)
void MythUIScreenBounds::SetUIScreenRect(const QRect Rect)
{
if (Rect == m_uiScreenRect)
return;
Expand All @@ -210,7 +210,7 @@ QRect MythUIScreenBounds::GetScreenRect()
return m_screenRect;
}

QSize MythUIScreenBounds::NormSize(const QSize& Size) const
QSize MythUIScreenBounds::NormSize(const QSize Size) const
{
QSize result;
result.setWidth(static_cast<int>(Size.width() * m_screenHorizScale));
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythuiscreenbounds.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ class MUI_PUBLIC MythUIScreenBounds : public QWidget

void UpdateScreenSettings(MythDisplay* mDisplay);
QRect GetUIScreenRect();
void SetUIScreenRect(const QRect& Rect);
void SetUIScreenRect(QRect Rect);
QRect GetScreenRect();
QSize NormSize(const QSize& Size) const;
QSize NormSize(QSize Size) const;
int NormX(int X) const;
int NormY(int Y) const;
void GetScalingFactors(float& Horizontal, float& Vertical) const;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuisimpletext.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

MythUISimpleText::MythUISimpleText(const QString &text,
const MythFontProperties &font,
const QRect & rect, Qt::Alignment align,
const QRect rect, Qt::Alignment align,
MythUIType *parent, const QString &name)
: MythUIType(parent, name),
m_justification(align),
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuisimpletext.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class MUI_PUBLIC MythUISimpleText : public MythUIType
MythUISimpleText(MythUIType *parent, const QString &name)
: MythUIType(parent, name) {}
MythUISimpleText(const QString &text, const MythFontProperties &font,
const QRect &rect, Qt::Alignment align,
QRect rect, Qt::Alignment align,
MythUIType *parent, const QString &name);
~MythUISimpleText() override = default;

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuithemecache.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ MythUIThemeCache::~MythUIThemeCache()
delete m_imageThreadPool;
}

void MythUIThemeCache::SetScreenSize(const QSize &Size)
void MythUIThemeCache::SetScreenSize(QSize Size)
{
m_cacheScreenSize = Size;
}
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuithemecache.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class MUI_PUBLIC MythUIThemeCache
~MythUIThemeCache();

void UpdateImageCache();
void SetScreenSize(const QSize& Size);
void SetScreenSize(QSize Size);
void ClearThemeCacheDir();
QString GetThemeCacheDir();
MythImage* LoadCacheImage(QString File, const QString& Label,
Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythui/mythuitype.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ void MythUIType::DeleteAllChildren(void)
*
* \return The widget at these coordinates
*/
MythUIType *MythUIType::GetChildAt(const QPoint &p, bool recursive,
MythUIType *MythUIType::GetChildAt(const QPoint p, bool recursive,
bool focusable) const
{
if (GetArea().contains(p))
Expand Down Expand Up @@ -551,7 +551,7 @@ MythPoint MythUIType::GetPosition(void) const
return m_area.topLeft();
}

void MythUIType::SetSize(const QSize &size)
void MythUIType::SetSize(const QSize size)
{
if (size == m_area.size())
return;
Expand Down Expand Up @@ -851,7 +851,7 @@ void MythUIType::SetMinArea(const MythRect &rect)
m_parent->SetMinAreaParent(m_minArea, m_area, this);
}

void MythUIType::ExpandArea(const QRect &rect)
void MythUIType::ExpandArea(const QRect rect)
{
QSize childSize = rect.size();
QSize size = m_area.size();
Expand Down Expand Up @@ -1391,7 +1391,7 @@ void MythUIType::LoadNow(void)
*
* Largely used For correctly handling mouse clicks
*/
bool MythUIType::ContainsPoint(const QPoint &point) const
bool MythUIType::ContainsPoint(const QPoint point) const
{
return m_area.contains(point);
}
Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythui/mythuitype.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class MUI_PUBLIC MythUIType : public QObject, public XMLParseBase

void AddChild(MythUIType *child);
MythUIType *GetChild(const QString &name) const;
MythUIType *GetChildAt(const QPoint &p, bool recursive=true,
MythUIType *GetChildAt(QPoint p, bool recursive=true,
bool focusable=true) const;
QList<MythUIType *> *GetAllChildren(void);

Expand Down Expand Up @@ -133,7 +133,7 @@ class MUI_PUBLIC MythUIType : public QObject, public XMLParseBase
void SetPosition(QPoint point);
virtual void SetPosition(const MythPoint &point);
virtual MythPoint GetPosition(void) const;
virtual void SetSize(const QSize &size);
virtual void SetSize(QSize size);
virtual void SetMinSize(const MythPoint &size);
virtual QSize GetMinSize(void) const;
virtual void SetArea(const MythRect &rect);
Expand All @@ -146,7 +146,7 @@ class MUI_PUBLIC MythUIType : public QObject, public XMLParseBase
virtual MythRect GetArea(void) const;
virtual MythRect GetFullArea(void) const;
virtual void RecalculateArea(bool recurse = true);
void ExpandArea(const QRect &rect);
void ExpandArea(QRect rect);

virtual QRegion GetDirtyArea(void) const;

Expand Down Expand Up @@ -183,7 +183,7 @@ class MUI_PUBLIC MythUIType : public QObject, public XMLParseBase
void SetDeferLoad(bool defer) { m_deferload = defer; }
virtual void LoadNow(void);

bool ContainsPoint(const QPoint &point) const;
bool ContainsPoint(QPoint point) const;

virtual MythPainter *GetPainter(void);
void SetPainter(MythPainter *painter) { m_painter = painter; }
Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythui/opengl/mythpainteropengl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ MythGLTexture* MythOpenGLPainter::GetTextureFromCache(MythImage *Image)
#define DEST Dest
#endif

void MythOpenGLPainter::DrawImage(const QRect &Dest, MythImage *Image,
const QRect &Source, int Alpha)
void MythOpenGLPainter::DrawImage(const QRect Dest, MythImage *Image,
const QRect Source, int Alpha)
{
if (m_render)
{
Expand Down Expand Up @@ -280,7 +280,7 @@ void MythOpenGLPainter::DrawImage(const QRect &Dest, MythImage *Image,
* \note If high DPI scaling is in use, just use Qt painting rather than
* handling all of the adjustments required for pen width etc etc.
*/
void MythOpenGLPainter::DrawRect(const QRect &Area, const QBrush &FillBrush,
void MythOpenGLPainter::DrawRect(const QRect Area, const QBrush &FillBrush,
const QPen &LinePen, int Alpha)
{
if ((FillBrush.style() == Qt::SolidPattern ||
Expand All @@ -292,7 +292,7 @@ void MythOpenGLPainter::DrawRect(const QRect &Area, const QBrush &FillBrush,
MythPainterGPU::DrawRect(Area, FillBrush, LinePen, Alpha);
}

void MythOpenGLPainter::DrawRoundRect(const QRect &Area, int CornerRadius,
void MythOpenGLPainter::DrawRoundRect(const QRect Area, int CornerRadius,
const QBrush &FillBrush,
const QPen &LinePen, int Alpha)
{
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythui/opengl/mythpainteropengl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ class MUI_PUBLIC MythOpenGLPainter : public MythPainterGPU
void FreeResources(void) override;
void Begin(QPaintDevice *Parent) override;
void End() override;
void DrawImage(const QRect &Dest, MythImage *Image, const QRect &Source, int Alpha) override;
void DrawRect(const QRect &Area, const QBrush &FillBrush,
void DrawImage(QRect Dest, MythImage *Image, QRect Source, int Alpha) override;
void DrawRect(QRect Area, const QBrush &FillBrush,
const QPen &LinePen, int Alpha) override;
void DrawRoundRect(const QRect &Area, int CornerRadius,
void DrawRoundRect(QRect Area, int CornerRadius,
const QBrush &FillBrush, const QPen &LinePen, int Alpha) override;
void PushTransformation(const UIEffects &Fx, QPointF Center = QPointF()) override;
void PopTransformation(void) override;
Expand Down
22 changes: 11 additions & 11 deletions mythtv/libs/libmythui/opengl/mythrenderopengl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ void MythRenderOpenGL::doneCurrent()
m_lock.unlock();
}

void MythRenderOpenGL::SetViewPort(const QRect &Rect, bool ViewportOnly)
void MythRenderOpenGL::SetViewPort(QRect Rect, bool ViewportOnly)
{
if (Rect == m_viewport)
return;
Expand Down Expand Up @@ -659,7 +659,7 @@ MythGLTexture* MythRenderOpenGL::CreateTextureFromQImage(QImage *Image)
return result;
}

QSize MythRenderOpenGL::GetTextureSize(const QSize &Size, bool Normalised)
QSize MythRenderOpenGL::GetTextureSize(const QSize Size, bool Normalised)
{
if (((m_features & NPOTTextures) != 0U) || !Normalised)
return Size;
Expand Down Expand Up @@ -813,7 +813,7 @@ void MythRenderOpenGL::ClearFramebuffer(void)
}

void MythRenderOpenGL::DrawBitmap(MythGLTexture *Texture, QOpenGLFramebufferObject *Target,
const QRect &Source, const QRect &Destination,
const QRect Source, const QRect Destination,
QOpenGLShaderProgram *Program, int Alpha, qreal Scale)
{
makeCurrent();
Expand Down Expand Up @@ -870,7 +870,7 @@ void MythRenderOpenGL::DrawBitmap(MythGLTexture *Texture, QOpenGLFramebufferObje

void MythRenderOpenGL::DrawBitmap(std::vector<MythGLTexture *> &Textures,
QOpenGLFramebufferObject *Target,
const QRect &Source, const QRect &Destination,
const QRect Source, const QRect Destination,
QOpenGLShaderProgram *Program,
int Rotation)
{
Expand Down Expand Up @@ -938,7 +938,7 @@ static const float kLimitedRangeOffset = (16.0F / 255.0F);
static const float kLimitedRangeScale = (219.0F / 255.0F);

/// \brief An optimised method to clear a QRect to the given color
void MythRenderOpenGL::ClearRect(QOpenGLFramebufferObject *Target, const QRect &Area, int Color)
void MythRenderOpenGL::ClearRect(QOpenGLFramebufferObject *Target, const QRect Area, int Color)
{
makeCurrent();
BindFramebuffer(Target);
Expand All @@ -959,14 +959,14 @@ void MythRenderOpenGL::ClearRect(QOpenGLFramebufferObject *Target, const QRect &
}

void MythRenderOpenGL::DrawRect(QOpenGLFramebufferObject *Target,
const QRect &Area, const QBrush &FillBrush,
const QRect Area, const QBrush &FillBrush,
const QPen &LinePen, int Alpha)
{
DrawRoundRect(Target, Area, 1, FillBrush, LinePen, Alpha);
}

void MythRenderOpenGL::DrawRoundRect(QOpenGLFramebufferObject *Target,
const QRect &Area, int CornerRadius,
const QRect Area, int CornerRadius,
const QBrush &FillBrush,
const QPen &LinePen, int Alpha)
{
Expand Down Expand Up @@ -1279,8 +1279,8 @@ QStringList MythRenderOpenGL::GetDescription(void)
return result;
}

bool MythRenderOpenGL::UpdateTextureVertices(MythGLTexture *Texture, const QRect &Source,
const QRect &Destination, int Rotation, qreal Scale)
bool MythRenderOpenGL::UpdateTextureVertices(MythGLTexture *Texture, const QRect Source,
const QRect Destination, int Rotation, qreal Scale)
{
if (!Texture || Texture->m_size.isEmpty())
return false;
Expand Down Expand Up @@ -1363,7 +1363,7 @@ bool MythRenderOpenGL::UpdateTextureVertices(MythGLTexture *Texture, const QRect
return true;
}

GLfloat* MythRenderOpenGL::GetCachedVertices(GLuint Type, const QRect &Area)
GLfloat* MythRenderOpenGL::GetCachedVertices(GLuint Type, const QRect Area)
{
uint64_t ref = (static_cast<uint64_t>(Area.left()) & 0xfff) +
((static_cast<uint64_t>(Area.top()) & 0xfff) << 12) +
Expand Down Expand Up @@ -1412,7 +1412,7 @@ void MythRenderOpenGL::ExpireVertices(int Max)
}
}

void MythRenderOpenGL::GetCachedVBO(GLuint Type, const QRect &Area)
void MythRenderOpenGL::GetCachedVBO(GLuint Type, const QRect Area)
{
uint64_t ref = (static_cast<uint64_t>(Area.left()) & 0xfff) +
((static_cast<uint64_t>(Area.top()) & 0xfff) << 12) +
Expand Down
22 changes: 11 additions & 11 deletions mythtv/libs/libmythui/opengl/mythrenderopengl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class MUI_PUBLIC MythRenderOpenGL : public QOpenGLContext, public QOpenGLFunctio
int GetExtraFeatures(void) const;
QOpenGLFunctions::OpenGLFeatures GetFeatures(void) const;
bool IsRecommendedRenderer(void);
void SetViewPort(const QRect &Rect, bool ViewportOnly = false) override;
void SetViewPort(QRect Rect, bool ViewportOnly = false) override;
QRect GetViewPort(void) { return m_viewport; }
void PushTransformation(const UIEffects &Fx, QPointF &Center);
void PopTransformation(void);
Expand All @@ -132,7 +132,7 @@ class MUI_PUBLIC MythRenderOpenGL : public QOpenGLContext, public QOpenGLFunctio
QOpenGLBuffer* CreateVBO(int Size, bool Release = true);

MythGLTexture* CreateTextureFromQImage(QImage *Image);
QSize GetTextureSize(const QSize &Size, bool Normalised);
QSize GetTextureSize(QSize Size, bool Normalised);
static int GetTextureDataSize(MythGLTexture *Texture);
void SetTextureFilters(MythGLTexture *Texture, QOpenGLTexture::Filter Filter,
QOpenGLTexture::WrapMode Wrap = QOpenGLTexture::ClampToEdge);
Expand All @@ -154,19 +154,19 @@ class MUI_PUBLIC MythRenderOpenGL : public QOpenGLContext, public QOpenGLFunctio
void SetShaderProjection(QOpenGLShaderProgram* Program);

void DrawBitmap(MythGLTexture *Texture, QOpenGLFramebufferObject *Target,
const QRect &Source, const QRect &Destination,
QRect Source, QRect Destination,
QOpenGLShaderProgram *Program, int Alpha = 255, qreal Scale = 1.0);
void DrawBitmap(std::vector<MythGLTexture *> &Textures,
QOpenGLFramebufferObject *Target,
const QRect &Source, const QRect &Destination,
QRect Source, QRect Destination,
QOpenGLShaderProgram *Program, int Rotation);
void DrawRect(QOpenGLFramebufferObject *Target,
const QRect &Area, const QBrush &FillBrush,
QRect Area, const QBrush &FillBrush,
const QPen &LinePen, int Alpha);
void DrawRoundRect(QOpenGLFramebufferObject *Target,
const QRect &Area, int CornerRadius,
QRect Area, int CornerRadius,
const QBrush &FillBrush, const QPen &LinePen, int Alpha);
void ClearRect(QOpenGLFramebufferObject *Target, const QRect &Area, int Color);
void ClearRect(QOpenGLFramebufferObject *Target, QRect Area, int Color);

bool GetGPUMemory(int &Available, int &Total);

Expand All @@ -182,11 +182,11 @@ class MUI_PUBLIC MythRenderOpenGL : public QOpenGLContext, public QOpenGLFunctio
void Init2DState(void);
void SetMatrixView(void);
void DeleteFramebuffers(void);
static bool UpdateTextureVertices(MythGLTexture *Texture, const QRect &Source,
const QRect &Destination, int Rotation, qreal Scale = 1.0);
GLfloat* GetCachedVertices(GLuint Type, const QRect &Area);
static bool UpdateTextureVertices(MythGLTexture *Texture, QRect Source,
QRect Destination, int Rotation, qreal Scale = 1.0);
GLfloat* GetCachedVertices(GLuint Type, QRect Area);
void ExpireVertices(int Max = 0);
void GetCachedVBO(GLuint Type, const QRect &Area);
void GetCachedVBO(GLuint Type, QRect Area);
void ExpireVBOS(int Max = 0);
bool CreateDefaultShaders(void);
void DeleteDefaultShaders(void);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/vulkan/mythcombobuffervulkan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ void MythComboBufferVulkan::PopData(void)
m_data.pop_back();
}

void MythComboBufferVulkan::PushData(const QMatrix4x4 &Transform, const QRect& Source,
const QRect& Destination, int Alpha)
void MythComboBufferVulkan::PushData(const QMatrix4x4 &Transform, const QRect Source,
const QRect Destination, int Alpha)
{
m_data.push_back({});
VulkanComboBuffer* data = &m_data.back();
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/vulkan/mythcombobuffervulkan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class MUI_PUBLIC MythComboBufferVulkan
MythComboBufferVulkan(float Width, float Height);

const void* Data(void) const;
void PushData(const QMatrix4x4 &Transform, const QRect& Source,
const QRect& Destination, int Alpha);
void PushData(const QMatrix4x4 &Transform, QRect Source,
QRect Destination, int Alpha);
void PopData(void);

std::vector<VulkanComboBuffer> m_data;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/vulkan/mythdebugvulkan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ MythDebugVulkan::MythDebugVulkan(MythVulkanObject* Vulkan)
}
}

void MythDebugVulkan::BeginRegion(VkCommandBuffer CmdBuffer, const char *Name, const MythVulkan4F& Color)
void MythDebugVulkan::BeginRegion(VkCommandBuffer CmdBuffer, const char *Name, const MythVulkan4F Color)
{
VkDebugMarkerMarkerInfoEXT begin =
{ VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT, nullptr, Name,
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/vulkan/mythdebugvulkan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class MUI_PUBLIC MythDebugVulkan : protected MythVulkanObject

static MythDebugVulkan* Create(MythVulkanObject* Vulkan);

void BeginRegion (VkCommandBuffer CmdBuffer, const char* Name, const MythVulkan4F& Color);
void BeginRegion (VkCommandBuffer CmdBuffer, const char* Name, MythVulkan4F Color);
void EndRegion (VkCommandBuffer CmdBuffer);
void NameObject (uint64_t Object, VkDebugReportObjectTypeEXT Type, const char *Name);

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/vulkan/mythpaintervulkan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ void MythPainterVulkan::End()
m_vulkan->Render()->EndFrame();
}

void MythPainterVulkan::DrawImage(const QRect &Dest, MythImage *Image, const QRect &Source, int Alpha)
void MythPainterVulkan::DrawImage(const QRect Dest, MythImage *Image, const QRect Source, int Alpha)
{
if (!m_frameStarted)
return;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/vulkan/mythpaintervulkan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class MUI_PUBLIC MythPainterVulkan : public MythPainterGPU
void FreeResources () override;
void Begin (QPaintDevice* /*Parent*/) override;
void End () override;
void DrawImage (const QRect &Dest, MythImage *Image, const QRect &Source, int Alpha) override;
void DrawImage (QRect Dest, MythImage *Image, QRect Source, int Alpha) override;
void PushTransformation(const UIEffects &Fx, QPointF Center = QPointF()) override;
void PopTransformation () override;

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/vulkan/mythrendervulkan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ VkPhysicalDeviceLimits MythRenderVulkan::GetPhysicalDeviceLimits() const
}

void MythRenderVulkan::BeginDebugRegion(VkCommandBuffer CommandBuffer, const char *Name,
const MythVulkan4F &Color)
const MythVulkan4F Color)
{
if (m_debugMarker && CommandBuffer)
m_debugMarker->BeginRegion(CommandBuffer, Name, Color);
Expand Down Expand Up @@ -637,7 +637,7 @@ void MythRenderVulkan::FinishSingleUseCommandBuffer(VkCommandBuffer &Buffer)
}

VkPipeline MythRenderVulkan::CreatePipeline(MythShaderVulkan* Shader,
const QRect& Viewport,
const QRect Viewport,
std::vector<VkDynamicState> Dynamic)
{
if (!(Shader && Viewport.isValid()))
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/vulkan/mythrendervulkan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class MUI_PUBLIC MythRenderVulkan : public QObject, public QVulkanWindowRenderer
void logicalDeviceLost (void) override;

void BeginDebugRegion(VkCommandBuffer CommandBuffer, const char *Name,
const MythVulkan4F& Color);
MythVulkan4F Color);
void EndDebugRegion(VkCommandBuffer CommandBuffer);
bool CreateImage(QSize Size, VkFormat Format, VkImageTiling Tiling,
VkImageUsageFlags Usage, VkMemoryPropertyFlags Properties,
Expand All @@ -94,7 +94,7 @@ class MUI_PUBLIC MythRenderVulkan : public QObject, public QVulkanWindowRenderer
VkDeviceMemory& Memory);
void CopyBuffer(VkBuffer Src, VkBuffer Dst, VkDeviceSize Size,
VkCommandBuffer CommandBuffer = nullptr);
VkPipeline CreatePipeline(MythShaderVulkan* Shader, const QRect& Viewport,
VkPipeline CreatePipeline(MythShaderVulkan* Shader, QRect Viewport,
std::vector<VkDynamicState> Dynamic = { });
VkCommandBuffer CreateSingleUseCommandBuffer(void);
void FinishSingleUseCommandBuffer(VkCommandBuffer &Buffer);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/vulkan/mythvertexbuffervulkan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ MythVertexBufferVulkan::MythVertexBufferVulkan(MythVulkanObject *Vulkan, VkDevic
{
}

void MythVertexBufferVulkan::Update(const QRect &Source, const QRect &Dest,
void MythVertexBufferVulkan::Update(const QRect Source, const QRect Dest,
int Alpha, int Rotation, VkCommandBuffer CommandBuffer)
{
m_vulkanRender->CopyBuffer(m_stagingBuffer, m_buffer, m_bufferSize, CommandBuffer);
Expand All @@ -84,7 +84,7 @@ void MythVertexBufferVulkan::Update(const QRect &Source, const QRect &Dest,
m_rotation = Rotation;
}

bool MythVertexBufferVulkan::NeedsUpdate(const QRect &Source, const QRect &Dest, int Alpha, int Rotation)
bool MythVertexBufferVulkan::NeedsUpdate(const QRect Source, const QRect Dest, int Alpha, int Rotation)
{
return !((m_source == Source) && (m_dest == Dest) && (m_alpha == Alpha) && (m_rotation == Rotation));
}
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/vulkan/mythvertexbuffervulkan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class MUI_PUBLIC MythVertexBufferVulkan : public MythBufferVulkan
public:
static MythVertexBufferVulkan* Create(MythVulkanObject* Vulkan, VkDeviceSize Size);

bool NeedsUpdate (const QRect& Source, const QRect& Dest, int Alpha, int Rotation);
void Update (const QRect& Source, const QRect& Dest, int Alpha, int Rotation,
bool NeedsUpdate (QRect Source, QRect Dest, int Alpha, int Rotation);
void Update (QRect Source, QRect Dest, int Alpha, int Rotation,
VkCommandBuffer CommandBuffer = nullptr);

protected:
Expand Down