Thu Sep 6 22:57:44 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

20 files changed, 479 insertions, 506 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ebd56219fbc..63f795a9c9b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,26 @@
+Thu Sep  6 22:57:44 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * utils/NamingViewer/AddNameServerDlg.h:
+        * utils/NamingViewer/AddNameServerDlg.cpp:
+        * utils/NamingViewer/BindDialog.h:
+        * utils/NamingViewer/BindDialog.cpp:
+        * utils/NamingViewer/BindNewContext.h:
+        * utils/NamingViewer/BindNewContext.cpp:
+        * utils/NamingViewer/NamingTreeCtrl.h:
+        * utils/NamingViewer/NamingTreeCtrl.cpp:
+        * utils/NamingViewer/NamingViewer.h:
+        * utils/NamingViewer/NamingViewer.cpp:
+        * utils/NamingViewer/NamingViewerDlg.h:
+        * utils/NamingViewer/NamingViewerDlg.cpp:
+        * utils/NamingViewer/SelectNSDialog.h:
+        * utils/NamingViewer/SelectNSDialog.cpp:
+        * utils/NamingViewer/StdAfx.cpp:
+        * utils/NamingViewer/ViewIORDialog.h:
+        * utils/NamingViewer/ViewIORDialog.cpp:
+        * utils/catior/catior.cpp:
+        * utils/wxNamingViewer/wxBindDialog.cpp:
+          Untabify.
+
 Thu Sep  6 18:01:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/Notify/Service.h (create):
diff --git a/TAO/utils/NamingViewer/AddNameServerDlg.cpp b/TAO/utils/NamingViewer/AddNameServerDlg.cpp
index 87eeaabdb5b..0f4be971cb7 100644
--- a/TAO/utils/NamingViewer/AddNameServerDlg.cpp
+++ b/TAO/utils/NamingViewer/AddNameServerDlg.cpp
@@ -15,36 +15,36 @@ static char THIS_FILE[] = __FILE__;
 
 
 CAddNameServerDlg::CAddNameServerDlg(CWnd* pParent /*=NULL*/)
-	: CDialog(CAddNameServerDlg::IDD, pParent)
+  : CDialog(CAddNameServerDlg::IDD, pParent)
 {
-	//{{AFX_DATA_INIT(CAddNameServerDlg)
-	m_IOR = _T("corbaloc:iiop:1.1@myserver:nsport/NameService");
-	m_Name = _T("");
-	//}}AFX_DATA_INIT
+  //{{AFX_DATA_INIT(CAddNameServerDlg)
+  m_IOR = _T("corbaloc:iiop:1.1@myserver:nsport/NameService");
+  m_Name = _T("");
+  //}}AFX_DATA_INIT
 }
 
 
 void CAddNameServerDlg::DoDataExchange(CDataExchange* pDX)
 {
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CAddNameServerDlg)
-	DDX_Text(pDX, IDC_IOR, m_IOR);
-	DDX_Text(pDX, IDC_NAME, m_Name);
-	//}}AFX_DATA_MAP
+  CDialog::DoDataExchange(pDX);
+  //{{AFX_DATA_MAP(CAddNameServerDlg)
+  DDX_Text(pDX, IDC_IOR, m_IOR);
+  DDX_Text(pDX, IDC_NAME, m_Name);
+  //}}AFX_DATA_MAP
 }
 
 
 BEGIN_MESSAGE_MAP(CAddNameServerDlg, CDialog)
-	//{{AFX_MSG_MAP(CAddNameServerDlg)
-	//}}AFX_MSG_MAP
+  //{{AFX_MSG_MAP(CAddNameServerDlg)
+  //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
 // CAddNameServerDlg message handlers
 
-void CAddNameServerDlg::OnOK() 
+void CAddNameServerDlg::OnOK()
 {
-	// TODO: Add extra validation here
-	UpdateData();
-	CDialog::OnOK();
+  // TODO: Add extra validation here
+  UpdateData();
+  CDialog::OnOK();
 }
diff --git a/TAO/utils/NamingViewer/AddNameServerDlg.h b/TAO/utils/NamingViewer/AddNameServerDlg.h
index 0707c2a59fc..d76174b446c 100644
--- a/TAO/utils/NamingViewer/AddNameServerDlg.h
+++ b/TAO/utils/NamingViewer/AddNameServerDlg.h
@@ -15,31 +15,31 @@ class CAddNameServerDlg : public CDialog
 {
 // Construction
 public:
-	CAddNameServerDlg(CWnd* pParent = 0);   // standard constructor
+  CAddNameServerDlg(CWnd* pParent = 0);   // standard constructor
 
 // Dialog Data
-	//{{AFX_DATA(CAddNameServerDlg)
-	enum { IDD = IDD_ADD_NAME_SERVER };
-	CString	m_IOR;
-	CString	m_Name;
-	//}}AFX_DATA
+  //{{AFX_DATA(CAddNameServerDlg)
+  enum { IDD = IDD_ADD_NAME_SERVER };
+  CString m_IOR;
+  CString m_Name;
+  //}}AFX_DATA
 
 
 // Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CAddNameServerDlg)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
+  // ClassWizard generated virtual function overrides
+  //{{AFX_VIRTUAL(CAddNameServerDlg)
+  protected:
+  virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+  //}}AFX_VIRTUAL
 
 // Implementation
 protected:
 
-	// Generated message map functions
-	//{{AFX_MSG(CAddNameServerDlg)
-	virtual void OnOK();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+  // Generated message map functions
+  //{{AFX_MSG(CAddNameServerDlg)
+  virtual void OnOK();
+  //}}AFX_MSG
+  DECLARE_MESSAGE_MAP()
 };
 
 //{{AFX_INSERT_LOCATION}}
diff --git a/TAO/utils/NamingViewer/BindDialog.cpp b/TAO/utils/NamingViewer/BindDialog.cpp
index a7a0c2b7cdb..701e718da7d 100644
--- a/TAO/utils/NamingViewer/BindDialog.cpp
+++ b/TAO/utils/NamingViewer/BindDialog.cpp
@@ -16,13 +16,13 @@ static char THIS_FILE[] = __FILE__;
 
 
 CBindDialog::CBindDialog(bool Context, CORBA::ORB_ptr pORB, CWnd* pParent /*=NULL*/)
-	: CDialog(CBindDialog::IDD, pParent)
+  : CDialog(CBindDialog::IDD, pParent)
 {
-	//{{AFX_DATA_INIT(CBindDialog)
-	m_IOR = _T("");
-	m_ID = _T("");
-	m_Kind = _T("");
-	//}}AFX_DATA_INIT
+  //{{AFX_DATA_INIT(CBindDialog)
+  m_IOR = _T("");
+  m_ID = _T("");
+  m_Kind = _T("");
+  //}}AFX_DATA_INIT
   m_pORB = pORB;
   m_Context = Context;
 }
