Silenced all warnings.

Author: dlemstra

src/CommandLineInfo.cpp

@@ -27,6 +27,8 @@ CommandLineInfo::CommandLineInfo(Options &options)
 
 void CommandLineInfo::ParseParam(const wchar_t* pszParam, BOOL bFlag, BOOL bLast)
 {
+  UNREFERENCED_PARAMETER(bLast);
+
   if (!bFlag)
     return;
 

src/CommandLineInfo.h

@@ -27,6 +27,10 @@ class CommandLineInfo : public CCommandLineInfo
 public:
   CommandLineInfo(Options &options);
 
+  CommandLineInfo(const CommandLineInfo&) = delete;
+
+  CommandLineInfo& operator=(const CommandLineInfo&) = delete;
+
   bool showWizard;
 
   virtual void ParseParam(const wchar_t* pszParam, BOOL bFlag, BOOL bLast);

src/Config.cpp

@@ -20,8 +20,8 @@
 #include "Config.h"
 
 Config::Config(const wstring &name,const wstring &directory)
-  : _name(name),
-    _directory(directory),
+  : _directory(directory),
+    _name(name),
     _version(Version::empty())
 {
   _disabledForArm64=false;
@@ -50,9 +50,13 @@ const set<wstring>& Config::nasmIncludes(const Architecture architecture) const
 {
   switch (architecture)
   {
-    case Architecture::x64: return(_includesNasmX64);
-    case Architecture::x86: return(_includesNasmX86);
-    default: throwException(L"Unsupported architecture");
+    case Architecture::x64:
+      return(_includesNasmX64);
+    case Architecture::x86:
+      return(_includesNasmX86);
+    case Architecture::Arm64:
+    default:
+      throwException(L"Unsupported architecture");
   }
 }
 

src/Config.h

@@ -34,7 +34,7 @@ class Config
 
   const wstring directory() const { return(_directory); }
 
-  const bool disabledForArm64() const { return(_disabledForArm64); }
+  bool disabledForArm64() const { return(_disabledForArm64); }
 
   const set<wstring>& dynamicDefines() const { return(_dynamicDefines); }
 
@@ -44,15 +44,15 @@ class Config
 
   const set<wstring>& includes() const { return(_includes); }
 
-  const bool hasIncompatibleLicense() const { return(_hasIncompatibleLicense); }
+  bool hasIncompatibleLicense() const { return(_hasIncompatibleLicense); }
 
-  const bool isImageMagick7Only() const { return(_isImageMagick7Only); }
+  bool isImageMagick7Only() const { return(_isImageMagick7Only); }
 
-  const bool isLibrary() const { return(_type == ProjectType::DynamicLibrary || _type == ProjectType::StaticLibrary); }
+  bool isLibrary() const { return(_type == ProjectType::DynamicLibrary || _type == ProjectType::StaticLibrary); }
 
-  const bool isMagickProject() const { return(_isMagickProject); }
+  bool isMagickProject() const { return(_isMagickProject); }
 
-  const bool isOptional() const { return(_isOptional); }
+  bool isOptional() const { return(_isOptional); }
 
   const wstring licenseFile() const { return(_licenseFile); }
 
@@ -68,11 +68,11 @@ class Config
 
   const wstring url() const { return(_url); }
 
-  const bool useNasm() const { return(_useNasm); }
+  bool useNasm() const { return(_useNasm); }
 
-  const bool useOpenCL() const { return(_useOpenCL); }
+  bool useOpenCL() const { return(_useOpenCL); }
 
-  const bool useUnicode() const { return(_useUnicode); }
+  bool useUnicode() const { return(_useUnicode); }
 
   const set<wstring>& references() const { return(_references); }
 
@@ -82,7 +82,7 @@ class Config
 
   const set<wstring>& staticDefines() const { return(_staticDefines); }
 
-  const ProjectType type() const { return(_type); }
+  ProjectType type() const { return(_type); }
 
   const Version& version() const { return(_version); }
 

src/ConfigureApp.cpp

@@ -77,7 +77,7 @@ BOOL ConfigureApp::InitInstance()
   } 
 }
 
-void ConfigureApp::cleanupDirectories(Options &options,WaitDialog &waitDialog)
+void ConfigureApp::cleanupDirectories(Options &options)
 {
   filesystem::remove_all(options.demoArtifactsDirectory());
   filesystem::remove_all(options.fuzzArtifactsDirectory());
@@ -115,7 +115,7 @@ BOOL ConfigureApp::createFiles(Options &options,WaitDialog &waitDialog) const
   waitDialog.setSteps(17);
 
   waitDialog.nextStep(L"Cleaning up directories...");
-  cleanupDirectories(options,waitDialog);
+  cleanupDirectories(options);
 
   waitDialog.nextStep(L"Loading version information...");
   optional<VersionInfo> versionInfo=VersionInfo::load(options);

src/ConfigureApp.h

@@ -29,13 +29,16 @@ class ConfigureApp : public CWinApp
 public:
   ConfigureApp();
 
+  ConfigureApp(const ConfigureApp&) = delete;
+
+  ConfigureApp& operator=(const ConfigureApp&) = delete;
+
   virtual BOOL InitInstance();
 
   DECLARE_MESSAGE_MAP()
 
 private:
-
-  static void cleanupDirectories(Options &options,WaitDialog &waitDialog);
+  static void cleanupDirectories(Options &options);
 
   static void copyFiles(Options &options);
 

src/ConfigureWizard.h

@@ -31,6 +31,10 @@ class ConfigureWizard : public CPropertySheet
 public:
   ConfigureWizard(CWnd* pWndParent = (CWnd *) NULL);
 
+  ConfigureWizard(const ConfigureWizard&) = delete;
+
+  ConfigureWizard& operator=(const ConfigureWizard&) = delete;
+
   virtual ~ConfigureWizard();
 
   void setOptions(Options& options)

src/InstallerConfig.cpp

@@ -49,6 +49,8 @@ void InstallerConfig::write(const Options &options,const VersionInfo &versionInf
     case Architecture::x64:
       configFile << L"#define public Magick64BitArchitecture 1" << endl;
       break;
+    case Architecture::x86:
+      break;
   }
 
   if (options.useHDRI)

src/Licence.cpp

@@ -20,7 +20,7 @@
 
 #include "License.h"
 
-void License::write(const Options &options,const Config &config,const wstring name)
+void License::write(const Options &options,const Config &config)
 {
   auto& version=config.version();
   if (version.isEmpty())
@@ -60,6 +60,6 @@ void License::writeNonWindowsLicenses(const Options &options)
     auto configFile=options.rootDirectory + projectDirectory + L".ImageMagick\\Config.txt";
     auto config=Config::load(name,projectDirectory,configFile);
 
-    License::write(options,config,name);
+    License::write(options,config);
   }
 }

src/License.h

@@ -26,7 +26,7 @@
 class License
 {
 public:
-  static void write(const Options &options,const Config &config,const wstring name);
+  static void write(const Options &options,const Config &config);
 
   static void writeNonWindowsLicenses(const Options &options);
 };