get rid of QT3_SUPPORT and some cleanup

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14723 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/FileDialog.C b/src/frontends/qt4/FileDialog.C
index 99ea166af72f790e641f698c2def2c810b99b005..f9ee1f564d1a1fee87d7b81132a9a815498b368e 100644 (file)
--- a/src/frontends/qt4/FileDialog.C
+++ b/src/frontends/qt4/FileDialog.C
@@ -81,7 +81,7 @@ FileDialog::Result const FileDialog::save(string const & path,
 #ifdef USE_NATIVE_FILEDIALOG
        string const startsWith = makeAbsPath(suggested, path);
        result.second = fromqstr(QFileDialog::getSaveFileName(
 #ifdef USE_NATIVE_FILEDIALOG
        string const startsWith = makeAbsPath(suggested, path);
        result.second = fromqstr(QFileDialog::getSaveFileName(

-               qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(),
+               qApp->focusWidget(),

                title_.c_str(), toqstr(startsWith), toqstr(filters.as_string()) ));
 #else
        LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
                title_.c_str(), toqstr(startsWith), toqstr(filters.as_string()) ));
 #else
        LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);


@@ -95,7 +95,7 @@ FileDialog::Result const FileDialog::save(string const & path,
        int res = dlg.exec();
        lyxerr[Debug::GUI] << "result " << res << endl;
        if (res == QDialog::Accepted)
        int res = dlg.exec();
        lyxerr[Debug::GUI] << "result " << res << endl;
        if (res == QDialog::Accepted)

-               result.second = fromqstr(dlg.selectedFile());
+               result.second = fromqstr(dlg.selectedFiles()[0]);

        dlg.hide();
 #endif
        return result;
        dlg.hide();
 #endif
        return result;


@@ -115,7 +115,7 @@ FileDialog::Result const FileDialog::open(string const & path,
 #ifdef USE_NATIVE_FILEDIALOG
        string const startsWith = makeAbsPath(suggested, path);
        result.second = fromqstr(QFileDialog::getOpenFileName(
 #ifdef USE_NATIVE_FILEDIALOG
        string const startsWith = makeAbsPath(suggested, path);
        result.second = fromqstr(QFileDialog::getOpenFileName(

-               qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 
+               qApp->focusWidget(), 

                title_.c_str(), toqstr(startsWith), toqstr(filters.as_string()) ));
 #else
        LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
                title_.c_str(), toqstr(startsWith), toqstr(filters.as_string()) ));
 #else
        LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);


@@ -127,7 +127,7 @@ FileDialog::Result const FileDialog::open(string const & path,
        int res = dlg.exec();
        lyxerr[Debug::GUI] << "result " << res << endl;
        if (res == QDialog::Accepted)
        int res = dlg.exec();
        lyxerr[Debug::GUI] << "result " << res << endl;
        if (res == QDialog::Accepted)

-               result.second = fromqstr(dlg.selectedFile());
+               result.second = fromqstr(dlg.selectedFiles()[0]);

        dlg.hide();
 #endif
        return result;
        dlg.hide();
 #endif
        return result;


@@ -145,7 +145,7 @@ FileDialog::Result const FileDialog::opendir(string const & path,
 #ifdef USE_NATIVE_FILEDIALOG
        string const startsWith = makeAbsPath(suggested, path);
        result.second = fromqstr(QFileDialog::getExistingDirectory(
 #ifdef USE_NATIVE_FILEDIALOG
        string const startsWith = makeAbsPath(suggested, path);
        result.second = fromqstr(QFileDialog::getExistingDirectory(

-               qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(),
+               qApp->focusWidget(),

                title_.c_str(),toqstr(startsWith) ));
 #else
        FileFilterList const filter(_("Directories"));
                title_.c_str(),toqstr(startsWith) ));
 #else
        FileFilterList const filter(_("Directories"));


@@ -161,7 +161,7 @@ FileDialog::Result const FileDialog::opendir(string const & path,
        int res = dlg.exec();
        lyxerr[Debug::GUI] << "result " << res << endl;
        if (res == QDialog::Accepted)
        int res = dlg.exec();
        lyxerr[Debug::GUI] << "result " << res << endl;
        if (res == QDialog::Accepted)

-               result.second = fromqstr(dlg.selectedFile());
+               result.second = fromqstr(dlg.selectedFiles()[0]);

        dlg.hide();
 #endif
        return result;
        dlg.hide();
 #endif
        return result;

diff --git a/src/frontends/qt4/FileDialog_private.C b/src/frontends/qt4/FileDialog_private.C
index 32eb8f3581981d852ba09ad866d961c44a0c969c..7a4a83b4ee975c427f71c76842a3a26b80d11c57 100644 (file)
--- a/src/frontends/qt4/FileDialog_private.C
+++ b/src/frontends/qt4/FileDialog_private.C
@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include "FileDialog_private.h"
 #include <config.h>
 
 #include "FileDialog_private.h"

+

 #include "qt_helpers.h"
 
 #include "support/filefilterlist.h"
 #include "qt_helpers.h"
 
 #include "support/filefilterlist.h"


@@ -48,11 +49,12 @@ LyXFileDialog::LyXFileDialog(string const & t,
                             lyx::support::FileFilterList const & filters,
                             FileDialog::Button const & b1,
                             FileDialog::Button const & b2)
                             lyx::support::FileFilterList const & filters,
                             FileDialog::Button const & b1,
                             FileDialog::Button const & b2)

-       : QFileDialog(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(),
+                                // FIXME replace that with theApp->gui()->currentView()
+       : QFileDialog(qApp->focusWidget(),

                      toqstr(t), toqstr(p), toqstr(filters.as_string())),
                      b1_(0), b2_(0)
 {
                      toqstr(t), toqstr(p), toqstr(filters.as_string())),
                      b1_(0), b2_(0)
 {

-       setCaption(toqstr(t));
+       setWindowTitle(toqstr(t));

 
        QList<QHBoxLayout *> layout = findChildren<QHBoxLayout *>();
 
 
        QList<QHBoxLayout *> layout = findChildren<QHBoxLayout *>();
 


@@ -77,9 +79,9 @@ LyXFileDialog::LyXFileDialog(string const & t,
 void LyXFileDialog::buttonClicked()
 {
        if (sender() == b1_)
 void LyXFileDialog::buttonClicked()
 {
        if (sender() == b1_)

-               setDir(toqstr(b1_dir_));
+               setDirectory(toqstr(b1_dir_));

        else if (sender() == b2_)
        else if (sender() == b2_)

-               setDir(toqstr(b2_dir_));
+               setDirectory(toqstr(b2_dir_));

 }
 
 #include "FileDialog_private_moc.cpp"
 }
 
 #include "FileDialog_private_moc.cpp"

diff --git a/src/frontends/qt4/FileDialog_private.h b/src/frontends/qt4/FileDialog_private.h
index 0a0fc56c58b2c6fc2684b0c41acb711b90188532..f0d23d44fb230e26b9baeff232e9c0cfe444317f 100644 (file)
--- a/src/frontends/qt4/FileDialog_private.h
+++ b/src/frontends/qt4/FileDialog_private.h
@@ -12,8 +12,8 @@
 #ifndef FILEDIALOG_PRIVATE_H
 #define FILEDIALOG_PRIVATE_H
 
 #ifndef FILEDIALOG_PRIVATE_H
 #define FILEDIALOG_PRIVATE_H
 

-

 #include "frontends/FileDialog.h"
 #include "frontends/FileDialog.h"

+

 #include <QFileDialog>
 
 namespace lyx {
 #include <QFileDialog>
 
 namespace lyx {