Rename SBuf::find_first_of and find_first_not_of to camelCase.

diff --git a/src/SBuf.cc b/src/SBuf.cc
index fe50f266f166cf83927988749d4a0e09a2f2e7ea..9d2eecd72d11898f7a7f41c4bd68c041e29e2079 100644 (file)
--- a/src/SBuf.cc
+++ b/src/SBuf.cc
@@ -689,7 +689,7 @@ SBuf::rfind(char c, SBuf::size_type endPos) const
 }
 
 SBuf::size_type
-SBuf::find_first_of(const CharacterSet &set, size_type startPos) const
+SBuf::findFirstOf(const CharacterSet &set, size_type startPos) const
 {
     ++stats.find;
 
@@ -712,7 +712,7 @@ SBuf::find_first_of(const CharacterSet &set, size_type startPos) const
 }
 
 SBuf::size_type
-SBuf::find_first_not_of(const CharacterSet &set, size_type startPos) const
+SBuf::findFirstNotOf(const CharacterSet &set, size_type startPos) const
 {
     ++stats.find;
 

diff --git a/src/SBuf.h b/src/SBuf.h
index b47f68da79352a2394e21ab6fa7e85ac15c35311..67b6e665b04dbceda590888abb5787997a20b03d 100644 (file)
--- a/src/SBuf.h
+++ b/src/SBuf.h
@@ -517,7 +517,7 @@ public:
      *
      * TODO: rename to camelCase
      */
-    size_type find_first_of(const CharacterSet &set, size_type startPos = 0) const;
+    size_type findFirstOf(const CharacterSet &set, size_type startPos = 0) const;
 
     /** Find first occurrence character NOT in character set
      *
@@ -527,7 +527,7 @@ public:
      *
      * TODO: rename to camelCase
      */
-    size_type find_first_not_of(const CharacterSet &set, size_type startPos = 0) const;
+    size_type findFirstNotOf(const CharacterSet &set, size_type startPos = 0) const;
 
     /** sscanf-alike
      *

diff --git a/src/tests/SBufFindTest.cc b/src/tests/SBufFindTest.cc
index e133fa6d6b2f2600bce2cb190b3f5256e04d0790..a0f277e6cb95c59b9cfefd81614eba6bced6fdbf 100644 (file)
--- a/src/tests/SBufFindTest.cc
+++ b/src/tests/SBufFindTest.cc
@@ -100,13 +100,13 @@ SBufFindTest::testFind()
     checkResults("find");
 }
 
-/// tests SBuf::find_first_of(string needle, pos)
+/// tests SBuf::findFirstOf(string needle, pos)
 void
 SBufFindTest::testFindFirstOf()
 {
     theFindString = theStringHay.find_first_of(theStringNeedle, thePos);
     theBareNeedlePos = theStringHay.find_first_of(theStringNeedle);
-    theFindSBuf = theSBufHay.find_first_of(CharacterSet("cs",theSBufNeedle.c_str()), thePos);
+    theFindSBuf = theSBufHay.findFirstOf(CharacterSet("cs",theSBufNeedle.c_str()), thePos);
     checkResults("find_first_of");
 }
 

diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc
index 6aecb73449602ab9da6f302785472891b08d24ef..7cf1f05d1c2a38b85bea013fd785d74302ba7221 100644 (file)
--- a/src/tests/testSBuf.cc
+++ b/src/tests/testSBuf.cc
@@ -760,19 +760,19 @@ testSBuf::testFindFirstOf()
     SBuf::size_type idx;
 
     // not found
-    idx=haystack.find_first_of(CharacterSet("t1","ADHRWYP"));
+    idx=haystack.findFirstOf(CharacterSet("t1","ADHRWYP"));
     CPPUNIT_ASSERT_EQUAL(SBuf::npos,idx);
 
     // found at beginning
-    idx=haystack.find_first_of(CharacterSet("t2","THANDF"));
+    idx=haystack.findFirstOf(CharacterSet("t2","THANDF"));
     CPPUNIT_ASSERT_EQUAL(0U,idx);
 
     //found at end of haystack
-    idx=haystack.find_first_of(CharacterSet("t3","QWERYVg"));
+    idx=haystack.findFirstOf(CharacterSet("t3","QWERYVg"));
     CPPUNIT_ASSERT_EQUAL(haystack.length()-1,idx);
 
     //found in the middle of haystack
-    idx=haystack.find_first_of(CharacterSet("t4","QWERqYV"));
+    idx=haystack.findFirstOf(CharacterSet("t4","QWERqYV"));
     CPPUNIT_ASSERT_EQUAL(4U,idx);
 }
 
@@ -783,19 +783,19 @@ testSBuf::testFindFirstNotOf()
     SBuf::size_type idx;
 
     // all chars from the set
-    idx=haystack.find_first_not_of(CharacterSet("t1",literal.c_str()));
+    idx=haystack.findFirstNotOf(CharacterSet("t1",literal.c_str()));
     CPPUNIT_ASSERT_EQUAL(SBuf::npos,idx);
 
     // found at beginning
-    idx=haystack.find_first_not_of(CharacterSet("t2","a"));
+    idx=haystack.findFirstNotOf(CharacterSet("t2","a"));
     CPPUNIT_ASSERT_EQUAL(0U,idx);
 
     //found at end of haystack
-    idx=haystack.find_first_not_of(CharacterSet("t3",literal.substr(0,literal.length()-1).c_str()));
+    idx=haystack.findFirstNotOf(CharacterSet("t3",literal.substr(0,literal.length()-1).c_str()));
     CPPUNIT_ASSERT_EQUAL(haystack.length()-1,idx);
 
     //found in the middle of haystack
-    idx=haystack.find_first_not_of(CharacterSet("t4","The"));
+    idx=haystack.findFirstNotOf(CharacterSet("t4","The"));
     CPPUNIT_ASSERT_EQUAL(3U,idx);
 }