summaryrefslogtreecommitdiff
path: root/TAO/utils
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2004-05-19 09:19:11 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2004-05-19 09:19:11 +0000
commit47dc2c5ec223cc46cd8dd852a686defcb42cc796 (patch)
tree019a63c4c8f0101591cf2c2dbfabcd338a3564e1 /TAO/utils
parentaa54fc69a5973de1a80ee321bb44fc191b8f6cf2 (diff)
downloadATCD-47dc2c5ec223cc46cd8dd852a686defcb42cc796.tar.gz
ChangeLogTag: Wed May 19 09:19:14 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/utils')
-rw-r--r--TAO/utils/NamingViewer/BindNewContext.h2
-rw-r--r--TAO/utils/NamingViewer/NamingObject.h6
-rw-r--r--TAO/utils/NamingViewer/NamingTreeCtrl.h2
-rw-r--r--TAO/utils/NamingViewer/NamingViewerDlg.cpp10
-rw-r--r--TAO/utils/NamingViewer/NamingViewerDlg.h2
5 files changed, 11 insertions, 11 deletions
diff --git a/TAO/utils/NamingViewer/BindNewContext.h b/TAO/utils/NamingViewer/BindNewContext.h
index 8c76dcdfc1e..48f4c7073f3 100644
--- a/TAO/utils/NamingViewer/BindNewContext.h
+++ b/TAO/utils/NamingViewer/BindNewContext.h
@@ -7,7 +7,7 @@
#endif // _MSC_VER > 1000
// BindNewContext.h : header file
//
-#include "orbsvcs/CosNamingC.H"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
/////////////////////////////////////////////////////////////////////////////
// CBindNewContext dialog
diff --git a/TAO/utils/NamingViewer/NamingObject.h b/TAO/utils/NamingViewer/NamingObject.h
index 340be5182e2..ce257320641 100644
--- a/TAO/utils/NamingViewer/NamingObject.h
+++ b/TAO/utils/NamingViewer/NamingObject.h
@@ -10,9 +10,9 @@
#pragma once
#endif // _MSC_VER > 1000
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
-class CNamingObject
+class CNamingObject
{
public:
CNamingObject (CosNaming::Name& Name,
@@ -30,7 +30,7 @@ public:
CosNaming::Name& Name (void);
// returns the name of the object
- bool IsContext (void) { return m_Context; }
+ bool IsContext (void) { return m_Context; }
// Returns true if this is a context
private:
diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.h b/TAO/utils/NamingViewer/NamingTreeCtrl.h
index 8c871ad3792..dcfe3b12a9c 100644
--- a/TAO/utils/NamingViewer/NamingTreeCtrl.h
+++ b/TAO/utils/NamingViewer/NamingTreeCtrl.h
@@ -7,7 +7,7 @@
#endif // _MSC_VER > 1000
// NamingTreeCtrl.h : header file
//
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
class CNamingObject;
/////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
index 1614d1161a9..356f90237bd 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
@@ -4,7 +4,7 @@
#include "NamingViewer.h"
#include "NamingViewerDlg.h"
#include "ViewIORDialog.h"
-#include "ORBSvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
#include "SelectNSDialog.h"
#ifdef _DEBUG
@@ -69,7 +69,7 @@ CNamingViewerDlg::CNamingViewerDlg(CORBA::ORB_ptr pORB, CWnd* pParent /*=NULL*/)
//}}AFX_DATA_INIT
// Note that LoadIcon does not require a subsequent DestroyIcon in Win32
m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
-
+
m_pORB = pORB;
}
@@ -123,10 +123,10 @@ BOOL CNamingViewerDlg::OnInitDialog()
// 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);
-
+
// Initialize the naming client and get the root context
TAO_Naming_Client Client;
ACE_Time_Value Timeout(0,500000);
@@ -169,7 +169,7 @@ void CNamingViewerDlg::OnSysCommand(UINT nID, LPARAM lParam)
// to draw the icon. For MFC applications using the document/view model,
// this is automatically done for you by the framework.
-void CNamingViewerDlg::OnPaint()
+void CNamingViewerDlg::OnPaint()
{
if (IsIconic())
{
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.h b/TAO/utils/NamingViewer/NamingViewerDlg.h
index fbda6676e4d..4ddbe2e6e36 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.h
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.h
@@ -9,7 +9,7 @@
#pragma once
#endif // _MSC_VER > 1000
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "NamingTreeCtrl.h"
/////////////////////////////////////////////////////////////////////////////
// CNamingViewerDlg dialog