diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:56:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:56:28 -0600 |
| commit | b2ead42a56c863db8cbc1b6679e386b145018d2f (patch) | |
| tree | 70cf0f88690074cf4b7ee2a67da621f840d70761 /src/metadata | |
| parent | 062f8fc5853883ad6d3eecd53e1dde8f2f78f1f7 (diff) | |
| download | soundkonverter-b2ead42a56c863db8cbc1b6679e386b145018d2f.tar.gz soundkonverter-b2ead42a56c863db8cbc1b6679e386b145018d2f.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/metadata')
| -rwxr-xr-x | src/metadata/tplugins.cpp | 2 | ||||
| -rw-r--r-- | src/metadata/wavpack/Makefile.am | 4 | ||||
| -rw-r--r-- | src/metadata/wavpack/taglib_wavpactdefiletyperesolver.cpp (renamed from src/metadata/wavpack/taglib_wavpackfiletyperesolver.cpp) | 2 | ||||
| -rw-r--r-- | src/metadata/wavpack/taglib_wavpactdefiletyperesolver.h (renamed from src/metadata/wavpack/taglib_wavpackfiletyperesolver.h) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/metadata/tplugins.cpp b/src/metadata/tplugins.cpp index 10d7107..81c3b6c 100755 --- a/src/metadata/tplugins.cpp +++ b/src/metadata/tplugins.cpp @@ -38,7 +38,7 @@ #include "trueaudio/taglib_trueaudiofiletyperesolver.h" #include "trueaudio/ttafile.h" -#include "wavpack/taglib_wavpackfiletyperesolver.h" +#include "wavpack/taglib_wavpactdefiletyperesolver.h" #include "wavpack/wvfile.h" #include "speex/taglib_speexfiletyperesolver.h" #include "speex/speexfile.h" diff --git a/src/metadata/wavpack/Makefile.am b/src/metadata/wavpack/Makefile.am index 93a98c6..64f60b6 100644 --- a/src/metadata/wavpack/Makefile.am +++ b/src/metadata/wavpack/Makefile.am @@ -8,9 +8,9 @@ noinst_LTLIBRARIES = libtagwavpack.la libtagwavpack_la_SOURCES = \ wvfile.cpp \ wvproperties.cpp \ - taglib_wavpackfiletyperesolver.cpp + taglib_wavpactdefiletyperesolver.cpp noinst_HEADERS = wvfile.h \ wvproperties.h \ - taglib_wavpackfiletyperesolver.h + taglib_wavpactdefiletyperesolver.h diff --git a/src/metadata/wavpack/taglib_wavpackfiletyperesolver.cpp b/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.cpp index fe289a2..feadd8b 100644 --- a/src/metadata/wavpack/taglib_wavpackfiletyperesolver.cpp +++ b/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.cpp @@ -19,7 +19,7 @@ * MA 02110-1301 USA * ***************************************************************************/ -#include "taglib_wavpackfiletyperesolver.h" +#include "taglib_wavpactdefiletyperesolver.h" #include "wvfile.h" #include <string.h> diff --git a/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h b/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.h index b9d4500..b9d4500 100644 --- a/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h +++ b/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.h |