naming fix, initialization

Author: GrantComm

ui/command_buffer_model.cpp

@@ -255,12 +255,11 @@ void CommandBufferModel::OnSelectionChanged(const QModelIndex &index)
 
     // Ensures that the selected index passed belongs to the filter model currently displayed in the
     // main window.
-    QAbstractItemModel *model = const_cast<QAbstractItemModel *>(index.model());
-    DiveFilterModel    *dive_filter_model = dynamic_cast<DiveFilterModel *>(model);
+    const DiveFilterModel *dive_filter_model = qobject_cast<const DiveFilterModel *>(index.model());
     if (dive_filter_model)
     {
-        QModelIndex new_index = dive_filter_model->mapToSource(index);
-        selected_node_index = (uint64_t)new_index.internalPointer();
+        const QModelIndex &new_index = dive_filter_model->mapToSource(index);
+        selected_node_index = (uint64_t)(new_index.internalPointer());
     }
 
     emit beginResetModel();

ui/gfxr_vulkan_command_arguments_tab_view.cpp

@@ -40,13 +40,13 @@ GfxrVulkanCommandArgumentsFilterProxyModel *proxy_model,
 GfxrVulkanCommandModel                     *command_hierarchy_model,
 QWidget                                    *parent) :
     m_vulkan_command_hierarchy(vulkan_command_hierarchy),
-    m_arg_proxy_Model(proxy_model),
+    m_arg_proxy_model(proxy_model),
     m_command_hierarchy_model(command_hierarchy_model)
 {
     m_command_hierarchy_view = new DiveTreeView(m_vulkan_command_hierarchy);
 
-    m_arg_proxy_Model->setSourceModel(m_command_hierarchy_model);
-    m_command_hierarchy_view->setModel(m_arg_proxy_Model);
+    m_arg_proxy_model->setSourceModel(m_command_hierarchy_model);
+    m_command_hierarchy_view->setModel(m_arg_proxy_model);
 
     m_search_trigger_button = new QPushButton;
     m_search_trigger_button->setObjectName(kGfxrVulkanCommandArgumentsSearchButtonName);
@@ -98,7 +98,7 @@ void GfxrVulkanCommandArgumentsTabView::OnSelectionChanged(const QModelIndex &in
 {
     if (!index.isValid())
     {
-        m_arg_proxy_Model->SetTargetParentSourceIndex(QModelIndex());
+        m_arg_proxy_model->SetTargetParentSourceIndex(QModelIndex());
         return;
     }
 
@@ -116,7 +116,7 @@ void GfxrVulkanCommandArgumentsTabView::OnSelectionChanged(const QModelIndex &in
     }
 
     // Always use the source_index, regardless of whether a proxy was involved.
-    m_arg_proxy_Model->SetTargetParentSourceIndex(source_index);
+    m_arg_proxy_model->SetTargetParentSourceIndex(source_index);
 
     uint32_t column_count = (uint32_t)m_command_hierarchy_model->columnCount(QModelIndex());
     for (uint32_t column = 0; column < column_count; ++column)

ui/gfxr_vulkan_command_arguments_tab_view.h

@@ -66,7 +66,6 @@ public slots:
     SearchBar    *m_search_bar = nullptr;
 
     const Dive::CommandHierarchy               &m_vulkan_command_hierarchy;
-    GfxrVulkanCommandFilterProxyModel          *m_proxy_Model;
-    GfxrVulkanCommandArgumentsFilterProxyModel *m_arg_proxy_Model;
+    GfxrVulkanCommandArgumentsFilterProxyModel *m_arg_proxy_model;
     GfxrVulkanCommandModel                     *m_command_hierarchy_model;
 };

ui/gfxr_vulkan_command_tab_view.h

@@ -68,7 +68,7 @@ public slots:
 private:
     DiveTreeView *m_command_hierarchy_view;
     QPushButton  *m_search_trigger_button;
-    SearchBar    *m_search_bar = nullptr;
+    SearchBar    *m_search_bar;
 
     const Dive::CommandHierarchy      &m_vulkan_command_hierarchy;
     GfxrVulkanCommandFilterProxyModel &m_proxy_Model;