X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Futil.hpp;h=274839f8b7fd5cbd898bb451f032969a20669120;hp=5be379035bd875ae4bf3e6636444b89a5903519a;hb=eaa02ef436fb9d8217a94076e1258da47d3cd8e0;hpb=3ccf0f7f5b1b31ac628a983a2becee6f4c4c1507

diff --git a/pv/util.hpp b/pv/util.hpp
index 5be37903..274839f8 100644
--- a/pv/util.hpp
+++ b/pv/util.hpp
@@ -14,20 +14,26 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_UTIL_HPP
 #define PULSEVIEW_UTIL_HPP
 
 #include <cmath>
+#include <string>
+#include <vector>
 
+#ifndef Q_MOC_RUN
 #include <boost/multiprecision/cpp_dec_float.hpp>
+#endif
 
 #include <QMetaType>
 #include <QString>
 
+using std::string;
+using std::vector;
+
 namespace pv {
 namespace util {
 
@@ -71,19 +77,16 @@ typedef boost::multiprecision::number<
  * @param unit The unit of quantity.
  * @param sign Whether or not to add a sign also for positive numbers.
  *
- * @return The formated value.
+ * @return The formatted value.
  */
-QString format_time_si(
-	const Timestamp& t,
-	SIPrefix prefix = SIPrefix::unspecified,
-	unsigned precision = 0,
-	QString unit = "s",
-	bool sign = true);
+QString format_time_si(const Timestamp& v,
+	SIPrefix prefix = SIPrefix::unspecified, unsigned precision = 0,
+	QString unit = "s", bool sign = true);
 
 /**
- * Wrapper around 'format_time_si()' that interpretes the given 'precision'
+ * Wrapper around 'format_time_si()' that interprets the given 'precision'
  * value as the number of decimal places if the timestamp would be formatted
- * without a SI prefix (using 'SIPrefix::none') and adjustes the precision to
+ * without a SI prefix (using 'SIPrefix::none') and adjusts the precision to
  * match the given 'prefix'
  *
  * @param t The value to format.
@@ -93,14 +96,10 @@ QString format_time_si(
  * @param unit The unit of quantity.
  * @param sign Whether or not to add a sign also for positive numbers.
  *
- * @return The formated value.
+ * @return The formatted value.
  */
-QString format_time_si_adjusted(
-	const Timestamp& t,
-	SIPrefix prefix,
-	unsigned precision = 0,
-	QString unit = "s",
-	bool sign = true);
+QString format_time_si_adjusted(const Timestamp& t, SIPrefix prefix,
+	unsigned precision = 0, QString unit = "s", bool sign = true);
 
 /**
  * Formats the given timestamp using "[+-]DD:HH:MM:SS.mmm uuu nnn ppp..." format.
@@ -113,13 +112,13 @@ QString format_time_si_adjusted(
  * @param precision The number of digits after the decimal separator.
  * @param sign Whether or not to add a sign also for positive numbers.
  *
- * @return The formated value.
+ * @return The formatted value.
  */
-QString format_time_minutes(
-	const Timestamp& t,
-	signed precision = 0,
+QString format_time_minutes(const Timestamp& t, signed precision = 0,
 	bool sign = true);
 
+vector<string> split_string(string text, string separator);
+
 } // namespace util
 } // namespace pv