From f4637480501bb82884b719624d8d179b5d3016c2 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 28 Jan 2015 14:42:12 -0800 Subject: [PATCH] Make build with Qt4 Signed-off-by: Dirk Hohndel --- qt-ui/divelogexportdialog.cpp | 7 ++++++- qt-ui/divelogexportdialog.h | 4 ++++ qt-ui/divelogimportdialog.cpp | 30 ++++++++++++++++++++++++++++++ qt-ui/downloadfromdivecomputer.cpp | 12 ++++++++++++ qt-ui/plannerSettings.ui | 4 ++-- 5 files changed, 54 insertions(+), 3 deletions(-) diff --git a/qt-ui/divelogexportdialog.cpp b/qt-ui/divelogexportdialog.cpp index aff0265de616..24ac2942ac36 100644 --- a/qt-ui/divelogexportdialog.cpp +++ b/qt-ui/divelogexportdialog.cpp @@ -1,8 +1,9 @@ #include #include #include +#if QT_VERSION >= 0x050000 #include - +#endif #include "divelogexportdialog.h" #include "diveshareexportdialog.h" #include "ui_divelogexportdialog.h" @@ -311,7 +312,11 @@ void DiveLogExportDialog::on_buttonBox_accepted() settings.endGroup(); // the non XSLT exports are called directly above, the XSLT based ons are called here if (!stylesheet.isEmpty()) +#if QT_VERSION >= 0x050000 future = QtConcurrent::run(export_dives_xslt, filename.toUtf8(), ui->exportSelected->isChecked(), ui->CSVUnits_2->currentIndex(), stylesheet.toUtf8()); +#else + export_dives_xslt(filename.toUtf8(), ui->exportSelected->isChecked(), ui->CSVUnits_2->currentIndex(), stylesheet.toUtf8()); +#endif } } diff --git a/qt-ui/divelogexportdialog.h b/qt-ui/divelogexportdialog.h index 14f8f453980f..524416414a8e 100644 --- a/qt-ui/divelogexportdialog.h +++ b/qt-ui/divelogexportdialog.h @@ -3,7 +3,9 @@ #include #include +#if QT_VERSION >= 0x050000 #include +#endif #include "helpers.h" #include "statistics.h" @@ -28,7 +30,9 @@ slots: void on_exportGroup_buttonClicked(QAbstractButton *); private: +#if QT_VERSION >= 0x050000 QFuture future; +#endif Ui::DiveLogExportDialog *ui; void showExplanation(); void exportHtmlInit(const QString &filename); diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp index c79b9df953eb..25fd75d15d0e 100644 --- a/qt-ui/divelogimportdialog.cpp +++ b/qt-ui/divelogimportdialog.cpp @@ -375,14 +375,22 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy) seabear = true; firstLine = "Sample time;Sample depth;Sample NDL;Sample TTS;Sample stopdepth;Sample temperature;Sample pressure"; blockSignals(true); +#if QT_VERSION >= 0x050000 ui->knownImports->setCurrentText("Seabear CSV"); +#else + ui->knownImports->setCurrentIndex(4); +#endif blockSignals(false); } else if (firstLine.contains("Tauchgangs-Nr.:")) { xp5 = true; //"Abgelaufene Tauchzeit (Std:Min.)\tTiefe\tStickstoff Balkenanzeige\tSauerstoff Balkenanzeige\tAufstiegsgeschwindigkeit\tRestluftzeit\tRestliche Tauchzeit\tDekompressionszeit (Std:Min)\tDekostopp-Tiefe\tTemperatur\tPO2\tPressluftflasche\tLesen des Druckes\tStatus der Verbindung\tTauchstatus"; firstLine = "Sample time\tSample depth\t\t\t\t\t\t\t\tSample temperature\t"; blockSignals(true); +#if QT_VERSION >= 0x050000 ui->knownImports->setCurrentText("XP5"); +#else + ui->knownImports->setCurrentIndex(2); +#endif blockSignals(false); } @@ -390,7 +398,11 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy) if (triggeredBy == KNOWNTYPES && value == 1) { firstLine = "Sample time\tSample depth\t\t\t\t\tSample pO₂\t\t\t\t\t\t\t\t\tSample temperature\t\tSample CNS\tSample stopdepth"; blockSignals(true); +#if QT_VERSION >= 0x050000 ui->CSVSeparator->setCurrentText(tr("Tab")); +#else + ui->CSVSeparator->setCurrentIndex(0); +#endif blockSignals(false); } @@ -409,7 +421,16 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy) separator = ";"; if (ui->CSVSeparator->currentText() != separator) { blockSignals(true); +#if QT_VERSION >= 0x050000 ui->CSVSeparator->setCurrentText(separator); +#else + if (separator == "Tab") + ui->CSVSeparator->setCurrentIndex(0); + else if (separator == ",") + ui->CSVSeparator->setCurrentIndex(1); + else + ui->CSVSeparator->setCurrentIndex(2); +#endif blockSignals(false); currColumns = firstLine.split(separator); } @@ -460,7 +481,16 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy) if (ui->CSVSeparator->currentText() != separator || separator == "Tab") { ui->CSVSeparator->blockSignals(true); +#if QT_VERSION >= 0x050000 ui->CSVSeparator->setCurrentText(separator); +#else + if (separator == "Tab") + ui->CSVSeparator->setCurrentIndex(0); + else if (separator == ",") + ui->CSVSeparator->setCurrentIndex(1); + else + ui->CSVSeparator->setCurrentIndex(2); +#endif ui->CSVSeparator->blockSignals(false); if (separator == "Tab") separator = "\t"; diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp index cd3dd90d0cc2..e5ddab840b03 100644 --- a/qt-ui/downloadfromdivecomputer.cpp +++ b/qt-ui/downloadfromdivecomputer.cpp @@ -600,19 +600,31 @@ QVariant DiveImportedModel::data(const QModelIndex &index, int role) const void DiveImportedModel::changeSelected(QModelIndex clickedIndex) { checkStates[clickedIndex.row()] = !checkStates[clickedIndex.row()]; +#if QT_VERSION >= 0x050000 dataChanged(index(0, clickedIndex.row()), index(0, clickedIndex.row()), QVector() << Qt::CheckStateRole); +#else + dataChanged(index(0, clickedIndex.row()), index(0, clickedIndex.row())); +#endif } void DiveImportedModel::selectAll() { memset(checkStates, true, lastIndex - firstIndex + 1); +#if QT_VERSION >= 0x050000 dataChanged(index(0, 0), index(0, lastIndex - firstIndex), QVector() << Qt::CheckStateRole); +#else + dataChanged(index(0, 0), index(0, lastIndex - firstIndex)); +#endif } void DiveImportedModel::selectNone() { memset(checkStates, false, lastIndex - firstIndex + 1); +#if QT_VERSION >= 0x050000 dataChanged(index(0, 0), index(0, lastIndex - firstIndex), QVector() << Qt::CheckStateRole); +#else + dataChanged(index(0, 0), index(0, lastIndex - firstIndex )); +#endif } Qt::ItemFlags DiveImportedModel::flags(const QModelIndex &index) const diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui index af03fd1fbfb9..aaf99750e26f 100644 --- a/qt-ui/plannerSettings.ui +++ b/qt-ui/plannerSettings.ui @@ -338,8 +338,8 @@ - - + + 0 6 -- 1.8.0.rc0.18.gf84667d