diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-15 22:17:52 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-20 13:10:01 +0100 |
| commit | b29f51357b4d18f33f5d522994aeff149737b358 (patch) | |
| tree | 4c71185e39afc5a30b483b56cc1c96136196396f /src/activeqt/control/qaxserverdll.cpp | |
| parent | 6e55d96d899b78d17de022f2e1d93f210ff7a1d0 (diff) | |
| download | qtactiveqt-b29f51357b4d18f33f5d522994aeff149737b358.tar.gz | |
whitespace fixes
expand tabs, fix indentation, remove trailing whitespace.
Change-Id: Ibec1bbad9e8faff81671ce9d1c7bb4fb9b340bb9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/activeqt/control/qaxserverdll.cpp')
| -rw-r--r-- | src/activeqt/control/qaxserverdll.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/activeqt/control/qaxserverdll.cpp b/src/activeqt/control/qaxserverdll.cpp index be854cc..f6145f5 100644 --- a/src/activeqt/control/qaxserverdll.cpp +++ b/src/activeqt/control/qaxserverdll.cpp @@ -78,7 +78,7 @@ STDAPI DllGetClassObject(const GUID &clsid, const GUID &iid, void** ppv) if (!qAxThreadId) qAxThreadId = GetCurrentThreadId(); else if (GetCurrentThreadId() != qAxThreadId) - return E_FAIL; + return E_FAIL; GetClassObject(clsid, iid, ppv); if (!*ppv) @@ -94,7 +94,7 @@ STDAPI DllCanUnloadNow() return S_FALSE; if (!qax_ownQApp) return S_OK; - + // check if qApp still runs widgets (in other DLLs) QWidgetList widgets = qApp->allWidgets(); int count = widgets.count(); @@ -106,14 +106,14 @@ STDAPI DllCanUnloadNow() } if (count) return S_FALSE; - + // no widgets left - destroy qApp if (qax_hhook) UnhookWindowsHookEx(qax_hhook); - + delete qApp; qax_ownQApp = false; - + // never allow unloading - safety net for Internet Explorer return S_FALSE; } @@ -128,14 +128,14 @@ EXTERN_C BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /* lpvR qAxInstance = hInstance; qAxIsServer = true; - + if (dwReason == DLL_PROCESS_ATTACH) { DisableThreadLibraryCalls(hInstance); qAxInit(); } else if (dwReason == DLL_PROCESS_DETACH) { qAxCleanup(); } - + return true; } |