Changeset 9620 for trunk/gsdl/src/recpt/formattools.cpp

Timestamp:

2005-04-11T11:32:00+12:00 (19 years ago)

Author:

kjdon

Message:

added some x++ -> ++x changes submitted by Emanuel Dejanu

File:

• trunk/gsdl/src/recpt/formattools.cpp (modified) (24 diffs)

trunk/gsdl/src/recpt/formattools.cpp

@@ -110 +110 @@
       } else return false;
     }
-    here ++;
+    ++here;
   }
   return false;
@@ -373 +373 @@
   text_t::const_iterator end = link.end();
   
-  here ++;
+  ++here;
   while (here != end) {
     if (*here == '"') break;
     href.push_back(*here);
-    here ++;
+    ++here;
   }
 
@@ -436 +436 @@
     text_tarray::const_iterator doc_data = relationdata.begin();
     text_t document_collection = *doc_data;
-    doc_data++; //increment to get next item in array (oid)
+    ++doc_data; //increment to get next item in array (oid)
     text_t document_OID = *doc_data;
     
@@ -461 +461 @@
     relation += "  (" + document_collection + ")<br>";
     
-    currDoc++;
+    ++currDoc;
       }
     }
@@ -495 +495 @@
     else if (inquotes) op.push_back (*here);
     else com.push_back (*here);
-    here ++;
+    ++here;
   }
 
@@ -530 +530 @@
     else if (inquotes) op.push_back (*here);
     else com.push_back (*here);
-    here ++;
+    ++here;
   }
 
@@ -565 +565 @@
     else if (inquotes) op.push_back (*here);
     else com.push_back (*here);
-    here ++;
+    ++here;
   }
 
@@ -694 +694 @@
 
     if (*here == '\\') {
-      here ++;
+      ++here;
       if (here != end) text.push_back (*here);
 
@@ -722 +722 @@
       }
       text_t meta;
-      here ++;
+      ++here;
       while (*here != ']') {
     if (here == end) return false;
     meta.push_back (*here);
-    here ++;
+    ++here;
       }
       parse_meta (meta, formatlistptr, metadata, getParents);
@@ -735 +735 @@
       text.push_back (*here);
 
-    if (here != end) here ++;
+    if (here != end) ++here;
   }
   if (!text.empty()) {
@@ -757 +757 @@
   here = findchar (it, end, '{');
   if (here == end) return false;
-  else here ++;
+  else ++here;
 
   if (com == "If" || com == "if" || com == "IF") formatlistptr->command = comIf;
@@ -838 +838 @@
         text_t meta = substr (beginbracket+1, endbracket);
         parse_meta (meta, formatlistptr->decision.meta, metadata, getParents);
-        commacount ++;
+        ++commacount;
         text.clear();
       } 
@@ -855 +855 @@
         formatlistptr->decision.command = dText;
         formatlistptr->decision.text = text;
-        commacount ++;
+        ++commacount;
         text.clear();
       }
@@ -916 +916 @@
         { 
           if (*here == '}') break;
-          commacount ++; 
+          ++commacount; 
         }
     }
@@ -923 +923 @@
     } else text.push_back(*here);
     
-    if (here != end) here ++;
+    if (here != end) ++here;
   }
 
@@ -950 +950 @@
   const int end_i = metainfo.values.size()-1;
     
-  for (int i=start_i; i<=end_i; i++) {
+  for (int i=start_i; i<=end_i; ++i) {
     if (!first) tmp += meta.functionoptions;
       
@@ -1012 +1012 @@
     else tmp += *here;
     first = false;
-    here ++;
+    ++here;
       }
       if (meta.metacommand & mCgiSafe) return cgi_safe (tmp);
@@ -1146 +1146 @@
       break;
     }
-    pos++;
+    ++pos;
   }
 
@@ -1159 +1159 @@
       break;
     }
-    pos--;
+    --pos;
   }
 
@@ -1172 +1172 @@
       break;
     }
-    pos--;
+    --pos;
   }
 
@@ -1188 +1188 @@
       break;
     }
-    pos--;
+    --pos;
   }
 
@@ -1200 +1200 @@
   extracted_str.clear();
 
-  for (int pos=start_pos; pos<=end_pos; pos++) {
+  for (int pos=start_pos; pos<=end_pos; ++pos) {
     extracted_str.push_back(outstring[pos]);
   }
@@ -1277 +1277 @@
 
   if ((potential_quote == '\'') || (potential_quote == '\"')) {
-    rhs_end--;
+    --rhs_end;
     rhs_start = rscan_for(outstring,rhs_end-1,potential_quote) +1;
     quoted = true;
@@ -1431 +1431 @@
   while (here != end) {
     if (*here == '[') return true;
-    here ++;
+    ++here;
   }