Reverse yesterday's attempt to squash b_u_g 1530.

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 357a4b34a9ffdd9b5305bf2a3d18b91ec9bb6365..b240e9320944dbf4eff112bde544cff400790f7a 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-02  Angus Leeming  <leeming@lyx.org>
+
+       * Q[a-zA-Z]*DialogBase.C: reverse yesterday's patch, as discussed
+       on the list.
+
 2004-06-01  Angus Leeming  <leeming@lyx.org>
 
        * Q[a-zA-Z]*DialogBase.C: tell the QDialog base class who the

diff --git a/src/frontends/qt2/QBibitemDialog.C b/src/frontends/qt2/QBibitemDialog.C
index ac12364408e5059d012f31f77c0d2824fcd9cbca..d9fba1b1abf02319778b7971cff867420782a5a5 100644 (file)
--- a/src/frontends/qt2/QBibitemDialog.C
+++ b/src/frontends/qt2/QBibitemDialog.C
@@ -19,7 +19,7 @@ namespace lyx {
 namespace frontend {
 
 QBibitemDialog::QBibitemDialog(QBibitem * form)
-       : QBibitemDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QBibitemDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt2/QBibtexDialog.C
index 5d40b678d2cef790637274f415fe148f75f462bf..5acd3f8ee290472f63431122b3cc4e1baca5c8d7 100644 (file)
--- a/src/frontends/qt2/QBibtexDialog.C
+++ b/src/frontends/qt2/QBibtexDialog.C
@@ -32,7 +32,7 @@ namespace lyx {
 namespace frontend {
 
 QBibtexDialog::QBibtexDialog(QBibtex * form)
-       : QBibtexDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QBibtexDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QBoxDialog.C b/src/frontends/qt2/QBoxDialog.C
index bbd955359670490fa05eefc34a4e4bad745a9dc3..690ba81770b82cd536fdf4553672e4ae93ee8c05 100644 (file)
--- a/src/frontends/qt2/QBoxDialog.C
+++ b/src/frontends/qt2/QBoxDialog.C
@@ -24,7 +24,7 @@ namespace lyx {
 namespace frontend {
 
 QBoxDialog::QBoxDialog(QBox * form)
-       : QBoxDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QBoxDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(restorePB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QBranchDialog.C b/src/frontends/qt2/QBranchDialog.C
index 6f5afcad27a6fdc9fa758b78966f5d416cd2ec75..22d5d259d5adcc3cc68cdafe7656d182fa5671ee 100644 (file)
--- a/src/frontends/qt2/QBranchDialog.C
+++ b/src/frontends/qt2/QBranchDialog.C
@@ -19,7 +19,7 @@ namespace lyx {
 namespace frontend {
 
 QBranchDialog::QBranchDialog(QBranch * form)
-       : QBranchDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QBranchDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QChangesDialog.C b/src/frontends/qt2/QChangesDialog.C
index 1432b9ccf605f7bcf9b4f3c29be5ae93ffcb081f..4f21582e6a9f97a83ed2191d265181d5da52779e 100644 (file)
--- a/src/frontends/qt2/QChangesDialog.C
+++ b/src/frontends/qt2/QChangesDialog.C
@@ -20,7 +20,7 @@ namespace lyx {
 namespace frontend {
 
 QChangesDialog::QChangesDialog(QChanges * form)
-       : QChangesDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QChangesDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(closePB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QCharacterDialog.C b/src/frontends/qt2/QCharacterDialog.C
index f090991b8ae0d8750107fb15e2d30f23a0590e16..2635beb94cf15f46fc2b83eb0f57a78ce362d834 100644 (file)
--- a/src/frontends/qt2/QCharacterDialog.C
+++ b/src/frontends/qt2/QCharacterDialog.C
@@ -20,7 +20,7 @@ namespace lyx {
 namespace frontend {
 
 QCharacterDialog::QCharacterDialog(QCharacter * form)
-       : QCharacterDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QCharacterDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C
index b3323b26cb3b13c9d0b424e4672d6e623b2e8e39..fd1bc23d39c8abcff52ef127938236a35463e695 100644 (file)
--- a/src/frontends/qt2/QCitationDialog.C
+++ b/src/frontends/qt2/QCitationDialog.C
@@ -34,7 +34,7 @@ namespace lyx {
 namespace frontend {
 
 QCitationDialog::QCitationDialog(QCitation * form)
-       : QCitationDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QCitationDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(restorePB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QDelimiterDialog.C b/src/frontends/qt2/QDelimiterDialog.C
index 9ec8575ee0264ea3ba2c82e104bc50a290aba555..c3e7fd27fa82d932e900e277bd19b1e58587e28f 100644 (file)
--- a/src/frontends/qt2/QDelimiterDialog.C
+++ b/src/frontends/qt2/QDelimiterDialog.C
@@ -74,7 +74,7 @@ string fix_name(const string & str)
 
 
 QDelimiterDialog::QDelimiterDialog(QMathDelimiter * form)
-       : QDelimiterDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QDelimiterDialogBase(0, 0, false, 0),
        form_(form)
 {
        setCaption(qt_("LyX: Delimiters"));

diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C
index f44e4a69a072751bc6a65898d9dd9bb38bd63f28..006d06b1a98672962052348445d14e846dd17370 100644 (file)
--- a/src/frontends/qt2/QDocumentDialog.C
+++ b/src/frontends/qt2/QDocumentDialog.C
@@ -46,7 +46,7 @@ namespace lyx {
 namespace frontend {
 
 QDocumentDialog::QDocumentDialog(QDocument * form)
-       : QDocumentDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), form_(form)
+       : QDocumentDialogBase(0, 0, false, 0), form_(form)
 {
        connect(okPB, SIGNAL(clicked()),
                form, SLOT(slotOK()));

diff --git a/src/frontends/qt2/QERTDialog.C b/src/frontends/qt2/QERTDialog.C
index 196f8e2781e7a549e10bad2d458617831c51ac65..643214313308c724192a95e261139a119e935554 100644 (file)
--- a/src/frontends/qt2/QERTDialog.C
+++ b/src/frontends/qt2/QERTDialog.C
@@ -19,7 +19,7 @@ namespace lyx {
 namespace frontend {
 
 QERTDialog::QERTDialog(QERT * form)
-       : QERTDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QERTDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QErrorListDialog.C b/src/frontends/qt2/QErrorListDialog.C
index 162a74c510c8929b1bf89afe155966337a904e20..b981bb1bc94f58b71965bf3eb75272ca5d0fb936 100644 (file)
--- a/src/frontends/qt2/QErrorListDialog.C
+++ b/src/frontends/qt2/QErrorListDialog.C
@@ -20,7 +20,7 @@ namespace lyx {
 namespace frontend {
 
 QErrorListDialog::QErrorListDialog(QErrorList * form)
-       : QErrorListDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QErrorListDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(closePB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QExternalDialog.C b/src/frontends/qt2/QExternalDialog.C
index 86961437310bd50dfb0e366a0665542df851cff1..6e8825f473038b821f050cbc8a11f53c2ff1b8c3 100644 (file)
--- a/src/frontends/qt2/QExternalDialog.C
+++ b/src/frontends/qt2/QExternalDialog.C
@@ -57,7 +57,7 @@ LengthValidator * unsignedLengthValidator(QLineEdit * ed)
 
 
 QExternalDialog::QExternalDialog(QExternal * form)
-       : QExternalDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QExternalDialogBase(0, 0, false, 0),
          form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QFloatDialog.C b/src/frontends/qt2/QFloatDialog.C
index 65df7d2f01da934295de0aa2ff91419a841ef529..7eb01a11ca32bcb6d8449fac20864c52e5def06b 100644 (file)
--- a/src/frontends/qt2/QFloatDialog.C
+++ b/src/frontends/qt2/QFloatDialog.C
@@ -21,7 +21,7 @@ namespace lyx {
 namespace frontend {
 
 QFloatDialog::QFloatDialog(QFloat * form)
-       : QFloatDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QFloatDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(restorePB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QGraphicsDialog.C b/src/frontends/qt2/QGraphicsDialog.C
index a23fdf260446e176d9a15ff5aa520b5d47d85a6f..cf801d2162072c5aaf33f2346b732c29fce0d770 100644 (file)
--- a/src/frontends/qt2/QGraphicsDialog.C
+++ b/src/frontends/qt2/QGraphicsDialog.C
@@ -31,7 +31,7 @@ namespace lyx {
 namespace frontend {
 
 QGraphicsDialog::QGraphicsDialog(QGraphics * form)
-       : QGraphicsDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QGraphicsDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QIncludeDialog.C b/src/frontends/qt2/QIncludeDialog.C
index 6b3fb61d88d545e34e70780087f0d25ab2b22a4c..5e998a76b391aab6fa4112590523ef81a7f9767a 100644 (file)
--- a/src/frontends/qt2/QIncludeDialog.C
+++ b/src/frontends/qt2/QIncludeDialog.C
@@ -22,7 +22,7 @@ namespace lyx {
 namespace frontend {
 
 QIncludeDialog::QIncludeDialog(QInclude * form)
-       : QIncludeDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QIncludeDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QIndexDialog.C b/src/frontends/qt2/QIndexDialog.C
index 5bebf4cfe0b479fab2e820723f54ccb7f95e0ece..4df39df93c8ed04538eb3687098170064fbc8296 100644 (file)
--- a/src/frontends/qt2/QIndexDialog.C
+++ b/src/frontends/qt2/QIndexDialog.C
@@ -23,7 +23,7 @@ namespace lyx {
 namespace frontend {
 
 QIndexDialog::QIndexDialog(QIndex * form)
-       : QIndexDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QIndexDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QLPrintDialog.C b/src/frontends/qt2/QLPrintDialog.C
index 507d1395459c614b9b45de626b89de0300f42781..e06b9e9f95cdd2a988373191c3d1d8c0b2751220 100644 (file)
--- a/src/frontends/qt2/QLPrintDialog.C
+++ b/src/frontends/qt2/QLPrintDialog.C
@@ -25,7 +25,7 @@ namespace lyx {
 namespace frontend {
 
 QLPrintDialog::QLPrintDialog(QPrint * f)
-       : QPrintDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QPrintDialogBase(0, 0, false, 0),
        form_(f)
 {
        connect(printPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QLogDialog.C b/src/frontends/qt2/QLogDialog.C
index 33d35dae7ebcc89368b717f69da04e37072715c5..56f0c34d518ffdae354d77d99364a0bfc564d7d6 100644 (file)
--- a/src/frontends/qt2/QLogDialog.C
+++ b/src/frontends/qt2/QLogDialog.C
@@ -20,7 +20,7 @@ namespace lyx {
 namespace frontend {
 
 QLogDialog::QLogDialog(QLog * form)
-       : QLogDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QLogDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(closePB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt2/QMathDialog.C
index fbffa7c7b121ea58ed3439bfeaa8d365fb5d5ff0..0c43674accbb413f0f1da1e5abc8456e6123c0f9 100644 (file)
--- a/src/frontends/qt2/QMathDialog.C
+++ b/src/frontends/qt2/QMathDialog.C
@@ -77,7 +77,7 @@ bool panel_initialised[nr_panels];
 
 
 QMathDialog::QMathDialog(QMath * form)
-       : QMathDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QMathDialogBase(0, 0, false, 0),
        form_(form)
 {
        // enlarge the symbols ComboBox (no scrollbar)

diff --git a/src/frontends/qt2/QMathMatrixDialog.C b/src/frontends/qt2/QMathMatrixDialog.C
index 863ff00aa760ba062e10141aa05bb895d61fd79b..f9815edddb258c0bdafadbdcb87c5baa7096e908 100644 (file)
--- a/src/frontends/qt2/QMathMatrixDialog.C
+++ b/src/frontends/qt2/QMathMatrixDialog.C
@@ -40,7 +40,7 @@ char v_align_c[] = "tcb";
 
 
 QMathMatrixDialog::QMathMatrixDialog(QMathMatrix * form)
-       : QMathMatrixDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QMathMatrixDialogBase(0, 0, false, 0),
        form_(form)
 {
        setCaption(qt_("LyX: Insert Matrix"));

diff --git a/src/frontends/qt2/QNoteDialog.C b/src/frontends/qt2/QNoteDialog.C
index 242b9c7002c78b4fcc44fc60bf22f23de7b8043c..b03afdbc456bf69e49998605ca0e1f40b5eb8ea0 100644 (file)
--- a/src/frontends/qt2/QNoteDialog.C
+++ b/src/frontends/qt2/QNoteDialog.C
@@ -19,7 +19,7 @@ namespace lyx {
 namespace frontend {
 
 QNoteDialog::QNoteDialog(QNote * form)
-       : QNoteDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QNoteDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QParagraphDialog.C b/src/frontends/qt2/QParagraphDialog.C
index 87b0bfe39d08366e74f4be16f31a15c4077768c2..9db5aae51cf8829e0826f06d73dd0a7d57639fec 100644 (file)
--- a/src/frontends/qt2/QParagraphDialog.C
+++ b/src/frontends/qt2/QParagraphDialog.C
@@ -26,7 +26,7 @@ namespace lyx {
 namespace frontend {
 
 QParagraphDialog::QParagraphDialog(QParagraph * form)
-       : QParagraphDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QParagraphDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C
index 60c246adca1c572b9fac09c7cf41afe8de489422..50fae356d951c27464018726cd12abf8650ed9f2 100644 (file)
--- a/src/frontends/qt2/QPrefsDialog.C
+++ b/src/frontends/qt2/QPrefsDialog.C
@@ -53,7 +53,7 @@ namespace lyx {
 namespace frontend {
 
 QPrefsDialog::QPrefsDialog(QPrefs * form)
-       : QPrefsDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), form_(form)
+       : QPrefsDialogBase(0, 0, false, 0), form_(form)
 {
        connect(savePB, SIGNAL(clicked()),
                form, SLOT(slotOK()));

diff --git a/src/frontends/qt2/QRefDialog.C b/src/frontends/qt2/QRefDialog.C
index aecb71b9eff64853c009b410f12c31670db321bd..9114a9ac00653398b649781bb281206758edffd9 100644 (file)
--- a/src/frontends/qt2/QRefDialog.C
+++ b/src/frontends/qt2/QRefDialog.C
@@ -23,7 +23,7 @@ namespace lyx {
 namespace frontend {
 
 QRefDialog::QRefDialog(QRef * form)
-       : QRefDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QRefDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QSearchDialog.C b/src/frontends/qt2/QSearchDialog.C
index b07040502a4ee2db6e4ce29210c9c6b2b3b99317..f4e8c11a7a3ee13625c8b9b15d64b29fcd0d7941 100644 (file)
--- a/src/frontends/qt2/QSearchDialog.C
+++ b/src/frontends/qt2/QSearchDialog.C
@@ -42,7 +42,7 @@ void uniqueInsert(QComboBox * box, QString const & text)
 
 
 QSearchDialog::QSearchDialog(QSearch * form)
-       : QSearchDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QSearchDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(closePB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QSendtoDialog.C b/src/frontends/qt2/QSendtoDialog.C
index 90dcba23e0bef69af6ebe24dba161f53db722e8b..5d7296233c298ceb273cbe8427b82b59ac1b9b71 100644 (file)
--- a/src/frontends/qt2/QSendtoDialog.C
+++ b/src/frontends/qt2/QSendtoDialog.C
@@ -20,7 +20,7 @@ namespace lyx {
 namespace frontend {
 
 QSendtoDialog::QSendtoDialog(QSendto * form)
-       : QSendtoDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QSendtoDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QShowFileDialog.C b/src/frontends/qt2/QShowFileDialog.C
index 51d6c6a2add9b590f4cafc8dcc6a6b45ba348f33..f83bc9c4c2193ab6382c2996fdd8cee1a6b5c733 100644 (file)
--- a/src/frontends/qt2/QShowFileDialog.C
+++ b/src/frontends/qt2/QShowFileDialog.C
@@ -19,7 +19,7 @@ namespace lyx {
 namespace frontend {
 
 QShowFileDialog::QShowFileDialog(QShowFile * form)
-       : QShowFileDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QShowFileDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(closePB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QSpellcheckerDialog.C b/src/frontends/qt2/QSpellcheckerDialog.C
index 3cb23a40b5f0069c79cc8debf45d2e1a15937130..cb3ed9ebc4add20736d944822f944daef2e7cdb1 100644 (file)
--- a/src/frontends/qt2/QSpellcheckerDialog.C
+++ b/src/frontends/qt2/QSpellcheckerDialog.C
@@ -21,7 +21,7 @@ namespace lyx {
 namespace frontend {
 
 QSpellcheckerDialog::QSpellcheckerDialog(QSpellchecker * form)
-       : QSpellcheckerDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QSpellcheckerDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(closePB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QTabularCreateDialog.C b/src/frontends/qt2/QTabularCreateDialog.C
index 1e0bbc4892933adf046962ff59c5b0218f85bbc0..d53998659e15b95a558ed8c2916c7eb8e51dbb04 100644 (file)
--- a/src/frontends/qt2/QTabularCreateDialog.C
+++ b/src/frontends/qt2/QTabularCreateDialog.C
@@ -22,7 +22,7 @@ namespace lyx {
 namespace frontend {
 
 QTabularCreateDialog::QTabularCreateDialog(QTabularCreate * form)
-       : QTabularCreateDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QTabularCreateDialogBase(0, 0, false, 0),
        form_(form)
 {
        table->setMinimumSize(100,100);

diff --git a/src/frontends/qt2/QTabularDialog.C b/src/frontends/qt2/QTabularDialog.C
index d130ec95d2bd6762ce97e949b401370bb6536b28..4d7b4ab1593c64d880d0671fa68bb9b954a4a92b 100644 (file)
--- a/src/frontends/qt2/QTabularDialog.C
+++ b/src/frontends/qt2/QTabularDialog.C
@@ -29,7 +29,7 @@ namespace frontend {
 
 
 QTabularDialog::QTabularDialog(QTabular * form)
-       : QTabularDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QTabularDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(closePB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QTexinfoDialog.C b/src/frontends/qt2/QTexinfoDialog.C
index f259d0fcbd016ea595397164284bf31af2bbfc81..b9f15db0e222fda64acc4c4c9db55c29f4779403 100644 (file)
--- a/src/frontends/qt2/QTexinfoDialog.C
+++ b/src/frontends/qt2/QTexinfoDialog.C
@@ -25,7 +25,7 @@ namespace frontend {
 
 
 QTexinfoDialog::QTexinfoDialog(QTexinfo * form)
-       : QTexinfoDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QTexinfoDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(closePB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QThesaurusDialog.C b/src/frontends/qt2/QThesaurusDialog.C
index f754d38e18bc0e92522ae95d7598eff35da19c09..44e97ccb65004956e29d747d05811458c4acdf81 100644 (file)
--- a/src/frontends/qt2/QThesaurusDialog.C
+++ b/src/frontends/qt2/QThesaurusDialog.C
@@ -27,7 +27,7 @@ namespace frontend {
 
 
 QThesaurusDialog::QThesaurusDialog(QThesaurus * form)
-       : QThesaurusDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QThesaurusDialogBase(0, 0, false, 0),
        form_(form)
 {
        // hide the pointless QHeader

diff --git a/src/frontends/qt2/QTocDialog.C b/src/frontends/qt2/QTocDialog.C
index c58905ad7ce4dc72b9ce266d32995c74f2c60916..0e92d89378729b172163ffb0841f81af92c6a1c4 100644 (file)
--- a/src/frontends/qt2/QTocDialog.C
+++ b/src/frontends/qt2/QTocDialog.C
@@ -21,7 +21,7 @@ namespace lyx {
 namespace frontend {
 
 QTocDialog::QTocDialog(QToc * form)
-       : QTocDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QTocDialogBase(0, 0, false, 0),
        form_(form)
 {
        // disable sorting

diff --git a/src/frontends/qt2/QURLDialog.C b/src/frontends/qt2/QURLDialog.C
index ebbaa14b62290378bcd858abdba1d02251296ce4..c1600365b9a8cf296d7e60890abed67570997b29 100644 (file)
--- a/src/frontends/qt2/QURLDialog.C
+++ b/src/frontends/qt2/QURLDialog.C
@@ -20,7 +20,7 @@ namespace lyx {
 namespace frontend {
 
 QURLDialog::QURLDialog(QURL * form)
-       : QURLDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QURLDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QVSpaceDialog.C b/src/frontends/qt2/QVSpaceDialog.C
index 6c097456ceafe319e740b3d8df4d51516e2a20ba..133f0b840966208162477a7209038465091d2a45 100644 (file)
--- a/src/frontends/qt2/QVSpaceDialog.C
+++ b/src/frontends/qt2/QVSpaceDialog.C
@@ -28,7 +28,7 @@ namespace lyx {
 namespace frontend {
 
 QVSpaceDialog::QVSpaceDialog(QVSpace * form)
-       : QVSpaceDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QVSpaceDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(okPB, SIGNAL(clicked()),

diff --git a/src/frontends/qt2/QWrapDialog.C b/src/frontends/qt2/QWrapDialog.C
index 9cc5426a126d95c5ae59734ff6d300995f743c1c..3e9783c5d0ee8311a2e775d4375a6e0b48deec62 100644 (file)
--- a/src/frontends/qt2/QWrapDialog.C
+++ b/src/frontends/qt2/QWrapDialog.C
@@ -20,7 +20,7 @@ namespace frontend {
 
 
 QWrapDialog::QWrapDialog(QWrap * form)
-       : QWrapDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0),
+       : QWrapDialogBase(0, 0, false, 0),
        form_(form)
 {
        connect(restorePB, SIGNAL(clicked()),