Changeset 103462 in vbox

Timestamp:

Feb 19, 2024 11:26:11 PM (9 months ago)

Author:

vboxsync

Message:

VBoxDbg: Reverted r161795, included too much. bugref:10376

Location:

trunk/src/VBox/Debugger

Files:

• VBoxDbg.cpp (modified) (1 diff)
• VBoxDbgGui.cpp (modified) (2 diffs)
• VBoxDbgGui.h (modified) (1 diff)
• VBoxDbgStatsQt.cpp (modified) (4 diffs)
• VBoxDbgStatsQt.h (modified) (1 diff)

trunk/src/VBox/Debugger/VBoxDbg.cpp

@@ -220 +220 @@
  *
  * @returns VBox status code.
- * @param   pGui            The instance returned by DBGGuiCreate().
- * @param   pszFilter       Filter pattern.
- * @param   pszExpand       Expand pattern.
- * @param   pszAdvFilter    Advanced filter configuration string (min/max/regexp
- *                          on sub-trees).
- */
-DBGDECL(int) DBGGuiShowStatistics(PDBGGUI pGui, const char *pszFilter, const char *pszExpand, const char *pszAdvFilter)
+ * @param   pGui        The instance returned by DBGGuiCreate().
+ * @param   pszFilter   Filter pattern.
+ * @param   pszExpand   Expand pattern.
+ */
+DBGDECL(int) DBGGuiShowStatistics(PDBGGUI pGui, const char *pszFilter, const char *pszExpand)
 {
     AssertReturn(pGui, VERR_INVALID_PARAMETER);
     AssertMsgReturn(pGui->u32Magic == DBGGUI_MAGIC, ("u32Magic=%#x\n", pGui->u32Magic), VERR_INVALID_PARAMETER);
-    return pGui->pVBoxDbgGui->showStatistics(pszFilter, pszExpand, pszAdvFilter);
+    return pGui->pVBoxDbgGui->showStatistics(pszFilter, pszExpand);
 }
 

trunk/src/VBox/Debugger/VBoxDbgGui.cpp

@@ -182 +182 @@
 
 int
-VBoxDbgGui::showStatistics(const char *pszFilter, const char *pszExpand, const char *pszAdvFilter)
+VBoxDbgGui::showStatistics(const char *pszFilter, const char *pszExpand)
 {
     if (!m_pDbgStats)
@@ -189 +189 @@
                                        pszFilter && *pszFilter ? pszFilter :  "*",
                                        pszExpand && *pszExpand ? pszExpand : NULL,
-                                       pszAdvFilter && *pszAdvFilter ? pszAdvFilter : NULL,
                                        2, m_pParent);
         connect(m_pDbgStats, SIGNAL(destroyed(QObject *)), this, SLOT(notifyChildDestroyed(QObject *)));

trunk/src/VBox/Debugger/VBoxDbgGui.h

@@ -103 +103 @@
      *
      * @returns VBox status code.
-     * @param   pszFilter       Filter pattern.
-     * @param   pszExpand       Expand pattern.
-     * @param   pszAdvFilter    Advanced filter configuration string (min/max/regexp
-     *                          on sub-trees).
-     */
-    int showStatistics(const char *pszFilter, const char *pszExpand, const char *pszAdvFilter);
+     * @param   pszFilter   Filter pattern.
+     * @param   pszExpand   Expand pattern.
+     */
+    int showStatistics(const char *pszFilter, const char *pszExpand);
 
     /**

trunk/src/VBox/Debugger/VBoxDbgStatsQt.cpp

@@ -719 +719 @@
      * Constructor.
      *
-     * @param   a_pszAdvFilter  Configuration string from the command line or such.
      * @param   a_pParent       The parent object.
      */
-    VBoxDbgStatsSortFileProxyModel(const char *a_pszAdvFilter, QObject *a_pParent);
+    VBoxDbgStatsSortFileProxyModel(QObject *a_pParent);
 
     /** Destructor */
     virtual ~VBoxDbgStatsSortFileProxyModel()
     {}
-
-    /** Gets the unused-rows visibility status. */
-    bool isShowingUnusedRows() const { return m_fShowUnusedRows; }
 
     /** Sets whether or not to show unused rows (all zeros). */
@@ -3883 +3879 @@
     QModelIndex Idx = m_pCurMenu ? m_CurIndex : currentIndex();
     if (Idx.isValid())
-        Idx = myGetRootIndex();
+        Idx == myGetRootIndex();
     Idx = m_pProxyModel->mapToSource(Idx);
     PDBGGUISTATSNODE pNode = m_pVBoxModel->nodeFromIndex(Idx);
@@ -4091 +4087 @@
 
 VBoxDbgStats::VBoxDbgStats(VBoxDbgGui *a_pDbgGui, const char *pszFilter /*= NULL*/, const char *pszExpand /*= NULL*/,
-                           const char *pszAdvFilter /*= NULL*/, unsigned uRefreshRate/* = 0*/, QWidget *pParent/* = NULL*/)
+                           unsigned uRefreshRate/* = 0*/, QWidget *pParent/* = NULL*/)
     : VBoxDbgBaseWindow(a_pDbgGui, pParent, "Statistics")
     , m_PatStr(pszFilter), m_pPatCB(NULL), m_uRefreshRate(0), m_pTimer(NULL), m_pView(NULL)
@@ -4153 +4149 @@
     VBoxDbgStatsSortFileProxyModel *pProxyModel = new VBoxDbgStatsSortFileProxyModel(this);
     m_pView = new VBoxDbgStatsView(a_pDbgGui, pModel, pProxyModel, this);
-    pCheckBox->setCheckState(pProxyModel->isShowingUnusedRows() ? Qt::Checked : Qt::Unchecked)
 #else
     m_pView = new VBoxDbgStatsView(a_pDbgGui, pModel, NULL, this);

trunk/src/VBox/Debugger/VBoxDbgStatsQt.h

@@ -244 +244 @@
      * @param   pszExpand       Initial expansion pattern. NULL means nothing is
      *                          expanded.
-     * @param   pszAdvFilter    Advanced filter configuration string (min/max/regexp
-     *                          on sub-trees).
      * @param   uRefreshRate    The refresh rate. 0 means not to refresh and is the default.
      * @param   pParent         Parent widget.
      */
     VBoxDbgStats(VBoxDbgGui *a_pDbgGui, const char *pszFilter = NULL, const char *pszExpand = NULL,
-                 const char *pszAdvFilter = NULL, unsigned uRefreshRate = 0, QWidget *pParent = NULL);
+                 unsigned uRefreshRate = 0, QWidget *pParent = NULL);
 
     /** Destructor. */