Changeset 104978 in vbox

Timestamp:

Jun 20, 2024 1:14:00 PM (9 months ago)

Author:

vboxsync

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

163588

Message:

FE/Qt: bugref:10666, bugref:10669: A bit of cleanup for QILineEdit; This is the 1st step, reordering only.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QILineEdit.cpp (modified) (7 diffs)
• QILineEdit.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2008-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -48 +48 @@
     , m_fAllowToCopyContentsWhenDisabled(false)
     , m_pCopyAction(0)
+    , m_fMarkable(false)
+    , m_fMarkForError(false)
     , m_pIconLabel(0)
-    , m_fMarkForError(false)
-    , m_fMarkable(false)
     , m_iIconMargin(0)
 {
@@ -60 +60 @@
     , m_fAllowToCopyContentsWhenDisabled(false)
     , m_pCopyAction(0)
+    , m_fMarkable(false)
+    , m_fMarkForError(false)
     , m_pIconLabel(0)
-    , m_fMarkForError(false)
+    , m_iIconMargin(0)
 {
     prepare();
@@ -79 +81 @@
 {
     setFixedWidth(fitTextWidth(strText).width());
+}
+
+void QILineEdit::setMarkable(bool fMarkable)
+{
+    if (m_fMarkable == fMarkable)
+        return;
+    m_fMarkable = fMarkable;
+    update();
 }
 
@@ -96 +106 @@
     m_pIconLabel->setToolTip(strToolTip);
     m_iIconMargin = (height() - m_pIconLabel->height()) / 2;
-    update();
-}
-
-void QILineEdit::setMarkable(bool fMarkable)
-{
-    if (m_fMarkable == fMarkable)
-        return;
-    m_fMarkable = fMarkable;
     update();
 }
@@ -144 +146 @@
 }
 
-void QILineEdit::moveIconLabel()
-{
-    AssertPtrReturnVoid(m_pIconLabel);
-    m_pIconLabel->move(width() - m_pIconLabel->width() - m_iIconMargin, m_iIconMargin);
-}
-
 void QILineEdit::showEvent(QShowEvent *pShowEvent)
 {
@@ -200 +196 @@
     return sa;
 }
+
+void QILineEdit::moveIconLabel()
+{
+    AssertPtrReturnVoid(m_pIconLabel);
+    m_pIconLabel->move(width() - m_pIconLabel->width() - m_iIconMargin, m_iIconMargin);
+}

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2008-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -62 +62 @@
     void setFixedWidthByText(const QString &strText);
 
+    /** Defines whether line-edit is @a fMarkable. */
+    void setMarkable(bool fMarkable);
     /** Puts an icon to mark some error on the right hand side of the line edit. @p is used as tooltip of the icon. */
     void mark(bool fError, const QString &strErrorMessage, const QString &strNoErrorMessage);
-
-    void setMarkable(bool fMarkable);
 
 protected:
@@ -99 +99 @@
     QAction *m_pCopyAction;
 
-    QLabel *m_pIconLabel;
-    bool    m_fMarkForError;
-    bool    m_fMarkable;
-    QString m_strErrorMessage;
-    int     m_iIconMargin;
+    /** Holds whether line-edit is markable. */
+    bool     m_fMarkable;
+    /** Holds whether line-edit is marked for error. */
+    bool     m_fMarkForError;
+    /** Holds the icon label instance. */
+    QLabel  *m_pIconLabel;
+    /** Holds last error message. */
+    QString  m_strErrorMessage;
+    /** Holds cached icon margin. */
+    int      m_iIconMargin;
 };