Index: s10k/Vago/soundWizard/soundpage2.cpp =================================================================== --- s10k/Vago/soundWizard/soundpage2.cpp (revision 1092) +++ s10k/Vago/soundWizard/soundpage2.cpp (revision 1093) @@ -55,9 +55,9 @@ if(size==0){ - Util::showPopUp("Select a row first."); + Util::Dialogs::showInfo("Select a row first."); return; } - if(Util::showQuestionPopUp(this,"Are you sure you want to delete the selected rows?")){ + if(Util::Dialogs::showQuestion(this,"Are you sure you want to delete the selected rows?")){ for(int i=0; itwSoundFiles->removeRow(ui->twSoundFiles->selectionModel()->selectedRows().at(size-i-1).row()); @@ -71,12 +71,12 @@ //Pre-processing (check if received only folders) - foreach(QString myFile, resources){ + for(const QString &myFile : resources){ QString currFileExt="."+QFileInfo(myFile).completeSuffix(); if(QDir(myFile).exists()){ - Util::showErrorPopUp("Only files are allowed for this operation."); + Util::Dialogs::showError("Only files are allowed for this operation."); return; } - foreach(QString vext, this->allowedFiles){ + for(QString vext : this->allowedFiles){ vext.remove("*"); if(currFileExt.endsWith(vext)){ @@ -87,5 +87,5 @@ if(!fileExtValid){ - Util::showErrorPopUp("Files must be in the follow formats:\n" + + Util::Dialogs::showError("Files must be in the follow formats:\n" + this->allowedFiles.join(" ")); return; @@ -93,5 +93,5 @@ } - foreach(QString currentFile, resources){ + for(const QString ¤tFile : resources){ //Get actual number rows @@ -103,5 +103,5 @@ //Add to table and list to QTableWidgetItem *newName = new QTableWidgetItem(QFileInfo(currentFile).baseName()); - QTableWidgetItem *newFileLocation = new QTableWidgetItem(Util::normalizePath(currentFile)); + QTableWidgetItem *newFileLocation = new QTableWidgetItem(Util::FileSystem::normalizePath(currentFile)); myTable->setItem(twSize,0,newName); @@ -125,5 +125,5 @@ if(ui->twSoundFiles->rowCount()==0){ - Util::showErrorPopUp("You need to add some sound files first!"); + Util::Dialogs::showError("You need to add some sound files first!"); return false; } @@ -133,11 +133,11 @@ } - if(ui->rbOther->isChecked() && Util::checkEmptySpaces(QStringList() << ui->leOtherLocation->text())){ - Util::showErrorPopUp("Please input a directory to output the files."); + if(ui->rbOther->isChecked() && Util::Validation::checkEmptySpaces(QStringList() << ui->leOtherLocation->text())){ + Util::Dialogs::showError("Please input a directory to output the files."); return false; } if(ui->rbOther->isChecked() && !QDir(ui->leOtherLocation->text()).exists()){ - Util::showErrorPopUp("Invalid directory specified in other location. Please fix it."); + Util::Dialogs::showError("Invalid directory specified in other location. Please fix it."); return false; } Index: s10k/Vago/soundWizard/soundpage3.cpp =================================================================== --- s10k/Vago/soundWizard/soundpage3.cpp (revision 1092) +++ s10k/Vago/soundWizard/soundpage3.cpp (revision 1093) @@ -34,11 +34,11 @@ << ui->leTreshold->text(); - if(Util::checkEmptySpaces(leContents)){ - Util::showErrorPopUp("Please fill all fields first!"); + if(Util::Validation::checkEmptySpaces(leContents)){ + Util::Dialogs::showError("Please fill all fields first!"); return false; } - if(Util::checkIfDoubles(leContents)){ - Util::showErrorPopUp("All fields must contains numbers!"); + if(Util::Validation::checkIfDoubles(leContents)){ + Util::Dialogs::showError("All fields must contains numbers!"); return false; } Index: s10k/Vago/soundWizard/soundpage4.cpp =================================================================== --- s10k/Vago/soundWizard/soundpage4.cpp (revision 1092) +++ s10k/Vago/soundWizard/soundpage4.cpp (revision 1093) @@ -30,11 +30,11 @@ << ui->leWeight->text(); - if(Util::checkEmptySpaces(leContents)){ - Util::showErrorPopUp("Please fill all fields first!"); + if(Util::Validation::checkEmptySpaces(leContents)){ + Util::Dialogs::showError("Please fill all fields first!"); return false; } - if(Util::checkIfDoubles(leContents)){ - Util::showErrorPopUp("All fields must contains numbers!"); + if(Util::Validation::checkIfDoubles(leContents)){ + Util::Dialogs::showError("All fields must contains numbers!"); return false; } Index: s10k/Vago/soundWizard/soundpage5.cpp =================================================================== --- s10k/Vago/soundWizard/soundpage5.cpp (revision 1092) +++ s10k/Vago/soundWizard/soundpage5.cpp (revision 1093) @@ -29,11 +29,11 @@ ui->leImpactVelocity->text() << ui->leMinOcclusion->text(); - if(Util::checkEmptySpaces(leContents)){ - Util::showErrorPopUp("Please fill all fields first!"); + if(Util::Validation::checkEmptySpaces(leContents)){ + Util::Dialogs::showError("Please fill all fields first!"); return false; } - if(Util::checkIfDoubles(leContents)){ - Util::showErrorPopUp("All fields must contains numbers!"); + if(Util::Validation::checkIfDoubles(leContents)){ + Util::Dialogs::showError("All fields must contains numbers!"); return false; } Index: s10k/Vago/soundWizard/soundpagefinal.cpp =================================================================== --- s10k/Vago/soundWizard/soundpagefinal.cpp (revision 1092) +++ s10k/Vago/soundWizard/soundpagefinal.cpp (revision 1093) @@ -2,5 +2,5 @@ #include "ui_soundpagefinal.h" -SoundPageFinal::SoundPageFinal(QString AppDir, QString soundsLocation, DropTableWidget *page2Table, Logger *myLogger, QHash *commandMap, QWidget *parent) : +SoundPageFinal::SoundPageFinal(QString AppDir, QString soundsLocation, DropTableWidget *page2Table, QHash *commandMap, QWidget *parent) : QWizardPage(parent), ui(new Ui::soundpagefinal) @@ -9,11 +9,10 @@ this->soundsLocation=soundsLocation; this->page2Table=page2Table; - this->myLogger=myLogger; this->commandMap=commandMap; this->xmlCommands = new QStringList(); this->oniSplitCommands = new QStringList(); - this->myXmlProcessor = new XmlProcessor(AppDir, this->myLogger,this->xmlCommands); - this->myConverter = new Converter(AppDir, this->myLogger,this->oniSplitCommands); + this->myXmlProcessor = new XmlProcessor(AppDir, this->xmlCommands); + this->myConverter = new Converter(AppDir,this->oniSplitCommands); ui->lbComplete->setText("The wizard is now complete. The sounds have been converted. " @@ -126,21 +125,21 @@ } - sphereRadious=Util::normalizeDecimalSeparator(field("leSphereRadious").toString()); - minElapsedTime=Util::normalizeDecimalSeparator(field("leMinElapsedTime").toString()); - maxElapsedTime=Util::normalizeDecimalSeparator(field("leMaxElapsedTime").toString()); - minVolumeDistance=Util::normalizeDecimalSeparator(field("leMinVolumeDistance").toString()); - maxVolumeDistance=Util::normalizeDecimalSeparator(field("leMaxVolumeDistance").toString()); - minOcclusion=Util::normalizeDecimalSeparator(field("leMinOcclusion").toString()); - treshold=Util::normalizeDecimalSeparator(field("leTreshold").toString()); + sphereRadious=Util::String::normalizeDecimalSeparator(field("leSphereRadious").toString()); + minElapsedTime=Util::String::normalizeDecimalSeparator(field("leMinElapsedTime").toString()); + maxElapsedTime=Util::String::normalizeDecimalSeparator(field("leMaxElapsedTime").toString()); + minVolumeDistance=Util::String::normalizeDecimalSeparator(field("leMinVolumeDistance").toString()); + maxVolumeDistance=Util::String::normalizeDecimalSeparator(field("leMaxVolumeDistance").toString()); + minOcclusion=Util::String::normalizeDecimalSeparator(field("leMinOcclusion").toString()); + treshold=Util::String::normalizeDecimalSeparator(field("leTreshold").toString()); // Get data page 4 - volume=Util::normalizeDecimalSeparator(field("leVolume").toString()); - minVolume=Util::normalizeDecimalSeparator(field("leMinVolume").toString()); - maxVolume=Util::normalizeDecimalSeparator(field("leMaxVolume").toString()); - pitch=Util::normalizeDecimalSeparator(field("lePitch").toString()); - minPitch=Util::normalizeDecimalSeparator(field("leMinPitch").toString()); - maxPitch=Util::normalizeDecimalSeparator(field("leMaxPitch").toString()); - weight=Util::normalizeDecimalSeparator(field("leWeight").toString()); + volume=Util::String::normalizeDecimalSeparator(field("leVolume").toString()); + minVolume=Util::String::normalizeDecimalSeparator(field("leMinVolume").toString()); + maxVolume=Util::String::normalizeDecimalSeparator(field("leMaxVolume").toString()); + pitch=Util::String::normalizeDecimalSeparator(field("lePitch").toString()); + minPitch=Util::String::normalizeDecimalSeparator(field("leMinPitch").toString()); + maxPitch=Util::String::normalizeDecimalSeparator(field("leMaxPitch").toString()); + weight=Util::String::normalizeDecimalSeparator(field("leWeight").toString()); preventRepeat=field("cbPreventRepeat").toBool(); @@ -176,22 +175,22 @@ } - minVolumeDistanceImp=Util::normalizeDecimalSeparator(field("leMinVolumeDistanceImp").toString()); - maxVolumeDistanceImp=Util::normalizeDecimalSeparator(field("leMaxVolumeDistanceImp").toString()); - minAngleImp=Util::normalizeDecimalSeparator(field("leMinAngleImp").toString()); - maxAngleImp=Util::normalizeDecimalSeparator(field("leMaxAngleImp").toString()); - minAttenuationImp=Util::normalizeDecimalSeparator(field("leMinAttenuationImp").toString()); - impactVelocityImp=Util::normalizeDecimalSeparator(field("leImpactVelocityImp").toString()); - minOcclusionImp=Util::normalizeDecimalSeparator(field("leMinOcclusionImp").toString()); + minVolumeDistanceImp=Util::String::normalizeDecimalSeparator(field("leMinVolumeDistanceImp").toString()); + maxVolumeDistanceImp=Util::String::normalizeDecimalSeparator(field("leMaxVolumeDistanceImp").toString()); + minAngleImp=Util::String::normalizeDecimalSeparator(field("leMinAngleImp").toString()); + maxAngleImp=Util::String::normalizeDecimalSeparator(field("leMaxAngleImp").toString()); + minAttenuationImp=Util::String::normalizeDecimalSeparator(field("leMinAttenuationImp").toString()); + impactVelocityImp=Util::String::normalizeDecimalSeparator(field("leImpactVelocityImp").toString()); + minOcclusionImp=Util::String::normalizeDecimalSeparator(field("leMinOcclusionImp").toString()); //######################################################### Starting xml processing // Clean tmp dir - if(!Util::rmDir(GlobalVars::VagoTemporaryDir)){ - UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't clean vago temp dir for complete sound wizard. Aborting.\n"+GlobalVars::VagoTemporaryDir); + if(!Util::FileSystem::rmDir(GlobalVars::VagoTemporaryDir)){ + UtilVago::showAndLogErrorPopUpLogButton("Couldn't clean vago temp dir for complete sound wizard. Aborting.\n"+GlobalVars::VagoTemporaryDir); return; } if(!QDir(QDir::tempPath()).mkpath("VagoTemp")){ - UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't reconstruct vago temp dir for complete sound wizard. Aborting.\n"+GlobalVars::VagoTemporaryDir); + UtilVago::showAndLogErrorPopUpLogButton("Couldn't reconstruct vago temp dir for complete sound wizard. Aborting.\n"+GlobalVars::VagoTemporaryDir); } @@ -205,32 +204,32 @@ (*this->xmlCommands) - << "--replace-all-values -e Priority -n "+Util::insertQuotes(priority)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values -e Flags -n "+(flags.join(" ").isEmpty() ? Util::insertQuotes("") : Util::insertQuotes(flags.join(" ")))+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values -e SphereRadius -n "+Util::insertQuotes(sphereRadious)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values -e Treshold -n "+Util::insertQuotes(treshold)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values -e MinOcclusion -n "+Util::insertQuotes(minOcclusion)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name ElapsedTime -e Max -n "+Util::insertQuotes(maxElapsedTime)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name ElapsedTime -e Min -n "+Util::insertQuotes(minElapsedTime)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name Distance -e Max -n "+Util::insertQuotes(maxVolumeDistance)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name Distance -e Min -n "+Util::insertQuotes(minVolumeDistance)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name SoundGroup -e Volume -n "+Util::insertQuotes(volume)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name SoundGroup -e Pitch -n "+Util::insertQuotes(pitch)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name SoundGroup -e NumberOfChannels -n "+Util::insertQuotes(numberChannels)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name Volume -e Min -n "+Util::insertQuotes(minVolume)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name Volume -e Max -n "+Util::insertQuotes(maxVolume)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name Pitch -e Min -n "+Util::insertQuotes(minPitch)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name Pitch -e Max -n "+Util::insertQuotes(maxPitch)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values -e Weight -n "+Util::insertQuotes(weight)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values -e Priority -n "+Util::insertQuotes(priorityImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name Distance -e Min -n "+Util::insertQuotes(minVolumeDistanceImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name Distance -e Max -n "+Util::insertQuotes(maxVolumeDistanceImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name Angle -e Min -n "+Util::insertQuotes(minAngleImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values --parent-element-name Angle -e Max -n "+Util::insertQuotes(maxAngleImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values -e MinAttenuation -n "+Util::insertQuotes(minAttenuationImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values -e ImpactVelocity -n "+Util::insertQuotes(impactVelocityImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values -e MinOcclusion -n "+Util::insertQuotes(minOcclusionImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose"; + << "--replace-all-values -e Priority -n "+Util::String::insertQuotes(priority)+" -f "+Util::String::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values -e Flags -n "+(flags.join(" ").isEmpty() ? Util::String::insertQuotes("") : Util::String::insertQuotes(flags.join(" ")))+" -f "+Util::String::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values -e SphereRadius -n "+Util::String::insertQuotes(sphereRadious)+" -f "+Util::String::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values -e Treshold -n "+Util::String::insertQuotes(treshold)+" -f "+Util::String::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values -e MinOcclusion -n "+Util::String::insertQuotes(minOcclusion)+" -f "+Util::String::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name ElapsedTime -e Max -n "+Util::String::insertQuotes(maxElapsedTime)+" -f "+Util::String::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name ElapsedTime -e Min -n "+Util::String::insertQuotes(minElapsedTime)+" -f "+Util::String::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name Distance -e Max -n "+Util::String::insertQuotes(maxVolumeDistance)+" -f "+Util::String::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name Distance -e Min -n "+Util::String::insertQuotes(minVolumeDistance)+" -f "+Util::String::insertQuotes(ambFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name SoundGroup -e Volume -n "+Util::String::insertQuotes(volume)+" -f "+Util::String::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name SoundGroup -e Pitch -n "+Util::String::insertQuotes(pitch)+" -f "+Util::String::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name SoundGroup -e NumberOfChannels -n "+Util::String::insertQuotes(numberChannels)+" -f "+Util::String::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name Volume -e Min -n "+Util::String::insertQuotes(minVolume)+" -f "+Util::String::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name Volume -e Max -n "+Util::String::insertQuotes(maxVolume)+" -f "+Util::String::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name Pitch -e Min -n "+Util::String::insertQuotes(minPitch)+" -f "+Util::String::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name Pitch -e Max -n "+Util::String::insertQuotes(maxPitch)+" -f "+Util::String::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values -e Weight -n "+Util::String::insertQuotes(weight)+" -f "+Util::String::insertQuotes(grpFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values -e Priority -n "+Util::String::insertQuotes(priorityImp)+" -f "+Util::String::insertQuotes(impFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name Distance -e Min -n "+Util::String::insertQuotes(minVolumeDistanceImp)+" -f "+Util::String::insertQuotes(impFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name Distance -e Max -n "+Util::String::insertQuotes(maxVolumeDistanceImp)+" -f "+Util::String::insertQuotes(impFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name Angle -e Min -n "+Util::String::insertQuotes(minAngleImp)+" -f "+Util::String::insertQuotes(impFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values --parent-element-name Angle -e Max -n "+Util::String::insertQuotes(maxAngleImp)+" -f "+Util::String::insertQuotes(impFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values -e MinAttenuation -n "+Util::String::insertQuotes(minAttenuationImp)+" -f "+Util::String::insertQuotes(impFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values -e ImpactVelocity -n "+Util::String::insertQuotes(impactVelocityImp)+" -f "+Util::String::insertQuotes(impFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values -e MinOcclusion -n "+Util::String::insertQuotes(minOcclusionImp)+" -f "+Util::String::insertQuotes(impFileLocation)+" --no-backups --no-verbose"; if(preventRepeat){ - (*this->xmlCommands) << "--replace-all-values --parent-element-name SoundGroup -e Flags -n PreventRepeat -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"; + (*this->xmlCommands) << "--replace-all-values --parent-element-name SoundGroup -e Flags -n PreventRepeat -f "+Util::String::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"; } @@ -245,5 +244,5 @@ for(int i=0; ipage2Table->rowCount(); i++){ - (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+Util::insertQuotes(outputFolder)+" "+Util::insertQuotes(this->page2Table->item(i,1)->text()); // add location of sound file to convert + (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+Util::String::insertQuotes(outputFolder)+" "+Util::String::insertQuotes(this->page2Table->item(i,1)->text()); // add location of sound file to convert currFileName=this->page2Table->item(i,0)->text(); // get current file name @@ -256,14 +255,14 @@ QFile::copy(impFileLocation, currImpFileLocation); - (*this->xmlCommands) << "--replace-all-values -e BaseTrack1 -n "+Util::insertQuotes(currFileName)+" -f "+Util::insertQuotes(currAmbFileLocation)+" --no-backups --no-verbose" // process the xml - << "--replace-all-values -e Sound -n "+Util::insertQuotes(currFileName)+" -f "+Util::insertQuotes(currGrpFileLocation)+" --no-backups --no-verbose" - << "--replace-all-values -e Group -n "+Util::insertQuotes(currFileName)+" -f "+Util::insertQuotes(currImpFileLocation)+" --no-backups --no-verbose"; + (*this->xmlCommands) << "--replace-all-values -e BaseTrack1 -n "+Util::String::insertQuotes(currFileName)+" -f "+Util::String::insertQuotes(currAmbFileLocation)+" --no-backups --no-verbose" // process the xml + << "--replace-all-values -e Sound -n "+Util::String::insertQuotes(currFileName)+" -f "+Util::String::insertQuotes(currGrpFileLocation)+" --no-backups --no-verbose" + << "--replace-all-values -e Group -n "+Util::String::insertQuotes(currFileName)+" -f "+Util::String::insertQuotes(currImpFileLocation)+" --no-backups --no-verbose"; myXmlProcessor->start(); myXmlProcessor->wait(); // Wait until all xml is edited - (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+Util::insertQuotes(outputFolder)+" "+Util::insertQuotes(currAmbFileLocation); - (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+Util::insertQuotes(outputFolder)+" "+Util::insertQuotes(currGrpFileLocation); - (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+Util::insertQuotes(outputFolder)+" "+Util::insertQuotes(currImpFileLocation); + (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+Util::String::insertQuotes(outputFolder)+" "+Util::String::insertQuotes(currAmbFileLocation); + (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+Util::String::insertQuotes(outputFolder)+" "+Util::String::insertQuotes(currGrpFileLocation); + (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+Util::String::insertQuotes(outputFolder)+" "+Util::String::insertQuotes(currImpFileLocation); } Index: s10k/Vago/soundWizard/soundpagefinal.h =================================================================== --- s10k/Vago/soundWizard/soundpagefinal.h (revision 1092) +++ s10k/Vago/soundWizard/soundpagefinal.h (revision 1093) @@ -7,5 +7,4 @@ #include -#include "logger.h" #include "xmlprocessor.h" #include "converter.h" @@ -20,5 +19,5 @@ public: - explicit SoundPageFinal(QString AppDir, QString soundsLocation, DropTableWidget *page2Table, Logger *myLogger, QHash *commandMap, QWidget *parent = 0); + explicit SoundPageFinal(QString AppDir, QString soundsLocation, DropTableWidget *page2Table, QHash *commandMap, QWidget *parent = 0); ~SoundPageFinal(); @@ -27,5 +26,4 @@ Ui::soundpagefinal *ui; DropTableWidget *page2Table; - Logger *myLogger; XmlProcessor *myXmlProcessor; Converter *myConverter; Index: s10k/Vago/soundWizard/soundwizard.cpp =================================================================== --- s10k/Vago/soundWizard/soundwizard.cpp (revision 1092) +++ s10k/Vago/soundWizard/soundwizard.cpp (revision 1093) @@ -1,6 +1,6 @@ #include "soundwizard.h" -SoundWizard::SoundWizard(QString appDir, QString workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger, QHash *commandMap) - :AbstractWizard(appDir, workspaceWizardLocation, vagoSettings, myLogger, true) +SoundWizard::SoundWizard(QString appDir, QString workspaceWizardLocation, QSettings *vagoSettings, QHash *commandMap) + :AbstractWizard(appDir, workspaceWizardLocation, vagoSettings, true) { this->appDir=appDir; @@ -14,5 +14,5 @@ SoundPage4 *page4 = new SoundPage4(); SoundPage5 *page5 = new SoundPage5(); - SoundPageFinal *pageFinal = new SoundPageFinal(this->appDir, this->soundsLocation,page2->soundTable,this->myLogger, this->commandMap); + SoundPageFinal *pageFinal = new SoundPageFinal(this->appDir, this->soundsLocation,page2->soundTable, this->commandMap); this->myWizard.addPage Index: s10k/Vago/soundWizard/soundwizard.h =================================================================== --- s10k/Vago/soundWizard/soundwizard.h (revision 1092) +++ s10k/Vago/soundWizard/soundwizard.h (revision 1093) @@ -14,5 +14,4 @@ #include "util.h" #include "abstractwizard.h" -#include "logger.h" #include "soundpage2.h" #include "soundpage3.h" @@ -24,5 +23,5 @@ { protected: - SoundWizard(QString appLocation, QString workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger, QHash *commandMap); + SoundWizard(QString appLocation, QString workspaceWizardLocation, QSettings *vagoSettings, QHash *commandMap); void exec(); QHash *commandMap;