summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorsenator <elsenator@gmail.com>2011-11-23 15:07:01 +0100
committersenator <elsenator@gmail.com>2011-11-23 15:07:01 +0100
commit9989ea2f6bfa19bd349bbbdec8ec3f56c1427245 (patch)
tree91cab6be068ee7f99accb6e97dda5a7bda5879e0 /client
parentc09fb0787c3af4d282ae3fac53c706665a91b0a7 (diff)
parent07244d0376e2e25eaeba913e684bd06122ded893 (diff)
Merge branch 'master' of http://git.aasimon.org/public/pracro
Diffstat (limited to 'client')
-rw-r--r--client/client.pro3
-rw-r--r--client/praxisd.cc6
2 files changed, 3 insertions, 6 deletions
diff --git a/client/client.pro b/client/client.pro
index 831b570..46f4ae3 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -16,8 +16,7 @@ debug {
DEFINES+=USE_DEBUG
}
-include(../VERSION)
-DEFINES+=VERSION=\\\"$$VERSION\\\"
+DEFINES+=VERSION=\\\"2.2.1\\\"
win32 {
QMAKE_LIBDIR += lua/lib
diff --git a/client/praxisd.cc b/client/praxisd.cc
index 001eb90..161b471 100644
--- a/client/praxisd.cc
+++ b/client/praxisd.cc
@@ -104,18 +104,16 @@ static Patient getPatient(QByteArray data)
DOPATIENT(frilinie5);
if(element.tagName() == "sogeords") {
- sogeord_t sogeord;
-
QDomNodeList nodes = element.childNodes();
for(int j = 0; j < nodes.count(); j++) {
+ sogeord_t sogeord;
QDomNode node = nodes.at(j);
QDomElement element = node.toElement();
sogeord.sogenr = element.attribute("sogenr");
sogeord.sogedato = element.attribute("sogedato");
sogeord.sogetxt = element.text();
+ patient.sogeord.push_back(sogeord);
}
-
- patient.sogeord.push_back(sogeord);
}
DOPATIENT(ydernr);