Changeset 76760 in vbox

Timestamp:

Jan 10, 2019 6:07:47 PM (6 years ago)

Author:

vboxsync

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

128078

Message:

Main/Recording: thin out the excessive includes so that it doesn't hide missing includes in totally unrelated code, and adjust that code to do the right thing

Location:

trunk/src/VBox/Main

Files:

• include/EBMLWriter.h (modified) (3 diffs)
• include/Recording.h (modified) (1 diff)
• include/RecordingStream.h (modified) (1 diff)
• include/WebMWriter.h (modified) (3 diffs)
• src-client/KeyboardImpl.cpp (modified) (1 diff)
• src-client/MouseImpl.cpp (modified) (1 diff)
• src-client/PCIRawDevImpl.cpp (modified) (1 diff)
• src-client/UsbCardReader.cpp (modified) (1 diff)
• src-client/UsbWebcamInterface.cpp (modified) (1 diff)
• src-client/WebMWriter.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/EBMLWriter.h

@@ -23 +23 @@
 
 #include <iprt/file.h>
-#include <VBox/com/string.h> /* For Utf8Str. */
+#include <VBox/com/string.h>
 
-using namespace com;
-
-#include <list>
-#include <map>
-#include <queue>
 #include <stack>
 
-#include <math.h> /* For lround.h. */
-
-#include <iprt/asm.h>
-#include <iprt/buildconfig.h>
 #include <iprt/cdefs.h>
-#include <iprt/critsect.h>
-#include <iprt/err.h>
 #include <iprt/file.h>
-#include <iprt/rand.h>
-#include <iprt/string.h>
-
-#include <VBox/log.h>
-#include <VBox/version.h>
 
 /** No flags set. */
@@ -70 +54 @@
     RTFILE                     m_hFile;
     /** The file's name (path). */
-    Utf8Str                    m_strFile;
+    com::Utf8Str               m_strFile;
     /** Flags. */
     uint32_t                   m_fFlags;
@@ -91 +75 @@
 
     /** Returns the file name. */
-    const Utf8Str& getFileName(void) { return m_strFile; }
+    const com::Utf8Str& getFileName(void) { return m_strFile; }
 
     /** Returns file size. */

trunk/src/VBox/Main/include/Recording.h

@@ -25 +25 @@
 #include <VBox/com/string.h>
 #include <VBox/com/VirtualBox.h>
-#include <VBox/err.h>
 #include <VBox/settings.h>
 

trunk/src/VBox/Main/include/RecordingStream.h

@@ -27 +27 @@
 #include <iprt/critsect.h>
 
-#include <VBox/com/array.h>
-#include <VBox/com/VirtualBox.h>
-#include <VBox/err.h>
 #include <VBox/settings.h>
 

trunk/src/VBox/Main/include/WebMWriter.h

@@ -23 +23 @@
 
 #include "EBMLWriter.h"
+
+#include <queue>
+#include <map>
+#include <list>
+
+#include <iprt/rand.h>
 
 #ifdef VBOX_WITH_LIBVPX
@@ -87 +93 @@
 #endif /* VBOX_WITH_LIBOPUS */
 
-using namespace com;
 
 class WebMWriter : public EBMLWriter
@@ -540 +545 @@
     int WriteBlock(uint8_t uTrack, const void *pvData, size_t cbData);
 
-    const Utf8Str& GetFileName(void);
+    const com::Utf8Str& GetFileName(void);
 
     uint64_t GetFileSize(void);

trunk/src/VBox/Main/src-client/KeyboardImpl.cpp

@@ -26 +26 @@
 #include <VBox/com/array.h>
 #include <VBox/vmm/pdmdrv.h>
-
-#include <iprt/asm.h>
+#include <VBox/err.h>
+
 #include <iprt/cpp/utils.h>
+
 
 // defines

trunk/src/VBox/Main/src-client/MouseImpl.cpp

@@ -26 +26 @@
 #include "MousePointerShapeWrap.h"
 
-#include "AutoCaller.h"
-
 #include <VBox/vmm/pdmdrv.h>
 #include <VBox/VMMDev.h>
-
-#include <iprt/asm.h>
+#include <VBox/err.h>
+
 
 class ATL_NO_VTABLE MousePointerShape:

trunk/src/VBox/Main/src-client/PCIRawDevImpl.cpp

@@ -25 +25 @@
 // generated header for events
 #include "VBoxEvents.h"
+
+#include <VBox/err.h>
+
 
 /**

trunk/src/VBox/Main/src-client/UsbCardReader.cpp

@@ -29 +29 @@
 #include <VBox/vmm/pdmdrv.h>
 #include <VBox/vmm/pdmcardreaderinfs.h>
+#include <VBox/err.h>
 
 #include <iprt/req.h>

trunk/src/VBox/Main/src-client/UsbWebcamInterface.cpp

@@ -26 +26 @@
 
 #include <VBox/vmm/pdmwebcaminfs.h>
+#include <VBox/err.h>
 
 

trunk/src/VBox/Main/src-client/WebMWriter.cpp

@@ -25 +25 @@
 #include "LoggingNew.h"
 
-#include <list>
-#include <map>
-#include <queue>
-#include <stack>
-
-#include <math.h> /* For lround.h. */
-
-#include <iprt/asm.h>
-#include <iprt/buildconfig.h>
 #include <iprt/cdefs.h>
 #include <iprt/critsect.h>
 #include <iprt/errcore.h>
 #include <iprt/file.h>
-#include <iprt/rand.h>
-#include <iprt/string.h>
+#include <iprt/buildconfig.h>
 
 #include <VBox/log.h>
@@ -162 +152 @@
     Assert(CurSeg.mapTracks.size() == 0);
 
-    Utf8Str strFileName = getFileName().c_str();
+    com::Utf8Str strFileName = getFileName().c_str();
 
     close();
@@ -308 +298 @@
  * @returns File name as UTF-8 string.
  */
-const Utf8Str& WebMWriter::GetFileName(void)
+const com::Utf8Str& WebMWriter::GetFileName(void)
 {
     return getFileName();