X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Futil.hpp;h=274839f8b7fd5cbd898bb451f032969a20669120;hb=f9ebf303a853997535eb157f50d1fd28753d76bf;hp=fa67472181990a3dfdf251094cbe057f9ab39b88;hpb=520362f8c4082820193f09e43b27a8c7df2ef011;p=pulseview.git
diff --git a/pv/util.hpp b/pv/util.hpp
index fa67472..274839f 100644
--- a/pv/util.hpp
+++ b/pv/util.hpp
@@ -14,14 +14,15 @@
* 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 .
*/
#ifndef PULSEVIEW_UTIL_HPP
#define PULSEVIEW_UTIL_HPP
#include
+#include
+#include
#ifndef Q_MOC_RUN
#include
@@ -30,6 +31,9 @@
#include
#include
+using std::string;
+using std::vector;
+
namespace pv {
namespace util {
@@ -75,12 +79,9 @@ typedef boost::multiprecision::number<
*
* @return The formatted value.
*/
-QString format_time_si(
- const Timestamp& v,
- 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 interprets the given 'precision'
@@ -97,12 +98,8 @@ QString format_time_si(
*
* @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.
@@ -117,11 +114,11 @@ QString format_time_si_adjusted(
*
* @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 split_string(string text, string separator);
+
} // namespace util
} // namespace pv