Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-19 17:11:12 +02:00
Code Issues Releases Wiki Activity

Use type aliases CommandID, CommandIDs...

Browse Source 
... for identifiers of menu commands and macros, and for vectors thereof
This commit is contained in:
Paul Licameli
2019-03-10 22:05:37 -04:00
parent a30000cf74
commit 5fd6965925
28 changed files with 159 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/widgets/KeyView.cpp
View File

@@ -142,7 +142,7 @@ KeyView::GetFullLabel(int index) const
// Returns the index for the given name
//
int
KeyView::GetIndexByName(const wxString & name) const
KeyView::GetIndexByName(const CommandID & name) const
{
int cnt = (int) mNodes.size();
@@ -161,14 +161,14 @@ KeyView::GetIndexByName(const wxString & name) const
//
// Returns the command manager name for the given index
//
wxString
CommandID
KeyView::GetName(int index) const
{
// Make sure index is valid
if (index < 0 || index >= (int) mNodes.size())
{
wxASSERT(false);
return wxEmptyString;
return {};
}
return mNodes[index].name;
@@ -177,7 +177,7 @@ KeyView::GetName(int index) const
//
// Returns the command manager index for the given key combination
//
wxString
CommandID
KeyView::GetNameByKey(const NormalizedKeyString & key) const
{
int cnt = (int) mNodes.size();
@@ -191,7 +191,7 @@ KeyView::GetNameByKey(const NormalizedKeyString & key) const
}
}
return wxEmptyString;
return {};
}
//
@@ -292,7 +292,7 @@ KeyView::SetKey(int index, const NormalizedKeyString & key)
// Sets the key for the given name
//
bool
KeyView::SetKeyByName(const wxString & name, const NormalizedKeyString & key)
KeyView::SetKeyByName(const CommandID & name, const NormalizedKeyString & key)
{
int index = GetIndexByName(name);
@@ -518,7 +518,7 @@ KeyView::UpdateHScroll()
// Process a NEW set of bindings
//
void
KeyView::RefreshBindings(const wxArrayString & names,
KeyView::RefreshBindings(const CommandIDs & names,
const wxArrayString & categories,
const wxArrayString & prefixes,
const wxArrayString & labels,
@@ -545,7 +545,7 @@ KeyView::RefreshBindings(const wxArrayString & names,
int cnt = (int) names.size();
for (int i = 0; i < cnt; i++)
{
wxString name = names[i];
auto name = names[i];
int x, y;
// Remove any menu code from the category and prefix
@@ -587,7 +587,7 @@ KeyView::RefreshBindings(const wxArrayString & names,
KeyNode node;
// Fill in the node info
node.name = wxEmptyString; // don't associate branches with a command
node.name = CommandID{}; // don't associate branches with a command
node.category = cat;
node.prefix = pfx;
node.label = cat;
@@ -627,7 +627,7 @@ KeyView::RefreshBindings(const wxArrayString & names,
KeyNode node;
// Fill in the node info
node.name = wxEmptyString; // don't associate branches with a command
node.name = CommandID{}; // don't associate branches with a command
node.category = cat;
node.prefix = pfx;
node.label = pfx;

13
src/widgets/KeyView.h
View File

@@ -10,6 +10,7 @@
#define __AUDACITY_WIDGETS_KEYVIEW__
#include "../Audacity.h"
#include "audacity/Types.h"
#include <vector>
#include <wx/defs.h>
@@ -40,7 +41,7 @@ public:
//KeyNode &operator = ( KeyNode && ) = default;
public:
wxString name;
CommandID name;
wxString category;
wxString prefix;
wxString label;
@@ -83,7 +84,7 @@ public:
virtual ~KeyView();
wxString GetName() const; // Gets the control name from the base class
void RefreshBindings(const wxArrayString & names,
void RefreshBindings(const CommandIDs & names,
const wxArrayString & categories,
const wxArrayString & prefixes,
const wxArrayString & labels,
@@ -95,15 +96,15 @@ public:
wxString GetLabel(int index) const;
wxString GetFullLabel(int index) const;
int GetIndexByName(const wxString & name) const;
wxString GetName(int index) const;
wxString GetNameByKey(const NormalizedKeyString & key) const;
int GetIndexByName(const CommandID & name) const;
CommandID GetName(int index) const;
CommandID GetNameByKey(const NormalizedKeyString & key) const;
int GetIndexByKey(const NormalizedKeyString & key) const;
NormalizedKeyString GetKey(int index) const;
bool CanSetKey(int index) const;
bool SetKey(int index, const NormalizedKeyString & key);
bool SetKeyByName(const wxString & name, const NormalizedKeyString & key);
bool SetKeyByName(const CommandID & name, const NormalizedKeyString & key);
void SetView(ViewByType type);