projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
update.cc
diff --git
a/src/lib/update.cc
b/src/lib/update.cc
index 019db8e761ea619c26848ec822c16b517f363ea1..c7527ee493624247468b365cde6b2363acb5496f 100644
(file)
--- a/
src/lib/update.cc
+++ b/
src/lib/update.cc
@@
-22,6
+22,7
@@
#include <boost/algorithm/string.hpp>
#include <curl/curl.h>
#include <libcxml/cxml.h>
#include <boost/algorithm/string.hpp>
#include <curl/curl.h>
#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
#include "update.h"
#include "version.h"
#include "ui_signaller.h"
#include "update.h"
#include "version.h"
#include "ui_signaller.h"
@@
-32,7
+33,7
@@
using std::cout;
using std::min;
using std::string;
using std::stringstream;
using std::min;
using std::string;
using std::stringstream;
-using
boost::lexical_cas
t;
+using
dcp::raw_conver
t;
/** Singleton instance */
UpdateChecker* UpdateChecker::_instance = 0;
/** Singleton instance */
UpdateChecker* UpdateChecker::_instance = 0;
@@
-130,12
+131,12
@@
UpdateChecker::thread ()
current_pre = true;
}
current_pre = true;
}
- float current_float =
lexical_cas
t<float> (current);
+ float current_float =
raw_conver
t<float> (current);
if (current_pre) {
current_float -= 0.005;
}
if (current_pre) {
current_float -= 0.005;
}
- if (current_float <
lexical_cas
t<float> (_stable)) {
+ if (current_float <
raw_conver
t<float> (_stable)) {
set_state (YES);
} else {
set_state (NO);
set_state (YES);
} else {
set_state (NO);