Remove absolute namespaces

registry.cpp.tmpl

@@ -62,7 +62,7 @@ ElementsDictionary create_public_dictionary()
     return public_dictionary;
 }
 
-std::map<std::string, odil::Tag> create_public_tags()
+std::map<std::string, Tag> create_public_tags()
 {
 
     RawElementsDictionaryEntry raw_entries[] = {
@@ -74,7 +74,7 @@ std::map<std::string, odil::Tag> create_public_tags()
 {% endfor %}
     };
 
-    std::map<std::string, odil::Tag> public_tags;
+    std::map<std::string, Tag> public_tags;
 
     unsigned long const count = sizeof(raw_entries)/sizeof(RawElementsDictionaryEntry);
     for(unsigned long i=0; i<count; ++i)
@@ -117,10 +117,10 @@ UIDsDictionary create_uids_dictionary()
     return uids_dictionary;
 }
 
-}
+ElementsDictionary public_dictionary=create_public_dictionary();
+std::map<std::string, Tag> public_tags=create_public_tags();
+UIDsDictionary uids_dictionary=create_uids_dictionary();
 
 }
 
-odil::ElementsDictionary odil::registry::public_dictionary=odil::registry::create_public_dictionary();
-std::map<std::string, odil::Tag> odil::registry::public_tags=odil::registry::create_public_tags();
-odil::UIDsDictionary odil::registry::uids_dictionary=odil::registry::create_uids_dictionary();
+}

src/odil/Association.cpp

@@ -196,7 +196,9 @@ bool
 Association
 ::is_associated() const
 {
-    return this->_state_machine.get_transport().is_open() && this->_state_machine.get_state() == odil::dul::StateMachine::State::Sta6 ;
+    return (
+        this->_state_machine.get_transport().is_open()
+        && this->_state_machine.get_state() == dul::StateMachine::State::Sta6);
 }
 
 void

src/odil/MoveSCU.cpp

@@ -216,11 +216,11 @@ ::_handle_store_association(
         StoreSCP scp(association, store_callback);
         scp.receive_and_process();
     }
-    catch(odil::AssociationReleased const &)
+    catch(AssociationReleased const &)
     {
         result = true;
     }
-    catch(odil::AssociationAborted const & e)
+    catch(AssociationAborted const & e)
     {
         result = true;
     }

src/odil/SCP.cpp

@@ -26,7 +26,7 @@ SCP::Exception
 ::Exception(
     std::string const & message,
     Value::Integer status, std::shared_ptr<DataSet> status_fields)
-: ::odil::Exception(message), status(status), status_fields(status_fields)
+: odil::Exception(message), status(status), status_fields(status_fields)
 {
     // Nothing else.
 }

src/odil/VRFinder.cpp

@@ -180,12 +180,12 @@ ::implicit_vr_little_endian(
             tag == registry::LargestPixelValueInSeries ||
             tag == registry::PixelPaddingValue)
         {
-            if(!data_set->has(odil::registry::PixelRepresentation))
+            if(!data_set->has(registry::PixelRepresentation))
             {
                 throw Exception("Cannot find VR without PixelRepresentation");
             }
             auto const & pixel_representation = 
-                data_set->as_int(odil::registry::PixelRepresentation)[0];
+                data_set->as_int(registry::PixelRepresentation)[0];
             return (pixel_representation==0)?(VR::US):(VR::SS);
         }
         else
