Changeset 13836 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 5, 2008 2:42:54 AM (16 years ago)

Author:

vboxsync

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

38827

Message:

s/ELEMENTS/RT_ELEMENTS/g - retiring ELEMENTS (finally).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/VBoxGlobal.cpp (modified) (7 diffs)
• ui/VBoxHardDiskSettings.ui.h (modified) (5 diffs)

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

@@ -1704 +1704 @@
 {
     QStringList list;
-    for (size_t i = 0; i < ELEMENTS (comKnownPorts); ++ i)
+    for (size_t i = 0; i < RT_ELEMENTS (comKnownPorts); ++ i)
         list << comKnownPorts [i].name;
 
@@ -1716 +1716 @@
 {
     QStringList list;
-    for (size_t i = 0; i < ELEMENTS (lptKnownPorts); ++ i)
+    for (size_t i = 0; i < RT_ELEMENTS (lptKnownPorts); ++ i)
         list << lptKnownPorts [i].name;
 
@@ -1729 +1729 @@
 QString VBoxGlobal::toCOMPortName (ulong aIRQ, ulong aIOBase) const
 {
-    for (size_t i = 0; i < ELEMENTS (comKnownPorts); ++ i)
+    for (size_t i = 0; i < RT_ELEMENTS (comKnownPorts); ++ i)
         if (comKnownPorts [i].IRQ == aIRQ &&
             comKnownPorts [i].IOBase == aIOBase)
@@ -1744 +1744 @@
 QString VBoxGlobal::toLPTPortName (ulong aIRQ, ulong aIOBase) const
 {
-    for (size_t i = 0; i < ELEMENTS (lptKnownPorts); ++ i)
+    for (size_t i = 0; i < RT_ELEMENTS (lptKnownPorts); ++ i)
         if (lptKnownPorts [i].IRQ == aIRQ &&
             lptKnownPorts [i].IOBase == aIOBase)
@@ -1760 +1760 @@
                                    ulong &aIOBase) const
 {
-    for (size_t i = 0; i < ELEMENTS (comKnownPorts); ++ i)
+    for (size_t i = 0; i < RT_ELEMENTS (comKnownPorts); ++ i)
         if (strcmp (comKnownPorts [i].name, aName.utf8().data()) == 0)
         {
@@ -1779 +1779 @@
                                    ulong &aIOBase) const
 {
-    for (size_t i = 0; i < ELEMENTS (lptKnownPorts); ++ i)
+    for (size_t i = 0; i < RT_ELEMENTS (lptKnownPorts); ++ i)
         if (strcmp (lptKnownPorts [i].name, aName.utf8().data()) == 0)
         {
@@ -4455 +4455 @@
         { "kfmclient:exec", "gnome-open", "x-www-browser", "firefox", "konqueror" };
 
-    for (size_t i = 0; i < ELEMENTS (commands); ++ i)
+    for (size_t i = 0; i < RT_ELEMENTS (commands); ++ i)
     {
         QStringList args = QStringList::split (':', commands [i]);

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

@@ -382 +382 @@
     QString text (int aColumn) const
     {
-        AssertReturn (aColumn >= 0 && (size_t) aColumn < ELEMENTS (mCombos),
+        AssertReturn (aColumn >= 0 && (size_t) aColumn < RT_ELEMENTS (mCombos),
                       QString::null);
 
@@ -390 +390 @@
     const QPixmap *pixmap (int aColumn) const
     {
-        AssertReturn (aColumn >= 0 && (size_t) aColumn < ELEMENTS (mCombos),
+        AssertReturn (aColumn >= 0 && (size_t) aColumn < RT_ELEMENTS (mCombos),
                       NULL);
 
@@ -412 +412 @@
         if (mFocusColumn >= 0)
         {
-            AssertReturnVoid ((size_t) mFocusColumn < ELEMENTS (mCombos));
+            AssertReturnVoid ((size_t) mFocusColumn < RT_ELEMENTS (mCombos));
 
             if (mCombos [mFocusColumn]->count())
@@ -469 +469 @@
                const QUuid &aMachineId)
     {
-        AssertReturnVoid (listView()->columns() == ELEMENTS (mCombos));
+        AssertReturnVoid (listView()->columns() == RT_ELEMENTS (mCombos));
 
         setSelectable (false);
@@ -502 +502 @@
                     int aColumn, int aWidth, int aAlign)
     {
-        AssertReturnVoid (aColumn >= 0 && (size_t) aColumn < ELEMENTS (mCombos));
+        AssertReturnVoid (aColumn >= 0 && (size_t) aColumn < RT_ELEMENTS (mCombos));
 
         QComboBox *cb = mCombos [aColumn];