Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Class consistency renaming

Browse Source
This commit is contained in:
Simon Rozman
2016-07-20 10:55:26 +02:00
parent 434e042f8b
commit 2a19b4624a
14 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/EAPBase_UI/include/EAP_UI.h
View File

@@ -25,37 +25,37 @@
///
/// EAP configuration dialog
/// EAP top-most configuration dialog
///
template <class _Tmeth, class _wxT> class wxEAPConfigDialog;
///
/// EAP credentials dialog
/// EAP top-most credential dialog
///
template <class _Tprov> class wxEAPCredentialsDialog;
///
/// EAP dialog banner
/// Reusable EAP dialog banner for `wxEAPConfigDialog` and `wxEAPCredentialsDialog`
///
class wxEAPBannerPanel;
///
/// EAP Provider-locked congifuration note
///
template <class _Tprov> class wxEAPProviderLocked;
template <class _Tprov> class wxEAPProviderLockedPanel;
///
/// Base template for credentials configuration panel
/// Base template for credential configuration panel
///
template <class _Tprov, class _Tmeth, class _wxT> class wxEAPCredentialsConfigPanel;
///
/// Base template for all credential panels
/// Base template for all credential entry panels
///
template <class _Tcred, class _Tbase> class wxCredentialsPanel;
template <class _Tcred, class _Tbase> class wxEAPCredentialsPanelBase;
///
/// Password credentials panel
/// Generic password credential entry panel
///
template <class _Tprov> class wxPasswordCredentialsPanel;
@@ -218,15 +218,15 @@ protected:
template <class _Tprov>
class wxEAPProviderLocked : public wxEAPProviderLockedBase
class wxEAPProviderLockedPanel : public wxEAPProviderLockedPanelBase
{
public:
///
/// Constructs a notice pannel and set the title text
///
wxEAPProviderLocked(_Tprov &prov, wxWindow* parent) :
wxEAPProviderLockedPanel(_Tprov &prov, wxWindow* parent) :
m_prov(prov),
wxEAPProviderLockedBase(parent)
wxEAPProviderLockedPanelBase(parent)
{
// Load and set icon.
if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
@@ -496,7 +496,7 @@ private:
template <class _Tcred, class _Tbase>
class wxCredentialsPanel : public _Tbase
class wxEAPCredentialsPanelBase : public _Tbase
{
public:
///
@@ -507,7 +507,7 @@ public:
/// \param[in] parent Parent window
/// \param[in] is_config Is this panel used to pre-enter credentials? When \c true, the "Remember" checkbox is always selected and disabled.
///
wxCredentialsPanel(_Tcred &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false) :
wxEAPCredentialsPanelBase(_Tcred &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false) :
m_cred(cred),
m_target(pszCredTarget),
_Tbase(parent)
@@ -572,7 +572,7 @@ protected:
template <class _Tprov>
class wxPasswordCredentialsPanel : public wxCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase>
class wxPasswordCredentialsPanel : public wxEAPCredentialsPanelBase<eap::credentials_pass, wxEAPCredentialsPanelPassBase>
{
public:
///
@@ -585,7 +585,7 @@ public:
/// \param[in] is_config Is this panel used to pre-enter credentials? When \c true, the "Remember" checkbox is always selected and disabled.
///
wxPasswordCredentialsPanel(_Tprov &prov, eap::credentials_pass &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false) :
wxCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase>(cred, pszCredTarget, parent, is_config)
wxEAPCredentialsPanelBase<eap::credentials_pass, wxEAPCredentialsPanelPassBase>(cred, pszCredTarget, parent, is_config)
{
// Load and set icon.
if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))

8
lib/EAPBase_UI/res/wxEAP_UI.cpp
View File

@@ -119,7 +119,7 @@ wxEAPBannerPanelBase::~wxEAPBannerPanelBase()
{
}
wxEAPProviderLockedBase::wxEAPProviderLockedBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
wxEAPProviderLockedPanelBase::wxEAPProviderLockedPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
{
this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INFOBK ) );
@@ -143,7 +143,7 @@ wxEAPProviderLockedBase::wxEAPProviderLockedBase( wxWindow* parent, wxWindowID i
this->Layout();
}
wxEAPProviderLockedBase::~wxEAPProviderLockedBase()
wxEAPProviderLockedPanelBase::~wxEAPProviderLockedPanelBase()
{
}
@@ -269,7 +269,7 @@ wxEAPCredentialsConfigPanelBase::~wxEAPCredentialsConfigPanelBase()
}
wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
wxEAPCredentialsPanelPassBase::wxEAPCredentialsPanelPassBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
{
wxStaticBoxSizer* sb_credentials;
sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Credentials") ), wxVERTICAL );
@@ -330,6 +330,6 @@ wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent
this->Layout();
}
wxPasswordCredentialsPanelBase::~wxPasswordCredentialsPanelBase()
wxEAPCredentialsPanelPassBase::~wxEAPCredentialsPanelPassBase()
{
}

4
lib/EAPBase_UI/res/wxEAP_UI.fbp
View File

@@ -637,7 +637,7 @@
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">wxEAPProviderLockedBase</property>
<property name="name">wxEAPProviderLockedPanelBase</property>
<property name="pos"></property>
<property name="size">500,-1</property>
<property name="subclass"></property>
@@ -1818,7 +1818,7 @@
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">wxPasswordCredentialsPanelBase</property>
<property name="name">wxEAPCredentialsPanelPassBase</property>
<property name="pos"></property>
<property name="size">500,-1</property>
<property name="subclass"></property>

16
lib/EAPBase_UI/res/wxEAP_UI.h
View File

@@ -102,9 +102,9 @@ class wxEAPBannerPanelBase : public wxPanel
};
///////////////////////////////////////////////////////////////////////////////
/// Class wxEAPProviderLockedBase
/// Class wxEAPProviderLockedPanelBase
///////////////////////////////////////////////////////////////////////////////
class wxEAPProviderLockedBase : public wxPanel
class wxEAPProviderLockedPanelBase : public wxPanel
{
private:
@@ -115,8 +115,8 @@ class wxEAPProviderLockedBase : public wxPanel
public:
wxEAPProviderLockedBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
~wxEAPProviderLockedBase();
wxEAPProviderLockedPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
~wxEAPProviderLockedPanelBase();
};
@@ -153,9 +153,9 @@ class wxEAPCredentialsConfigPanelBase : public wxPanel
};
///////////////////////////////////////////////////////////////////////////////
/// Class wxPasswordCredentialsPanelBase
/// Class wxEAPCredentialsPanelPassBase
///////////////////////////////////////////////////////////////////////////////
class wxPasswordCredentialsPanelBase : public wxPanel
class wxEAPCredentialsPanelPassBase : public wxPanel
{
private:
@@ -170,8 +170,8 @@ class wxPasswordCredentialsPanelBase : public wxPanel
public:
wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL );
~wxPasswordCredentialsPanelBase();
wxEAPCredentialsPanelPassBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL );
~wxEAPCredentialsPanelPassBase();
};