vkconfig3: fix warnings

Change-Id: I55b927f2a2eb9a36f7c1b92f0331eab78fc9bc68
LunarG · Nov 27, 2024 · fe6a846 · fe6a846
1 parent 04020f1
commit fe6a846
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 35 deletions.
diff --git a/vkconfig_cmd/main_layers.cpp b/vkconfig_cmd/main_layers.cpp
@@ -89,7 +89,7 @@ static int RunLayersList(Configurator& configurator, const CommandLine& command_
 }
 
 static int RunLayersVerbose(Configurator& configurator, const CommandLine& command_line) {
-    printf(configurator.layers.Log().c_str());
+    printf("%s", configurator.layers.Log().c_str());
     return 0;
 }
 

diff --git a/vkconfig_core/configuration.cpp b/vkconfig_core/configuration.cpp
@@ -231,7 +231,7 @@ bool Configuration::Load(const Path& full_path, const LayerManager& layers) {
     return true;
 }
 
-bool Configuration::Save(const Path& full_path, bool exporter) const {
+bool Configuration::Save(const Path& full_path) const {
     assert(!full_path.Empty());
 
     QJsonObject root;

diff --git a/vkconfig_core/configuration.h b/vkconfig_core/configuration.h
@@ -37,7 +37,7 @@ class Configuration {
     static Configuration Create(const LayerManager& layers, const std::string& configuration_key);
 
     bool Load(const Path& full_path, const LayerManager& layers);
-    bool Save(const Path& full_path, bool exporter = false) const;
+    bool Save(const Path& full_path) const;
     void Reset(const LayerManager& layers);
 
     Parameter* Find(const std::string& layer_key);

diff --git a/vkconfig_core/configuration_manager.cpp b/vkconfig_core/configuration_manager.cpp
@@ -156,14 +156,6 @@ void ConfigurationManager::SortConfigurations() {
     std::sort(this->available_configurations.begin(), this->available_configurations.end(), Compare());
 }
 
-std::vector<ReferencedLayer> ConfigurationManager::BuildReferencedLayers(const LayerManager &layers, const Path &path) {
-    std::vector<ReferencedLayer> result;
-
-    layers.GatherLayerNames();
-
-    return result;
-}
-
 void ConfigurationManager::LoadConfigurationsPath(const LayerManager &layers) {
     const std::vector<Path> &configuration_files = CollectFilePaths(Get(Path::CONFIGS));
     for (std::size_t i = 0, n = configuration_files.size(); i < n; ++i) {
@@ -350,7 +342,8 @@ void ConfigurationManager::RenameConfiguration(const std::string &old_configurat
     this->SortConfigurations();
 }
 
-bool ConfigurationManager::ImportConfiguration(const LayerManager &layers, const Path &full_import_path) {
+bool ConfigurationManager::ImportConfiguration(const LayerManager &layers, const Path &full_import_path,
+                                               std::string &configuration_name) {
     assert(!full_import_path.Empty());
 
     this->last_path_import_config = full_import_path.AbsoluteDir();
@@ -360,17 +353,18 @@ bool ConfigurationManager::ImportConfiguration(const LayerManager &layers, const
         return false;
     }
 
-    configuration.key = MakeConfigurationName(this->available_configurations, configuration.key + " (Imported)");
+    configuration_name = configuration.key =
+        MakeConfigurationName(this->available_configurations, configuration.key + " (Imported)");
     this->available_configurations.push_back(configuration);
     this->SortConfigurations();
 
-    // this->GetActiveConfigurationInfo()->name = configuration.key;
-
     return true;
 }
 
 bool ConfigurationManager::ExportConfiguration(const LayerManager &layers, const Path &full_export_path,
                                                const std::string &configuration_name) {
+    (void)layers;
+
     assert(!configuration_name.empty());
     assert(!full_export_path.Empty());
 
@@ -379,5 +373,5 @@ bool ConfigurationManager::ExportConfiguration(const LayerManager &layers, const
     Configuration *configuration = this->FindConfiguration(configuration_name);
     assert(configuration);
 
-    return configuration->Save(full_export_path, true);
+    return configuration->Save(full_export_path);
 }
diff --git a/vkconfig_core/configuration_manager.h b/vkconfig_core/configuration_manager.h
@@ -51,7 +51,7 @@ class ConfigurationManager : public Serialize {
     int GetConfigurationIndex(const std::string& configuration_name) const;
 
     void RenameConfiguration(const std::string& old_configuration_name, const std::string& new_configuration_name);
-    bool ImportConfiguration(const LayerManager& layers, const Path& full_import_path);
+    bool ImportConfiguration(const LayerManager& layers, const Path& full_import_path, std::string& configuration_name);
     bool ExportConfiguration(const LayerManager& layers, const Path& full_export_path, const std::string& configuration_name);
 
     const Configuration* FindConfiguration(const std::string& configuration_name) const;
@@ -62,8 +62,6 @@ class ConfigurationManager : public Serialize {
     bool IsDefaultConfiguration(const std::string& configuration_key) const;
     void ResetDefaultConfigurations(const LayerManager& layers);
 
-    std::vector<ReferencedLayer> BuildReferencedLayers(const LayerManager& layers, const Path& path);
-
     bool Empty() const { return this->available_configurations.empty(); }
 
     bool HasFile(const Configuration& configuration) const;

diff --git a/vkconfig_core/layer.cpp b/vkconfig_core/layer.cpp
@@ -106,7 +106,6 @@ LayerControl Layer::GetActualControl() const {
 std::string Layer::GetActualControlTooltip() const {
     if (this->type == LAYER_TYPE_IMPLICIT) {
         if (!this->disable_env.empty()) {
-            const std::string& value = qgetenv(this->disable_env.c_str()).toStdString();
             if (qEnvironmentVariableIsSet(this->disable_env.c_str())) {
                 return format("'%s' is set", this->disable_env.c_str());
             }

diff --git a/vkconfig_gui/mainwindow.cpp b/vkconfig_gui/mainwindow.cpp
@@ -177,10 +177,6 @@ void MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason) {
         case QSystemTrayIcon::Context:
             break;
         case QSystemTrayIcon::DoubleClick:
-            Qt::WindowStates window_states = this->windowState();
-            const bool is_minimized = this->isMinimized();
-            const bool is_visible = this->isVisible();
-            const bool is_hidden = this->isHidden();
             if (this->isMinimized() || this->isHidden()) {
                 this->setVisible(true);
                 this->showNormal();

diff --git a/vkconfig_gui/settings_tree.cpp b/vkconfig_gui/settings_tree.cpp
@@ -48,9 +48,6 @@
 
 #include <cassert>
 
-static const char *TOOLTIP_ORDER =
-    "Layers are executed between the Vulkan application and driver in the specific order represented here";
-
 SettingsTreeManager::SettingsTreeManager(std::shared_ptr<Ui::MainWindow> ui) : ui(ui) {
     assert(ui.get() != nullptr);
 

diff --git a/vkconfig_gui/tab_about.cpp b/vkconfig_gui/tab_about.cpp
@@ -41,11 +41,16 @@ TabAbout::TabAbout(MainWindow &window, std::shared_ptr<Ui::MainWindow> ui) : Tab
 
 TabAbout::~TabAbout() {}
 
-void TabAbout::UpdateUI(UpdateUIMode mode) {}
+void TabAbout::UpdateUI(UpdateUIMode mode) { (void)mode; }
 
 void TabAbout::CleanUI() {}
 
-bool TabAbout::EventFilter(QObject *target, QEvent *event) { return false; }
+bool TabAbout::EventFilter(QObject *target, QEvent *event) {
+    (void)target;
+    (void)event;
+
+    return false;
+}
 
 void TabAbout::on_about_lunarg_pushButton_pressed() {
     QDesktopServices::openUrl(QUrl("https://www.lunarg.com/", QUrl::TolerantMode));

diff --git a/vkconfig_gui/tab_applications.cpp b/vkconfig_gui/tab_applications.cpp
@@ -98,7 +98,12 @@ void TabApplications::UpdateUI(UpdateUIMode mode) {
 
 void TabApplications::CleanUI() { this->ResetLaunchApplication(); }
 
-bool TabApplications::EventFilter(QObject *target, QEvent *event) { return false; }
+bool TabApplications::EventFilter(QObject *target, QEvent *event) {
+    (void)target;
+    (void)event;
+
+    return false;
+}
 
 void TabApplications::on_launch_executable_search_pressed() {
     Configurator &configurator = Configurator::Get();

diff --git a/vkconfig_gui/tab_configurations.cpp b/vkconfig_gui/tab_configurations.cpp
@@ -117,6 +117,8 @@ TabConfigurations::~TabConfigurations() {
 }
 
 void TabConfigurations::UpdateUI_Configurations(UpdateUIMode ui_update_mode) {
+    (void)mode;
+
     Configurator &configurator = Configurator::Get();
 
     ui->configurations_executable_scope->blockSignals(true);
@@ -220,6 +222,8 @@ void TabConfigurations::UpdateUI_LoaderMessages() {
 }
 
 void TabConfigurations::UpdateUI_Layers(UpdateUIMode mode) {
+    (void)mode;
+
     ui->configurations_layers_list->blockSignals(true);
     ui->configurations_layers_list->clear();
 
@@ -272,6 +276,8 @@ void TabConfigurations::UpdateUI_Layers(UpdateUIMode mode) {
 }
 
 void TabConfigurations::UpdateUI_Settings(UpdateUIMode mode) {
+    (void)mode;
+
     Configurator &configurator = Configurator::Get();
 
     if (configurator.GetActiveConfiguration() == nullptr) {
@@ -582,10 +588,13 @@ void TabConfigurations::OnContextMenuImportClicked(ListItem *item) {
         return;
     }
 
-    const bool result = configurator.configurations.ImportConfiguration(configurator.layers, selected_path);
+    std::string configuration_name;
+    const bool result = configurator.configurations.ImportConfiguration(configurator.layers, selected_path, configuration_name);
 
     if (result) {
+        configurator.SetActiveConfigurationName(configuration_name);
         configurator.Override(OVERRIDE_AREA_ALL);
+
         this->UpdateUI_Configurations(UPDATE_REBUILD_UI);
         this->UpdateUI_LoaderMessages();
         this->UpdateUI_Layers(UPDATE_REBUILD_UI);

diff --git a/vkconfig_gui/tab_diagnostics.cpp b/vkconfig_gui/tab_diagnostics.cpp
@@ -84,7 +84,12 @@ void TabDiagnostics::UpdateUI(UpdateUIMode mode) {
 
 void TabDiagnostics::CleanUI() {}
 
-bool TabDiagnostics::EventFilter(QObject *target, QEvent *event) { return false; }
+bool TabDiagnostics::EventFilter(QObject *target, QEvent *event) {
+    (void)target;
+    (void)event;
+
+    return false;
+}
 
 void TabDiagnostics::on_diagnostic_keep_running_toggled(bool checked) {
     Configurator &configurator = Configurator::Get();

diff --git a/vkconfig_gui/tab_documentation.cpp b/vkconfig_gui/tab_documentation.cpp
@@ -25,8 +25,13 @@ TabDocumentation::TabDocumentation(MainWindow &window, std::shared_ptr<Ui::MainW
 
 TabDocumentation::~TabDocumentation() {}
 
-void TabDocumentation::UpdateUI(UpdateUIMode mode) {}
+void TabDocumentation::UpdateUI(UpdateUIMode mode) { (void)mode; }
 
 void TabDocumentation::CleanUI() {}
 
-bool TabDocumentation::EventFilter(QObject *target, QEvent *event) { return false; }
+bool TabDocumentation::EventFilter(QObject *target, QEvent *event) {
+    (void)target;
+    (void)event;
+
+    return false;
+}
diff --git a/vkconfig_gui/vkconfig.pro b/vkconfig_gui/vkconfig.pro
@@ -7,6 +7,7 @@ CONFIG += sdk_no_version_check
 
 INCLUDEPATH += ../external/Vulkan-Headers/include
 INCLUDEPATH += ../Vulkan-Headers/include
+INCLUDEPATH += ../external/Debug/64/Vulkan-Headers/include
 
 # Ignore JSON validation
 DEFINES += JSON_VALIDATION_OFF

diff --git a/vkconfig_gui/widget_tab_configurations_layer.h b/vkconfig_gui/widget_tab_configurations_layer.h
@@ -43,7 +43,7 @@ class ConfigurationLayerWidget : public QLabel {
     std::string layer_name;
 
    protected:
-    bool eventFilter(QObject *target, QEvent *event);
+    bool eventFilter(QObject *target, QEvent *event) override;
     void resizeEvent(QResizeEvent *event) override;
 
    public Q_SLOTS:

diff --git a/vkconfig_gui/widget_tab_layers_path.cpp b/vkconfig_gui/widget_tab_layers_path.cpp
@@ -54,6 +54,8 @@ void LayersPathWidget::resizeEvent(QResizeEvent* event) {
 }
 
 void LayersPathWidget::on_buttom_remove_clicked(bool checked) {
+    (void)checked;
+
     Configurator& configurator = Configurator::Get();
 
     std::vector<ReferencedLayer> referenced_layers;