Changeset 71101 in vbox for trunk/src/VBox

Timestamp:

Feb 22, 2018 1:30:02 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:6699 Rename UIInformationGuestSession to UIGuestControlWidget

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/runtime/information/UIVMInformationDialog.cpp (modified) (2 diffs)
• src/runtime/information/guestctrl/UIGuestControlWidget.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIInformationGuestSession.cpp ) (16 diffs)
• src/runtime/information/guestctrl/UIGuestControlWidget.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIInformationGuestSession.h ) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -379 +379 @@
         src/runtime/information/guestctrl/UIGuestControlInterface.h \
         src/runtime/information/guestctrl/UIGuestControlTreeItem.h \
-        src/runtime/information/guestctrl/UIInformationGuestSession.h \
+        src/runtime/information/guestctrl/UIGuestControlWidget.h \
         src/runtime/normal/UIKeyboardHandlerNormal.h \
         src/runtime/normal/UIMachineLogicNormal.h \
@@ -565 +565 @@
         src/runtime/UIIndicatorsPool.cpp \
         src/runtime/UIStatusBarEditorWindow.cpp \
-        src/runtime/information/guestctrl/UIInformationGuestSession.cpp \
+        src/runtime/information/guestctrl/UIGuestControlWidget.cpp \
         src/selector/UIActionPoolSelector.cpp \
         src/selector/UIDesktopPane.cpp \
@@ -708 +708 @@
         src/runtime/information/guestctrl/UIGuestControlConsole.cpp \
         src/runtime/information/guestctrl/UIGuestControlInterface.cpp \
-        src/runtime/information/guestctrl/UIInformationGuestSession.cpp \
         src/runtime/information/guestctrl/UIGuestControlTreeItem.cpp \
+        src/runtime/information/guestctrl/UIGuestControlWidget.cpp \
         src/runtime/normal/UIKeyboardHandlerNormal.cpp \
         src/runtime/normal/UIMachineLogicNormal.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -38 +38 @@
 # include "VBoxUtils.h"
 # include "UIInformationConfiguration.h"
-# include "UIInformationGuestSession.h"
+# include "UIGuestControlWidget.h"
 # include "UIInformationRuntime.h"
 # include "UIMachine.h"
@@ -245 +245 @@
         if(m_pMachineWindow->console().isOk())
         {
-            UIInformationGuestSession *pGuestSessionWidget =
-                new UIInformationGuestSession(this, m_pMachineWindow->console().GetGuest());
-            if (pGuestSessionWidget)
+            UIGuestControlWidget *pGuestControlWidget =
+                new UIGuestControlWidget(this, m_pMachineWindow->console().GetGuest());
+            if (pGuestControlWidget)
             {
-                m_tabs.insert(2, pGuestSessionWidget);
+                m_tabs.insert(2, pGuestControlWidget);
                 m_pTabWidget->addTab(m_tabs.value(2), QString());
             }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlWidget.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIInformationGuestSession class implementation.
+ * VBox Qt GUI - UIGuestControlWidget class implementation.
  */
 
@@ -32 +32 @@
 # include "UIGuestControlInterface.h"
 # include "UIGuestControlTreeItem.h"
-# include "UIInformationGuestSession.h"
+# include "UIGuestControlWidget.h"
 # include "UIVMInformationDialog.h"
 # include "VBoxGlobal.h"
@@ -164 +164 @@
 };
 
-UIInformationGuestSession::UIInformationGuestSession(QWidget *pParent, const CGuest &comGuest)
+UIGuestControlWidget::UIGuestControlWidget(QWidget *pParent, const CGuest &comGuest)
     : QWidget(pParent)
     , m_comGuest(comGuest)
@@ -180 +180 @@
 }
 
-void UIInformationGuestSession::prepareObjects()
+void UIGuestControlWidget::prepareObjects()
 {
     m_pControlInterface = new UIGuestControlInterface(this, m_comGuest);
@@ -226 +226 @@
 }
 
-void UIInformationGuestSession::updateTreeWidget()
+void UIGuestControlWidget::updateTreeWidget()
 {
     if (!m_pTreeWidget)
@@ -236 +236 @@
 }
 
-void UIInformationGuestSession::prepareConnections()
+void UIGuestControlWidget::prepareConnections()
 {
     qRegisterMetaType<QVector<int> >();
     connect(m_pControlInterface, &UIGuestControlInterface::sigOutputString,
-            this, &UIInformationGuestSession::sltConsoleOutputReceived);
+            this, &UIGuestControlWidget::sltConsoleOutputReceived);
     connect(m_pConsole, &UIGuestControlConsole::commandEntered,
-            this, &UIInformationGuestSession::sltConsoleCommandEntered);
+            this, &UIGuestControlWidget::sltConsoleCommandEntered);
 
     if (m_pTreeWidget)
         connect(m_pTreeWidget, &UIGuestControlTreeWidget::sigCloseSessionOrProcess,
-                this, &UIInformationGuestSession::sltCloseSessionOrProcess);
+                this, &UIGuestControlWidget::sltCloseSessionOrProcess);
 
     if (m_pQtListener)
     {
         connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigGuestSessionRegistered,
-                this, &UIInformationGuestSession::sltGuestSessionRegistered, Qt::DirectConnection);
+                this, &UIGuestControlWidget::sltGuestSessionRegistered, Qt::DirectConnection);
         connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigGuestSessionUnregistered,
