Changeset 59498 in vbox

Timestamp:

Jan 27, 2016 4:35:56 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8069: LogWindow: Removing unnecessary dynamic-allocation of QString.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UIVMLogViewer.cpp (modified) (5 diffs)
• UIVMLogViewer.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp

@@ -502 +502 @@
         QTextEdit *pCurrentPage = m_pViewer->currentLogPage();
         AssertReturnVoid(pCurrentPage);
-        const QString *pCurrentLog = m_pViewer->currentLog();
-        if (pCurrentLog)
-        {
-            QString strInputText(pCurrentLog->data());
+        QString strInputText = m_pViewer->currentLog();
+        if (!strInputText.isNull())
+        {
             /* Prepare filter-data: */
             QString strFilteredText;
@@ -755 +754 @@
 
     /* Clearing old data if any: */
-    for (int index = 0; index < m_book.count(); index++)
-    {
-        QTextEdit* pLogPage = m_book.at(index).second;
-        if (pLogPage)
-            delete m_logMap[pLogPage];
-    }
     m_book.clear();
     m_logMap.clear();
@@ -805 +798 @@
                 m_book << qMakePair(strFileName, pLogViewer);
                 /* Add the log-text to the map: */
-                m_logMap[pLogViewer] = new QString(strText);
+                m_logMap[pLogViewer] = strText;
                 isAnyLogPresent = true;
             }
@@ -978 +971 @@
     saveSettings();
 
-    /* Delete the log if not already: */
-    for (int index = 0; index < m_book.count(); index++)
-    {
-        QTextEdit* pLogPage = m_book.at(index).second;
-        if (pLogPage)
-            delete m_logMap[pLogPage];
-    }
-
     /* Remove log-viewer: */
     if (!m_machine.isNull())
@@ -1111 +1096 @@
 }
 
-const QString* UIVMLogViewer::currentLog()
+const QString& UIVMLogViewer::currentLog()
 {
     return m_logMap[currentLogPage()];

trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.h

@@ -45 +45 @@
 typedef QPair<QString, QTextEdit*> LogPage;
 typedef QList<LogPage> LogBook;
-typedef QMap<QTextEdit*, QString*> VMLogMap;
+typedef QMap<QTextEdit*, QString> VMLogMap;
 
 /** QMainWindow extension
@@ -110 +110 @@
     QTextEdit* createLogPage(const QString &strPage);
     /** Returns the content of current log-page. */
-    const QString* currentLog();
+    const QString& currentLog();
 
     /** Load settings helper. */