@@ -212,12 +212,12 @@ ::explicit_vr_little_endian(
         // PS3.5, A.1 (c)
         if(tag == registry::PixelData)
         {
-            if(!data_set->has(odil::registry::BitsAllocated))
+            if(!data_set->has(registry::BitsAllocated))
             {
                 throw Exception("Cannot find VR without BitsAllocated");
             }
             auto const & bits_allocated = 
-                data_set->as_int(odil::registry::BitsAllocated)[0];
+                data_set->as_int(registry::BitsAllocated)[0];
             return (bits_allocated<=8)?(VR::OB):(VR::OW);
         }
         else if((tag.group>>8) == 0x60 && tag.element == 0x3000)
@@ -261,12 +261,12 @@ ::explicit_vr_little_endian(
             tag == registry::LargestPixelValueInSeries ||
             tag == registry::PixelPaddingValue)
         {
-            if(!data_set->has(odil::registry::PixelRepresentation))
+            if(!data_set->has(registry::PixelRepresentation))
             {
                 throw Exception("Cannot find VR without PixelRepresentation");
             }
             auto const & pixel_representation = 
-                data_set->as_int(odil::registry::PixelRepresentation)[0];
+                data_set->as_int(registry::PixelRepresentation)[0];
             return (pixel_representation==0)?(VR::US):(VR::SS);
         }
         else

src/odil/Writer.cpp

@@ -219,7 +219,7 @@ void
 Writer
 ::write_file(
     std::shared_ptr<DataSet const> data_set , std::ostream & stream,
-    std::shared_ptr<odil::DataSet const> meta_information,
+    std::shared_ptr<DataSet const> meta_information,
     std::string const & transfer_syntax, ItemEncoding item_encoding,
     bool use_group_length)
 {

src/odil/dcmtk/Exception.cpp

@@ -23,14 +23,14 @@ namespace dcmtk
 
 Exception
 ::Exception(std::string const & message)
-: ::odil::Exception(message), _source(Source::Message), _condition()
+: odil::Exception(message), _source(Source::Message), _condition()
 {
     // Nothing else.
 }
 
 Exception
 ::Exception(OFCondition const & condition)
-: ::odil::Exception(), _source(Source::Condition), _condition(condition)
+: odil::Exception(), _source(Source::Condition), _condition(condition)
 {
     // Nothing else.
 }

src/odil/dcmtk/Exception.h

@@ -21,7 +21,7 @@ namespace odil
 namespace dcmtk
 {
 
-class ODIL_API Exception: public ::odil::Exception
+class ODIL_API Exception: public odil::Exception
 {
 public:
     /**

src/odil/json_converter.h

@@ -21,7 +21,7 @@ namespace odil
 /// @brief Convert a data set to its JSON representation.
 ODIL_API Json::Value as_json(
     std::shared_ptr<DataSet const> data_set,
-    odil::Value::Strings const & specific_character_set={});
+    Value::Strings const & specific_character_set={});
 
 /// @brief Create a data set from its JSON representation.
 ODIL_API std::shared_ptr<DataSet> as_dataset(Json::Value const & json);

src/odil/message/NSetRequest.cpp

@@ -27,7 +27,7 @@ ::NSetRequest(
     std::shared_ptr<DataSet> dataset)
 : Request(message_id)
 {
-    this->set_command_field( ::odil::message::Message::Command::N_SET_RQ);
+    this->set_command_field(Message::Command::N_SET_RQ);
     this->set_requested_sop_class_uid(requested_sop_class_uid);
     this->set_requested_sop_instance_uid(requested_sop_instance_uid);
 

src/odil/message/Response.h

@@ -91,9 +91,9 @@ class ODIL_API Response: public Message
     ODIL_MESSAGE_OPTIONAL_FIELD_INTEGER_MACRO(
         error_id, registry::ErrorID)
     ODIL_MESSAGE_OPTIONAL_FIELD_STRING_MACRO(
-        affected_sop_instance_uid, odil::registry::AffectedSOPInstanceUID)
+        affected_sop_instance_uid, registry::AffectedSOPInstanceUID)
     ODIL_MESSAGE_OPTIONAL_FIELD_STRING_MACRO(
-        attribute_identifier_list, odil::registry::AttributeIdentifierList)
+        attribute_identifier_list, registry::AttributeIdentifierList)
 
     /// @brief Test whether the status class is pending.
     bool is_pending() const;

src/odil/pdu/Item.cpp

@@ -73,7 +73,7 @@ ::as_unsigned_int_8() const
 {
     if(this->_type != Type::unsigned_int_8)
     {
-        throw odil::Exception("Incorrect type");
+        throw Exception("Incorrect type");
     }
     return this->_uint8;
 }
@@ -84,7 +84,7 @@ ::as_unsigned_int_8()
 {
     if(this->_type != Type::unsigned_int_8)
     {
-        throw odil::Exception("Incorrect type");
+        throw Exception("Incorrect type");
     }
     return this->_uint8;
 }
@@ -95,7 +95,7 @@ ::as_unsigned_int_16() const
 {
     if(this->_type != Type::unsigned_int_16)
     {
-        throw odil::Exception("Incorrect type");
+        throw Exception("Incorrect type");
     }
     return this->_uint16;
 }
@@ -106,7 +106,7 @@ ::as_unsigned_int_16()
 {
     if(this->_type != Type::unsigned_int_16)
     {
-        throw odil::Exception("Incorrect type");
+        throw Exception("Incorrect type");
     }
     return this->_uint16;
 }
@@ -117,7 +117,7 @@ ::as_unsigned_int_32() const
 {
     if(this->_type != Type::unsigned_int_32)
     {
-        throw odil::Exception("Incorrect type");
+        throw Exception("Incorrect type");
     }
     return this->_uint32;
 }
@@ -128,7 +128,7 @@ ::as_unsigned_int_32()
 {
     if(this->_type != Type::unsigned_int_32)
     {
-        throw odil::Exception("Incorrect type");
+        throw Exception("Incorrect type");
     }
     return this->_uint32;
 }
@@ -139,7 +139,7 @@ ::as_string() const
 {
     if(this->_type != Type::string)
     {
-        throw odil::Exception("Incorrect type");
+        throw Exception("Incorrect type");
     }
     return this->_string;
 }
@@ -150,7 +150,7 @@ ::as_string()
 {
     if(this->_type != Type::string)
     {
-        throw odil::Exception("Incorrect type");
+        throw Exception("Incorrect type");
     }
     return this->_string;
 }
@@ -161,7 +161,7 @@ ::as_items() const
 {
     if(this->_type != Type::items)
     {
-        throw odil::Exception("Incorrect type");
+        throw Exception("Incorrect type");
     }
     return this->_items;
 }
@@ -172,7 +172,7 @@ ::as_items()
 {
     if(this->_type != Type::items)
     {
-        throw odil::Exception("Incorrect type");
+        throw Exception("Incorrect type");
     }
     return this->_items;
 }

src/odil/registry.cpp

@@ -13409,10 +13409,10 @@ UIDsDictionary create_uids_dictionary()
     return uids_dictionary;
 }
 
-}
+ElementsDictionary public_dictionary=create_public_dictionary();
+std::map<std::string, Tag> public_tags=create_public_tags();
+UIDsDictionary uids_dictionary=create_uids_dictionary();
 
 }
 
-odil::ElementsDictionary odil::registry::public_dictionary=odil::registry::create_public_dictionary();
-std::map<std::string, odil::Tag> odil::registry::public_tags=odil::registry::create_public_tags();
-odil::UIDsDictionary odil::registry::uids_dictionary=odil::registry::create_uids_dictionary();
+}

src/odil/webservices/QIDORSRequest.cpp

@@ -235,7 +235,7 @@ add_qido_element(
             Tag const tag(*it);
             if(!current_ds->has(tag))
             {
-                current_ds->add(tag, {std::make_shared<odil::DataSet>()});
+                current_ds->add(tag, {std::make_shared<DataSet>()});
             }
             current_ds = current_ds->as_data_set(tag)[0];
         }
@@ -475,7 +475,7 @@ ::_generate_url(bool numerical_tags)
 {
     // Breadth-first walk of the query data set to generate the query terms
     // (e.g. PatientName=Doe) and the include fields
-    std::queue<std::pair<std::shared_ptr<odil::DataSet const>, std::string>> queue;
+    std::queue<std::pair<std::shared_ptr<DataSet const>, std::string>> queue;
     queue.emplace(std::make_pair(this->_query_data_set, ""));
 
     std::vector<std::string> terms;

src/odil/webservices/QIDORSRequest.h

@@ -66,7 +66,7 @@ class ODIL_API QIDORSRequest
     std::shared_ptr<DataSet const> get_query_data_set() const;
 
     /// @brief Return the wanted fields.
-    std::set<std::vector<odil::Tag>> const & get_includefields() const;
+    std::set<std::vector<Tag>> const & get_includefields() const;
 
     /// @brief Return whether fuzzymatching is wanted or not.
     bool get_fuzzymatching() const;
@@ -107,7 +107,7 @@ class ODIL_API QIDORSRequest
     static bool _is_selector_valid (Selector const & selector);
 
     /// @brief Return the tag as a numerical string or as a "string"
-    static std::string _tag_to_string(odil::Tag const & tag, bool numerical_tag);
+    static std::string _tag_to_string(Tag const & tag, bool numerical_tag);
 
     /// @brief Split an URL into a tuple
     void _from_url(URL const & url);

src/odil/webservices/QIDORSResponse.cpp

@@ -157,7 +157,7 @@ ::set_data_sets(Value::DataSets const & data_sets)
     this->_data_sets = data_sets;
 }
 
-odil::webservices::Representation const &
+Representation const &
 QIDORSResponse
 ::get_representation() const
 {

src/odil/webservices/STOWRSRequest.cpp

@@ -340,7 +340,7 @@ ::get_http_request() const
             {
                 std::string buffer;
                 OStringStream stream(buffer);
-                odil::Writer::write_file(data_set, stream);
+                Writer::write_file(data_set, stream);
                 stream.flush();
 
                 return Message(
@@ -567,7 +567,7 @@ ::_extract_bulk_data(
             // 2. Get Transfer Syntax from dataSet
             std::string const & transfer_syntax =
                     data_set->get_transfer_syntax().empty()
-                        ?odil::registry::ExplicitVRLittleEndian
+                        ?registry::ExplicitVRLittleEndian
                         :data_set->get_transfer_syntax();
 
             // 3. Create a new BulkData
@@ -612,7 +612,7 @@ ::_restore_data_set(std::shared_ptr<DataSet> data_set, BulkMap & bulk_map)
     {
         auto & tag = it.first;
         auto & element = it.second;
-        if(element.vr == odil::VR::UR)
+        if(element.vr == VR::UR)
         {
             auto const bulk_map_it = bulk_map.find(element.as_string()[0]);
             if(bulk_map_it != bulk_map.end())
@@ -621,10 +621,10 @@ ::_restore_data_set(std::shared_ptr<DataSet> data_set, BulkMap & bulk_map)
                     data_set->get_transfer_syntax().empty()
                     ?registry::ExplicitVRLittleEndian
                     :data_set->get_transfer_syntax();
-                odil::VRFinder vr_finder;
+                VRFinder vr_finder;
                 auto const vr = vr_finder(tag, data_set, transfer_syntax);
 
-                data_set->add(tag, odil::Value::Binary({bulk_map_it->second}), vr);
+                data_set->add(tag, Value::Binary({bulk_map_it->second}), vr);
             }
             else
             {

src/odil/webservices/WADORSRequest.cpp

@@ -277,7 +277,7 @@ ::get_type() const
     return this->_type;
 }
 
-odil::webservices::Selector const &
+Selector const &
 WADORSRequest
 ::get_selector() const
 {