儲存庫 vbox 的更動 65329

時間撮記:

2017-1-16 下午01:32:36 (8 年 以前)

作者:

vboxsync

訊息:

FE/Qt: bugref:6899: Accessibility support (step 176): A bit of care for UIInformationItem: Refactoring.

位置:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information

檔案:

• UIInformationItem.cpp (修改) (6 筆差異)
• UIInformationItem.h (修改) (3 筆差異)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationItem.cpp

@@ -21 +21 @@
 
 /* Qt includes: */
+# include <QApplication>
 # include <QPainter>
-# include <QApplication>
-# include <QAbstractTextDocumentLayout>
 # include <QTextDocument>
 # include <QUrl>
 
 /* GUI includes: */
+# include "VBoxGlobal.h"
 # include "UIIconPool.h"
 # include "UIInformationItem.h"
-# include "VBoxGlobal.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -62 +61 @@
 }
 
-const UITextTable& UIInformationItem::text() const
+const UITextTable &UIInformationItem::text() const
 {
     /* Return text: */
@@ -77 +76 @@
     {
         /* Lines: */
-        QString strLeftLine = line.first;
-        QString strRightLine = line.second;
+        const QString strLeftLine = line.first;
+        const QString strRightLine = line.second;
 
         /* If 2nd line is NOT empty: */
@@ -113 +112 @@
 }
 
-QString UIInformationItem::htmlData()
+QString UIInformationItem::htmlData() const
 {
     /* Return html-data: */
@@ -126 +125 @@
     updateData(index);
     /* If there is something to paint: */
-    if (m_text.count() != 0)
+    if (!m_text.isEmpty())
     {
         /* Draw item as per application style: */
@@ -140 +139 @@
 }
 
-QSize UIInformationItem::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+QSize UIInformationItem::sizeHint(const QStyleOptionViewItem & /* option */, const QModelIndex &index) const
 {
-    RT_NOREF(option);
-
     /* Update data: */
     updateData(index);
-    if (m_text.count() == 0)
-    {
+    if (m_text.isEmpty())
         return QSize(0, 0);
-    }
     /* Return size: */
     return m_pTextDocument->size().toSize();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationItem.h

@@ -20 +20 @@
 
 /* Qt includes: */
-#include <QIcon>
-#include <QTextLayout>
 #include <QStyledItemDelegate>
-#include <QStyleOptionViewItem>
 
 /* GUI includes: */
+#include "QIWithRetranslateUI.h"
+#include "UIExtraDataDefs.h"
 #include "UIGDetailsItem.h"
-#include "UIExtraDataDefs.h"
-#include "QIWithRetranslateUI.h"
 
 /* Forward declarations: */
-class QTextLayout;
+class QStyleOptionViewItem;
 class QTextDocument;
 
@@ -59 +56 @@
 
     /** Returns the text-data of information-item. */
-    const UITextTable& text() const;
+    const UITextTable &text() const;
     /** Defines the text-data of information-item as @a text. */
     void setText(const UITextTable &text) const;
@@ -67 +64 @@
 
     /** Returns html data. */
-    QString htmlData();
+    QString htmlData() const;
 
 protected:
 
     /** Performs painting for @a index using @a pPainter and @a option set. */
-    void paint(QPainter *pPainter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    virtual void paint(QPainter *pPainter, const QStyleOptionViewItem &option, const QModelIndex &index) const /* override */;
 
     /** Calculates size-hint for @a index using @a option set. */
-    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const /* override */;
 
 private: