summaryrefslogtreecommitdiff
path: root/TAO/utils/NamingViewer
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/utils/NamingViewer')
-rw-r--r--TAO/utils/NamingViewer/BindDialog.cpp12
-rw-r--r--TAO/utils/NamingViewer/BindNewContext.cpp4
-rw-r--r--TAO/utils/NamingViewer/NamingTreeCtrl.cpp18
-rw-r--r--TAO/utils/NamingViewer/NamingViewer.cpp2
-rw-r--r--TAO/utils/NamingViewer/NamingViewerDlg.cpp4
-rw-r--r--TAO/utils/NamingViewer/ViewIORDialog.cpp4
6 files changed, 22 insertions, 22 deletions
diff --git a/TAO/utils/NamingViewer/BindDialog.cpp b/TAO/utils/NamingViewer/BindDialog.cpp
index a7a0c2b7cdb..7d0af9359eb 100644
--- a/TAO/utils/NamingViewer/BindDialog.cpp
+++ b/TAO/utils/NamingViewer/BindDialog.cpp
@@ -54,11 +54,11 @@ void CBindDialog::OnViewior()
try
{
UpdateData();
- m_Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (m_IOR));
+ m_Object = m_pORB->string_to_object(ACE_TEXT_TO_CHAR_IN (m_IOR));
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
return;
}
ViewIORDialog Dialog(m_pORB, m_Object);
@@ -87,15 +87,15 @@ void CBindDialog::OnOK()
// 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));
+ m_Name[0].id = CORBA::string_dup(m_ID);
+ m_Name[0].kind = CORBA::string_dup(m_Kind);
try
{
- m_Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (m_IOR));
+ m_Object = m_pORB->string_to_object(ACE_TEXT_TO_CHAR_IN (m_IOR));
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("Invalid IOR"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("Invalid IOR"));
return;
}
CDialog::OnOK();
diff --git a/TAO/utils/NamingViewer/BindNewContext.cpp b/TAO/utils/NamingViewer/BindNewContext.cpp
index a846fa6cf3c..f0deb874b4e 100644
--- a/TAO/utils/NamingViewer/BindNewContext.cpp
+++ b/TAO/utils/NamingViewer/BindNewContext.cpp
@@ -48,7 +48,7 @@ void CBindNewContext::OnOK()
// 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));
+ m_Name[0].id = CORBA::string_dup(m_ID);
+ m_Name[0].kind = CORBA::string_dup(m_Kind);
CDialog::OnOK();
}
diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
index 112d769ee01..fcbbb7e3903 100644
--- a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
+++ b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
@@ -186,7 +186,7 @@ void CNamingTreeCtrl::ListContext(HTREEITEM hItem)
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
}
}
@@ -237,7 +237,7 @@ void CNamingTreeCtrl::OnContextPopupUnbind()
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
}
}
@@ -286,7 +286,7 @@ void CNamingTreeCtrl::OnContextPopupDestroy()
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
}
}
@@ -317,7 +317,7 @@ void CNamingTreeCtrl::OnContextPopupBindContext()
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
}
}
@@ -343,7 +343,7 @@ void CNamingTreeCtrl::OnContextPopupBindobject()
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
}
}
@@ -381,7 +381,7 @@ void CNamingTreeCtrl::OnContextpopupBindnewcontext()
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
}
}
@@ -418,7 +418,7 @@ void CNamingTreeCtrl::OnCopy()
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
}
}
@@ -461,7 +461,7 @@ void CNamingTreeCtrl::OnObjectpopupUnbind()
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
}
}
@@ -513,7 +513,7 @@ void CNamingTreeCtrl::ListBindingList(HTREEITEM hItem, CosNaming::NamingContext_
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
}
}
diff --git a/TAO/utils/NamingViewer/NamingViewer.cpp b/TAO/utils/NamingViewer/NamingViewer.cpp
index 2f86a0d3a4a..d5025fc2186 100644
--- a/TAO/utils/NamingViewer/NamingViewer.cpp
+++ b/TAO/utils/NamingViewer/NamingViewer.cpp
@@ -57,7 +57,7 @@ BOOL CNamingViewerApp::InitInstance()
#endif
// Parse command line arguments so we can initialize ORB with them
- ACE_ARGV Argv(ACE_TEXT_CHAR_TO_TCHAR(m_lpCmdLine));
+ ACE_ARGV Argv(ACE_TEXT_TO_TCHAR_IN(m_lpCmdLine));
ACE::init();
{
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
index 0e7520cf8db..2a27722a583 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
@@ -219,7 +219,7 @@ void CNamingViewerDlg::OnSelectNs()
}
try
{
- CORBA::Object_var Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (Dialog.GetIOR()));
+ CORBA::Object_var Object = m_pORB->string_to_object(ACE_TEXT_TO_CHAR_IN (Dialog.GetIOR()));
m_RootContext = CosNaming::NamingContext::_narrow(Object);
m_Server = Dialog.GetName();
UpdateData(FALSE);
@@ -227,7 +227,7 @@ void CNamingViewerDlg::OnSelectNs()
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
}
}
diff --git a/TAO/utils/NamingViewer/ViewIORDialog.cpp b/TAO/utils/NamingViewer/ViewIORDialog.cpp
index f7724f02d70..4c9cfc22537 100644
--- a/TAO/utils/NamingViewer/ViewIORDialog.cpp
+++ b/TAO/utils/NamingViewer/ViewIORDialog.cpp
@@ -69,12 +69,12 @@ void ViewIORDialog::OnApply()
UpdateData();
try
{
- m_Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (m_IOR));
+ m_Object = m_pORB->string_to_object(ACE_TEXT_TO_CHAR_IN (m_IOR));
DecodeIOR();
}
catch(CORBA::Exception& ex)
{
- MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+ MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
}
}
View Lorry Controller Status