-                this, &UIInformationGuestSession::sltGuestSessionUnregistered, Qt::DirectConnection);
-    }
-}
-
-void UIInformationGuestSession::sltGuestSessionsUpdated()
+                this, &UIGuestControlWidget::sltGuestSessionUnregistered, Qt::DirectConnection);
+    }
+}
+
+void UIGuestControlWidget::sltGuestSessionsUpdated()
 {
     updateTreeWidget();
 }
 
-void UIInformationGuestSession::sltConsoleCommandEntered(const QString &strCommand)
+void UIGuestControlWidget::sltConsoleCommandEntered(const QString &strCommand)
 {
     if (m_pControlInterface)
@@ -270 +270 @@
 }
 
-void UIInformationGuestSession::sltConsoleOutputReceived(const QString &strOutput)
+void UIGuestControlWidget::sltConsoleOutputReceived(const QString &strOutput)
 {
     if (m_pConsole)
@@ -278 +278 @@
 }
 
-void UIInformationGuestSession::sltCloseSessionOrProcess()
+void UIGuestControlWidget::sltCloseSessionOrProcess()
 {
     if (!m_pTreeWidget)
@@ -307 +307 @@
 }
 
-void UIInformationGuestSession::prepareListener()
+void UIGuestControlWidget::prepareListener()
 {
     /* Create event listener instance: */
@@ -336 +336 @@
 }
 
-void UIInformationGuestSession::initGuestSessionTree()
+void UIGuestControlWidget::initGuestSessionTree()
 {
     if (!m_comGuest.isOk())
@@ -348 +348 @@
 }
 
-void UIInformationGuestSession::cleanupListener()
+void UIGuestControlWidget::cleanupListener()
 {
     /* If event listener registered as passive one: */
@@ -370 +370 @@
 
 
-void UIInformationGuestSession::sltGuestSessionRegistered(CGuestSession guestSession)
+void UIGuestControlWidget::sltGuestSessionRegistered(CGuestSession guestSession)
 {
     if (!guestSession.isOk())
@@ -377 +377 @@
 }
 
-void UIInformationGuestSession::addGuestSession(CGuestSession guestSession)
+void UIGuestControlWidget::addGuestSession(CGuestSession guestSession)
 {
     UIGuestSessionTreeItem* sessionTreeItem = new UIGuestSessionTreeItem(m_pTreeWidget, guestSession);
     connect(sessionTreeItem, &UIGuestSessionTreeItem::sigGuessSessionUpdated,
-            this, &UIInformationGuestSession::sltTreeItemUpdated);
+            this, &UIGuestControlWidget::sltTreeItemUpdated);
     connect(sessionTreeItem, &UIGuestSessionTreeItem::sigGuestSessionErrorText,
-            this, &UIInformationGuestSession::sltGuestControlErrorText);
-}
-
-void UIInformationGuestSession::sltGuestControlErrorText(QString strError)
+            this, &UIGuestControlWidget::sltGuestControlErrorText);
+}
+
+void UIGuestControlWidget::sltGuestControlErrorText(QString strError)
 {
     if (m_pConsole)
@@ -394 +394 @@
 }
 
-void UIInformationGuestSession::sltTreeItemUpdated()
+void UIGuestControlWidget::sltTreeItemUpdated()
 {
     if (m_pTreeWidget)
@@ -400 +400 @@
 }
 
-void UIInformationGuestSession::sltGuestSessionUnregistered(CGuestSession guestSession)
+void UIGuestControlWidget::sltGuestSessionUnregistered(CGuestSession guestSession)
 {
     if (!guestSession.isOk())
@@ -424 +424 @@
 }
 
-#include "UIInformationGuestSession.moc"
+#include "UIGuestControlWidget.moc"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlWidget.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIInformationGuestSession class declaration.
+ * VBox Qt GUI - UIGuestControlWidget class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef ___UIInformationGuestSession_h___
-#define ___UIInformationGuestSession_h___
+#ifndef ___UIGuestControlWidget_h___
+#define ___UIGuestControlWidget_h___
 
 /* Qt includes: */
@@ -41 +41 @@
 /** QWidget extension
   * providing GUI with guest session information and control tab in session-information window. */
-class UIInformationGuestSession : public QWidget
+class UIGuestControlWidget : public QWidget
 {
     Q_OBJECT;
@@ -47 +47 @@
 public:
 
-    UIInformationGuestSession(QWidget *pParent, const CGuest &comGuest);
+    UIGuestControlWidget(QWidget *pParent, const CGuest &comGuest);
 
 private slots:
@@ -85 +85 @@
 };
 
-#endif /* !___UIInformationGuestSession_h___ */
+#endif /* !___UIGuestControlWidget_h___ */