@@ -30,19 +30,19 @@ CBindDialog::CBindDialog(bool Context, CORBA::ORB_ptr pORB, CWnd* pParent /*=NUL
 
 void CBindDialog::DoDataExchange(CDataExchange* pDX)
 {
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CBindDialog)
-	DDX_Text(pDX, IDC_IOR, m_IOR);
-	DDX_Text(pDX, IDC_ID, m_ID);
-	DDX_Text(pDX, IDC_KIND, m_Kind);
-	//}}AFX_DATA_MAP
+  CDialog::DoDataExchange(pDX);
+  //{{AFX_DATA_MAP(CBindDialog)
+  DDX_Text(pDX, IDC_IOR, m_IOR);
+  DDX_Text(pDX, IDC_ID, m_ID);
+  DDX_Text(pDX, IDC_KIND, m_Kind);
+  //}}AFX_DATA_MAP
 }
 
 
 BEGIN_MESSAGE_MAP(CBindDialog, CDialog)
-	//{{AFX_MSG_MAP(CBindDialog)
-	ON_BN_CLICKED(IDC_VIEWIOR, OnViewior)
-	//}}AFX_MSG_MAP
+  //{{AFX_MSG_MAP(CBindDialog)
+  ON_BN_CLICKED(IDC_VIEWIOR, OnViewior)
+  //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@ END_MESSAGE_MAP()
 
 void CBindDialog::OnViewior()
 {
-	// TODO: Add your control notification handler code here
+  // TODO: Add your control notification handler code here
   try
   {
     UpdateData();
@@ -67,10 +67,10 @@ void CBindDialog::OnViewior()
 
 BOOL CBindDialog::OnInitDialog()
 {
-	CDialog::OnInitDialog();
-	
-	// TODO: Add extra initialization here
-	if(m_Context)
+  CDialog::OnInitDialog();
+
+  // TODO: Add extra initialization here
+  if(m_Context)
   {
     SetWindowText(ACE_TEXT ("Bind Context"));
   }
@@ -78,14 +78,14 @@ BOOL CBindDialog::OnInitDialog()
   {
     SetWindowText(ACE_TEXT ("Bind Object"));
   }
-	return TRUE;  // return TRUE unless you set the focus to a control
-	              // EXCEPTION: OCX Property Pages should return FALSE
+  return TRUE;  // return TRUE unless you set the focus to a control
+  // EXCEPTION: OCX Property Pages should return FALSE
 }
 
 void CBindDialog::OnOK()
 {
-	// TODO: Add extra validation here
-	UpdateData();
+  // TODO: Add extra validation here
+  UpdateData();
   m_Name.length(1);
   m_Name[0].id = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_ID));
   m_Name[0].kind = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_Kind));
diff --git a/TAO/utils/NamingViewer/BindDialog.h b/TAO/utils/NamingViewer/BindDialog.h
index 2b1f04a080c..a8e80a8e56e 100644
--- a/TAO/utils/NamingViewer/BindDialog.h
+++ b/TAO/utils/NamingViewer/BindDialog.h
@@ -19,33 +19,33 @@ public:
   CBindDialog(bool Context, CORBA::ORB_ptr pORB, CWnd* pParent = 0);   // standard constructor
 
 // Dialog Data
-	//{{AFX_DATA(CBindDialog)
-	enum { IDD = IDD_BIND };
-	CString	m_IOR;
-	CString	m_ID;
-	CString	m_Kind;
-	//}}AFX_DATA
+  //{{AFX_DATA(CBindDialog)
+  enum { IDD = IDD_BIND };
+  CString m_IOR;
+  CString m_ID;
+  CString m_Kind;
+  //}}AFX_DATA
   CORBA::Object_ptr GetObject() {return m_Object;};
 
   CosNaming::Name& GetName() {return m_Name;};
 
 // Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CBindDialog)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
+  // ClassWizard generated virtual function overrides
+  //{{AFX_VIRTUAL(CBindDialog)
+  protected:
+  virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+  //}}AFX_VIRTUAL
 
 // Implementation
 protected:
 
-	// Generated message map functions
-	//{{AFX_MSG(CBindDialog)
-	afx_msg void OnViewior();
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+  // Generated message map functions
+  //{{AFX_MSG(CBindDialog)
+  afx_msg void OnViewior();
+  virtual BOOL OnInitDialog();
+  virtual void OnOK();
+  //}}AFX_MSG
+  DECLARE_MESSAGE_MAP()
   CORBA::Object_var m_Object;
   CORBA::ORB_ptr    m_pORB;
   CosNaming::Name   m_Name;
diff --git a/TAO/utils/NamingViewer/BindNewContext.cpp b/TAO/utils/NamingViewer/BindNewContext.cpp
index a846fa6cf3c..0746f4a42f6 100644
--- a/TAO/utils/NamingViewer/BindNewContext.cpp
+++ b/TAO/utils/NamingViewer/BindNewContext.cpp
@@ -16,28 +16,28 @@ static char THIS_FILE[] = __FILE__;
 
 
 CBindNewContext::CBindNewContext(CWnd* pParent /*=NULL*/)
-	: CDialog(CBindNewContext::IDD, pParent)
+  : CDialog(CBindNewContext::IDD, pParent)
 {
-	//{{AFX_DATA_INIT(CBindNewContext)
-	m_ID = _T("");
-	m_Kind = _T("");
-	//}}AFX_DATA_INIT
+  //{{AFX_DATA_INIT(CBindNewContext)
+  m_ID = _T("");
+  m_Kind = _T("");
+  //}}AFX_DATA_INIT
 }
 
 
 void CBindNewContext::DoDataExchange(CDataExchange* pDX)
 {
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CBindNewContext)
-	DDX_Text(pDX, IDC_ID, m_ID);
-	DDX_Text(pDX, IDC_KIND, m_Kind);
-	//}}AFX_DATA_MAP
+  CDialog::DoDataExchange(pDX);
+  //{{AFX_DATA_MAP(CBindNewContext)
+  DDX_Text(pDX, IDC_ID, m_ID);
+  DDX_Text(pDX, IDC_KIND, m_Kind);
+  //}}AFX_DATA_MAP
 }
 
 
 BEGIN_MESSAGE_MAP(CBindNewContext, CDialog)
-	//{{AFX_MSG_MAP(CBindNewContext)
-	//}}AFX_MSG_MAP
+  //{{AFX_MSG_MAP(CBindNewContext)
+  //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -45,10 +45,10 @@ END_MESSAGE_MAP()
 
 void CBindNewContext::OnOK()
 {
-	// TODO: Add extra validation here
-	UpdateData();
+  // TODO: Add extra validation here
+  UpdateData();
   m_Name.length(1);
   m_Name[0].id = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_ID));
   m_Name[0].kind = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_Kind));
-	CDialog::OnOK();
+  CDialog::OnOK();
 }
diff --git a/TAO/utils/NamingViewer/BindNewContext.h b/TAO/utils/NamingViewer/BindNewContext.h
index d636994c2ec..b94ca864732 100644
--- a/TAO/utils/NamingViewer/BindNewContext.h
+++ b/TAO/utils/NamingViewer/BindNewContext.h
@@ -15,31 +15,31 @@ class CBindNewContext : public CDialog
 {
 // Construction
 public:
-	CBindNewContext(CWnd* pParent = 0);   // standard constructor
+  CBindNewContext(CWnd* pParent = 0);   // standard constructor
 
 // Dialog Data
-	//{{AFX_DATA(CBindNewContext)
-	enum { IDD = IDD_BIND_NEW_CONTEXT };
-	CString	m_ID;
-	CString	m_Kind;
-	//}}AFX_DATA
+  //{{AFX_DATA(CBindNewContext)
+  enum { IDD = IDD_BIND_NEW_CONTEXT };
+  CString m_ID;
+  CString m_Kind;
+  //}}AFX_DATA
   CosNaming::Name& GetName() {return m_Name;};
 
 // Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CBindNewContext)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
+  // ClassWizard generated virtual function overrides
+  //{{AFX_VIRTUAL(CBindNewContext)
+  protected:
+  virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+  //}}AFX_VIRTUAL
 
 // Implementation
 protected:
 
-	// Generated message map functions
-	//{{AFX_MSG(CBindNewContext)
-	virtual void OnOK();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+  // Generated message map functions
+  //{{AFX_MSG(CBindNewContext)
+  virtual void OnOK();
+  //}}AFX_MSG
+  DECLARE_MESSAGE_MAP()
 
   CosNaming::Name   m_Name;
 };
diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
index 3c7f265d9d8..229c07741ea 100644
--- a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
+++ b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
@@ -28,21 +28,21 @@ CNamingTreeCtrl::~CNamingTreeCtrl (void)
 }
 
 BEGIN_MESSAGE_MAP(CNamingTreeCtrl, CTreeCtrl)
