1 files changed, 38 insertions, 42 deletions

diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
index e7f7bd0dc17..bf602477877 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_QUERYCONDITION_H
-#define DDS4CCM_QUERYCONDITION_H
+#ifndef CIAO_RTI_QUERYCONDITION_H
+#define CIAO_RTI_QUERYCONDITION_H
 
 #include "tao/LocalObject.h"
 
@@ -17,67 +17,63 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::QueryCondition DDSQueryCondition;
-#endif
-
 #include "tao/LocalObject.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_QueryCondition_i :
-      public virtual ::DDS::CCM_QueryCondition,
-      public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_QueryCondition_i (void);
+      class DDS4CCM_NDDS_IMPL_Export RTI_QueryCondition_i :
+        public virtual ::DDS::CCM_QueryCondition,
+        public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_QueryCondition_i (void);
 
-      /// Destructor
-      virtual ~CCM_DDS_QueryCondition_i (void);
+        // Destructor
+        virtual ~RTI_QueryCondition_i (void);
 
-      virtual ::CORBA::Boolean
-      get_trigger_value (void);
+        virtual ::CORBA::Boolean
+        get_trigger_value (void);
 
-      virtual ::DDS::SampleStateMask
-      get_sample_state_mask (void);
+        virtual ::DDS::SampleStateMask
+        get_sample_state_mask (void);
 
-      virtual ::DDS::ViewStateMask
-      get_view_state_mask (void);
+        virtual ::DDS::ViewStateMask
+        get_view_state_mask (void);
 
-      virtual ::DDS::InstanceStateMask
-      get_instance_state_mask (void);
+        virtual ::DDS::InstanceStateMask
+        get_instance_state_mask (void);
 
-      virtual ::DDS::DataReader_ptr
-      get_datareader (void);
+        virtual ::DDS::DataReader_ptr
+        get_datareader (void);
 
-      virtual char *
-      get_query_expression (void);
+        virtual char *
+        get_query_expression (void);
 
-      virtual ::DDS::ReturnCode_t
-      get_query_parameters (
-        ::DDS::StringSeq & query_parameters);
+        virtual ::DDS::ReturnCode_t
+        get_query_parameters (
+          ::DDS::StringSeq & query_parameters);
 
-      virtual ::DDS::ReturnCode_t
-      set_query_parameters (
-        const ::DDS::StringSeq & query_parameters);
+        virtual ::DDS::ReturnCode_t
+        set_query_parameters (
+          const ::DDS::StringSeq & query_parameters);
 
-      DDSQueryCondition * get_impl (void);
+        DDSQueryCondition * get_impl (void);
 
-      void set_impl (DDSQueryCondition * qc);
+        void set_impl (DDSQueryCondition * qc);
 
-    private:
-      DDSQueryCondition * impl_;
+      private:
+        DDSQueryCondition * impl_;
 
-      DDSQueryCondition * impl ();
-    };
+        DDSQueryCondition * impl ();
+      };
+    }
   }
 }
 
-#endif /* DDS4CCM_QUERYCONDITION_H */
+#endif /* CIAO_RTI_QUERYCONDITION_H */