Compare commits
No commits in common. "a8fa4c2613ddbed5201c4a86daa133c7171ce767" and "4a3d313deb79220fcf0d3fe6ed04a2cb27b5063d" have entirely different histories.
a8fa4c2613
...
4a3d313deb
@ -22,7 +22,7 @@ typedef Configuration parking_tariff_t;
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
struct CALCULATE_LIBRARY_API price_t {
|
||||
struct price_t {
|
||||
uint32_t units;
|
||||
double netto;
|
||||
double brutto;
|
||||
|
@ -9,7 +9,7 @@ INCLUDEPATH += $$_PRO_FILE_PWD_/include/mobilisis
|
||||
INCLUDEPATH += $$_PRO_FILE_PWD_/include/rapidjson
|
||||
|
||||
win32 {
|
||||
QMAKE_CXXFLAGS += -DCALCULATE_LIBRARY_EXPORTS
|
||||
CONFIG+=-DCALCULATE_LIBRARY_EXPORTS
|
||||
}
|
||||
|
||||
SOURCES += \
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
static Calculator calculator;
|
||||
|
||||
int CALCULATE_LIBRARY_API get_zone_nr() {
|
||||
int get_zone_nr() {
|
||||
QFile zone("/etc/zone_nr");
|
||||
if (zone.exists()) {
|
||||
QFileInfo finfo(zone);
|
||||
@ -23,7 +23,7 @@ int CALCULATE_LIBRARY_API get_zone_nr() {
|
||||
return -1;
|
||||
}
|
||||
|
||||
bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) {
|
||||
bool init_tariff(parking_tariff_t **tariff, char const *config_file) {
|
||||
*tariff = new Configuration();
|
||||
|
||||
int const zone = get_zone_nr();
|
||||
@ -52,12 +52,11 @@ bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *co
|
||||
return false;
|
||||
}
|
||||
|
||||
void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
|
||||
void free_tariff(parking_tariff_t *tariff) {
|
||||
delete tariff;
|
||||
}
|
||||
|
||||
bool CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
|
||||
parking_tariff_t *tariff,
|
||||
bool compute_price_for_parking_ticket(parking_tariff_t *tariff,
|
||||
time_t start_parking_time, // in minutes
|
||||
time_t end_parking_time, // in minutes
|
||||
struct price_t *price) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user