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

Class naming update

Browse Source
This commit is contained in:
Simon Rozman
2016-07-20 10:37:12 +02:00
parent 512f46f014
commit 434e042f8b
16 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/TTLS_UI/include/Module.h
View File

@@ -35,7 +35,7 @@ namespace eap
namespace eap
{
class peer_ttls_ui : public peer_ui<eap::config_ttls, eap::credentials_ttls, bool, bool>
class peer_ttls_ui : public peer_ui<eap::config_method_ttls, eap::credentials_ttls, bool, bool>
{
public:
///

14
lib/TTLS_UI/include/TTLS_UI.h
View File

@@ -53,7 +53,7 @@ public:
///
/// Constructs a configuration panel
///
wxEAPTTLSConfigPanel(_Tprov &prov, eap::config_ttls &cfg, wxWindow* parent) :
wxEAPTTLSConfigPanel(_Tprov &prov, eap::config_method_ttls &cfg, wxWindow* parent) :
m_prov(prov),
m_cfg(cfg),
wxEAPTTLSConfigPanelBase(parent)
@@ -122,7 +122,7 @@ protected:
protected:
_Tprov &m_prov; ///< EAP provider
eap::config_ttls &m_cfg; ///< TTLS configuration
eap::config_method_ttls &m_cfg; ///< TTLS configuration
winstd::library m_shell32; ///< shell32.dll resource library reference
wxIcon m_icon; ///< Panel icon
};
@@ -139,7 +139,7 @@ public:
/// \param[in] pszCredTarget Target name of credentials in Windows Credential Manager. Can be further decorated to create final target name.
/// \param[in] parent Parent window
///
wxEAPTTLSConfig(_Tprov &prov, eap::config_ttls &cfg, LPCTSTR pszCredTarget, wxWindow* parent) :
wxEAPTTLSConfig(_Tprov &prov, eap::config_method_ttls &cfg, LPCTSTR pszCredTarget, wxWindow* parent) :
m_prov(prov),
m_cfg(cfg),
m_cfg_pap(cfg.m_module),
@@ -213,7 +213,7 @@ protected:
m_inner_type->GetChoiceCtrl()->Enable(false);
}
eap::config_pap *cfg_pap = dynamic_cast<eap::config_pap*>(m_cfg.m_inner);
eap::config_method_pap *cfg_pap = dynamic_cast<eap::config_method_pap*>(m_cfg.m_inner);
if (cfg_pap) {
m_cfg_pap = *cfg_pap;
m_inner_type->SetSelection(0); // 0=PAP
@@ -235,7 +235,7 @@ protected:
switch (m_inner_type->GetSelection()) {
case 0: // 0=PAP
delete m_cfg.m_inner;
m_cfg.m_inner = new eap::config_pap(m_cfg_pap);
m_cfg.m_inner = new eap::config_method_pap(m_cfg_pap);
break;
default:
@@ -263,12 +263,12 @@ protected:
protected:
_Tprov &m_prov; ///< EAP provider
eap::config_ttls &m_cfg; ///< TTLS configuration
eap::config_method_ttls &m_cfg; ///< TTLS configuration
wxStaticText *m_outer_title; ///< Outer authentication title
wxEAPTTLSConfigPanel<_Tprov> *m_outer_identity; ///< Outer identity configuration panel
wxEAPTLSConfigPanel<_Tprov> *m_tls; ///< TLS configuration panel
wxStaticText *m_inner_title; ///< Inner authentication title
wxChoicebook *m_inner_type; ///< Inner authentication type
eap::config_pap m_cfg_pap; ///< Temporary PAP configuration
eap::config_method_pap m_cfg_pap; ///< Temporary PAP configuration
};

4
lib/TTLS_UI/src/Module.cpp
View File

@@ -25,7 +25,7 @@
// eap::peer_ttls_ui
//////////////////////////////////////////////////////////////////////
eap::peer_ttls_ui::peer_ttls_ui() : peer_ui<eap::config_ttls, eap::credentials_ttls, bool, bool>(type_ttls)
eap::peer_ttls_ui::peer_ttls_ui() : peer_ui<eap::config_method_ttls, eap::credentials_ttls, bool, bool>(type_ttls)
{
}
@@ -50,7 +50,7 @@ bool eap::peer_ttls_ui::invoke_config_ui(
wxTopLevelWindows.Append(&parent);
// Create and launch configuration dialog.
wxEAPConfigDialog<config_ttls, wxEAPTTLSConfig<provider_config_type> > dlg(cfg, &parent);
wxEAPConfigDialog<config_method_ttls, wxEAPTTLSConfig<provider_config_type> > dlg(cfg, &parent);
result = dlg.ShowModal();
wxTopLevelWindows.DeleteObject(&parent);