From 684299d10769578bed173e8979afc277bb0288d0 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Wed, 2 Jun 2004 20:13:18 +0000
Subject: [PATCH] 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
---
 src/frontends/qt2/ChangeLog              | 5 +++++
 src/frontends/qt2/QBibitemDialog.C       | 2 +-
 src/frontends/qt2/QBibtexDialog.C        | 2 +-
 src/frontends/qt2/QBoxDialog.C           | 2 +-
 src/frontends/qt2/QBranchDialog.C        | 2 +-
 src/frontends/qt2/QChangesDialog.C       | 2 +-
 src/frontends/qt2/QCharacterDialog.C     | 2 +-
 src/frontends/qt2/QCitationDialog.C      | 2 +-
 src/frontends/qt2/QDelimiterDialog.C     | 2 +-
 src/frontends/qt2/QDocumentDialog.C      | 2 +-
 src/frontends/qt2/QERTDialog.C           | 2 +-
 src/frontends/qt2/QErrorListDialog.C     | 2 +-
 src/frontends/qt2/QExternalDialog.C      | 2 +-
 src/frontends/qt2/QFloatDialog.C         | 2 +-
 src/frontends/qt2/QGraphicsDialog.C      | 2 +-
 src/frontends/qt2/QIncludeDialog.C       | 2 +-
 src/frontends/qt2/QIndexDialog.C         | 2 +-
 src/frontends/qt2/QLPrintDialog.C        | 2 +-
 src/frontends/qt2/QLogDialog.C           | 2 +-
 src/frontends/qt2/QMathDialog.C          | 2 +-
 src/frontends/qt2/QMathMatrixDialog.C    | 2 +-
 src/frontends/qt2/QNoteDialog.C          | 2 +-
 src/frontends/qt2/QParagraphDialog.C     | 2 +-
 src/frontends/qt2/QPrefsDialog.C         | 2 +-
 src/frontends/qt2/QRefDialog.C           | 2 +-
 src/frontends/qt2/QSearchDialog.C        | 2 +-
 src/frontends/qt2/QSendtoDialog.C        | 2 +-
 src/frontends/qt2/QShowFileDialog.C      | 2 +-
 src/frontends/qt2/QSpellcheckerDialog.C  | 2 +-
 src/frontends/qt2/QTabularCreateDialog.C | 2 +-
 src/frontends/qt2/QTabularDialog.C       | 2 +-
 src/frontends/qt2/QTexinfoDialog.C       | 2 +-
 src/frontends/qt2/QThesaurusDialog.C     | 2 +-
 src/frontends/qt2/QTocDialog.C           | 2 +-
 src/frontends/qt2/QURLDialog.C           | 2 +-
 src/frontends/qt2/QVSpaceDialog.C        | 2 +-
 src/frontends/qt2/QWrapDialog.C          | 2 +-
 37 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 357a4b34a9..b240e93209 100644
--- 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 ac12364408..d9fba1b1ab 100644
--- 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 5d40b678d2..5acd3f8ee2 100644
--- 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 bbd9553596..690ba81770 100644
--- 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 6f5afcad27..22d5d259d5 100644
--- 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 1432b9ccf6..4f21582e6a 100644
--- 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 f090991b8a..2635beb94c 100644
--- 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 b3323b26cb..fd1bc23d39 100644
--- 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 9ec8575ee0..c3e7fd27fa 100644
--- 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 f44e4a69a0..006d06b1a9 100644
--- 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 196f8e2781..6432143133 100644
--- 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 162a74c510..b981bb1bc9 100644
--- 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 8696143731..6e8825f473 100644
--- 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 65df7d2f01..7eb01a11ca 100644
--- 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 a23fdf2604..cf801d2162 100644
--- 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 6b3fb61d88..5e998a76b3 100644
--- 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 5bebf4cfe0..4df39df93c 100644
--- 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 507d139545..e06b9e9f95 100644
--- 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 33d35dae7e..56f0c34d51 100644
--- 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 fbffa7c7b1..0c43674acc 100644
--- 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 863ff00aa7..f9815edddb 100644
--- 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 242b9c7002..b03afdbc45 100644
--- 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 87b0bfe39d..9db5aae51c 100644
--- 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 60c246adca..50fae356d9 100644
--- 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 aecb71b9ef..9114a9ac00 100644
--- 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 b07040502a..f4e8c11a7a 100644
--- 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 90dcba23e0..5d7296233c 100644
--- 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 51d6c6a2ad..f83bc9c4c2 100644
--- 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 3cb23a40b5..cb3ed9ebc4 100644
--- 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 1e0bbc4892..d53998659e 100644
--- 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 d130ec95d2..4d7b4ab159 100644
--- 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 f259d0fcbd..b9f15db0e2 100644
--- 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 f754d38e18..44e97ccb65 100644
--- 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 c58905ad7c..0e92d89378 100644
--- 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 ebbaa14b62..c1600365b9 100644
--- 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 6c097456ce..133f0b8409 100644
--- 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 9cc5426a12..3e9783c5d0 100644
--- 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()),