-	//{{AFX_MSG_MAP(CNamingTreeCtrl)
-	ON_WM_RBUTTONDOWN()
-	ON_COMMAND(ID_CONTEXT_POPUP_VIEWREFERENCE, OnContextPopupViewreference)
-	ON_NOTIFY_REFLECT(TVN_ITEMEXPANDING, OnItemexpanding)
-	ON_COMMAND(ID_CONTEXT_POPUP_REFRESH, OnContextPopupRefresh)
-	ON_COMMAND(ID_CONTEXT_POPUP_UNBIND, OnContextPopupUnbind)
-	ON_COMMAND(ID_CONTEXT_POPUP_DESTROY, OnContextPopupDestroy)
-	ON_COMMAND(ID_CONTEXT_POPUP_BIND_CONTEXT, OnContextPopupBindContext)
-	ON_COMMAND(ID_CONTEXT_POPUP_BINDOBJECT, OnContextPopupBindobject)
-	ON_WM_DESTROY()
-	ON_COMMAND(ID_CONTEXTPOPUP_BINDNEWCONTEXT, OnContextpopupBindnewcontext)
-	ON_NOTIFY_REFLECT(NM_DBLCLK, OnDblclk)
-	ON_COMMAND(ID_OBJECTPOPUP_UNBIND, OnObjectpopupUnbind)
-	ON_COMMAND(ID_OBJECTPOPUP_VIEWREFRENCE, OnObjectpopupViewrefrence)
-	//}}AFX_MSG_MAP
+  //{{AFX_MSG_MAP(CNamingTreeCtrl)
+  ON_WM_RBUTTONDOWN()
+  ON_COMMAND(ID_CONTEXT_POPUP_VIEWREFERENCE, OnContextPopupViewreference)
+  ON_NOTIFY_REFLECT(TVN_ITEMEXPANDING, OnItemexpanding)
+  ON_COMMAND(ID_CONTEXT_POPUP_REFRESH, OnContextPopupRefresh)
+  ON_COMMAND(ID_CONTEXT_POPUP_UNBIND, OnContextPopupUnbind)
+  ON_COMMAND(ID_CONTEXT_POPUP_DESTROY, OnContextPopupDestroy)
+  ON_COMMAND(ID_CONTEXT_POPUP_BIND_CONTEXT, OnContextPopupBindContext)
+  ON_COMMAND(ID_CONTEXT_POPUP_BINDOBJECT, OnContextPopupBindobject)
+  ON_WM_DESTROY()
+  ON_COMMAND(ID_CONTEXTPOPUP_BINDNEWCONTEXT, OnContextpopupBindnewcontext)
+  ON_NOTIFY_REFLECT(NM_DBLCLK, OnDblclk)
+  ON_COMMAND(ID_OBJECTPOPUP_UNBIND, OnObjectpopupUnbind)
+  ON_COMMAND(ID_OBJECTPOPUP_VIEWREFRENCE, OnObjectpopupViewrefrence)
+  //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -72,10 +72,10 @@ void CNamingTreeCtrl::OnRButtonDown (UINT nFlags, CPoint point)
     {
       if(!m_ObjectPopup.GetSubMenu(0)->TrackPopupMenu(
 #if defined (TPM_RIGHTBUTTON)
-		                                              TPM_RIGHTBUTTON |
+                                                      TPM_RIGHTBUTTON |
 #endif
-                                            		  TPM_LEFTALIGN,
-		                                              Point.x, Point.y, this))
+                                                      TPM_LEFTALIGN,
+                                                      Point.x, Point.y, this))
         {
           TRACE0("TrackPopupMenu Failed");
         }
@@ -84,10 +84,10 @@ void CNamingTreeCtrl::OnRButtonDown (UINT nFlags, CPoint point)
     {
       if(!m_ContextPopup.GetSubMenu(0)->TrackPopupMenu(
 #if defined (TPM_RIGHTBUTTON)
-		                                              TPM_RIGHTBUTTON |
+                                                       TPM_RIGHTBUTTON |
 #endif
-		                                               TPM_LEFTALIGN,
-		                                               Point.x, Point.y, this))
+                                                       TPM_LEFTALIGN,
+                                                       Point.x, Point.y, this))
         {
           TRACE0("TrackPopupMenu Failed");
         }
@@ -96,8 +96,8 @@ void CNamingTreeCtrl::OnRButtonDown (UINT nFlags, CPoint point)
 
 void CNamingTreeCtrl::OnContextPopupViewreference()
 {
-	// TODO: Add your command handler code here
-	ViewIORDialog Dialog(m_pORB, GetTreeObject()->Object());
+  // TODO: Add your command handler code here
+  ViewIORDialog Dialog(m_pORB, GetTreeObject()->Object());
   Dialog.DoModal();
 }
 
