Index: code/branches/presentation2/src/modules/objects/Attacher.cc
===================================================================
--- code/branches/presentation2/src/modules/objects/Attacher.cc	(revision 6388)
+++ code/branches/presentation2/src/modules/objects/Attacher.cc	(revision 6394)
@@ -98,5 +98,5 @@
         this->target_ = 0;
 
-        if (this->targetname_ == "")
+        if (this->targetname_.empty())
             return;
 
@@ -113,5 +113,5 @@
     void Attacher::loadedNewXMLName(BaseObject* object)
     {
-        if (this->target_ || this->targetname_ == "")
+        if (this->target_ || this->targetname_.empty())
             return;
 
Index: code/branches/presentation2/src/modules/objects/eventsystem/EventFilter.cc
===================================================================
--- code/branches/presentation2/src/modules/objects/eventsystem/EventFilter.cc	(revision 6388)
+++ code/branches/presentation2/src/modules/objects/eventsystem/EventFilter.cc	(revision 6394)
@@ -62,5 +62,5 @@
         if (this->bActive_)
         {
-            COUT(2) << "Warning: Detected Event loop in EventFilter \"" << this->getName() << "\"" << std::endl;
+            COUT(2) << "Warning: Detected Event loop in EventFilter \"" << this->getName() << '"' << std::endl;
             return;
         }
Index: code/branches/presentation2/src/modules/objects/eventsystem/EventListener.cc
===================================================================
--- code/branches/presentation2/src/modules/objects/eventsystem/EventListener.cc	(revision 6388)
+++ code/branches/presentation2/src/modules/objects/eventsystem/EventListener.cc	(revision 6394)
@@ -58,5 +58,5 @@
         if (this->bActive_)
         {
-            COUT(2) << "Warning: Detected Event loop in EventListener \"" << this->getName() << "\"" << std::endl;
+            COUT(2) << "Warning: Detected Event loop in EventListener \"" << this->getName() << '"' << std::endl;
             return;
         }
@@ -71,5 +71,5 @@
         this->eventName_ = eventname;
 
-        if (this->eventName_ == "")
+        if (this->eventName_.empty())
             return;
 
@@ -81,5 +81,5 @@
     void EventListener::loadedNewXMLName(BaseObject* object)
     {
-        if (this->eventName_ == "")
+        if (this->eventName_.empty())
             return;
 
Index: code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.cc
===================================================================
--- code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.cc	(revision 6388)
+++ code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.cc	(revision 6394)
@@ -60,5 +60,5 @@
         if (this->bActive_)
         {
-            COUT(2) << "Warning: Detected Event loop in EventTarget \"" << this->getName() << "\"" << std::endl;
+            COUT(2) << "Warning: Detected Event loop in EventTarget \"" << this->getName() << '"' << std::endl;
             return;
         }
@@ -80,5 +80,5 @@
     void EventTarget::loadedNewXMLName(BaseObject* object)
     {
-        if (this->target_ == "")
+        if (this->target_.empty())
             return;
 
Index: code/branches/presentation2/src/modules/objects/triggers/DistanceTrigger.cc
===================================================================
--- code/branches/presentation2/src/modules/objects/triggers/DistanceTrigger.cc	(revision 6388)
+++ code/branches/presentation2/src/modules/objects/triggers/DistanceTrigger.cc	(revision 6394)
@@ -92,5 +92,5 @@
     if (!targetId)
     {
-        COUT(1) << "Error: \"" << targets << "\" is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << std::endl;
+        COUT(1) << "Error: \"" << targets << "\" is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ')' << std::endl;
         return;
     }
Index: code/branches/presentation2/src/modules/objects/triggers/Trigger.cc
===================================================================
--- code/branches/presentation2/src/modules/objects/triggers/Trigger.cc	(revision 6388)
+++ code/branches/presentation2/src/modules/objects/triggers/Trigger.cc	(revision 6394)
@@ -280,11 +280,11 @@
   {
     if (this->mode_ == TriggerMode::EventTriggerAND)
-      return std::string("and");
+      return "and";
     else if (this->mode_ == TriggerMode::EventTriggerOR)
-      return std::string("or");
+      return "or";
     else if (this->mode_ == TriggerMode::EventTriggerXOR)
-      return std::string("xor");
+      return "xor";
     else
-      return std::string("and");
+      return "and";
   }
 
