--- libgig/trunk/src/gig.cpp	2021/06/17 09:21:11	3933
+++ libgig/trunk/src/gig.cpp	2021/06/17 10:09:42	3935
@@ -6213,7 +6213,8 @@
             "other Group. This is a bug, report it!"
         );
         // now move all samples of this group to the other group
-        for (Sample* pSample = GetFirstSample(); pSample; pSample = GetNextSample()) {
+        Sample* pSample;
+        while ((pSample = GetSample(0))) {
             pOtherGroup->AddSample(pSample);
         }
     }
@@ -6955,10 +6956,10 @@
      * @param index - number of the sought group (0..n)
      * @returns sought group or NULL if there's no such group
      */
-    Group* File::GetGroup(uint index) {
+    Group* File::GetGroup(size_t index) {
         if (!pGroups) LoadGroups();
         GroupsIterator = pGroups->begin();
-        for (uint i = 0; GroupsIterator != pGroups->end(); i++) {
+        for (size_t i = 0; GroupsIterator != pGroups->end(); i++) {
             if (i == index) return *GroupsIterator;
             ++GroupsIterator;
         }
@@ -7007,7 +7008,8 @@
         if (iter == pGroups->end()) throw gig::Exception("Could not delete group, could not find given group");
         if (pGroups->size() == 1) throw gig::Exception("Cannot delete group, there must be at least one default group!");
         // delete all members of this group
-        for (Sample* pSample = pGroup->GetFirstSample(); pSample; pSample = pGroup->GetNextSample()) {
+        Sample* pSample;
+        while ((pSample = pGroup->GetSample(0))) {
             DeleteSample(pSample);
         }
         // now delete this group object