Changeset 9496 in vbox for trunk/src

Timestamp:

Jun 6, 2008 6:01:47 PM (17 years ago)

Author:

vboxsync

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

31762

Message:

Fe/Qt4: Little fix related to VBoxMediaComboBox porting.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxMediaComboBox.h

r9480	r9496
45	45	void setUseEmptyItem (bool);
46	46	void setBelongsTo (const QUuid &);
47		QUuid getId (int aId = -1);
	47	QUuid getId (int aId = -1) const;
48	48	QUuid getBelongsTo();
49	49	void setCurrentItem (const QUuid &);

-              r9480
+              r9496
+}
 QUuid VBoxMediaComboBox::getId (int aId)
+QUuid VBoxMediaComboBox::getId (int aId) const
+{
     return mUuidList.isEmpty() ? QUuid() :
 …
     int currentInd = currentIndex();
     int insertPosition = -1;
+    int insertPosition = count();
     for (int i = 0; i < count(); ++ i)
         /* Searching for the first real (non-null) vdi item
 …
+        }
     insertPosition == -1 ? mUuidList.append (aId) :
+    insertPosition == count() ? mUuidList.append (aId) :
         mUuidList.insert (insertPosition, aId);
     insertPosition == -1 ? mTipList.append (aTip) :
+    insertPosition == count() ? mTipList.append (aTip) :
         mTipList.insert (insertPosition, aTip);
 …
               insertItem (insertPosition, aName);
     if (insertPosition != -1 && currentInd >= insertPosition)
+    if (insertPosition != count() && currentInd >= insertPosition)
         QComboBox::setCurrentIndex (currentInd + 1);
+}

Note: See TracChangeset for help on using the changeset viewer.