AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Use true and false in preference to TRUE and FALSE"

Browse Source 
Even though I really think the change was the right thing to do, it seems
like Windows people don't like this change because of some Windows Data Types
specific rules.

This reverts parts of the commit 56d5c909af.

Change-Id: I2c67d9b1bab36fc63937ef386aef56d2a4472a04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Sergio Ahumada 2012-09-06 10:54:50 +02:00 committed by Qt by Nokia
parent 23951b38d4
commit b77b5cc5be
16 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/io/qfsfileengine_win.cpp
View File

@ -121,7 +121,7 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)
if (openMode & QIODevice::WriteOnly)
accessRights |= GENERIC_WRITE;
SECURITY_ATTRIBUTES securityAtts = { sizeof(SECURITY_ATTRIBUTES), NULL, false };
SECURITY_ATTRIBUTES securityAtts = { sizeof(SECURITY_ATTRIBUTES), NULL, FALSE };
// WriteOnly can create files, ReadOnly cannot.
DWORD creationDisp = (openMode & QIODevice::WriteOnly) ? OPEN_ALWAYS : OPEN_EXISTING;
@ -639,7 +639,7 @@ bool QFSFileEngine::link(const QString &newName)
IPersistFile *ppf;
hres = psl->QueryInterface(IID_IPersistFile, (void **)&ppf);
if (SUCCEEDED(hres)) {
hres = ppf->Save((wchar_t*)linkName.utf16(), true);
hres = ppf->Save((wchar_t*)linkName.utf16(), TRUE);
if (SUCCEEDED(hres))
ret = true;
ppf->Release();

16
src/corelib/io/qprocess_win.cpp
View File

@ -135,7 +135,7 @@ static void duplicateStdWriteChannel(Q_PIPE *pipe, DWORD nStdHandle)
HANDLE hStdWriteChannel = GetStdHandle(nStdHandle);
HANDLE hCurrentProcess = GetCurrentProcess();
DuplicateHandle(hCurrentProcess, hStdWriteChannel, hCurrentProcess,
&pipe[1], 0, true, DUPLICATE_SAME_ACCESS);
&pipe[1], 0, TRUE, DUPLICATE_SAME_ACCESS);
}
/*
@ -149,7 +149,7 @@ bool QProcessPrivate::createChannel(Channel &channel)
if (&channel == &stderrChannel && processChannelMode == QProcess::MergedChannels) {
return DuplicateHandle(GetCurrentProcess(), stdoutChannel.pipe[1], GetCurrentProcess(),
&stderrChannel.pipe[1], 0, true, DUPLICATE_SAME_ACCESS);
&stderrChannel.pipe[1], 0, TRUE, DUPLICATE_SAME_ACCESS);
}
if (channel.type == Channel::Normal) {
@ -182,7 +182,7 @@ bool QProcessPrivate::createChannel(Channel &channel)
return true;
} else if (channel.type == Channel::Redirect) {
// we're redirecting the channel to/from a file
SECURITY_ATTRIBUTES secAtt = { sizeof(SECURITY_ATTRIBUTES), NULL, true };
SECURITY_ATTRIBUTES secAtt = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE };
if (&channel == &stdinChannel) {
// try to open in read-only mode
@ -244,7 +244,7 @@ bool QProcessPrivate::createChannel(Channel &channel)
HANDLE tmpHandle = source->pipe[1];
if (!DuplicateHandle(GetCurrentProcess(), tmpHandle,
GetCurrentProcess(), &source->pipe[1],
0, true, DUPLICATE_SAME_ACCESS))
0, TRUE, DUPLICATE_SAME_ACCESS))
return false;
CloseHandle(tmpHandle);
@ -270,7 +270,7 @@ bool QProcessPrivate::createChannel(Channel &channel)
HANDLE tmpHandle = sink->pipe[0];
if (!DuplicateHandle(GetCurrentProcess(), tmpHandle,
GetCurrentProcess(), &sink->pipe[0],
0, true, DUPLICATE_SAME_ACCESS))
0, TRUE, DUPLICATE_SAME_ACCESS))
return false;
CloseHandle(tmpHandle);
@ -484,7 +484,7 @@ void QProcessPrivate::startProcess()
stdinChannel.pipe[0], stdoutChannel.pipe[1], stderrChannel.pipe[1]
};
success = CreateProcess(0, (wchar_t*)args.utf16(),
0, 0, true, dwCreationFlags,
0, 0, TRUE, dwCreationFlags,
environment.isEmpty() ? 0 : envlist.data(),
workingDirectory.isEmpty() ? 0 : (wchar_t*)QDir::toNativeSeparators(workingDirectory).utf16(),
&startupInfo, pid);
@ -585,7 +585,7 @@ static BOOL QT_WIN_CALLBACK qt_terminateApp(HWND hwnd, LPARAM procId)
if (currentProcId == (DWORD)procId)
PostMessage(hwnd, WM_CLOSE, 0, 0);
return true;
return TRUE;
}
void QProcessPrivate::terminateProcess()
@ -853,7 +853,7 @@ bool QProcessPrivate::startDetached(const QString &program, const QStringList &a
0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
success = CreateProcess(0, (wchar_t*)args.utf16(),
0, 0, false, CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_CONSOLE, 0,
0, 0, FALSE, CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_CONSOLE, 0,
workingDir.isEmpty() ? 0 : (wchar_t*)workingDir.utf16(),
&startupInfo, &pinfo);

20
src/corelib/io/qstandardpaths_win.cpp
View File

@ -100,9 +100,9 @@ QString QStandardPaths::writableLocation(StandardLocation type)
case DataLocation:
case GenericDataLocation:
#if defined Q_OS_WINCE
if (SHGetSpecialFolderPath(0, path, CSIDL_APPDATA, false))
if (SHGetSpecialFolderPath(0, path, CSIDL_APPDATA, FALSE))
#else
if (SHGetSpecialFolderPath(0, path, CSIDL_LOCAL_APPDATA, false))
if (SHGetSpecialFolderPath(0, path, CSIDL_LOCAL_APPDATA, FALSE))
#endif
result = convertCharArray(path);
if (isTestModeEnabled())
@ -116,38 +116,38 @@ QString QStandardPaths::writableLocation(StandardLocation type)
break;
case DesktopLocation:
if (SHGetSpecialFolderPath(0, path, CSIDL_DESKTOPDIRECTORY, false))
if (SHGetSpecialFolderPath(0, path, CSIDL_DESKTOPDIRECTORY, FALSE))
result = convertCharArray(path);
break;
case DownloadLocation: // TODO implement with SHGetKnownFolderPath(FOLDERID_Downloads) (starting from Vista)
case DocumentsLocation:
if (SHGetSpecialFolderPath(0, path, CSIDL_PERSONAL, false))
if (SHGetSpecialFolderPath(0, path, CSIDL_PERSONAL, FALSE))
result = convertCharArray(path);
break;
case FontsLocation:
if (SHGetSpecialFolderPath(0, path, CSIDL_FONTS, false))
if (SHGetSpecialFolderPath(0, path, CSIDL_FONTS, FALSE))
result = convertCharArray(path);
break;
case ApplicationsLocation:
if (SHGetSpecialFolderPath(0, path, CSIDL_PROGRAMS, false))
if (SHGetSpecialFolderPath(0, path, CSIDL_PROGRAMS, FALSE))
result = convertCharArray(path);
break;
case MusicLocation:
if (SHGetSpecialFolderPath(0, path, CSIDL_MYMUSIC, false))
if (SHGetSpecialFolderPath(0, path, CSIDL_MYMUSIC, FALSE))
result = convertCharArray(path);
break;
case MoviesLocation:
if (SHGetSpecialFolderPath(0, path, CSIDL_MYVIDEO, false))
if (SHGetSpecialFolderPath(0, path, CSIDL_MYVIDEO, FALSE))
result = convertCharArray(path);
break;
case PicturesLocation:
if (SHGetSpecialFolderPath(0, path, CSIDL_MYPICTURES, false))
if (SHGetSpecialFolderPath(0, path, CSIDL_MYPICTURES, FALSE))
result = convertCharArray(path);
break;
@ -186,7 +186,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type)
case ConfigLocation: // same as DataLocation, on Windows
case DataLocation:
case GenericDataLocation:
if (SHGetSpecialFolderPath(0, path, CSIDL_COMMON_APPDATA, false)) {
if (SHGetSpecialFolderPath(0, path, CSIDL_COMMON_APPDATA, FALSE)) {
QString result = convertCharArray(path);
if (type != GenericDataLocation) {
if (!QCoreApplication::organizationName().isEmpty())

6
src/corelib/io/qwindowspipewriter.cpp
View File

@ -54,7 +54,7 @@ QWindowsPipeWriter::QWindowsPipeWriter(HANDLE pipe, QObject * parent)
{
#if !defined(Q_OS_WINCE) || (_WIN32_WCE >= 0x600)
DuplicateHandle(GetCurrentProcess(), pipe, GetCurrentProcess(),
&writePipe, 0, false, DUPLICATE_SAME_ACCESS);
&writePipe, 0, FALSE, DUPLICATE_SAME_ACCESS);
#else
Q_UNUSED(pipe);
writePipe = GetCurrentProcess();
@ -103,7 +103,7 @@ void QWindowsPipeWriter::run()
{
OVERLAPPED overl;
memset(&overl, 0, sizeof overl);
overl.hEvent = CreateEvent(NULL, true, false, NULL);
overl.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
forever {
lock.lock();
while(data.isEmpty() && (!quitNow)) {
@ -138,7 +138,7 @@ void QWindowsPipeWriter::run()
}
#ifndef Q_OS_WINCE
if (GetLastError() == ERROR_IO_PENDING) {
if (!GetOverlappedResult(writePipe, &overl, &written, true)) {
if (!GetOverlappedResult(writePipe, &overl, &written, TRUE)) {
CloseHandle(overl.hEvent);
return;
}

2
src/corelib/io/qwinoverlappedionotifier.cpp
View File

@ -168,7 +168,7 @@ QWinOverlappedIoNotifier::QWinOverlappedIoNotifier(QObject *parent)
lastNumberOfBytes(0),
lastErrorCode(ERROR_SUCCESS)
{
hEvent = CreateEvent(NULL, true, false, NULL);
hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
connect(this, &QWinOverlappedIoNotifier::_q_notify,
this, &QWinOverlappedIoNotifier::_q_notified, Qt::QueuedConnection);
}

2
src/corelib/kernel/qeventdispatcher_win.cpp
View File

@ -1001,7 +1001,7 @@ void QEventDispatcherWin32::activateEventNotifiers()
//### this could break if events are removed/added in the activation
for (int i=0; i<d->winEventNotifierList.count(); i++) {
#if !defined(Q_OS_WINCE)
if (WaitForSingleObjectEx(d->winEventNotifierList.at(i)->handle(), 0, true) == WAIT_OBJECT_0)
if (WaitForSingleObjectEx(d->winEventNotifierList.at(i)->handle(), 0, TRUE) == WAIT_OBJECT_0)
d->activateEventNotifier(d->winEventNotifierList.at(i));
#else
if (WaitForSingleObject(d->winEventNotifierList.at(i)->handle(), 0) == WAIT_OBJECT_0)

2
src/corelib/thread/qmutex_win.cpp
View File

@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
QMutexPrivate::QMutexPrivate()
{
event = CreateEvent(0, false, false, 0);
event = CreateEvent(0, FALSE, FALSE, 0);
if (!event)
qWarning("QMutexData::QMutexData: Cannot create event");
}

2
src/corelib/thread/qthread_win.cpp
View File

@ -127,7 +127,7 @@ QThreadData *QThreadData::current()
GetCurrentProcess(),
&realHandle,
0,
false,
FALSE,
DUPLICATE_SAME_ACCESS);
#else
realHandle = (HANDLE)GetCurrentThreadId();

2
src/corelib/thread/qwaitcondition_win.cpp
View File

@ -64,7 +64,7 @@ class QWaitConditionEvent
public:
inline QWaitConditionEvent() : priority(0), wokenUp(false)
{
event = CreateEvent(NULL, true, false, NULL);
event = CreateEvent(NULL, TRUE, FALSE, NULL);
}
inline ~QWaitConditionEvent() { CloseHandle(event); }
int priority;

12
src/network/socket/qlocalserver_win.cpp
View File

@ -69,7 +69,7 @@ bool QLocalServerPrivate::addListener()
SECURITY_ATTRIBUTES sa;
sa.nLength = sizeof(SECURITY_ATTRIBUTES);
sa.bInheritHandle = false; //non inheritable handle, same as default
sa.bInheritHandle = FALSE; //non inheritable handle, same as default
sa.lpSecurityDescriptor = 0; //default security descriptor
QScopedPointer<SECURITY_DESCRIPTOR> pSD;
@ -166,9 +166,9 @@ bool QLocalServerPrivate::addListener()
return false;
}
}
SetSecurityDescriptorOwner(pSD.data(), pTokenUser->User.Sid, false);
SetSecurityDescriptorGroup(pSD.data(), pTokenGroup->PrimaryGroup, false);
if (!SetSecurityDescriptorDacl(pSD.data(), false, acl, false)) {
SetSecurityDescriptorOwner(pSD.data(), pTokenUser->User.Sid, FALSE);
SetSecurityDescriptorGroup(pSD.data(), pTokenGroup->PrimaryGroup, FALSE);
if (!SetSecurityDescriptorDacl(pSD.data(), TRUE, acl, FALSE)) {
setError(QLatin1String("QLocalServerPrivate::addListener"));
FreeSid(worldSID);
return false;
@ -252,7 +252,7 @@ bool QLocalServerPrivate::listen(const QString &name)
// Use only one event for all listeners of one socket.
// The idea is that listener events are rare, so polling all listeners once in a while is
// cheap compared to waiting for N additional events in each iteration of the main loop.
eventHandle = CreateEvent(NULL, true, false, NULL);
eventHandle = CreateEvent(NULL, TRUE, FALSE, NULL);
connectionEventNotifier = new QWinEventNotifier(eventHandle , q);
q->connect(connectionEventNotifier, SIGNAL(activated(HANDLE)), q, SLOT(_q_onNewConnection()));
@ -282,7 +282,7 @@ void QLocalServerPrivate::_q_onNewConnection()
for (int i = 0; i < listeners.size(); ) {
HANDLE handle = listeners[i].handle;
if (listeners[i].connected
|| GetOverlappedResult(handle, &listeners[i].overlapped, &dummy, false))
|| GetOverlappedResult(handle, &listeners[i].overlapped, &dummy, FALSE))
{
listeners.removeAt(i);

14
src/plugins/platforms/windows/qwindowsglcontext.cpp
View File

@ -377,9 +377,9 @@ static int choosePixelFormat(HDC hdc,
iAttributes[i++] = testFlag(additional.formatFlags, QWindowsGLDirectRendering) ?
WGL_FULL_ACCELERATION_ARB : WGL_NO_ACCELERATION_ARB;
iAttributes[i++] = WGL_SUPPORT_OPENGL_ARB;
iAttributes[i++] = true;
iAttributes[i++] = TRUE;
iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB;
iAttributes[i++] = true;
iAttributes[i++] = TRUE;
iAttributes[i++] = WGL_COLOR_BITS_ARB;
iAttributes[i++] = 24;
switch (format.swapBehavior()) {
@ -387,17 +387,17 @@ static int choosePixelFormat(HDC hdc,
break;
case QSurfaceFormat::SingleBuffer:
iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB;
iAttributes[i++] = false;
iAttributes[i++] = FALSE;
break;
case QSurfaceFormat::DoubleBuffer:
case QSurfaceFormat::TripleBuffer:
iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB;
iAttributes[i++] = true;
iAttributes[i++] = TRUE;
break;
}
if (format.stereo()) {
iAttributes[i++] = WGL_STEREO_ARB;
iAttributes[i++] = true;
iAttributes[i++] = TRUE;
}
if (format.depthBufferSize() >= 0) {
iAttributes[i++] = WGL_DEPTH_BITS_ARB;
@ -435,13 +435,13 @@ static int choosePixelFormat(HDC hdc,
int samplesValuePosition = 0;
if (sampleBuffersRequested) {
iAttributes[i++] = WGL_SAMPLE_BUFFERS_ARB;
iAttributes[i++] = true;
iAttributes[i++] = TRUE;
iAttributes[i++] = WGL_SAMPLES_ARB;
samplesValuePosition = i;
iAttributes[i++] = format.samples();
} else if (samples == 0 || samples == 1 ) {
iAttributes[i++] = WGL_SAMPLE_BUFFERS_ARB;
iAttributes[i++] = false;
iAttributes[i++] = FALSE;
}
// If sample buffer request cannot be satisfied, reduce request.
int pixelFormat = 0;

4
src/plugins/platforms/windows/qwindowskeymapper.cpp
View File

@ -697,7 +697,7 @@ static void showSystemMenu(QWindow* w)
{
QWindow *topLevel = QWindowsWindow::topLevelOf(w);
HWND topLevelHwnd = QWindowsWindow::handleOf(topLevel);
HMENU menu = GetSystemMenu(topLevelHwnd, false);
HMENU menu = GetSystemMenu(topLevelHwnd, FALSE);
if (!menu)
return; // no menu for this window
@ -722,7 +722,7 @@ static void showSystemMenu(QWindow* w)
closeItem.cbSize = sizeof(MENUITEMINFO);
closeItem.fMask = MIIM_STATE;
closeItem.fState = MFS_DEFAULT;
SetMenuItemInfo(menu, SC_CLOSE, false, &closeItem);
SetMenuItemInfo(menu, SC_CLOSE, FALSE, &closeItem);
#undef enabled
#undef disabled

6
src/plugins/platforms/windows/qwindowsscreen.cpp
View File

@ -93,8 +93,8 @@ BOOL QT_WIN_CALLBACK monitorEnumCallback(HMONITOR hMonitor, HDC, LPRECT, LPARAM
MONITORINFOEX info;
memset(&info, 0, sizeof(MONITORINFOEX));
info.cbSize = sizeof(MONITORINFOEX);
if (GetMonitorInfo(hMonitor, &info) == false)
return true;
if (GetMonitorInfo(hMonitor, &info) == FALSE)
return TRUE;
WindowsScreenDataList *result = reinterpret_cast<WindowsScreenDataList *>(p);
QWindowsScreenData data;
@ -131,7 +131,7 @@ BOOL QT_WIN_CALLBACK monitorEnumCallback(HMONITOR hMonitor, HDC, LPRECT, LPARAM
data.flags |= QWindowsScreenData::PrimaryScreen;
data.name = QString::fromWCharArray(info.szDevice);
result->append(data);
return true;
return TRUE;
}
static inline WindowsScreenDataList monitorData()

2
src/plugins/platforms/windows/qwindowsservices.cpp
View File

@ -138,7 +138,7 @@ static inline bool launchMail(const QUrl &url)
STARTUPINFO si;
ZeroMemory(&si, sizeof(si));
si.cb = sizeof(si);
if (!CreateProcess(NULL, (wchar_t*)command.utf16(), NULL, NULL, false, 0, NULL, NULL, &si, &pi)) {
if (!CreateProcess(NULL, (wchar_t*)command.utf16(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) {
qErrnoWarning("Unable to launch '%s'", qPrintable(command));
return false;
}

10
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -511,7 +511,7 @@ void WindowCreationData::initialize(HWND hwnd, bool frameChange, qreal opacityLe
SetWindowPos(hwnd, HWND_BOTTOM, 0, 0, 0, 0, swpFlags);
}
if (flags & (Qt::CustomizeWindowHint|Qt::WindowTitleHint)) {
HMENU systemMenu = GetSystemMenu(hwnd, false);
HMENU systemMenu = GetSystemMenu(hwnd, FALSE);
if (flags & Qt::WindowCloseButtonHint)
EnableMenuItem(systemMenu, SC_CLOSE, MF_BYCOMMAND|MF_ENABLED);
else
@ -557,7 +557,7 @@ QMargins QWindowsGeometryHint::frame(DWORD style, DWORD exStyle)
#ifndef Q_OS_WINCE
style &= ~(WS_OVERLAPPED); // Not permitted, see docs.
#endif
if (!AdjustWindowRectEx(&rect, style, false, exStyle))
if (!AdjustWindowRectEx(&rect, style, FALSE, exStyle))
qErrnoWarning("%s: AdjustWindowRectEx failed", __FUNCTION__);
const QMargins result(qAbs(rect.left), qAbs(rect.top),
qAbs(rect.right), qAbs(rect.bottom));
@ -869,7 +869,7 @@ void QWindowsWindow::show_sys() const
// maximizing the widget, and then remove the maximize button afterwards.
if (flags & Qt::WindowTitleHint &&
!(flags & (Qt::WindowMinMaxButtonsHint | Qt::FramelessWindowHint))) {
fakedMaximize = true;
fakedMaximize = TRUE;
setStyle(style() | WS_MAXIMIZEBOX);
}
}
@ -1107,7 +1107,7 @@ bool QWindowsWindow::handleWmPaint(HWND hwnd, UINT message,
WPARAM, LPARAM)
{
// Ignore invalid update bounding rectangles
if (!GetUpdateRect(m_data.hwnd, 0, false))
if (!GetUpdateRect(m_data.hwnd, 0, FALSE))
return false;
if (message == WM_ERASEBKGND) // Backing store - ignored.
return true;
@ -1537,7 +1537,7 @@ static inline DWORD cornerToWinOrientation(Qt::Corner corner)
bool QWindowsWindow::startSystemResize(const QPoint &, Qt::Corner corner)
{
if (!GetSystemMenu(m_data.hwnd, false))
if (!GetSystemMenu(m_data.hwnd, FALSE))
return false;
ReleaseCapture();

2
src/winmain/qtmain_win.cpp
View File

@ -109,7 +109,7 @@ int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR /*cmdPara
// If there exists an other instance of this application
// it will be the owner of a mutex with the unique ID.
HANDLE mutex = CreateMutex(NULL, true, (LPCWSTR)uid.utf16());
HANDLE mutex = CreateMutex(NULL, TRUE, (LPCWSTR)uid.utf16());
if (mutex && ERROR_ALREADY_EXISTS == GetLastError()) {
CloseHandle(mutex);