Move to Qt5 and Qt5Multimedia

This commit is contained in:
Bertrand Songis
2016-03-10 07:12:44 +01:00
parent d7a9710a9c
commit aec2170e7e
98 changed files with 355 additions and 438 deletions
+2 -3
View File
@@ -12,7 +12,6 @@
*
*/
#include <QtGui>
#include "wizarddialog.h"
#include "wizarddata.h"
#include "helpers.h"
@@ -296,8 +295,8 @@ bool ModelSelectionPage::validatePage()
QString newName(nameLineEdit->text());
newName = (newName.normalized(QString::NormalizationForm_D));
newName = newName.replace(QRegExp("[^ A-Za-z0-9_.-,\\s]"), "");
strncpy( wizDlg->mix.name, newName.toAscii(), WIZ_MODEL_NAME_LENGTH);
wizDlg->mix.name[WIZ_MODEL_NAME_LENGTH]=0;
strncpy( wizDlg->mix.name, newName.toLatin1(), WIZ_MODEL_NAME_LENGTH);
wizDlg->mix.name[WIZ_MODEL_NAME_LENGTH] = 0;
if (multirotorRB->isChecked())
wizDlg->mix.vehicle = MULTICOPTER;