Changeset 467 for cpp/frams/genetics/genman.cpp

Timestamp:

02/07/16 23:21:55 (8 years ago)

Author:

Maciej Komosinski

Message:

GenMan? interface uses STL std::string instead of SString

File:

• cpp/frams/genetics/genman.cpp (modified) (3 diffs)

cpp/frams/genetics/genman.cpp

@@ -395 +395 @@
 }
 
-SString GenMan::HTMLize(const char *g) { return HTMLize(g, false); }
-
-SString GenMan::HTMLizeShort(const char *g) { return HTMLize(g, true); }
-
-SString GenMan::HTMLize(const char *g, bool shorten)
+string GenMan::HTMLize(const char *g) { return HTMLize(g, false); }
+
+string GenMan::HTMLizeShort(const char *g) { return HTMLize(g, true); }
+
+string GenMan::HTMLize(const char *g, bool shorten)
 {
         char buf[50];
@@ -407 +407 @@
         uint32_t *styletab = new uint32_t[len];
         GetFullStyle(g, styletab);
-        SString html = "\n<div style=\"background:white;padding:0.2em;font-family:arial,helvetica,sans-serif;font-size:90%\">";
+        string html = "\n<div style=\"background:white;padding:0.2em;font-family:arial,helvetica,sans-serif;font-size:90%\">";
         uint32_t prevstyle, prevcolor, style = 0, color = 0;
         for (int i = 0; i<len; i++)
@@ -448 +448 @@
 void GenMan::p_htmlize(ExtValue *args, ExtValue *ret)
 {
-        ret->setString(HTMLize(args->getString().c_str()));
+        ret->setString(HTMLize(args->getString().c_str()).c_str());
 }
 
 void GenMan::p_htmlizeshort(ExtValue *args, ExtValue *ret)
 {
-        ret->setString(HTMLizeShort(args->getString().c_str()));
+        ret->setString(HTMLizeShort(args->getString().c_str()).c_str());
 }