From ccf4574259fc54f4d1d4a385e4e8f7a5c9f309f7 Mon Sep 17 00:00:00 2001 From: Damian Laptop Date: Mon, 8 Aug 2022 20:40:42 +0200 Subject: [PATCH] Update do Qt.6.0 --- BrdcEphemeris.cpp | 9 +- IonoFreeCorrection.pro.user | 566 +++--------------------------------- MixedNavigationFile.cpp | 9 +- RinexNavigacyjny.cpp | 2 +- RinexOVer3.cpp | 25 +- main.cpp | 2 +- mainwindow.cpp | 8 +- 7 files changed, 63 insertions(+), 558 deletions(-) diff --git a/BrdcEphemeris.cpp b/BrdcEphemeris.cpp index 6fd6321..b8ea542 100644 --- a/BrdcEphemeris.cpp +++ b/BrdcEphemeris.cpp @@ -1,5 +1,6 @@ #include "BrdcEphemeris.h" #include "RinexNavigacyjny.h" + /* * Pusty konstruktor */ @@ -129,7 +130,7 @@ void BrdcEphemeris::UzupelnijStrukture(){ if (IONa > 0) { linia_txt.replace("D","e"); //zamiana "D" na "e" - lista = linia_txt.split(" ",QString::SkipEmptyParts); //split po spacjach + lista = linia_txt.split(" ",Qt::SkipEmptyParts); //split po spacjach brdcIonoPharam[0] = lista[0].toDouble(); brdcIonoPharam[1] = lista[1].toDouble(); brdcIonoPharam[2] = lista[2].toDouble(); @@ -138,7 +139,7 @@ void BrdcEphemeris::UzupelnijStrukture(){ if (IONb > 0) { linia_txt.replace("D","e"); //zamiana "D" na "e" - lista = linia_txt.split(" ",QString::SkipEmptyParts); //split po spacjach + lista = linia_txt.split(" ",Qt::SkipEmptyParts); //split po spacjach brdcIonoPharam[4] = lista[0].toDouble(); brdcIonoPharam[5] = lista[1].toDouble(); brdcIonoPharam[6] = lista[2].toDouble(); @@ -150,7 +151,7 @@ void BrdcEphemeris::UzupelnijStrukture(){ linia_txt.replace("-", " -"); //naprawa złączonych elementów linia_txt.replace("D ","D"); //usuniecie spacji z "D -" linia_txt.replace("D","e"); //zamiana "D" na "e" - lista = linia_txt.split(" ",QString::SkipEmptyParts); //split po spacjach + lista = linia_txt.split(" ",Qt::SkipEmptyParts); //split po spacjach if(lista.count() >= 5){ int CurrentHour = lista[4].toInt(); if (CurrentHour %2 != 0 && CurrentHour != 0 ){CurrentHour++;} @@ -289,7 +290,7 @@ void BrdcEphemeris::PoprawStruktureSatelity(FileDatas *dane, QString SV){ linia_txt.replace("-", " -"); //naprawa złączonych elementów linia_txt.replace("D ","D"); //usuniecie spacji z "D -" linia_txt.replace("D","e"); //zamiana "D" na "e" - lista = linia_txt.split(" ",QString::SkipEmptyParts); //split po spacjach + lista = linia_txt.split(" ",Qt::SkipEmptyParts); //split po spacjach if(lista.count() >= 5){ int CurrentHour = lista[4].toInt(); if (CurrentHour %2 != 0 && CurrentHour != 0 ){CurrentHour++;} diff --git a/IonoFreeCorrection.pro.user b/IonoFreeCorrection.pro.user index c9aa24f..35dcd6f 100644 --- a/IonoFreeCorrection.pro.user +++ b/IonoFreeCorrection.pro.user @@ -1,14 +1,14 @@ - + EnvironmentId - {76310c8a-3688-46cb-af8c-a741f290981a} + {7928cc45-f985-4127-b498-efa68581a2e1} ProjectExplorer.Project.ActiveTarget - 0 + 0 ProjectExplorer.Project.EditorSettings @@ -28,7 +28,7 @@ QmlJSGlobal - 2 + 2 UTF-8 false 4 @@ -73,8 +73,8 @@ -fno-delayed-template-parsing - false - {dce8fe13-945b-4a2c-9f1a-aa177fea3de5} + true + Builtin.BuildSystem true true @@ -85,465 +85,22 @@ true - - true - ProjectExplorer.Project.Target.0 Desktop - Desktop Qt 5.13.0 MinGW 64-bit - Desktop Qt 5.13.0 MinGW 64-bit - qt.qt5.5130.win64_mingw73_kit - 0 - 0 - 0 - - 0 - E:\WAT\MAGISTERKA\PROGRAM\build-IonoFreeCorrection-Desktop_Qt_5_13_0_MinGW_64_bit-Debug - E:/WAT/MAGISTERKA/PROGRAM/build-IonoFreeCorrection-Desktop_Qt_5_13_0_MinGW_64_bit-Debug - - - true - Qt4ProjectManager.MakeStep - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 3 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 0 - - - E:\WAT\MAGISTERKA\PROGRAM\build-IonoFreeCorrection-Desktop_Qt_5_13_0_MinGW_64_bit-Release - E:/WAT/MAGISTERKA/PROGRAM/build-IonoFreeCorrection-Desktop_Qt_5_13_0_MinGW_64_bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - - E:\WAT\MAGISTERKA\PROGRAM\build-IonoFreeCorrection-Desktop_Qt_5_13_0_MinGW_64_bit-Profile - E:/WAT/MAGISTERKA/PROGRAM/build-IonoFreeCorrection-Desktop_Qt_5_13_0_MinGW_64_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Profilowanie - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - - 25 - - 1 - true - false - true - - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:E:/WAT/MAGISTERKA/PROGRAM/IonoFreeCorrection/IonoFreeCorrection.pro - E:/WAT/MAGISTERKA/PROGRAM/IonoFreeCorrection/IonoFreeCorrection.pro - false - true - true - false - true - E:/WAT/MAGISTERKA/PROGRAM/build-IonoFreeCorrection-Desktop_Qt_5_13_0_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop - Desktop Qt 6.2.0 MSVC2019 64bit - Desktop Qt 6.2.0 MSVC2019 64bit - qt.qt6.620.win64_msvc2019_64_kit - 0 - 0 - 0 - - 0 - E:\WAT\MAGISTERKA\PROGRAM\build-IonoFreeCorrection-Desktop_Qt_6_2_0_MSVC2019_64bit-Debug - E:/WAT/MAGISTERKA/PROGRAM/build-IonoFreeCorrection-Desktop_Qt_6_2_0_MSVC2019_64bit-Debug - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - E:\WAT\MAGISTERKA\PROGRAM\build-IonoFreeCorrection-Desktop_Qt_6_2_0_MSVC2019_64bit-Release - E:/WAT/MAGISTERKA/PROGRAM/build-IonoFreeCorrection-Desktop_Qt_6_2_0_MSVC2019_64bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - - - 0 - E:\WAT\MAGISTERKA\PROGRAM\build-IonoFreeCorrection-Desktop_Qt_6_2_0_MSVC2019_64bit-Profile - E:/WAT/MAGISTERKA/PROGRAM/build-IonoFreeCorrection-Desktop_Qt_6_2_0_MSVC2019_64bit-Profile - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - - 25 - - 1 - true - false - true - - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:E:/WAT/MAGISTERKA/PROGRAM/IonoFreeCorrection/IonoFreeCorrection.pro - E:/WAT/MAGISTERKA/PROGRAM/IonoFreeCorrection/IonoFreeCorrection.pro - false - true - true - false - true - - 1 - - - - ProjectExplorer.Project.Target.2 - - Desktop - Desktop Qt 5.13.0 MSVC2017 64bit - Desktop Qt 5.13.0 MSVC2017 64bit - qt.qt5.5130.win64_msvc2017_64_kit - 0 - 0 - 0 + Desktop Qt 6.2.4 MinGW 64-bit + Desktop Qt 6.2.4 MinGW 64-bit + qt.qt6.624.win64_mingw_kit + 0 + 0 + 0 0 - E:\WAT\MAGISTERKA\PROGRAM\build-IonoFreeCorrection-Desktop_Qt_5_13_0_MSVC2017_64bit-Debug - E:/WAT/MAGISTERKA/PROGRAM/build-IonoFreeCorrection-Desktop_Qt_5_13_0_MSVC2017_64bit-Debug + E:\PROGRAM MAGISTERKA\build-IonoFreeCorrection-Desktop_Qt_6_2_4_MinGW_64_bit-Debug + E:/PROGRAM MAGISTERKA/build-IonoFreeCorrection-Desktop_Qt_6_2_4_MinGW_64_bit-Debug true @@ -555,7 +112,7 @@ true Qt4ProjectManager.MakeStep - 2 + 2 Build Build ProjectExplorer.BuildSteps.Build @@ -566,7 +123,7 @@ Qt4ProjectManager.MakeStep clean - 1 + 1 Clean Clean ProjectExplorer.BuildSteps.Clean @@ -574,14 +131,15 @@ 2 false + false Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - E:\WAT\MAGISTERKA\PROGRAM\build-IonoFreeCorrection-Desktop_Qt_5_13_0_MSVC2017_64bit-Release - E:/WAT/MAGISTERKA/PROGRAM/build-IonoFreeCorrection-Desktop_Qt_5_13_0_MSVC2017_64bit-Release + E:\PROGRAM MAGISTERKA\build-IonoFreeCorrection-Desktop_Qt_6_2_4_MinGW_64_bit-Release + E:/PROGRAM MAGISTERKA/build-IonoFreeCorrection-Desktop_Qt_6_2_4_MinGW_64_bit-Release true @@ -593,7 +151,7 @@ true Qt4ProjectManager.MakeStep - 2 + 2 Build Build ProjectExplorer.BuildSteps.Build @@ -604,7 +162,7 @@ Qt4ProjectManager.MakeStep clean - 1 + 1 Clean Clean ProjectExplorer.BuildSteps.Clean @@ -612,6 +170,7 @@ 2 false + false Release Qt4ProjectManager.Qt4BuildConfiguration @@ -620,8 +179,8 @@ 0 - E:\WAT\MAGISTERKA\PROGRAM\build-IonoFreeCorrection-Desktop_Qt_5_13_0_MSVC2017_64bit-Profile - E:/WAT/MAGISTERKA/PROGRAM/build-IonoFreeCorrection-Desktop_Qt_5_13_0_MSVC2017_64bit-Profile + E:\PROGRAM MAGISTERKA\build-IonoFreeCorrection-Desktop_Qt_6_2_4_MinGW_64_bit-Profile + E:/PROGRAM MAGISTERKA/build-IonoFreeCorrection-Desktop_Qt_6_2_4_MinGW_64_bit-Profile true @@ -633,7 +192,7 @@ true Qt4ProjectManager.MakeStep - 2 + 2 Build Build ProjectExplorer.BuildSteps.Build @@ -644,7 +203,7 @@ Qt4ProjectManager.MakeStep clean - 1 + 1 Clean Clean ProjectExplorer.BuildSteps.Clean @@ -652,6 +211,7 @@ 2 false + false Profile Qt4ProjectManager.Qt4BuildConfiguration @@ -659,10 +219,10 @@ 0 0 - 3 + 3 - 0 + 0 Deploy Deploy ProjectExplorer.BuildSteps.Deploy @@ -672,85 +232,29 @@ false ProjectExplorer.DefaultDeployConfiguration - 1 + 1 - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F true - 4096 - false - false - 1000 - true - - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - - 25 - - 1 true - false - true - - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 2 - Qt4ProjectManager.Qt4RunConfiguration:E:/WAT/MAGISTERKA/PROGRAM/IonoFreeCorrection/IonoFreeCorrection.pro - E:/WAT/MAGISTERKA/PROGRAM/IonoFreeCorrection/IonoFreeCorrection.pro + Qt4ProjectManager.Qt4RunConfiguration:E:/PROGRAM MAGISTERKA/IonoFreeCorrection/IonoFreeCorrection.pro + E:/PROGRAM MAGISTERKA/IonoFreeCorrection/IonoFreeCorrection.pro false true true false true + E:/PROGRAM MAGISTERKA/build-IonoFreeCorrection-Desktop_Qt_6_2_4_MinGW_64_bit-Debug - 1 + 1 ProjectExplorer.Project.TargetCount - 3 + 1 ProjectExplorer.Project.Updater.FileVersion diff --git a/MixedNavigationFile.cpp b/MixedNavigationFile.cpp index ab34b41..a2e9b4d 100644 --- a/MixedNavigationFile.cpp +++ b/MixedNavigationFile.cpp @@ -77,7 +77,8 @@ void MixedNavigationFIle::UzupelnijStrukture() linia_txt.replace("D","e"); //zamiana D na e linia_txt.replace("E","e"); //zamiana E na e linia_txt.replace("e ","e"); //usuniecie spacji z "e -" - lista = linia_txt.split(" ",QString::SkipEmptyParts); //split po spacjach + + lista = linia_txt.split(" ",Qt::SkipEmptyParts); //split po spacjach if(lista.count() >= 5){ int CurrentHour = lista[4].toInt(); int E_h, E_m; @@ -131,7 +132,7 @@ void MixedNavigationFIle::UzupelnijStrukture() switch (NumerDoCzytania) { case 1: ObecnySatelita = lista[0]; - DanePliku.SV = lista[0].toInt(); + DanePliku.SV = lista[0]; DanePliku.hs = lista[4].toInt(); DanePliku.ms = lista[5].toInt(); DanePliku.ss = lista[6].toDouble(); @@ -258,9 +259,9 @@ void MixedNavigationFIle::PoprawStruktureSatelity(FileDatas* dane,QString SV) linia_txt.replace("D","e"); //zamiana D na e linia_txt.replace("E","e"); //zamiana E na e linia_txt.replace("e ","e"); //usuniecie spacji z "e -" - lista = linia_txt.split(" ",QString::SkipEmptyParts); //split po spacjach + lista = linia_txt.split(" ",Qt::SkipEmptyParts); //split po spacjach if(lista.count() >= 5){ - lista = linia_txt.split(" ",QString::SkipEmptyParts); //split po spacjach + lista = linia_txt.split(" ",Qt::SkipEmptyParts); //split po spacjach int CurrentHour = lista[4].toInt(); int E_h, E_m; diff --git a/RinexNavigacyjny.cpp b/RinexNavigacyjny.cpp index fa68045..ac1486d 100644 --- a/RinexNavigacyjny.cpp +++ b/RinexNavigacyjny.cpp @@ -198,7 +198,7 @@ QString RinexNavigacyjny::dataPliku(QString f) if (EndOfHeaderT > 0){header = false; continue;} if (!header) { - lista = linia_txt.split(" ",QString::SkipEmptyParts); //split po spacjach + lista = linia_txt.split(" ",Qt::SkipEmptyParts); //split po spacjach int rok = lista[1].toInt(); if (rok < 1000){rok += 2000;} data = QString::number(rok)+"-" + diff --git a/RinexOVer3.cpp b/RinexOVer3.cpp index f46276f..f3a63da 100644 --- a/RinexOVer3.cpp +++ b/RinexOVer3.cpp @@ -87,7 +87,7 @@ void RinexOVer3::WyszukajParametryCzestotliwosi() if(isNewTime >= 0) { if (SzukanyCzas) {break;} - ElementyLinii = linia.split(" ",QString::SkipEmptyParts); + ElementyLinii = linia.split(" ",Qt::SkipEmptyParts); int Hours,Minutes; double Secounds; Hours = ElementyLinii[4].toInt(); @@ -105,7 +105,7 @@ void RinexOVer3::WyszukajParametryCzestotliwosi() if(SzukanyCzas) { QString NumerSatelity = linia.mid(0,3); - if(linia[0] != "G" && linia[0] != "E"){continue;} //obecnie obliczamy tylko sat. GPS + if(linia[0] != 'G' && linia[0] != 'E'){continue;} //obecnie obliczamy tylko sat. GPS int poczatek = 4; double IleIteracji; IleIteracji = (linia.length() - 5)/16; @@ -116,10 +116,10 @@ void RinexOVer3::WyszukajParametryCzestotliwosi() poczatek += 16; } vector KolejnosciObs; - if(linia[0] == "G") + if(linia[0] == 'G') { KolejnosciObs = FrequencyOrderGPS; - }else if(linia[0]=="E") + }else if(linia[0]== 'E') { KolejnosciObs = FrequencyOrderGalileo; } @@ -128,7 +128,6 @@ void RinexOVer3::WyszukajParametryCzestotliwosi() for(int i = 0; i < ElementyLinii.count(); i++) { QString item = KolejnosciObs[i+2]; - long double wartosc; if (ElementyLinii[i]=="") { CurrentLine.insert({item,0}); @@ -188,7 +187,7 @@ void RinexOVer3::DaneNaglowka(){ int isStartTime = ll.indexOf("TIME OF FIRST OBS"); //falaga poczatku obs z pliku int isEndTime = ll.indexOf("TIME OF LAST OBS"); //flaga konca obserwacji z pliku if (isXYZ > 0){ - QSlist = ll.split(" ",QString::SkipEmptyParts); + QSlist = ll.split(" ",Qt::SkipEmptyParts); header.PozX = QSlist[0].toDouble(); header.PozY = QSlist[1].toDouble(); header.PozZ = QSlist[2].toDouble(); @@ -196,7 +195,7 @@ void RinexOVer3::DaneNaglowka(){ } if (isStartTime > 0){ - QSlist = QSlist = ll.split(" ",QString::SkipEmptyParts); + QSlist = QSlist = ll.split(" ",Qt::SkipEmptyParts); header.rok = QSlist[0].toInt(); header.mies = QSlist[1].toInt(); header.dzien = QSlist[2].toInt(); @@ -204,7 +203,7 @@ void RinexOVer3::DaneNaglowka(){ } if (isEndTime > 0){ - QSlist = QSlist = ll.split(" ",QString::SkipEmptyParts); + QSlist = QSlist = ll.split(" ",Qt::SkipEmptyParts); KoniecObserwacjiPliku = MyTimeClass(QSlist[0].toInt(),QSlist[1].toInt(),QSlist[2].toDouble()); continue; } @@ -221,14 +220,14 @@ void RinexOVer3::DaneNaglowka(){ { QChar SPC = ll[0]; - if(SPC == "G") { + if(SPC == 'G') { satGPS = true; first = true; FrequencySize = 100; wskNaKolejnosc = &FrequencyOrderGPS; FounAll = true; } - else if (SPC == "E") + else if (SPC == 'E') { satGPS = false; first = true; @@ -247,7 +246,7 @@ void RinexOVer3::DaneNaglowka(){ } ll.remove("SYS / # / OBS TYPES"); - QSlist = ll.split(" ",QString::SkipEmptyParts); //utworzenie tablicy z linii, z pominieciem spacji + QSlist = ll.split(" ",Qt::SkipEmptyParts); //utworzenie tablicy z linii, z pominieciem spacji //dodanie wszystkich elementow tablicy do kontenera if(first) { @@ -290,10 +289,10 @@ vector RinexOVer3::PrzedzialGodzinowy(MyTimeClass poczatek, MyTimeC { QString ll = in.readLine(); - if (ll[0] == ">") + if (ll[0] == '>') { QStringList ListaElementowLinii; - ListaElementowLinii = ll.split(" ",QString::SkipEmptyParts); + ListaElementowLinii = ll.split(" ",Qt::SkipEmptyParts); int h = ListaElementowLinii[4].toInt(); int m = ListaElementowLinii[5].toInt(); double s = ListaElementowLinii[6].toDouble(); diff --git a/main.cpp b/main.cpp index 32ef7bd..c5c5185 100644 --- a/main.cpp +++ b/main.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include "MyTimeClass.h" #include "MixedNavigationFile.h" diff --git a/mainwindow.cpp b/mainwindow.cpp index e74dd9a..b35f647 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -52,7 +52,7 @@ void MainWindow::Ustawienia() QStringList ElemLinii; while(!in.atEnd()){ linia = in.readLine(); - ElemLinii = linia.split("|",QString::SkipEmptyParts); + ElemLinii = linia.split("|",Qt::SkipEmptyParts); settings.insert({ElemLinii[0],ElemLinii[1]}); // <- do mapy try { WczytajUstawienie(ElemLinii[0],ElemLinii[1]); // <- wywołaj metodę i przypis ustawienie @@ -99,7 +99,7 @@ void MainWindow::on_ButtonReadObsFile_clicked() Filename = QFileDialog::getOpenFileName(this, "Wybierz plik RINEX'u obserwacyjnego",ObecnyFolder, "pliki RNX (*O.rnx);;inne pliki(*.??o)"); - if(Filename != NULL) + if(!Filename.isEmpty()) { WczytajRinexObserwacyjny(Filename); ui->labelObsFilePath->setText(Filename); @@ -145,7 +145,7 @@ void MainWindow::on_ButtonReadNaviFile_clicked() "Wybierz plik RINEX'u navigacyjnego",ObecnyFolder, "pliki RNX (*N.rnx);;GPS z CDDIS(brdc*.??n)"); - if(Filename != NULL) + if(!Filename.isEmpty()) { QString File; @@ -451,7 +451,7 @@ void MainWindow::ZapiszDoPlikuUstawien(QString key, QString FileName) { linia = fs.readLine(); //sprawdz spacje w pliku - ElemLinii = linia.split("|",QString::SkipEmptyParts); + ElemLinii = linia.split("|",Qt::SkipEmptyParts); if (ElemLinii[0] == key) //znalazo element w pliku z informacja o nazwie pliku {