--- Vago/trunk/Vago/packageWizard/packagewizard.cpp	2016/12/09 19:04:18	1061
+++ s10k/Vago/packageWizard/packagewizard.cpp	2017/12/30 13:57:32	1093
@@ -1,13 +1,13 @@
 #include "packagewizard.h"
 
-PackageWizard::PackageWizard(const QString &appDir, QString workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger)
-    :AbstractWizard(appDir, workspaceWizardLocation, vagoSettings, myLogger, false)
+PackageWizard::PackageWizard(const QString &appDir, QString workspaceWizardLocation, QSettings *vagoSettings)
+    :AbstractWizard(appDir, workspaceWizardLocation, vagoSettings, false)
 {
     this->packagesLocation=this->workspaceWizardLocation+"/Packages";
 }
 
 void PackageWizard::exec(){
-    PackagePage2 *page2 = new PackagePage2(this->myLogger);
+    PackagePage2 *page2 = new PackagePage2();
     PackagePage3 *page3 = new PackagePage3();
     PackagePage4 *page4 = new PackagePage4();
     this->page4Pointer = page4; // save the pointer in class variable
@@ -57,7 +57,7 @@ void PackageWizard::createPackage(){
     this->vagoSettings->setValue("PackageCreator/OpenFolder",openFolder);
     this->vagoSettings->setValue("PackageCreator/CreateZip",createZip);
 
-    const QString packageName=packageNumber+Util::fullTrim(modName);
+    const QString packageName=packageNumber+Util::String::fullTrim(modName);
 
     // Start package creation...
 
@@ -87,7 +87,7 @@ void PackageWizard::createPackage(){
     QFile modInfo(modDir+"Mod_Info.cfg");
 
     if (!modInfo.open(QIODevice::WriteOnly | QIODevice::Text)){ //open to write
-        UtilVago::showAndLogErrorPopUp(this->myLogger, "Couldn't create Mod_Info.cfg file when creating AE Package.");
+        UtilVago::showAndLogErrorPopUp("Couldn't create Mod_Info.cfg file when creating AE Package.");
         return;
     }
 
@@ -123,7 +123,7 @@ void PackageWizard::createPackage(){
 
     if(createZip){
         if(!JlCompress::compressDir(this->packagesLocation+"/"+packageName+".zip", modDir)){
-            UtilVago::showAndLogErrorPopUp(this->myLogger, "An error occurred while zipping the package.");
+            UtilVago::showAndLogErrorPopUp("An error occurred while zipping the package.");
         }
     }
 
@@ -161,9 +161,9 @@ void PackageWizard::copyPackageFolders(c
             }
         }
         QDir().mkpath(path); //create path if doesn't exist
-        if(!Util::copyDir(sourceFolder,path,false)){//copy contents (creates dest destination automatically if not exists yet)
+        if(!Util::FileSystem::copyDir(sourceFolder,path,false)){//copy contents (creates dest destination automatically if not exists yet)
 
-         UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "An error occurred while copying the folder/files to the package folder: \n"
+         UtilVago::showAndLogErrorPopUpLogButton("An error occurred while copying the folder/files to the package folder: \n"
                                                         "Copying from "+sourceFolder+"\n to "+path);
         }
     }