diff options
| author | miniak <milan.burda@gmail.com> | 2009-07-01 09:50:19 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-07-01 09:51:22 (GMT) |
| commit | 24e7a5f983ead3fe722703851cf59cd0943e3964 (patch) | |
| tree | ae858cbe73d50db8f4e05ba58dff53e728703120 | |
| parent | 7ae4e3c1827138cc47d14dd0f128b5999ccb30ce (diff) | |
| download | Qt-24e7a5f983ead3fe722703851cf59cd0943e3964.zip Qt-24e7a5f983ead3fe722703851cf59cd0943e3964.tar.gz Qt-24e7a5f983ead3fe722703851cf59cd0943e3964.tar.bz2 | |
src/3rdparty/phonon: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| -rw-r--r-- | src/3rdparty/phonon/ds9/qaudiocdreader.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/ds9/qaudiocdreader.cpp b/src/3rdparty/phonon/ds9/qaudiocdreader.cpp index b9f9fd6..d5bdce2 100644 --- a/src/3rdparty/phonon/ds9/qaudiocdreader.cpp +++ b/src/3rdparty/phonon/ds9/qaudiocdreader.cpp @@ -154,10 +154,7 @@ namespace Phonon path = QString::fromLatin1("\\\\.\\%1:").arg(drive); } - m_cddrive = QT_WA_INLINE ( - ::CreateFile( (TCHAR*)path.utf16(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ), - ::CreateFileA( path.toLocal8Bit().constData(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ) - ); + m_cddrive = ::CreateFile((const wchar_t *)path.utf16(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); qMemSet(m_toc, 0, sizeof(CDROM_TOC)); //read the TOC |