diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-08-24 13:03:10 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-08-24 13:36:04 (GMT) |
| commit | 9df60795dc76af807271cab9262b51f7e10307fb (patch) | |
| tree | 0be06ff5b9ce41794bcf1e132f8d0b0c704cfe4e /src/gui | |
| parent | dd3f78028e897436132070f9ef3ea5adacc6327f (diff) | |
| download | Qt-9df60795dc76af807271cab9262b51f7e10307fb.zip Qt-9df60795dc76af807271cab9262b51f7e10307fb.tar.gz Qt-9df60795dc76af807271cab9262b51f7e10307fb.tar.bz2 | |
Fix include guard and simplify compiler workaround.
Addresses S60 review comment.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/dialogs/qfilesystemmodel.cpp | 10 | ||||
| -rw-r--r-- | src/gui/dialogs/qfscompleter_p.h | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp index 2c46ae4..bdf0909 100644 --- a/src/gui/dialogs/qfilesystemmodel.cpp +++ b/src/gui/dialogs/qfilesystemmodel.cpp @@ -381,16 +381,12 @@ QFileSystemModelPrivate::QFileSystemNode *QFileSystemModelPrivate::node(const QS #if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN) { - if (!pathElements.at(0).contains(QLatin1String(":"))) -#if defined(Q_CC_NOKIAX86) - { - // Workaround for bizarre compiler crash. + if (!pathElements.at(0).contains(QLatin1String(":"))) { + // The reason we express it like this instead of with anonymous, temporary + // variables, is to workaround a compiler crash with Q_CC_NOKIAX86. QString rootPath = QDir(longPath).rootPath(); pathElements.prepend(rootPath); } -#else - pathElements.prepend(QDir(longPath).rootPath()); -#endif if (pathElements.at(0).endsWith(QLatin1Char('/'))) pathElements[0].chop(1); } diff --git a/src/gui/dialogs/qfscompleter_p.h b/src/gui/dialogs/qfscompleter_p.h index 2e5a674..fde7706 100644 --- a/src/gui/dialogs/qfscompleter_p.h +++ b/src/gui/dialogs/qfscompleter_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QCOMPLETOR_P_H -#define QCOMPLETOR_P_H +#ifndef QFSCOMPLETOR_P_H +#define QFSCOMPLETOR_P_H // // W A R N I N G @@ -78,5 +78,5 @@ public: }; #endif // QT_NO_COMPLETER QT_END_NAMESPACE -#endif // QCOMPLETOR_P_H +#endif // QFSCOMPLETOR_P_H |