@@ -192,9 +192,9 @@ void CNamingTreeCtrl::ListContext(HTREEITEM hItem)
 
 void CNamingTreeCtrl::OnItemexpanding(NMHDR* pNMHDR, LRESULT* pResult)
 {
-	NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
-	// TODO: Add your control notification handler code here
-	*pResult = 0;
+  NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
+  // TODO: Add your control notification handler code here
+  *pResult = 0;
   // If this item has a child, it has already been listed so nothing to do..
   if(GetChildItem(pNMTreeView->itemNew.hItem))
   {
@@ -205,17 +205,17 @@ void CNamingTreeCtrl::OnItemexpanding(NMHDR* pNMHDR, LRESULT* pResult)
 
 void CNamingTreeCtrl::OnContextPopupRefresh()
 {
-	// TODO: Add your command handler code here
-	HTREEITEM hItem = GetSelectedItem();
+  // TODO: Add your command handler code here
+  HTREEITEM hItem = GetSelectedItem();
   ClearChildren(hItem);
   ListContext(hItem);
 }
 
 void CNamingTreeCtrl::OnContextPopupUnbind()
 {
-	// TODO: Add your command handler code here
+  // TODO: Add your command handler code here
   if(MessageBox(ACE_TEXT ("Are you sure you want to unbind this object?"),
-	            ACE_TEXT ("Confirm"), MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
+                ACE_TEXT ("Confirm"), MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
   {
     return;
   }
@@ -257,9 +257,9 @@ void CNamingTreeCtrl::Resolve(CosNaming::NamingContext_ptr pRootContext)
 
 void CNamingTreeCtrl::OnContextPopupDestroy()
 {
-	// TODO: Add your command handler code here
+  // TODO: Add your command handler code here
   if(MessageBox(ACE_TEXT ("Are you sure you want to destroy this context?"),
-	            ACE_TEXT ("Confirm"), MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
+                ACE_TEXT ("Confirm"), MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
   {
     return;
   }
@@ -292,7 +292,7 @@ void CNamingTreeCtrl::OnContextPopupDestroy()
 
 void CNamingTreeCtrl::OnContextPopupBindContext()
 {
-	// TODO: Add your command handler code here
+  // TODO: Add your command handler code here
   CBindDialog Dialog(true, m_pORB);
   if(Dialog.DoModal() != IDOK)
   {
@@ -323,7 +323,7 @@ void CNamingTreeCtrl::OnContextPopupBindContext()
 
 void CNamingTreeCtrl::OnContextPopupBindobject()
 {
-	// TODO: Add your command handler code here
+  // TODO: Add your command handler code here
   CBindDialog Dialog(false, m_pORB);
   if(Dialog.DoModal() != IDOK)
   {
@@ -349,17 +349,17 @@ void CNamingTreeCtrl::OnContextPopupBindobject()
 
 void CNamingTreeCtrl::OnDestroy()
 {
-	CTreeCtrl::OnDestroy();
-	
-	// TODO: Add your message handler code here
-	ClearChildren();
-	
+  CTreeCtrl::OnDestroy();
+
+  // TODO: Add your message handler code here
+  ClearChildren();
+
 }
 
 
 void CNamingTreeCtrl::OnContextpopupBindnewcontext()
 {
-	// TODO: Add your command handler code here
+  // TODO: Add your command handler code here
   HTREEITEM hItem = GetSelectedItem();
   CNamingObject* pObject = GetTreeObject(hItem);
   CosNaming::NamingContext_var Context = pObject->NamingContext();
@@ -367,7 +367,7 @@ void CNamingTreeCtrl::OnContextpopupBindnewcontext()
   {
     return;
   }
-	CBindNewContext Dialog;
+  CBindNewContext Dialog;
   if(Dialog.DoModal() != IDOK)
   {
     return;
@@ -387,21 +387,21 @@ void CNamingTreeCtrl::OnContextpopupBindnewcontext()
 
 void CNamingTreeCtrl::OnDblclk(NMHDR* pNMHDR, LRESULT* pResult)
 {
-	// TODO: Add your control notification handler code here
-	CNamingObject* pObject = GetTreeObject();
+  // TODO: Add your control notification handler code here
+  CNamingObject* pObject = GetTreeObject();
   // Only display non contexts
   if(!pObject->IsContext())
   {
     ViewIORDialog Dialog(m_pORB, pObject->Object());
     Dialog.DoModal();
   }
-	
-	*pResult = 0;
+
+  *pResult = 0;
 }
 
 void CNamingTreeCtrl::OnCopy()
 {
-	// TODO: Add your command handler code here
+  // TODO: Add your command handler code here
   CNamingObject* pObject = GetTreeObject();
   try
   {
@@ -424,22 +424,22 @@ void CNamingTreeCtrl::OnCopy()
 
 LRESULT CNamingTreeCtrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 {
-	// TODO: Add your specialized code here and/or call the base class
-	if(message == WM_HOTKEY)
+  // TODO: Add your specialized code here and/or call the base class
+  if(message == WM_HOTKEY)
   {
     // To trap control-c (for copying) we registered a hotkey.  For some reason
     // MFC wasn't calling my OnHotKey() function that I registered so I am forcing
     // it this way.  Anyone know the right way to do this?
     OnCopy();
   }
-	return CTreeCtrl::WindowProc(message, wParam, lParam);
+  return CTreeCtrl::WindowProc(message, wParam, lParam);
 }
 
 void CNamingTreeCtrl::OnObjectpopupUnbind()
 {
-	// TODO: Add your command handler code here
+  // TODO: Add your command handler code here
   if(MessageBox(ACE_TEXT ("Are you sure you want to unbind this object?"),
-	            ACE_TEXT ("Confirm"), MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
+                ACE_TEXT ("Confirm"), MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
   {
     return;
   }
@@ -462,13 +462,13 @@ void CNamingTreeCtrl::OnObjectpopupUnbind()
   catch(CORBA::Exception& ex)
   {
     MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
-  }	
+  }
 }
 
 void CNamingTreeCtrl::OnObjectpopupViewrefrence()
 {
-	// TODO: Add your command handler code here
-	ViewIORDialog Dialog(m_pORB, GetTreeObject()->Object());
+  // TODO: Add your command handler code here
+  ViewIORDialog Dialog(m_pORB, GetTreeObject()->Object());
   Dialog.DoModal();
 }
 
diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.h b/TAO/utils/NamingViewer/NamingTreeCtrl.h
index 8086e987f79..8afe055bf01 100644
--- a/TAO/utils/NamingViewer/NamingTreeCtrl.h
+++ b/TAO/utils/NamingViewer/NamingTreeCtrl.h
@@ -29,35 +29,35 @@ public:
   void ListContext(HTREEITEM hItem);
   void Resolve(CosNaming::NamingContext_ptr pRootContext);
 // Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CNamingTreeCtrl)
-	protected:
-	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
-	//}}AFX_VIRTUAL
+  // ClassWizard generated virtual function overrides
+  //{{AFX_VIRTUAL(CNamingTreeCtrl)
+  protected:
+  virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+  //}}AFX_VIRTUAL
 
 // Implementation
 public:
-	virtual ~CNamingTreeCtrl();
+  virtual ~CNamingTreeCtrl();
 
-	// Generated message map functions
+  // Generated message map functions
 protected:
-	//{{AFX_MSG(CNamingTreeCtrl)
-	afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnContextPopupViewreference();
-	afx_msg void OnItemexpanding(NMHDR* pNMHDR, LRESULT* pResult);
-	afx_msg void OnContextPopupRefresh();
-	afx_msg void OnContextPopupUnbind();
-	afx_msg void OnContextPopupDestroy();
-	afx_msg void OnContextPopupBindContext();
-	afx_msg void OnContextPopupBindobject();
-	afx_msg void OnDestroy();
-	afx_msg void OnContextpopupBindnewcontext();
-	afx_msg void OnDblclk(NMHDR* pNMHDR, LRESULT* pResult);
-	afx_msg void OnObjectpopupUnbind();
-	afx_msg void OnObjectpopupViewrefrence();
-	//}}AFX_MSG
+  //{{AFX_MSG(CNamingTreeCtrl)
+  afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
+  afx_msg void OnContextPopupViewreference();
+  afx_msg void OnItemexpanding(NMHDR* pNMHDR, LRESULT* pResult);
+  afx_msg void OnContextPopupRefresh();
+  afx_msg void OnContextPopupUnbind();
+  afx_msg void OnContextPopupDestroy();
+  afx_msg void OnContextPopupBindContext();
+  afx_msg void OnContextPopupBindobject();
+  afx_msg void OnDestroy();
+  afx_msg void OnContextpopupBindnewcontext();
+  afx_msg void OnDblclk(NMHDR* pNMHDR, LRESULT* pResult);
+  afx_msg void OnObjectpopupUnbind();
+  afx_msg void OnObjectpopupViewrefrence();
+  //}}AFX_MSG
 
-	DECLARE_MESSAGE_MAP()
+  DECLARE_MESSAGE_MAP()
 
   void Refresh(HTREEITEM hItem);
   void OnCopy();
diff --git a/TAO/utils/NamingViewer/NamingViewer.cpp b/TAO/utils/NamingViewer/NamingViewer.cpp
index 9296d1ce76a..c0eca3e1dfa 100644
--- a/TAO/utils/NamingViewer/NamingViewer.cpp
+++ b/TAO/utils/NamingViewer/NamingViewer.cpp
@@ -17,11 +17,11 @@ static char THIS_FILE[] = __FILE__;
 // CNamingViewerApp
 
 BEGIN_MESSAGE_MAP(CNamingViewerApp, CWinApp)
-	//{{AFX_MSG_MAP(CNamingViewerApp)
-		// NOTE - the ClassWizard will add and remove mapping macros here.
-		//    DO NOT EDIT what you see in these blocks of generated code!
-	//}}AFX_MSG
-	ON_COMMAND(ID_HELP, CWinApp::OnHelp)
+  //{{AFX_MSG_MAP(CNamingViewerApp)
+    // NOTE - the ClassWizard will add and remove mapping macros here.
+    //    DO NOT EDIT what you see in these blocks of generated code!
+  //}}AFX_MSG
+  ON_COMMAND(ID_HELP, CWinApp::OnHelp)
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -29,8 +29,8 @@ END_MESSAGE_MAP()
 
 CNamingViewerApp::CNamingViewerApp()
 {
-	// TODO: add construction code here,
-	// Place all significant initialization in InitInstance
+  // TODO: add construction code here,
+  // Place all significant initialization in InitInstance
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -43,10 +43,10 @@ CNamingViewerApp theApp;
 
 BOOL CNamingViewerApp::InitInstance()
 {
-	// Standard initialization
-	// If you are not using these features and wish to reduce the size
-	//  of your final executable, you should remove from the following
-	//  the specific initialization routines you do not need.
+  // Standard initialization
+  // If you are not using these features and wish to reduce the size
+  //  of your final executable, you should remove from the following
+  //  the specific initialization routines you do not need.
 /*
    From MFC 5.0, Enable3dControls and Enable3dControlsStatic are obsolete
    because their functionality is incorporated into Microsoft's 32-bit
@@ -54,9 +54,9 @@ BOOL CNamingViewerApp::InitInstance()
 
 #if !defined (_WIN32_WCE)
 #ifdef _AFXDLL
-	Enable3dControls();			// Call this when using MFC in a shared DLL
+  Enable3dControls();   // Call this when using MFC in a shared DLL
 #else
-	Enable3dControlsStatic();	// Call this when linking to MFC statically
+  Enable3dControlsStatic(); // Call this when linking to MFC statically
 #endif
 #endif
 */
@@ -65,27 +65,27 @@ BOOL CNamingViewerApp::InitInstance()
 
   ACE::init();
   {
-    
+
     int argc = Argv.argc();
     ACE_Argv_Type_Converter argcon (argc, Argv.argv ());
     CORBA::ORB_var ORB = CORBA::ORB_init(argcon.get_argc (),
                                          argcon.get_ASCII_argv ());
-	  CNamingViewerDlg dlg(ORB);
-	  m_pMainWnd = &dlg;
-	  int nResponse = dlg.DoModal();
-	  if (nResponse == IDOK)
-	  {
-		  // TODO: Place code here to handle when the dialog is
-		  //  dismissed with OK
-	  }
-	  else if (nResponse == IDCANCEL)
-	  {
-		  // TODO: Place code here to handle when the dialog is
-		  //  dismissed with Cancel
-	  }
+    CNamingViewerDlg dlg(ORB);
+    m_pMainWnd = &dlg;
+    int nResponse = dlg.DoModal();
+    if (nResponse == IDOK)
+    {
+      // TODO: Place code here to handle when the dialog is
+      //  dismissed with OK
+    }
+    else if (nResponse == IDCANCEL)
+    {
+      // TODO: Place code here to handle when the dialog is
+      //  dismissed with Cancel
+    }
   }
   ACE::fini();
-	// Since the dialog has been closed, return FALSE so that we exit the
-	//  application, rather than start the application's message pump.
-	return FALSE;
+  // Since the dialog has been closed, return FALSE so that we exit the
+  //  application, rather than start the application's message pump.
+  return FALSE;
 }
diff --git a/TAO/utils/NamingViewer/NamingViewer.h b/TAO/utils/NamingViewer/NamingViewer.h
index 84853ad13cd..e45772851fc 100644
--- a/TAO/utils/NamingViewer/NamingViewer.h
+++ b/TAO/utils/NamingViewer/NamingViewer.h
@@ -10,10 +10,10 @@
 #endif // _MSC_VER > 1000
 
 #ifndef __AFXWIN_H__
-	#error include 'stdafx.h' before including this file for PCH
+  #error include 'stdafx.h' before including this file for PCH
 #endif
 
-#include "resource.h"		// main symbols
+#include "resource.h" // main symbols
 
 /////////////////////////////////////////////////////////////////////////////
 // CNamingViewerApp:
@@ -23,22 +23,22 @@
 class CNamingViewerApp : public CWinApp
 {
 public:
-	CNamingViewerApp();
+  CNamingViewerApp();
 
 // Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CNamingViewerApp)
-	public:
-	virtual BOOL InitInstance();
-	//}}AFX_VIRTUAL
+  // ClassWizard generated virtual function overrides
+  //{{AFX_VIRTUAL(CNamingViewerApp)
+  public:
+  virtual BOOL InitInstance();
+  //}}AFX_VIRTUAL
 
 // Implementation
 
-	//{{AFX_MSG(CNamingViewerApp)
-		// NOTE - the ClassWizard will add and remove member functions here.
-		//    DO NOT EDIT what you see in these blocks of generated code !
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+  //{{AFX_MSG(CNamingViewerApp)
+    // NOTE - the ClassWizard will add and remove member functions here.
+    //    DO NOT EDIT what you see in these blocks of generated code !
+  //}}AFX_MSG
+  DECLARE_MESSAGE_MAP()
 };
 
 
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
index 203aee1fc62..baa5a4d07dd 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
@@ -20,56 +20,56 @@ static char THIS_FILE[] = __FILE__;
 class CAboutDlg : public CDialog
 {
 public:
-	CAboutDlg();
+  CAboutDlg();
 
 // Dialog Data
-	//{{AFX_DATA(CAboutDlg)
-	enum { IDD = IDD_ABOUTBOX };
-	//}}AFX_DATA
+  //{{AFX_DATA(CAboutDlg)
+  enum { IDD = IDD_ABOUTBOX };
+  //}}AFX_DATA
 
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CAboutDlg)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
+  // ClassWizard generated virtual function overrides
+  //{{AFX_VIRTUAL(CAboutDlg)
+  protected:
+  virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+  //}}AFX_VIRTUAL
 
 // Implementation
 protected:
-	//{{AFX_MSG(CAboutDlg)
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+  //{{AFX_MSG(CAboutDlg)
+  //}}AFX_MSG
+  DECLARE_MESSAGE_MAP()
 };
 
 CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
 {
-	//{{AFX_DATA_INIT(CAboutDlg)
-	//}}AFX_DATA_INIT
+  //{{AFX_DATA_INIT(CAboutDlg)
+  //}}AFX_DATA_INIT
 }
 
 void CAboutDlg::DoDataExchange(CDataExchange* pDX)
 {
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CAboutDlg)
-	//}}AFX_DATA_MAP
+  CDialog::DoDataExchange(pDX);
+  //{{AFX_DATA_MAP(CAboutDlg)
+  //}}AFX_DATA_MAP
 }
 
 BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
-	//{{AFX_MSG_MAP(CAboutDlg)
-		// No message handlers
-	//}}AFX_MSG_MAP
+  //{{AFX_MSG_MAP(CAboutDlg)
+    // No message handlers
+  //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
 // CNamingViewerDlg dialog
 
 CNamingViewerDlg::CNamingViewerDlg(CORBA::ORB_ptr pORB, CWnd* pParent /*=0*/)
-	: CDialog(CNamingViewerDlg::IDD, pParent)
+  : CDialog(CNamingViewerDlg::IDD, pParent)
 {
-	//{{AFX_DATA_INIT(CNamingViewerDlg)
-	m_Server = _T("");
-	//}}AFX_DATA_INIT
-	// Note that LoadIcon does not require a subsequent DestroyIcon in Win32
-	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+  //{{AFX_DATA_INIT(CNamingViewerDlg)
+  m_Server = _T("");
+  //}}AFX_DATA_INIT
+  // Note that LoadIcon does not require a subsequent DestroyIcon in Win32
+  m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
 
   m_pORB = pORB;
 
@@ -77,21 +77,21 @@ CNamingViewerDlg::CNamingViewerDlg(CORBA::ORB_ptr pORB, CWnd* pParent /*=0*/)
 
 void CNamingViewerDlg::DoDataExchange(CDataExchange* pDX)
 {
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CNamingViewerDlg)
-	DDX_Control(pDX, IDC_TREE, m_Tree);
-	DDX_Text(pDX, IDC_SERVER, m_Server);
-	//}}AFX_DATA_MAP
+  CDialog::DoDataExchange(pDX);
+  //{{AFX_DATA_MAP(CNamingViewerDlg)
+  DDX_Control(pDX, IDC_TREE, m_Tree);
+  DDX_Text(pDX, IDC_SERVER, m_Server);
+  //}}AFX_DATA_MAP
 }
 
 BEGIN_MESSAGE_MAP(CNamingViewerDlg, CDialog)
-	//{{AFX_MSG_MAP(CNamingViewerDlg)
-	ON_WM_SYSCOMMAND()
-	ON_WM_PAINT()
-	ON_WM_QUERYDRAGICON()
-	ON_BN_CLICKED(IDC_SELECT_NS, OnSelectNs)
-	ON_WM_SIZE()
-	//}}AFX_MSG_MAP
+  //{{AFX_MSG_MAP(CNamingViewerDlg)
+  ON_WM_SYSCOMMAND()
+  ON_WM_PAINT()
+  ON_WM_QUERYDRAGICON()
+  ON_BN_CLICKED(IDC_SELECT_NS, OnSelectNs)
+  ON_WM_SIZE()
+  //}}AFX_MSG_MAP
 #if !defined (_WIN32_WCE)
   ON_WM_GETMINMAXINFO()
 #endif
@@ -102,35 +102,35 @@ END_MESSAGE_MAP()
 
 BOOL CNamingViewerDlg::OnInitDialog()
 {
-	CDialog::OnInitDialog();
+  CDialog::OnInitDialog();
 
-	// Add "About..." menu item to system menu.
+  // Add "About..." menu item to system menu.
 
-	// IDM_ABOUTBOX must be in the system command range.
-	ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
-	ASSERT(IDM_ABOUTBOX < 0xF000);
+  // IDM_ABOUTBOX must be in the system command range.
+  ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
+  ASSERT(IDM_ABOUTBOX < 0xF000);
 
 #if !defined (_WIN32_WCE)
-	CMenu* pSysMenu = GetSystemMenu(FALSE);
-	if (pSysMenu != 0)
-	{
-		CString strAboutMenu;
-		strAboutMenu.LoadString(IDS_ABOUTBOX);
-		if (!strAboutMenu.IsEmpty())
-		{
-			pSysMenu->AppendMenu(MF_SEPARATOR);
-			pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu);
-		}
-	}
+  CMenu* pSysMenu = GetSystemMenu(FALSE);
+  if (pSysMenu != 0)
+  {
+    CString strAboutMenu;
+    strAboutMenu.LoadString(IDS_ABOUTBOX);
+    if (!strAboutMenu.IsEmpty())
+    {
+      pSysMenu->AppendMenu(MF_SEPARATOR);
+      pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu);
+    }
+  }
 #endif
 
-	// Set the icon for this dialog.  The framework does this automatically
-	//  when the application's main window is not a dialog
-	SetIcon(m_hIcon, TRUE);			// Set big icon
-	SetIcon(m_hIcon, FALSE);		// Set small icon
+  // Set the icon for this dialog.  The framework does this automatically
+  //  when the application's main window is not a dialog
+  SetIcon(m_hIcon, TRUE);  // Set big icon
+  SetIcon(m_hIcon, FALSE); // Set small icon
 
-	// TODO: Add extra initialization here
-	m_Tree.SetpORB(m_pORB);
+  // TODO: Add extra initialization here
+  m_Tree.SetpORB(m_pORB);
 
   // Initialize the naming client and get the root context
   TAO_Naming_Client Client;
@@ -159,15 +159,15 @@ BOOL CNamingViewerDlg::OnInitDialog()
 
 void CNamingViewerDlg::OnSysCommand(UINT nID, LPARAM lParam)
 {
-	if ((nID & 0xFFF0) == IDM_ABOUTBOX)
-	{
-		CAboutDlg dlgAbout;
-		dlgAbout.DoModal();
-	}
-	else
-	{
-		CDialog::OnSysCommand(nID, lParam);
-	}
+  if ((nID & 0xFFF0) == IDM_ABOUTBOX)
+  {
+    CAboutDlg dlgAbout;
+    dlgAbout.DoModal();
+  }
+  else
+  {
+    CDialog::OnSysCommand(nID, lParam);
+  }
 }
 
 // If you add a minimize button to your dialog, you will need the code below
@@ -176,32 +176,32 @@ void CNamingViewerDlg::OnSysCommand(UINT nID, LPARAM lParam)
 
 void CNamingViewerDlg::OnPaint()
 {
-	if (IsIconic())
-	{
-		CPaintDC dc(this); // device context for painting
-
-		// Center icon in client rectangle
-		int cxIcon = GetSystemMetrics(SM_CXICON);
-		int cyIcon = GetSystemMetrics(SM_CYICON);
-		CRect rect;
-		GetClientRect(&rect);
-		int x = (rect.Width() - cxIcon + 1) / 2;
-		int y = (rect.Height() - cyIcon + 1) / 2;
-
-		// Draw the icon
-		dc.DrawIcon(x, y, m_hIcon);
-	}
-	else
-	{
-		CDialog::OnPaint();
-	}
+  if (IsIconic())
+  {
+    CPaintDC dc(this); // device context for painting
+
+    // Center icon in client rectangle
+    int cxIcon = GetSystemMetrics(SM_CXICON);
+    int cyIcon = GetSystemMetrics(SM_CYICON);
+    CRect rect;
+    GetClientRect(&rect);
+    int x = (rect.Width() - cxIcon + 1) / 2;
+    int y = (rect.Height() - cyIcon + 1) / 2;
+
+    // Draw the icon
+    dc.DrawIcon(x, y, m_hIcon);
+  }
+  else
+  {
+    CDialog::OnPaint();
+  }
 }
 
 // The system calls this to obtain the cursor to display while the user drags
 //  the minimized window.
 HCURSOR CNamingViewerDlg::OnQueryDragIcon()
 {
-	return (HCURSOR) m_hIcon;
+  return (HCURSOR) m_hIcon;
 }
 
 void CNamingViewerDlg::Resolve()
@@ -211,8 +211,8 @@ void CNamingViewerDlg::Resolve()
 
 void CNamingViewerDlg::OnSelectNs()
 {
-	// TODO: Add your control notification handler code here
-	CSelectNSDialog Dialog;
+  // TODO: Add your control notification handler code here
+  CSelectNSDialog Dialog;
   if(Dialog.DoModal() != IDOK)
   {
     return;
@@ -233,8 +233,8 @@ void CNamingViewerDlg::OnSelectNs()
 
 void CNamingViewerDlg::OnSize(UINT nType, int cx, int cy)
 {
-	CDialog::OnSize(nType, cx, cy);
-	// TODO: Add your message handler code here
+  CDialog::OnSize(nType, cx, cy);
+  // TODO: Add your message handler code here
 
   // Resize the tree control
   if(m_Tree.m_hWnd)
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.h b/TAO/utils/NamingViewer/NamingViewerDlg.h
index a9ea8c96639..1b535d519d1 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.h
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.h
@@ -19,38 +19,38 @@ class CNamingViewerDlg : public CDialog
 {
 // Construction
 public:
-  CNamingViewerDlg(CORBA::ORB_ptr pORB, CWnd* pParent = 0);	// standard constructor
+  CNamingViewerDlg(CORBA::ORB_ptr pORB, CWnd* pParent = 0); // standard constructor
 
 // Dialog Data
-	//{{AFX_DATA(CNamingViewerDlg)
-	enum { IDD = IDD_NAMINGVIEWER_DIALOG };
-	CNamingTreeCtrl	m_Tree;
-	CString	m_Server;
-	//}}AFX_DATA
-
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CNamingViewerDlg)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);	// DDX/DDV support
-	//}}AFX_VIRTUAL
+  //{{AFX_DATA(CNamingViewerDlg)
+  enum { IDD = IDD_NAMINGVIEWER_DIALOG };
+  CNamingTreeCtrl m_Tree;
+  CString m_Server;
+  //}}AFX_DATA
+
+  // ClassWizard generated virtual function overrides
+  //{{AFX_VIRTUAL(CNamingViewerDlg)
+  protected:
+  virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+  //}}AFX_VIRTUAL
 
 // Implementation
 protected:
-	HICON m_hIcon;
-
-	// Generated message map functions
-	//{{AFX_MSG(CNamingViewerDlg)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
-	afx_msg void OnPaint();
-	afx_msg HCURSOR OnQueryDragIcon();
-	afx_msg void OnSelectNs();
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	//}}AFX_MSG
+  HICON m_hIcon;
+
+  // Generated message map functions
+  //{{AFX_MSG(CNamingViewerDlg)
+  virtual BOOL OnInitDialog();
+  afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
+  afx_msg void OnPaint();
+  afx_msg HCURSOR OnQueryDragIcon();
+  afx_msg void OnSelectNs();
+  afx_msg void OnSize(UINT nType, int cx, int cy);
+  //}}AFX_MSG
 #if !defined (_WIN32_WCE)
   afx_msg void OnGetMinMaxInfo( MINMAXINFO FAR* lpMMI );
 #endif
-	DECLARE_MESSAGE_MAP()
+  DECLARE_MESSAGE_MAP()
   void Resolve();
 
   CORBA::ORB_ptr                  m_pORB;
diff --git a/TAO/utils/NamingViewer/SelectNSDialog.cpp b/TAO/utils/NamingViewer/SelectNSDialog.cpp
index 401816b527c..745582ca05c 100644
--- a/TAO/utils/NamingViewer/SelectNSDialog.cpp
+++ b/TAO/utils/NamingViewer/SelectNSDialog.cpp
@@ -20,30 +20,30 @@ static char THIS_FILE[] = __FILE__;
 
 
 CSelectNSDialog::CSelectNSDialog(CWnd* pParent /*=NULL*/)
-	: CDialog(CSelectNSDialog::IDD, pParent)
+  : CDialog(CSelectNSDialog::IDD, pParent)
 {
-	//{{AFX_DATA_INIT(CSelectNSDialog)
-		// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
+  //{{AFX_DATA_INIT(CSelectNSDialog)
+    // NOTE: the ClassWizard will add member initialization here
+  //}}AFX_DATA_INIT
   m_pConfig = 0;
 }
 
 
 void CSelectNSDialog::DoDataExchange(CDataExchange* pDX)
 {
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CSelectNSDialog)
-	DDX_Control(pDX, IDC_SERVERS, m_Servers);
-	//}}AFX_DATA_MAP
+  CDialog::DoDataExchange(pDX);
+  //{{AFX_DATA_MAP(CSelectNSDialog)
+  DDX_Control(pDX, IDC_SERVERS, m_Servers);
+  //}}AFX_DATA_MAP
 }
 
 
 BEGIN_MESSAGE_MAP(CSelectNSDialog, CDialog)
-	//{{AFX_MSG_MAP(CSelectNSDialog)
-	ON_BN_CLICKED(IDC_ADD, OnAdd)
-	ON_BN_CLICKED(IDC_REMOVE, OnRemove)
-	ON_WM_DESTROY()
-	//}}AFX_MSG_MAP
+  //{{AFX_MSG_MAP(CSelectNSDialog)
+  ON_BN_CLICKED(IDC_ADD, OnAdd)
+  ON_BN_CLICKED(IDC_REMOVE, OnRemove)
+  ON_WM_DESTROY()
+  //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -51,8 +51,8 @@ END_MESSAGE_MAP()
 
 void CSelectNSDialog::OnOK()
 {
-	// TODO: Add extra validation here
-	int index = m_Servers.GetCurSel();
+  // TODO: Add extra validation here
+  int index = m_Servers.GetCurSel();
   if(index == LB_ERR)
   {
     AfxMessageBox(ACE_TEXT ("You must select a server or cancel"));
@@ -61,13 +61,13 @@ void CSelectNSDialog::OnOK()
   char* pIOR = (char*)m_Servers.GetItemData(index);
   m_IOR = pIOR;
   m_Servers.GetText(index, m_Name);
-	CDialog::OnOK();
+  CDialog::OnOK();
 }
 
 void CSelectNSDialog::OnAdd()
 {
-	// TODO: Add your control notification handler code here
-	CAddNameServerDlg Dialog;
+  // TODO: Add your control notification handler code here
+  CAddNameServerDlg Dialog;
   if(Dialog.DoModal() != IDOK)
   {
     return;
@@ -84,8 +84,8 @@ void CSelectNSDialog::OnAdd()
 
 void CSelectNSDialog::OnRemove()
 {
-	// TODO: Add your control notification handler code here
-	int index = m_Servers.GetCurSel();
+  // TODO: Add your control notification handler code here
+  int index = m_Servers.GetCurSel();
   if(index == LB_ERR)
   {
     return;
@@ -100,9 +100,9 @@ void CSelectNSDialog::OnRemove()
 
 BOOL CSelectNSDialog::OnInitDialog()
 {
-	CDialog::OnInitDialog();
-	
-	// TODO: Add extra initialization here
+  CDialog::OnInitDialog();
+
+  // TODO: Add extra initialization here
   HKEY hKey = ACE_Configuration_Win32Registry::resolve_key(HKEY_LOCAL_MACHINE, ACE_TEXT("Software\\TAO\\NamingViewer\\Servers"));
   m_pConfig = new ACE_Configuration_Win32Registry(hKey);
   ACE_Configuration_Section_Key Section = m_pConfig->root_section();;
@@ -122,16 +122,16 @@ BOOL CSelectNSDialog::OnInitDialog()
     index++;
   }
 
-	return TRUE;  // return TRUE unless you set the focus to a control
-	              // EXCEPTION: OCX Property Pages should return FALSE
+  return TRUE;  // return TRUE unless you set the focus to a control
+  // EXCEPTION: OCX Property Pages should return FALSE
 }
 
 void CSelectNSDialog::OnDestroy()
 {
-	CDialog::OnDestroy();
-	
-	// TODO: Add your message handler code here
-	int count = m_Servers.GetCount();
+  CDialog::OnDestroy();
+
+  // TODO: Add your message handler code here
+  int count = m_Servers.GetCount();
   for(int i=0; i < count; i++)
   {
     delete (char*)m_Servers.GetItemData(i);
diff --git a/TAO/utils/NamingViewer/SelectNSDialog.h b/TAO/utils/NamingViewer/SelectNSDialog.h
index 76e6de3002d..27a90c4a599 100644
--- a/TAO/utils/NamingViewer/SelectNSDialog.h
+++ b/TAO/utils/NamingViewer/SelectNSDialog.h
@@ -16,35 +16,35 @@ class CSelectNSDialog : public CDialog
 {
 // Construction
 public:
-	CSelectNSDialog(CWnd* pParent = 0);   // standard constructor
+  CSelectNSDialog(CWnd* pParent = 0);   // standard constructor
 
 // Dialog Data
-	//{{AFX_DATA(CSelectNSDialog)
-	enum { IDD = IDD_SELECT_NS };
-	CListBox	m_Servers;
-	//}}AFX_DATA
-  
+  //{{AFX_DATA(CSelectNSDialog)
+  enum { IDD = IDD_SELECT_NS };
+  CListBox m_Servers;
+  //}}AFX_DATA
+
   const CString& GetIOR() const {return m_IOR;};
   const CString& GetName() const {return m_Name;};
 // Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CSelectNSDialog)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
+  // ClassWizard generated virtual function overrides
+  //{{AFX_VIRTUAL(CSelectNSDialog)
+  protected:
+  virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+  //}}AFX_VIRTUAL
 
 // Implementation
 protected:
 
-	// Generated message map functions
-	//{{AFX_MSG(CSelectNSDialog)
-	virtual void OnOK();
-	afx_msg void OnAdd();
-	afx_msg void OnRemove();
-	virtual BOOL OnInitDialog();
-	afx_msg void OnDestroy();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+  // Generated message map functions
+  //{{AFX_MSG(CSelectNSDialog)
+  virtual void OnOK();
+  afx_msg void OnAdd();
+  afx_msg void OnRemove();
+  virtual BOOL OnInitDialog();
+  afx_msg void OnDestroy();
+  //}}AFX_MSG
+  DECLARE_MESSAGE_MAP()
 
 
   ACE_Configuration_Win32Registry* m_pConfig;
diff --git a/TAO/utils/NamingViewer/StdAfx.cpp b/TAO/utils/NamingViewer/StdAfx.cpp
index 80fcb464de7..a0d86b1a5ce 100644
--- a/TAO/utils/NamingViewer/StdAfx.cpp
+++ b/TAO/utils/NamingViewer/StdAfx.cpp
@@ -1,7 +1,7 @@
 // $Id$
 // stdafx.cpp : source file that includes just the standard includes
-//	NamingViewer.pch will be the pre-compiled header
-//	stdafx.obj will contain the pre-compiled type information
+// NamingViewer.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
 
 #include "stdafx.h"
 
diff --git a/TAO/utils/NamingViewer/ViewIORDialog.cpp b/TAO/utils/NamingViewer/ViewIORDialog.cpp
index f7724f02d70..7b84bb745c8 100644
--- a/TAO/utils/NamingViewer/ViewIORDialog.cpp
+++ b/TAO/utils/NamingViewer/ViewIORDialog.cpp
@@ -17,12 +17,12 @@ static char THIS_FILE[] = __FILE__;
 
 
 ViewIORDialog::ViewIORDialog(CORBA::ORB_ptr pORB, CORBA::Object_ptr pObject, CWnd* pParent /*=NULL*/)
-	: CDialog(ViewIORDialog::IDD, pParent)
+  : CDialog(ViewIORDialog::IDD, pParent)
 {
-	//{{AFX_DATA_INIT(ViewIORDialog)
-	m_TypeID = _T("");
-	m_IOR = _T("");
-	//}}AFX_DATA_INIT
+  //{{AFX_DATA_INIT(ViewIORDialog)
+  m_TypeID = _T("");
+  m_IOR = _T("");
+  //}}AFX_DATA_INIT
   m_pORB = pORB;
   if(pObject)
   {
@@ -35,19 +35,19 @@ ViewIORDialog::ViewIORDialog(CORBA::ORB_ptr pORB, CORBA::Object_ptr pObject, CWn
 
 void ViewIORDialog::DoDataExchange(CDataExchange* pDX)
 {
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(ViewIORDialog)
-	DDX_Control(pDX, IDC_PROFILES, m_Profiles);
-	DDX_Text(pDX, IDC_TYPE_ID, m_TypeID);
-	DDX_Text(pDX, IDC_IOR, m_IOR);
-	//}}AFX_DATA_MAP
+  CDialog::DoDataExchange(pDX);
+  //{{AFX_DATA_MAP(ViewIORDialog)
+  DDX_Control(pDX, IDC_PROFILES, m_Profiles);
+  DDX_Text(pDX, IDC_TYPE_ID, m_TypeID);
+  DDX_Text(pDX, IDC_IOR, m_IOR);
+  //}}AFX_DATA_MAP
 }
 
 
 BEGIN_MESSAGE_MAP(ViewIORDialog, CDialog)
-	//{{AFX_MSG_MAP(ViewIORDialog)
-	ON_BN_CLICKED(IDC_APPLY, OnApply)
-	//}}AFX_MSG_MAP
+  //{{AFX_MSG_MAP(ViewIORDialog)
+  ON_BN_CLICKED(IDC_APPLY, OnApply)
+  //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -55,17 +55,17 @@ END_MESSAGE_MAP()
 
 BOOL ViewIORDialog::OnInitDialog()
 {
-	CDialog::OnInitDialog();
-	
-	// TODO: Add extra initialization here
+  CDialog::OnInitDialog();
+
+  // TODO: Add extra initialization here
   DecodeIOR();
   return TRUE;  // return TRUE unless you set the focus to a control
-	              // EXCEPTION: OCX Property Pages should return FALSE
+  // EXCEPTION: OCX Property Pages should return FALSE
 }
 
 void ViewIORDialog::OnApply()
 {
-	// TODO: Add your control notification handler code here
+  // TODO: Add your control notification handler code here
   UpdateData();
   try
   {
diff --git a/TAO/utils/NamingViewer/ViewIORDialog.h b/TAO/utils/NamingViewer/ViewIORDialog.h
index 84ca529dc57..dced6811462 100644
--- a/TAO/utils/NamingViewer/ViewIORDialog.h
+++ b/TAO/utils/NamingViewer/ViewIORDialog.h
@@ -18,29 +18,29 @@ public:
   ViewIORDialog(CORBA::ORB_ptr pORB, CORBA::Object_ptr pObject, CWnd* pParent = 0);   // standard constructor
 
 // Dialog Data
-	//{{AFX_DATA(ViewIORDialog)
-	enum { IDD = IDD_VIEWIOR_DIALOG };
-	CTreeCtrl	m_Profiles;
-	CString	m_TypeID;
-	CString	m_IOR;
-	//}}AFX_DATA
-  
+  //{{AFX_DATA(ViewIORDialog)
+  enum { IDD = IDD_VIEWIOR_DIALOG };
+  CTreeCtrl m_Profiles;
+  CString m_TypeID;
+  CString m_IOR;
+  //}}AFX_DATA
+
 // Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(ViewIORDialog)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
+  // ClassWizard generated virtual function overrides
+  //{{AFX_VIRTUAL(ViewIORDialog)
+  protected:
+  virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+  //}}AFX_VIRTUAL
 
 // Implementation
 protected:
 
-	// Generated message map functions
-	//{{AFX_MSG(ViewIORDialog)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnApply();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+  // Generated message map functions
+  //{{AFX_MSG(ViewIORDialog)
+  virtual BOOL OnInitDialog();
+  afx_msg void OnApply();
+  //}}AFX_MSG
+  DECLARE_MESSAGE_MAP()
 
   void DecodeIOR();
 
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index 70139a19ad0..10cc44035cb 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -1512,9 +1512,9 @@ cat_tagged_components (TAO_InputCDR& stream)
         cat_tag_policies(stream);
         ACE_DEBUG ((LM_DEBUG, "%}%}"));
       } else if (tag == 20U /* SSLIOP::TAG_SSL_SEC_TRANS */) {
-	ACE_DEBUG ((LM_DEBUG,"%d (TAG_SSL_SEC_TRANS)\n", tag));
+        ACE_DEBUG ((LM_DEBUG,"%d (TAG_SSL_SEC_TRANS)\n", tag));
         ACE_DEBUG ((LM_DEBUG, "%{"));
-	cat_tag_ssl_sec_trans(stream);
+        cat_tag_ssl_sec_trans(stream);
         ACE_DEBUG ((LM_DEBUG, "%}"));
       } else {
         ACE_DEBUG ((LM_DEBUG,"%d\n", tag));
diff --git a/TAO/utils/wxNamingViewer/wxBindDialog.cpp b/TAO/utils/wxNamingViewer/wxBindDialog.cpp
index 8936d7d24d8..008b5267796 100644
--- a/TAO/utils/wxNamingViewer/wxBindDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxBindDialog.cpp
@@ -16,100 +16,50 @@
 namespace  // anonymous
 {
 
-void create_dialog_components( wxDialog* dialog)
+void create_dialog_components(wxDialog* dialog)
 {
-  wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL);
+  wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
 
   {
-    wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL);
-    sizer->Add(
-        new wxStaticText( dialog, -1, "ID:" ),
-        0,
-        wxALL,
-        5);
-    wxTextCtrl* text = new wxTextCtrl(
-	dialog,
-	IDC_ID
-	);
-    text->SetName( "idTextCtrl");
-    sizer->Add(
-	text,
-	1,
-	wxALL,
-	5);
-    topsizer->Add(
-        sizer,
-        0,
-        wxALIGN_LEFT | wxEXPAND);
+    wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
+    sizer->Add(new wxStaticText(dialog, -1, "ID:" ), 0, wxALL, 5);
+    wxTextCtrl* text = new wxTextCtrl(dialog, IDC_ID);
+    text->SetName("idTextCtrl");
+    sizer->Add(text, 1, wxALL, 5);
+    topsizer->Add(sizer, 0, wxALIGN_LEFT | wxEXPAND);
   }
 
   {
-    wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL);
-    sizer->Add(
-        new wxStaticText( dialog, -1, "Kind:" ),
-        0,
-        wxALL,
-        5);
-    wxTextCtrl* text = new wxTextCtrl(
-	dialog,
-	IDC_KIND
-	);
-    text->SetName( "kindTextCtrl");
-    sizer->Add(
-	text,
-	1,
-	wxALL,
-	5);
-    topsizer->Add(
-        sizer,
-        0,
-        wxALIGN_LEFT | wxEXPAND);
+    wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
+    sizer->Add(new wxStaticText(dialog, -1, "Kind:" ), 0, wxALL, 5);
+    wxTextCtrl* text = new wxTextCtrl(dialog, IDC_KIND);
+    text->SetName("kindTextCtrl");
+    sizer->Add(text, 1, wxALL, 5);
+    topsizer->Add(sizer, 0, wxALIGN_LEFT | wxEXPAND);
   }
 
   {
     wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL);
-    sizer->Add(
-        new wxStaticText( dialog, -1, "IOR:" ),
-        0,
-        wxALL,
-        5);
-    wxTextCtrl* text = new wxTextCtrl(
-	dialog,
-	IDC_IOR
-	);
+    sizer->Add(new wxStaticText( dialog, -1, "IOR:" ), 0, wxALL, 5);
+    wxTextCtrl* text = new wxTextCtrl(dialog, IDC_IOR);
     text->SetName( "iorTextCtrl");
-    sizer->Add(
-	text,
-	1,
-	wxALL,
-	5);
-    topsizer->Add(
-        sizer,
-        0,
-        wxALIGN_LEFT | wxEXPAND);
+    sizer->Add(text, 1, wxALL, 5);
+    topsizer->Add(sizer, 0, wxALIGN_LEFT | wxEXPAND);
   }
 
   wxBoxSizer* button_sizer = new wxBoxSizer( wxHORIZONTAL);
   {
     wxButton* button = new wxButton( dialog, wxID_OK, "OK" );
     button->SetName( "okButton");
-    button_sizer->Add(
-        button,
-        0,
-        wxALL,
-        5);
+    button_sizer->Add(button, 0, wxALL, 5);
   }
   {
-    button_sizer->Add(
-        new wxButton( dialog, wxID_CANCEL, "Cancel" ),
-        0,
-        wxALL,
-        5);
+    button_sizer->Add(new wxButton( dialog, wxID_CANCEL, "Cancel" ),
+                      0,
+                      wxALL,
+                      5);
   }
-  topsizer->Add(
-     button_sizer,
-     0,
-     wxALIGN_CENTER);
+  topsizer->Add(button_sizer, 0, wxALIGN_CENTER);
 
   dialog->SetSizer( topsizer);
   topsizer->SetSizeHints( dialog);