diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2011-09-29 12:36:44 (GMT) |
|---|---|---|
| committer | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-09-29 12:36:44 (GMT) |
| commit | 569228bb5d7759025f06b1963f3d4a1fc4e05694 (patch) | |
| tree | 9eed5d614523a55468bd4af7f2f7b4ecb683938d /src/corelib/plugin/qsystemlibrary.cpp | |
| parent | 7d9ac9659568f77d3acf70f304fa152d3ecadcb1 (diff) | |
| download | Qt-569228bb5d7759025f06b1963f3d4a1fc4e05694.zip Qt-569228bb5d7759025f06b1963f3d4a1fc4e05694.tar.gz Qt-569228bb5d7759025f06b1963f3d4a1fc4e05694.tar.bz2 | |
nano-opts, styling fixes
Merge-request: 1344
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/corelib/plugin/qsystemlibrary.cpp')
| -rw-r--r-- | src/corelib/plugin/qsystemlibrary.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/corelib/plugin/qsystemlibrary.cpp b/src/corelib/plugin/qsystemlibrary.cpp index c983f38..7296c5b 100644 --- a/src/corelib/plugin/qsystemlibrary.cpp +++ b/src/corelib/plugin/qsystemlibrary.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qsystemlibrary_p.h" + #include <QtCore/qvarlengtharray.h> #include <QtCore/qstringlist.h> #include <QtCore/qfileinfo.h> @@ -91,7 +92,7 @@ HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirect extern QString qAppFileName(); #endif -static QString qSystemDirectory() +static inline QString qSystemDirectory() { QVarLengthArray<wchar_t, MAX_PATH> fullPath; @@ -118,24 +119,22 @@ HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirect const QString PATH = QString::fromWCharArray((const wchar_t *)_wgetenv(L"PATH")); searchOrder << PATH.split(QLatin1Char(';'), QString::SkipEmptyParts); } - QString fileName = QString::fromWCharArray(libraryName); - fileName.append(QLatin1String(".dll")); + const QString fileName = QString::fromWCharArray(libraryName) + QLatin1String(".dll"); // Start looking in the order specified for (int i = 0; i < searchOrder.count(); ++i) { QString fullPathAttempt = searchOrder.at(i); - if (!fullPathAttempt.endsWith(QLatin1Char('\\'))) { + if (!fullPathAttempt.endsWith(QLatin1Char('\\'))) fullPathAttempt.append(QLatin1Char('\\')); - } fullPathAttempt.append(fileName); HINSTANCE inst = ::LoadLibrary((const wchar_t *)fullPathAttempt.utf16()); if (inst != 0) return inst; } - return 0; + return 0; } -#endif //Q_OS_WINCE +#endif // !Q_OS_WINCE QT_END_NAMESPACE |