Changeset 89137 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 18, 2021 12:36:28 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

144478

Message:

FE/Qt: bugref:10003: Reworking Chooser pane; Removing unwanted unconst stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserItemGlobal.cpp (modified) (8 diffs)
• UIChooserItemGlobal.h (modified) (1 diff)
• UIChooserItemMachine.cpp (modified) (10 diffs)
• UIChooserItemMachine.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp

@@ -28 +28 @@
 #include "UIIconPool.h"
 #include "UIVirtualBoxManager.h"
-
-/* Other VBox includes: */
-#include "iprt/cpp/utils.h"
 
 
@@ -553 +550 @@
 }
 
-void UIChooserItemGlobal::paintBackground(QPainter *pPainter, const QRect &rectangle) const
+void UIChooserItemGlobal::paintBackground(QPainter *pPainter, const QRect &rectangle)
 {
     /* Save painter: */
@@ -562 +559 @@
 
     /* Selected-item background: */
-    if (model()->selectedItems().contains(unconst(this)))
+    if (model()->selectedItems().contains(this))
     {
         /* Prepare color: */
@@ -655 +652 @@
 }
 
-void UIChooserItemGlobal::paintFrame(QPainter *pPainter, const QRect &rectangle) const
+void UIChooserItemGlobal::paintFrame(QPainter *pPainter, const QRect &rectangle)
 {
     /* Only selected and/or hovered item should have a frame: */
-    if (!model()->selectedItems().contains(unconst(this)) && !isHovered())
+    if (!model()->selectedItems().contains(this) && !isHovered())
         return;
 
@@ -669 +666 @@
 
     /* Selected-item frame: */
-    if (model()->selectedItems().contains(unconst(this)))
+    if (model()->selectedItems().contains(this))
         strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHighlightLightnessMin - 40);
     /* Hovered-item frame: */
@@ -689 +686 @@
 }
 
-void UIChooserItemGlobal::paintGlobalInfo(QPainter *pPainter, const QRect &rectangle) const
+void UIChooserItemGlobal::paintGlobalInfo(QPainter *pPainter, const QRect &rectangle)
 {
     /* Prepare variables: */
@@ -700 +697 @@
 
     /* Selected or hovered item foreground: */
-    if (model()->selectedItems().contains(unconst(this)) || isHovered())
+    if (model()->selectedItems().contains(this) || isHovered())
     {
         /* Prepare palette: */
@@ -707 +704 @@
         /* Get background color: */
         const QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
-        const QColor background = model()->selectedItems().contains(unconst(this))
+        const QColor background = model()->selectedItems().contains(this)
                                 ? highlight.lighter(m_iHighlightLightnessMin)
                                 : highlight.lighter(m_iHoverLightnessMin);

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.h

@@ -210 +210 @@
       * @{ */
         /** Paints background using specified @a pPainter and certain @a rectangle. */
-        void paintBackground(QPainter *pPainter, const QRect &rectangle) const;
+        void paintBackground(QPainter *pPainter, const QRect &rectangle);
         /** Paints frame using specified @a pPainter and certain @a rect. */
-        void paintFrame(QPainter *pPainter, const QRect &rectangle) const;
+        void paintFrame(QPainter *pPainter, const QRect &rectangle);
         /** Paints global info using specified @a pPainter and certain @a pOptions. */
-        void paintGlobalInfo(QPainter *pPainter, const QRect &rectangle) const;
+        void paintGlobalInfo(QPainter *pPainter, const QRect &rectangle);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

@@ -33 +33 @@
 #include "UIVirtualMachineItemCloud.h"
 #include "UIVirtualMachineItemLocal.h"
-
-/* Other VBox includes: */
-#include "iprt/cpp/utils.h"
 
 
@@ -897 +894 @@
 }
 
-void UIChooserItemMachine::paintBackground(QPainter *pPainter, const QRect &rectangle) const
+void UIChooserItemMachine::paintBackground(QPainter *pPainter, const QRect &rectangle)
 {
     /* Save painter: */
@@ -906 +903 @@
 
     /* Selected-item background: */
-    if (model()->selectedItems().contains(unconst(this)))
+    if (model()->selectedItems().contains(this))
     {
         /* Prepare color: */
@@ -999 +996 @@
         {
             /* Selected-item background: */
-            if (model()->selectedItems().contains(unconst(this)))
+            if (model()->selectedItems().contains(this))
                 backgroundColor = pal.color(QPalette::Active, QPalette::Highlight);
             /* Default background: */
@@ -1012 +1009 @@
         {
             /* Selected-item background: */
-            if (model()->selectedItems().contains(unconst(this)))
+            if (model()->selectedItems().contains(this))
                 backgroundColor = pal.color(QPalette::Active, QPalette::Highlight);
             /* Default background: */
@@ -1035 +1032 @@
 }
 
-void UIChooserItemMachine::paintFrame(QPainter *pPainter, const QRect &rectangle) const
+void UIChooserItemMachine::paintFrame(QPainter *pPainter, const QRect &rectangle)
 {
     /* Only selected and/or hovered item should have a frame: */
-    if (!model()->selectedItems().contains(unconst(this)) && !isHovered())
+    if (!model()->selectedItems().contains(this) && !isHovered())
         return;
 
@@ -1049 +1046 @@
 
     /* Selected-item frame: */
-    if (model()->selectedItems().contains(unconst(this)))
+    if (model()->selectedItems().contains(this))
         strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHighlightLightnessMin - 40);
     /* Hovered-item frame: */
@@ -1071 +1068 @@
 }
 
-void UIChooserItemMachine::paintMachineInfo(QPainter *pPainter, const QRect &rectangle) const
+void UIChooserItemMachine::paintMachineInfo(QPainter *pPainter, const QRect &rectangle)
 {
     /* Prepare variables: */
@@ -1084 +1081 @@
 
     /* Selected or hovered item foreground: */
-    if (model()->selectedItems().contains(unconst(this)) || isHovered())
+    if (model()->selectedItems().contains(this) || isHovered())
     {
         /* Prepare palette: */
@@ -1091 +1088 @@
         /* Get background color: */
         const QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
-        const QColor background = model()->selectedItems().contains(unconst(this))
+        const QColor background = model()->selectedItems().contains(this)
                                 ? highlight.lighter(m_iHighlightLightnessMin)
                                 : highlight.lighter(m_iHoverLightnessMin);

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.h

@@ -243 +243 @@
       * @{ */
         /** Paints background using specified @a pPainter and certain @a rectangle. */
-        void paintBackground(QPainter *pPainter, const QRect &rectangle) const;
+        void paintBackground(QPainter *pPainter, const QRect &rectangle);
         /** Paints frame using specified @a pPainter and certain @a rectangle. */
-        void paintFrame(QPainter *pPainter, const QRect &rectangle) const;
+        void paintFrame(QPainter *pPainter, const QRect &rectangle);
         /** Paints machine info using specified @a pPainter and certain @a rectangle. */
-        void paintMachineInfo(QPainter *pPainter, const QRect &rectangle) const;
+        void paintMachineInfo(QPainter *pPainter, const QRect &rectangle);
     /** @} */