header cleanup

[lyx.git] / src / frontends / qt4 / LyXFileDialog.cpp

diff --git a/src/frontends/qt4/LyXFileDialog.cpp b/src/frontends/qt4/LyXFileDialog.cpp
index 96a05ea96cf4371f85fdec9a16673da98cdf0a41..f00bbd61bf31ea92f5d358e13226159b7b45c9c8 100644 (file)
--- a/src/frontends/qt4/LyXFileDialog.cpp
+++ b/src/frontends/qt4/LyXFileDialog.cpp
@@ -21,8 +21,8 @@
 #include <QToolButton>
 #include <QHBoxLayout>
 
-using lyx::support::split;
-using std::string;
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -35,10 +35,9 @@ static docstring const getLabel(docstring const & ucs4str)
        string sc = split(str, label, '|');
        if (sc.length() < 2)
                return from_utf8(label);
-       string::size_type pos = label.find(sc[1]);
-       if (pos == string::npos)
-               return from_utf8(label);
-       label.insert(pos, 1, '&');
+       size_t pos = label.find(sc[1]);
+       if (pos != string::npos)
+               label.insert(pos, 1, '&');
        return from_utf8(label);
 }
 
@@ -52,6 +51,13 @@ LyXFileDialog::LyXFileDialog(docstring const & t,
        : QFileDialog(qApp->focusWidget(),
                      toqstr(t), toqstr(p), toqstr(filters.as_string()))
 {
+       QString const path = toqstr(p);
+       QDir dir(path);
+       // FIXME: workaround for a bug in qt which makes LyX crash
+       // with hidden paths (bug 4513). Recheck with recent Qt versions.
+       if (path.contains("/."))
+               dir.setFilter(QDir::Hidden);
+       setDirectory(dir);
        setWindowTitle(toqstr(t));
 
        QList<QHBoxLayout *> layout = findChildren<QHBoxLayout *>();