diff options
| author | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2009-04-28 09:59:36 (GMT) |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2009-04-29 06:33:55 (GMT) |
| commit | 75868b9e64d541ec0ffcfa04fdcc5e36354f47e4 (patch) | |
| tree | a33d8fc07e7911278070f37c1a00e42d53c7688a /src/gui/dialogs/qfiledialog_win.cpp | |
| parent | 68999af7823e80aa049c19f332045b1fb074fb96 (diff) | |
| download | Qt-75868b9e64d541ec0ffcfa04fdcc5e36354f47e4.zip Qt-75868b9e64d541ec0ffcfa04fdcc5e36354f47e4.tar.gz Qt-75868b9e64d541ec0ffcfa04fdcc5e36354f47e4.tar.bz2 | |
introduce Q_WS_WINCE
Task-number: 246130
Reviewed-by: joerg
Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we
decided to stick with Q_WS_WIN32, but having a separate define
makes the code more readable. In addition Q_WS_WINCE_WM is available
for Windows Mobile only parts, where we do not check for the OS on
runtime.
Diffstat (limited to 'src/gui/dialogs/qfiledialog_win.cpp')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_win.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp index 8431488..6962674 100644 --- a/src/gui/dialogs/qfiledialog_win.cpp +++ b/src/gui/dialogs/qfiledialog_win.cpp @@ -60,7 +60,7 @@ #include <shlobj.h> -#ifdef Q_OS_WINCE +#ifdef Q_WS_WINCE #include <commdlg.h> # ifndef BFFM_SETSELECTION # define BFFM_SETSELECTION (WM_USER + 102) @@ -112,7 +112,7 @@ static void qt_win_resolve_libs() triedResolve = true; if (!(QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based)) { -#if !defined(Q_OS_WINCE) +#if !defined(Q_WS_WINCE) QLibrary lib(QLatin1String("shell32")); ptrSHBrowseForFolder = (PtrSHBrowseForFolder) lib.resolve("SHBrowseForFolderW"); ptrSHGetPathFromIDList = (PtrSHGetPathFromIDList) lib.resolve("SHGetPathFromIDListW"); @@ -186,7 +186,7 @@ static QString qt_win_selected_filter(const QString &filter, DWORD idx) return qt_win_make_filters_list(filter).at((int)idx - 1); } -#ifndef Q_OS_WINCE +#ifndef Q_WS_WINCE // Static vars for OFNA funcs: static QByteArray aInitDir; static QByteArray aInitSel; @@ -505,7 +505,7 @@ QString qt_win_get_save_file_name(const QFileDialogArgs &args, } qt_win_clean_up_OFNA(&ofn); }); -#if defined(Q_OS_WINCE) +#if defined(Q_WS_WINCE) int semIndex = result.indexOf(QLatin1Char(';')); if (semIndex >= 0) result = result.left(semIndex); @@ -700,7 +700,7 @@ QString qt_win_get_existing_directory(const QFileDialogArgs &args) modal_widget.setAttribute(Qt::WA_NoChildEventsForParent, true); modal_widget.setParent(parent, Qt::Window); QApplicationPrivate::enterModal(&modal_widget); -#if !defined(Q_OS_WINCE) +#if !defined(Q_WS_WINCE) QT_WA({ qt_win_resolve_libs(); QString initDir = QDir::toNativeSeparators(args.directory); |