Changeset 12844 in vbox

Timestamp:

Oct 1, 2008 1:07:12 AM (17 years ago)

Author:

vboxsync

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

37214

Message:

Debugger: disabled autocompletion, fixed a statistics update problem.

Location:

trunk/src/VBox/Debugger

Files:

• VBoxDbgConsole.cpp (modified) (15 diffs)
• VBoxDbgGui.cpp (modified) (1 diff)
• VBoxDbgStatsQt4.cpp (modified) (5 diffs)

trunk/src/VBox/Debugger/VBoxDbgConsole.cpp

@@ -38 +38 @@
 # include <qtextview.h>
 # include <qlineedit.h>
-#endif 
+#endif
 
 #include <VBox/dbg.h>
@@ -67 +67 @@
 VBoxDbgConsoleOutput::VBoxDbgConsoleOutput(QWidget *pParent/* = NULL*/, const char *pszName/* = NULL*/)
 #ifdef VBOXDBG_USE_QT4
-    : QTextEdit(pParent), 
-#else
-    : QTextEdit(pParent, pszName), 
+    : QTextEdit(pParent),
+#else
+    : QTextEdit(pParent, pszName),
 #endif
       m_uCurLine(0), m_uCurPos(0), m_hGUIThread(RTThreadNativeSelf())
@@ -101 +101 @@
     setPaper(QBrush(Qt::black));
     setColor(QColor(qRgb(0, 0xe0, 0)));
-#endif 
+#endif
     NOREF(pszName);
 }
@@ -128 +128 @@
 #else
         int iPosNL = rStr.find('\n', iPos);
-#endif 
+#endif
         int iPosEnd = iPosNL >= 0 ? iPosNL : cch;
         if ((unsigned)iPosNL != iPos)
@@ -140 +140 @@
 #else
                 insertAt(Str, m_uCurLine, m_uCurPos);
-#endif 
+#endif
             if (iPosNL >= 0)
             {
@@ -174 +174 @@
 VBoxDbgConsoleInput::VBoxDbgConsoleInput(QWidget *pParent/* = NULL*/, const char *pszName/* = NULL*/)
 #ifdef VBOXDBG_USE_QT4
-    : QComboBox(pParent), 
-#else
-    : QComboBox(true, pParent, pszName), 
-#endif 
+    : QComboBox(pParent),
+#else
+    : QComboBox(true, pParent, pszName),
+#endif
       m_iBlankItem(0), m_hGUIThread(RTThreadNativeSelf())
 {
@@ -184 +184 @@
     setEditable(true);
     setInsertPolicy(NoInsert);
+    setAutoCompletion(false);
 #else
     insertItem("", m_iBlankItem);
     setInsertionPolicy(NoInsertion);
-#endif 
+#endif
     setMaxCount(50);
     const QLineEdit *pEdit = lineEdit();
@@ -237 +238 @@
     clearEdit();
     setCurrentItem(m_iBlankItem);
-#endif 
+#endif
 }
 
@@ -280 +281 @@
 #else
     QLabel *pLabel = new QLabel(NULL, "11111111111111111111111111111111111111111111111111111111111111111111111111111112222222222", this); /// @todo
-#endif 
+#endif
     pLabel->setFont(m_pOutput->font());
     QSize Size = pLabel->sizeHint();
@@ -306 +307 @@
 
 # if 0//def Q_WS_MAC
-    pLabel = new QLabel("  "); 
+    pLabel = new QLabel("  ");
     pLayout->addWidget(pLabel);
     pLabel->setMaximumSize(20, m_pInput->sizeHint().height() + 6);
@@ -343 +344 @@
     pVLayout->addWidget(pHBox);
     setLayout(pVLayout);
-#endif 
+#endif
 
     /*
@@ -424 +425 @@
     QByteArray Utf8Array = rCommand.toUtf8();
     const char *psz = Utf8Array.constData();
-#else                               
+#else
     const char *psz = rCommand;//.utf8();
 #endif
@@ -457 +458 @@
 #else
     m_pOutput->scrollToBottom();
-#endif 
+#endif
 
     m_fInputRestoreFocus = m_pInput->hasFocus();    /* dirty focus hack */
@@ -669 +670 @@
 #else
                     m_pTimer->start(10, true /* single shot */);
-#endif 
+#endif
                 }
                 break;
@@ -700 +701 @@
 #else
     return QVBox::event(pGenEvent);
-#endif 
-}
-
+#endif
+}
+

trunk/src/VBox/Debugger/VBoxDbgGui.cpp

@@ -154 +154 @@
     if (!m_pDbgStats)
     {
-        m_pDbgStats = new VBoxDbgStats(m_pVM);
+        m_pDbgStats = new VBoxDbgStats(m_pVM, "*");
         connect(m_pDbgStats, SIGNAL(destroyed(QObject *)), this, SLOT(notifyChildDestroyed(QObject *)));
         repositionStatistics();

trunk/src/VBox/Debugger/VBoxDbgStatsQt4.cpp

@@ -1780 +1780 @@
         if (!pLast)
         {
+            /* nuking the whole tree. */
             setRootNode(createRootNode());
             m_fUpdateInsertRemove = true;
@@ -2570 +2571 @@
     m_PatStr = rPatStr;
     if (m_pModel->updateStatsByPattern(rPatStr))
-        setRootIndex(m_pModel->getRootIndex()); /// @todo this is a hack?
+        setRootIndex(QModelIndex()); /* hack */
 }
 
@@ -2654 +2655 @@
     QModelIndex Idx = m_pCurMenu ? m_CurIndex : currentIndex();
     if (!Idx.isValid() || Idx == m_pModel->getRootIndex())
-        m_pModel->updateStatsByPattern(m_PatStr);
+    {
+        if (m_pModel->updateStatsByPattern(m_PatStr))
+            setRootIndex(QModelIndex()); /* hack */
+    }
     else
         m_pModel->updateStatsByIndex(Idx);
@@ -2725 +2729 @@
 
     m_pPatCB = new QComboBox();
+    m_pPatCB->setAutoCompletion(false);
     pHLayout->addWidget(m_pPatCB);
     if (!m_PatStr.isEmpty())
@@ -2786 +2791 @@
 }
 
+
 VBoxDbgStats::~VBoxDbgStats()
 {