removed olive:: qualifier from icon:: namespace

app/project/item/folder/folder.cpp

@@ -38,5 +38,5 @@ bool Folder::CanHaveChildren() const
 
 QIcon Folder::icon()
 {
-  return olive::icon::Folder;
+  return icon::Folder;
 }

app/project/item/footage/footage.cpp

@@ -126,22 +126,22 @@ QIcon Footage::icon()
     if (HasStreamsOfType(Stream::kVideo)) {
 
       // Prioritize the video icon
-      return olive::icon::Video;
+      return icon::Video;
 
     } else if (HasStreamsOfType(Stream::kAudio)) {
 
       // Otherwise assume it's audio only
-      return olive::icon::Audio;
+      return icon::Audio;
 
     } else if (HasStreamsOfType(Stream::kImage)) {
 
       // Otherwise assume it's an image
-      return olive::icon::Image;
+      return icon::Image;
 
     }
     /* fall-through */
   case kInvalid:
-    return olive::icon::Error;
+    return icon::Error;
   }
 
   return QIcon();

app/project/item/footage/stream.cpp

@@ -105,11 +105,11 @@ QIcon Stream::IconFromType(const Stream::Type &type)
 {
   switch (type) {
   case Stream::kVideo:
-    return olive::icon::Video;
+    return icon::Video;
   case Stream::kImage:
-    return olive::icon::Image;
+    return icon::Image;
   case Stream::kAudio:
-    return olive::icon::Audio;
+    return icon::Audio;
   default:
     break;
   }

app/project/item/sequence/sequence.cpp

@@ -84,7 +84,7 @@ Item::Type Sequence::type() const
 
 QIcon Sequence::icon()
 {
-  return olive::icon::Sequence;
+  return icon::Sequence;
 }
 
 QString Sequence::duration()