X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvRegisterForm.cxx;h=2d6057e9e9bed82217ec327ad3a70607589234c0;hb=e55d86a6f36d877a88649cc0494be51aa6eba5e0;hp=c25b253c22154a1a6c1311cf38bdfc269069c392;hpb=224ba7dda02a766906622bf3d78aab64e18f4fac;p=clitk.git diff --git a/vv/vvRegisterForm.cxx b/vv/vvRegisterForm.cxx index c25b253..2d6057e 100644 --- a/vv/vvRegisterForm.cxx +++ b/vv/vvRegisterForm.cxx @@ -20,6 +20,9 @@ #include "vvRegisterForm.h" #include #include +#if QT_VERSION >= 0x050000 +#include +#endif #include #include "clitkConfiguration.h" #include "vvConfiguration.h" @@ -33,16 +36,32 @@ vvRegisterForm::vvRegisterForm(QUrl url, QString path, QSettings::Format format) void vvRegisterForm::sendData(){ QUrl url2(url); + +#if QT_VERSION < 0x050000 url2.addQueryItem("name", firstName->text().toUtf8()); url2.addQueryItem("lastName", lastName->text().toUtf8()); url2.addQueryItem("email", email->text().toUtf8()); url2.addQueryItem("group", group->text().toUtf8()); - url2.addQueryItem("os", osName->text().toUtf8()); + url2.addQueryItem("os", OS_NAME); url2.addQueryItem("vvVersion", VV_VERSION); url2.addQueryItem("architecture", ARCHITECTURE); url2.addQueryItem("adressing", QString::number(sizeof(char*)*8)+"-bit"); url2.addQueryItem("compilationDate", QString(__DATE__) + ", " + QString(__TIME__) ); - +#else + QUrlQuery url2Query; + + url2Query.addQueryItem("name", firstName->text().toUtf8()); + url2Query.addQueryItem("lastName", lastName->text().toUtf8()); + url2Query.addQueryItem("email", email->text().toUtf8()); + url2Query.addQueryItem("group", group->text().toUtf8()); + url2Query.addQueryItem("os", OS_NAME); + url2Query.addQueryItem("vvVersion", VV_VERSION); + url2Query.addQueryItem("architecture", ARCHITECTURE); + url2Query.addQueryItem("adressing", QString::number(sizeof(char*)*8)+"-bit"); + url2Query.addQueryItem("compilationDate", QString(__DATE__) + ", " + QString(__TIME__) ); + url2.setQuery(url2Query); +#endif + manager->get(QNetworkRequest(url2)); } void vvRegisterForm::accept(){ @@ -66,7 +85,8 @@ void vvRegisterForm::show(){ lastName->setText(settings.value("lastName").toString()); email->setText(settings.value("email").toString()); group->setText(settings.value("group").toString()); - - osName->setText(QString::fromStdString(OS_NAME)); + osName->setText(QString::fromStdString(OS_NAME) + ", " + + ARCHITECTURE + ", " + + QString::number(sizeof(char*)*8)+"-bit"); QDialog::show(); }