Ticket #12996: v2-0010-Correct-the-variable-names-from-clipRegion-to-cli.patch

File v2-0010-Correct-the-variable-names-from-clipRegion-to-cli.patch, 2.6 KB (added by David Hampton <mythtv@…>, 3 years ago)

Correct the variable names from clipRegion to clipRect.

  • mythtv/libs/libmythui/mythuitype.h

    Correct the variable names from clipRegion to clipRect.
    
    These variable are all of type QRect, so their name should be
    clipRect. There are other variable of type QRegion that have the name
    clipRegion.
    ---
     mythtv/libs/libmythui/mythuitype.h         | 4 ++--
     mythtv/libs/libmythui/mythuiwebbrowser.cpp | 2 +-
     mythtv/libs/libmythui/mythuiwebbrowser.h   | 2 +-
     3 files changed, 4 insertions(+), 4 deletions(-)
    
    diff --git a/mythtv/libs/libmythui/mythuitype.h b/mythtv/libs/libmythui/mythuitype.h
    index a76b8aa..e795281 100644
    a b class MUI_PUBLIC MythUIType : public QObject, public XMLParseBase 
    111111    virtual void Pulse(void);
    112112
    113113    void Draw(MythPainter *p, int xoffset, int yoffset, int alphaMod = 255,
    114               QRect clipRegion = QRect());
     114              QRect clipRect = QRect());
    115115
    116116    /// Convenience method, calls SetPosition(const MythPoint&)
    117117    /// Override that instead to change functionality.
    class MUI_PUBLIC MythUIType : public QObject, public XMLParseBase 
    211211
    212212  protected:
    213213    virtual void DrawSelf(MythPainter *p, int xoffset, int yoffset,
    214                           int alphaMod, QRect clipRegion);
     214                          int alphaMod, QRect clipRect);
    215215
    216216    void AddFocusableChildrenToList(QMap<int, MythUIType *> &focusList);
    217217    void HandleAlphaPulse();
  • mythtv/libs/libmythui/mythuiwebbrowser.cpp

    diff --git a/mythtv/libs/libmythui/mythuiwebbrowser.cpp b/mythtv/libs/libmythui/mythuiwebbrowser.cpp
    index 5bb6270..4c07cd0 100644
    a b void MythUIWebBrowser::Pulse(void) 
    15101510 *  \copydoc MythUIType::DrawSelf()
    15111511 */
    15121512void MythUIWebBrowser::DrawSelf(MythPainter *p, int xoffset, int yoffset,
    1513                                 int alphaMod, QRect clipRegion)
     1513                                int alphaMod, QRect clipRect)
    15141514{
    15151515    if (!m_image || m_image->isNull() || !m_browser || m_browser->hasFocus())
    15161516        return;
  • mythtv/libs/libmythui/mythuiwebbrowser.h

    diff --git a/mythtv/libs/libmythui/mythuiwebbrowser.h b/mythtv/libs/libmythui/mythuiwebbrowser.h
    index 5495a18..7f10126 100644
    a b class MUI_PUBLIC MythUIWebBrowser : public MythUIType 
    208208    bool IsOnTopScreen(void);
    209209
    210210    virtual void DrawSelf(MythPainter *p, int xoffset, int yoffset,
    211                           int alphaMod, QRect clipRegion);
     211                          int alphaMod, QRect clipRect);
    212212
    213213    virtual bool ParseElement(
    214214        const QString &filename, QDomElement &element, bool showWarnings);