Use range-based for loop where possible

4 files changed, 13 insertions, 16 deletions

diff --git a/src/dls.cpp b/src/dls.cpp
index 06cf8a9..6c5d76b 100644
--- a/src/dls.cpp
+++ b/src/dls.cpp
@@ -317,8 +317,8 @@ DATA_GROUP* DLSEncoder::dls_get(const std::string& text, DABCharset charset, int
 
 #ifdef DEBUG
     fprintf(stderr, "DL segment:");
-    for (size_t i = 0; i < seg_data.size(); i++)
-        fprintf(stderr, " %02x", seg_data[i]);
+    for (const uint8_t& b : seg_data)
+        fprintf(stderr, " %02x", b);
     fprintf(stderr, "\n");
 #endif
     return dg;
diff --git a/src/odr-padenc.cpp b/src/odr-padenc.cpp
index e065755..d44dc67 100644
--- a/src/odr-padenc.cpp
+++ b/src/odr-padenc.cpp
@@ -105,8 +105,8 @@ static void usage(const char* name) {
 
 static std::string list_dls_files(std::vector<std::string> dls_files) {
     std::string result = "";
-    for(std::string dls_file : dls_files) {
-        if(!result.empty())
+    for (const std::string& dls_file : dls_files) {
+        if (!result.empty())
             result += "/";
         result += "'" + dls_file + "'";
     }
diff --git a/src/pad_common.cpp b/src/pad_common.cpp
index 57d2837..0fccb7f 100644
--- a/src/pad_common.cpp
+++ b/src/pad_common.cpp
@@ -112,8 +112,8 @@ bool PADPacketizer::QueueFilled() {
 }
 
 bool PADPacketizer::QueueContainsDG(int apptype_start) {
-    for(std::deque<DATA_GROUP*>::const_iterator it = queue.cbegin(); it != queue.cend(); it++)
-        if((*it)->apptype_start == apptype_start)
+    for (const DATA_GROUP* dg : queue)
+        if (dg->apptype_start == apptype_start)
             return true;
     return false;
 }
@@ -156,7 +156,7 @@ void PADPacketizer::WriteAllPADs(int output_fd, int limit, bool output_sole_fpad
 
         if (verbose >= 2) {
             fprintf(stderr, "ODR-PadEnc writing PAD (%zu bytes):", pad->size());
-            for(size_t j = 0; j < pad->size(); j++) {
+            for (size_t j = 0; j < pad->size(); j++) {
                 const char sep = (j == (pad->size() - 1) || j == (pad->size() - 1 - FPAD_LEN)) ? '|' : ' ';
                 fprintf(stderr, "%c%02X", sep , (*pad)[j]);
             }
diff --git a/src/sls.cpp b/src/sls.cpp
index 4cb7848..f19829f 100644
--- a/src/sls.cpp
+++ b/src/sls.cpp
@@ -36,13 +36,10 @@ const int    History::MAXSLIDEID      =  9999; // Roll-over value for fidx
 
 int History::find(const fingerprint_t& fp) const
 {
-    size_t i;
-    for (i = 0; i < m_database.size(); i++) {
-        if (m_database[i] == fp) {
-            // return the id of fingerprint found
-            return m_database[i].fidx;
-        }
-    }
+    // return the id of fingerprint found
+    for (const fingerprint_t& db_fp : m_database)
+        if (db_fp == fp)
+            return db_fp.fidx;
 
     // return -1 when the database doesn't contain this fingerprint
     return -1;
@@ -124,13 +121,13 @@ bool SlideStore::InitFromDir(const std::string& dir) {
 
     struct dirent** dir_entries;
     int dir_count = scandir(dir.c_str(), &dir_entries, FilterSlides, alphasort);
-    if(dir_count < 0) {
+    if (dir_count < 0) {
         perror(("ODR-PadEnc Error: cannot open slides directory '" + dir + "'").c_str());
         return false;
     }
 
     // add new slides to transmit to list
-    for(int i = 0; i < dir_count; i++) {
+    for (int i = 0; i < dir_count; i++) {
         std::string imagepath = dir + "/" + std::string(dir_entries[i]->d_name);
         free(dir_entries[i]);