[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/taglib
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2004-05-06 16:59:13
Message-ID: 20040506165913.F2EF91CEE () office ! kde ! org
[Download RAW message or body]

CVS commit by wheeler: 

Just a little hack to make the Vorbis classes appear in the Ogg namespace
in the API docs and a tyepdef to make this work (since this is how things
will be in the next BIC version).


  M +1 -0      Makefile.am   1.26
  M +24 -0     ogg/vorbis/vorbisfile.h   1.13
  M +24 -0     ogg/vorbis/vorbisproperties.h   1.5


--- kdesupport/taglib/Makefile.am  #1.25:1.26
@@ -47,4 +47,5 @@
         echo "FILE_PATTERNS       = *.h" >> taglib.doxyfile ; \
         echo "PREDEFINED          = DO_NOT_DOCUMENT" >> taglib.doxyfile ; \
+        echo "PREDEFINED          = DOXYGEN" >> taglib.doxyfile ; \
         echo "EXTRACT_ALL         = YES" >> taglib.doxyfile ; \
         doxygen taglib.doxyfile

--- kdesupport/taglib/ogg/vorbis/vorbisfile.h  #1.12:1.13
@@ -30,4 +30,15 @@
 namespace TagLib {
 
+/*
+ * This is just to make this appear to be in the Ogg namespace in the
+ * documentation.  The typedef below will make this work with the current code.
+ * In the next BIC version of TagLib this will be really moved into the Ogg
+ * namespace.
+ */
+
+#ifdef DOXYGEN
+  namespace Ogg {
+#endif
+
   //! A namespace containing classes for Vorbis metadata
 
@@ -85,4 +96,17 @@ namespace TagLib {
     };
   }
+
+/*
+ * To keep compatibility with the current version put Vorbis in the Ogg namespace
+ * only in the docs and provide a typedef to make it work.  In the next BIC
+ * version this will be removed and it will only exist in the Ogg namespace. 
+ */
+
+#ifdef DOXYGEN
+  }
+#else
+  namespace Ogg { namespace Vorbis { typedef TagLib::Vorbis::File File; } }
+#endif
+
 }
 

--- kdesupport/taglib/ogg/vorbis/vorbisproperties.h  #1.4:1.5
@@ -27,4 +27,15 @@
 namespace TagLib {
 
+/*
+ * This is just to make this appear to be in the Ogg namespace in the
+ * documentation.  The typedef below will make this work with the current code.
+ * In the next BIC version of TagLib this will be really moved into the Ogg
+ * namespace.
+ */
+
+#ifdef DOXYGEN
+  namespace Ogg {
+#endif
+
   namespace Vorbis {
 
@@ -92,4 +103,17 @@ namespace TagLib {
     };
   }
+
+/*
+ * To keep compatibility with the current version put Vorbis in the Ogg namespace
+ * only in the docs and provide a typedef to make it work.  In the next BIC
+ * version this will be removed and it will only exist in the Ogg namespace. 
+ */
+
+#ifdef DOXYGEN
+  }
+#else
+  namespace Ogg { namespace Vorbis { typedef TagLib::AudioProperties AudioProperties; } }
+#endif
+
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]