Changeset 568 in vbox for trunk

Timestamp:

Feb 2, 2007 6:02:58 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Attempt to fix build warnings and errors on rhel3 (oldish gcc 3.2.3).

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxDiskImageManagerDlg.ui (modified) (4 diffs)
• VBoxDiskImageManagerDlg.ui.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui

@@ -517 +517 @@
     <include location="local" impldecl="in declaration">VBoxGlobal.h</include>
     <include location="local" impldecl="in declaration">VBoxProblemReporter.h</include>
+    <include location="local" impldecl="in implementation">VBoxDefs.h</include>
     <include location="local" impldecl="in implementation">VBoxNewHDWzd.h</include>
     <include location="local" impldecl="in implementation">VBoxToolBar.h</include>
@@ -597 +598 @@
     <function access="private">done( int )</function>
     <function access="private" returnType="DiskImageItem*">searchItem( QListView*, const QUuid &amp; )</function>
-    <function specifier="non virtual" access="private" returnType="QString">static getDVDImageUsage( const QUuid &amp; id )</function>
-    <function specifier="non virtual" access="private" returnType="QString">static getFloppyImageUsage( const QUuid &amp; id )</function>
+    <function specifier="static" access="private" returnType="QString">getDVDImageUsage( const QUuid &amp; id )</function>
+    <function specifier="static" access="private" returnType="QString">getFloppyImageUsage( const QUuid &amp; id )</function>
     <function access="private" returnType="bool">checkImage( DiskImageItem* item )</function>
     <function access="private">releaseDisk( QUuid machineId, QUuid itemId, VBoxDefs::DiskType diskType )</function>
@@ -608 +609 @@
     <function returnType="bool">eventFilter( QObject *, QEvent * )</function>
     <function access="private">addDroppedImages( QStringList* )</function>
-    <function access="private">addImageToList( QString aSource, VBoxDefs::DiskType aDiskType )</function>
+    <function access="private">addImageToList( const QString &amp; aSource, VBoxDefs::DiskType aDiskType )</function>
     <function access="private" returnType="DiskImageItem*">createImageNode( QListView *aList, DiskImageItem *aRoot )</function>
     <function access="private">updateHdItem( DiskImageItem*, const VBoxMedia &amp; )</function>
@@ -621 +622 @@
     <function access="protected">keyPressEvent( QKeyEvent* )</function>
     <function access="protected">closeEvent( QCloseEvent* )</function>
-    <function access="protected" returnType="QIRichLabel*">createInfoString( QString, QWidget*, int, int )</function>
+    <function access="protected" returnType="QIRichLabel*">createInfoString( const QString &amp;, QWidget*, int, int )</function>
     <function access="protected" returnType="QPushButton*">searchDefaultButton()</function>
     <function access="protected">setCurrentItem( QListView*, QListViewItem* )</function>
-    <function specifier="non virtual">static showModeless( bool aRefresh = true )</function>
-    <function specifier="non virtual" returnType="QString">static composeHdToolTip( CHardDisk &amp;, VBoxMedia::Status = VBoxMedia::Ok )</function>
-    <function specifier="non virtual" returnType="QString">static composeCdToolTip( CDVDImage &amp;, VBoxMedia::Status = VBoxMedia::Ok )</function>
-    <function specifier="non virtual" returnType="QString">static composeFdToolTip( CFloppyImage &amp;, VBoxMedia::Status = VBoxMedia::Ok )</function>
+    <function specifier="static"> showModeless( bool aRefresh = true )</function>
+    <function specifier="static" returnType="QString">composeHdToolTip( CHardDisk &amp;, VBoxMedia::Status = VBoxMedia::Ok )</function>
+    <function specifier="static" returnType="QString">composeCdToolTip( CDVDImage &amp;, VBoxMedia::Status = VBoxMedia::Ok )</function>
+    <function specifier="static" returnType="QString">composeFdToolTip( CFloppyImage &amp;, VBoxMedia::Status = VBoxMedia::Ok )</function>
     <function access="protected">prepareToRefresh( int aTotal = 0 )</function>
 </functions>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui.h

@@ -394 +394 @@
 
 
-QIRichLabel *VBoxDiskImageManagerDlg::createInfoString (QString name, QWidget *root, int row, int column)
+QIRichLabel *VBoxDiskImageManagerDlg::createInfoString (const QString &name, QWidget *root, int row, int column)
 {
     QLabel *nameLabel = new QLabel (name, root, "nameLabel");
@@ -679 +679 @@
 
 
-void VBoxDiskImageManagerDlg::addImageToList (QString aSource,
+void VBoxDiskImageManagerDlg::addImageToList (const QString &aSource,
                                               VBoxDefs::DiskType aDiskType)
 {
@@ -1188 +1188 @@
             subHd.isOk() ? VBoxMedia::Inaccessible :
             VBoxMedia::Error;
-        const VBoxMedia media (CUnknown (subHd), VBoxDefs::HD, status);
+        VBoxMedia media (CUnknown (subHd), VBoxDefs::HD, status);
         createHdItem (0, aRoot, media);
     }