diff options
| author | miniak <milan.burda@gmail.com> | 2009-12-22 13:57:59 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-12-22 14:42:30 (GMT) |
| commit | e60dbc9ca47a0e9371d619b7c5d24a4b3ec4fcd9 (patch) | |
| tree | 4f1df650ecbb1f5a66c49ab9e4458d75ebeef095 /src/gui/dialogs | |
| parent | ef5291b0fd521b7f22169ebc2297f720120296d6 (diff) | |
| download | Qt-e60dbc9ca47a0e9371d619b7c5d24a4b3ec4fcd9.zip Qt-e60dbc9ca47a0e9371d619b7c5d24a4b3ec4fcd9.tar.gz Qt-e60dbc9ca47a0e9371d619b7c5d24a4b3ec4fcd9.tar.bz2 | |
fix small leftovers from the Win9x removal in the code
LoadLibraryW -> LoadLibrary
RegOpenKeyExW -> RegOpenKeyEx
qdesktopservices_win.cpp: buffer size fixed in launchWebBrowser()
Windows NT 4.0 version condition removed
Merge-request: 1627
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_win.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp index c74f622..6128a8a 100644 --- a/src/gui/dialogs/qfiledialog_win.cpp +++ b/src/gui/dialogs/qfiledialog_win.cpp @@ -85,11 +85,6 @@ static const CLSID QT_CLSID_FileOpenDialog = {0xdc1c5a9c, 0xe88a, 0x4dde, {0xa5, #endif -// Don't remove the lines below! -// -// resolving the W methods manually is needed, because Windows 95 doesn't include -// these methods in Shell32.lib (not even stubs!), so you'd get an unresolved symbol -// when Qt calls getExistingDirectory(), etc. typedef LPITEMIDLIST (WINAPI *PtrSHBrowseForFolder)(BROWSEINFO*); static PtrSHBrowseForFolder ptrSHBrowseForFolder = 0; typedef BOOL (WINAPI *PtrSHGetPathFromIDList)(LPITEMIDLIST,LPWSTR); @@ -125,7 +120,7 @@ static void qt_win_resolve_libs() ptrSHGetMalloc = (PtrSHGetMalloc) lib.resolve("SHGetMalloc"); #else // CE stores them in a different lib and does not use unicode version - HINSTANCE handle = LoadLibraryW(L"Ceshell"); + HINSTANCE handle = LoadLibrary(L"Ceshell"); ptrSHBrowseForFolder = (PtrSHBrowseForFolder)GetProcAddress(handle, L"SHBrowseForFolder"); ptrSHGetPathFromIDList = (PtrSHGetPathFromIDList)GetProcAddress(handle, L"SHGetPathFromIDList"); ptrSHGetMalloc = (PtrSHGetMalloc)GetProcAddress(handle, L"SHGetMalloc"); |