Revert "Hide a private static variable."

This reverts commit 25ffbcb4b9b04326edd1d25a785b686951a0f235.

# Conflicts:
#	taglib/mpeg/id3v2/id3v2framefactory.cpp
#	taglib/mpeg/id3v2/id3v2framefactory.h

diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
index bbeb56f0b6b3d66ed6426385e8b8c5e919efa141..0fbb87d026cdeaf599709e91f87866f70ee3336d 100644 (file)
--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
@@ -102,13 +102,14 @@ public:
   }
 };
 
+FrameFactory FrameFactory::factory;
+
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
 FrameFactory *FrameFactory::instance()
 {
-  static FrameFactory factory;
   return &factory;
 }
 
@@ -538,4 +539,3 @@ bool FrameFactory::updateFrame(Frame::Header *header) const
 
   return true;
 }
-

diff --git a/taglib/mpeg/id3v2/id3v2framefactory.h b/taglib/mpeg/id3v2/id3v2framefactory.h
index c3875dc5cd291bbeb88091f39c83c74d8e6030de..33c7f67ef8a93b284078c74c12e20d11dea922e1 100644 (file)
--- a/taglib/mpeg/id3v2/id3v2framefactory.h
+++ b/taglib/mpeg/id3v2/id3v2framefactory.h
@@ -66,7 +66,6 @@ namespace TagLib {
     {
     public:
       static FrameFactory *instance();
-
       /*!
        * Create a frame based on \a data.  \a synchSafeInts should only be set
        * false if we are parsing an old tag (v2.3 or older) that does not support
@@ -153,6 +152,8 @@ namespace TagLib {
       FrameFactory(const FrameFactory &);
       FrameFactory &operator=(const FrameFactory &);
 
+      static FrameFactory factory;
+
       class FrameFactoryPrivate;
       FrameFactoryPrivate *d;
     };