From df55785b5a7381a820fe6dd8084aabf5703472bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Thu, 22 Mar 2007 23:07:24 +0000
Subject: [PATCH] compile qt4 three times faster with msvc:  - only trivial
 renaming  - one used variable removed

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17514 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/Action.C         | 5 -----
 src/frontends/qt4/QAbout.C         | 4 ++--
 src/frontends/qt4/QBibitem.C       | 4 ++--
 src/frontends/qt4/QBibtex.C        | 4 ++--
 src/frontends/qt4/QBox.C           | 4 ++--
 src/frontends/qt4/QBranch.C        | 4 ++--
 src/frontends/qt4/QChanges.C       | 4 ++--
 src/frontends/qt4/QCharacter.C     | 4 ++--
 src/frontends/qt4/QDocument.C      | 4 ++--
 src/frontends/qt4/QERT.C           | 4 ++--
 src/frontends/qt4/QErrorList.C     | 4 ++--
 src/frontends/qt4/QExternal.C      | 4 ++--
 src/frontends/qt4/QFloat.C         | 4 ++--
 src/frontends/qt4/QGraphics.C      | 4 ++--
 src/frontends/qt4/QInclude.C       | 4 ++--
 src/frontends/qt4/QIndex.C         | 4 ++--
 src/frontends/qt4/QLog.C           | 4 ++--
 src/frontends/qt4/QNomencl.C       | 4 ++--
 src/frontends/qt4/QNote.C          | 4 ++--
 src/frontends/qt4/QParagraph.C     | 4 ++--
 src/frontends/qt4/QPrefs.C         | 4 ++--
 src/frontends/qt4/QPrefsDialog.C   | 4 ++--
 src/frontends/qt4/QPrint.C         | 4 ++--
 src/frontends/qt4/QRef.C           | 4 ++--
 src/frontends/qt4/QSearch.C        | 4 ++--
 src/frontends/qt4/QSendto.C        | 4 ++--
 src/frontends/qt4/QShowFile.C      | 4 ++--
 src/frontends/qt4/QSpellchecker.C  | 4 ++--
 src/frontends/qt4/QTabular.C       | 4 ++--
 src/frontends/qt4/QTabularCreate.C | 4 ++--
 src/frontends/qt4/QTexinfo.C       | 4 ++--
 src/frontends/qt4/QThesaurus.C     | 4 ++--
 src/frontends/qt4/QVSpace.C        | 4 ++--
 src/frontends/qt4/QViewSource.C    | 4 ++--
 src/frontends/qt4/QWrap.C          | 4 ++--
 src/frontends/qt4/UrlView.C        | 4 ++--
 36 files changed, 70 insertions(+), 75 deletions(-)

diff --git a/src/frontends/qt4/Action.C b/src/frontends/qt4/Action.C
index 3f05a0c4fd..bd4512727f 100644
--- a/src/frontends/qt4/Action.C
+++ b/src/frontends/qt4/Action.C
@@ -33,11 +33,6 @@ namespace lyx {
 
 namespace frontend {
 
-namespace {
-
-int const statusbar_timer_value = 3000;
-
-} // namespace anon
 
 Action::Action(GuiView & lyxView, docstring const & text,
 		FuncRequest const & func, docstring const & tooltip)
diff --git a/src/frontends/qt4/QAbout.C b/src/frontends/qt4/QAbout.C
index 667d316a62..fc5e4bea88 100644
--- a/src/frontends/qt4/QAbout.C
+++ b/src/frontends/qt4/QAbout.C
@@ -38,10 +38,10 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlAboutlyx, QView<QAboutDialog> > base_class;
+typedef QController<ControlAboutlyx, QView<QAboutDialog> > about_base_class;
 
 QAbout::QAbout(Dialog & parent)
-	: base_class(parent, _("About LyX"))
+	: about_base_class(parent, _("About LyX"))
 {
 }
 
diff --git a/src/frontends/qt4/QBibitem.C b/src/frontends/qt4/QBibitem.C
index 435ec1f3ef..7d36b72a54 100644
--- a/src/frontends/qt4/QBibitem.C
+++ b/src/frontends/qt4/QBibitem.C
@@ -24,11 +24,11 @@
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlCommand, QView<QBibitemDialog> > base_class;
+typedef QController<ControlCommand, QView<QBibitemDialog> > bibitem_base_class;
 
 
 QBibitem::QBibitem(Dialog & parent)
-	: base_class(parent, _("Bibliography Entry Settings"))
+	: bibitem_base_class(parent, _("Bibliography Entry Settings"))
 {
 }
 
diff --git a/src/frontends/qt4/QBibtex.C b/src/frontends/qt4/QBibtex.C
index 50cc3e203f..0e45c8ab3e 100644
--- a/src/frontends/qt4/QBibtex.C
+++ b/src/frontends/qt4/QBibtex.C
@@ -42,10 +42,10 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlBibtex, QView<QBibtexDialog> > base_class;
+typedef QController<ControlBibtex, QView<QBibtexDialog> > bibtex_base_class;
 
 QBibtex::QBibtex(Dialog & parent)
-	: base_class(parent, _("BibTeX Bibliography"))
+	: bibtex_base_class(parent, _("BibTeX Bibliography"))
 {
 }
 
diff --git a/src/frontends/qt4/QBox.C b/src/frontends/qt4/QBox.C
index 262900d306..ca3ecbe6d8 100644
--- a/src/frontends/qt4/QBox.C
+++ b/src/frontends/qt4/QBox.C
@@ -43,10 +43,10 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlBox, QView<QBoxDialog> > base_class;
+typedef QController<ControlBox, QView<QBoxDialog> > box_base_class;
 
 QBox::QBox(Dialog & parent)
-	: base_class(parent, _("Box Settings"))
+	: box_base_class(parent, _("Box Settings"))
 {}
 
 
diff --git a/src/frontends/qt4/QBranch.C b/src/frontends/qt4/QBranch.C
index c37cc29e58..2da8fa9261 100644
--- a/src/frontends/qt4/QBranch.C
+++ b/src/frontends/qt4/QBranch.C
@@ -26,11 +26,11 @@
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlBranch, QView<QBranchDialog> > base_class;
+typedef QController<ControlBranch, QView<QBranchDialog> > branch_base_class;
 
 
 QBranch::QBranch(Dialog & parent)
-	: base_class(parent, _("Branch Settings"))
+	: branch_base_class(parent, _("Branch Settings"))
 {}
 
 
diff --git a/src/frontends/qt4/QChanges.C b/src/frontends/qt4/QChanges.C
index 4891a77c96..d95f0fdfab 100644
--- a/src/frontends/qt4/QChanges.C
+++ b/src/frontends/qt4/QChanges.C
@@ -28,11 +28,11 @@ using lyx::support::bformat;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlChanges, QView<QChangesDialog> > base_class;
+typedef QController<ControlChanges, QView<QChangesDialog> > changes_base_class;
 
 
 QChanges::QChanges(Dialog & parent)
-	: base_class(parent, _("Merge Changes"))
+	: changes_base_class(parent, _("Merge Changes"))
 {
 }
 
diff --git a/src/frontends/qt4/QCharacter.C b/src/frontends/qt4/QCharacter.C
index 81e3d6e891..a4f87048bf 100644
--- a/src/frontends/qt4/QCharacter.C
+++ b/src/frontends/qt4/QCharacter.C
@@ -27,11 +27,11 @@ using std::vector;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlCharacter, QView<QCharacterDialog> > base_class;
+typedef QController<ControlCharacter, QView<QCharacterDialog> > character_base_class;
 
 
 QCharacter::QCharacter(Dialog & parent)
-	: base_class(parent, _("Text Style"))
+	: character_base_class(parent, _("Text Style"))
 {
 }
 
diff --git a/src/frontends/qt4/QDocument.C b/src/frontends/qt4/QDocument.C
index b0dbab59ae..ef5de14e23 100644
--- a/src/frontends/qt4/QDocument.C
+++ b/src/frontends/qt4/QDocument.C
@@ -41,11 +41,11 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlDocument, QView<QDocumentDialog> > base_class;
+typedef QController<ControlDocument, QView<QDocumentDialog> > document_base_class;
 
 
 QDocument::QDocument(Dialog & parent)
-	: base_class(parent, _("Document Settings"))
+	: document_base_class(parent, _("Document Settings"))
 {}
 
 
diff --git a/src/frontends/qt4/QERT.C b/src/frontends/qt4/QERT.C
index fcf4083219..d02469d758 100644
--- a/src/frontends/qt4/QERT.C
+++ b/src/frontends/qt4/QERT.C
@@ -23,11 +23,11 @@
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlERT, QView<QERTDialog> > base_class;
+typedef QController<ControlERT, QView<QERTDialog> > ert_base_class;
 
 
 QERT::QERT(Dialog & parent)
-	: base_class(parent, _("TeX Code Settings"))
+	: ert_base_class(parent, _("TeX Code Settings"))
 {
 }
 
diff --git a/src/frontends/qt4/QErrorList.C b/src/frontends/qt4/QErrorList.C
index 061447ab65..aef8c3003c 100644
--- a/src/frontends/qt4/QErrorList.C
+++ b/src/frontends/qt4/QErrorList.C
@@ -24,10 +24,10 @@
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlErrorList, QView<QErrorListDialog> > base_class;
+typedef QController<ControlErrorList, QView<QErrorListDialog> > errorlist_base_class;
 
 QErrorList::QErrorList(Dialog & parent)
-	: base_class(parent, lyx::docstring())
+	: errorlist_base_class(parent, lyx::docstring())
 {}
 
 
diff --git a/src/frontends/qt4/QExternal.C b/src/frontends/qt4/QExternal.C
index 8d7a131bf8..8784b4f3e1 100644
--- a/src/frontends/qt4/QExternal.C
+++ b/src/frontends/qt4/QExternal.C
@@ -276,10 +276,10 @@ void getExtra(external::ExtraData & data,
 } // namespace anon
 
 
-typedef QController<ControlExternal, QView<QExternalDialog> > base_class;
+typedef QController<ControlExternal, QView<QExternalDialog> > external_base_class;
 
 QExternal::QExternal(Dialog & parent)
-	: base_class(parent, _("External Material"))
+	: external_base_class(parent, _("External Material"))
 {}
 
 
diff --git a/src/frontends/qt4/QFloat.C b/src/frontends/qt4/QFloat.C
index 1d1ccfc581..0c10f09ef5 100644
--- a/src/frontends/qt4/QFloat.C
+++ b/src/frontends/qt4/QFloat.C
@@ -24,11 +24,11 @@
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlFloat, QView<QFloatDialog> > base_class;
+typedef QController<ControlFloat, QView<QFloatDialog> > float_base_class;
 
 
 QFloat::QFloat(Dialog & parent)
-	: base_class(parent, _("Float Settings"))
+	: float_base_class(parent, _("Float Settings"))
 {
 }
 
diff --git a/src/frontends/qt4/QGraphics.C b/src/frontends/qt4/QGraphics.C
index 5c3c7c53b1..b225c106a4 100644
--- a/src/frontends/qt4/QGraphics.C
+++ b/src/frontends/qt4/QGraphics.C
@@ -56,10 +56,10 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlGraphics, QView<QGraphicsDialog> > base_class;
+typedef QController<ControlGraphics, QView<QGraphicsDialog> > graphics_base_class;
 
 QGraphics::QGraphics(Dialog & parent)
-	: base_class(parent, _("Graphics"))
+	: graphics_base_class(parent, _("Graphics"))
 {
 }
 
diff --git a/src/frontends/qt4/QInclude.C b/src/frontends/qt4/QInclude.C
index c820f33b4a..162fb183b3 100644
--- a/src/frontends/qt4/QInclude.C
+++ b/src/frontends/qt4/QInclude.C
@@ -35,11 +35,11 @@ using lyx::support::os::internal_path;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlInclude, QView<QIncludeDialog> > base_class;
+typedef QController<ControlInclude, QView<QIncludeDialog> > include_base_class;
 
 
 QInclude::QInclude(Dialog & parent)
-	: base_class(parent, _("Child Document"))
+	: include_base_class(parent, _("Child Document"))
 {}
 
 
diff --git a/src/frontends/qt4/QIndex.C b/src/frontends/qt4/QIndex.C
index 47ba8ab94c..d727b1b770 100644
--- a/src/frontends/qt4/QIndex.C
+++ b/src/frontends/qt4/QIndex.C
@@ -27,11 +27,11 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlCommand, QView<QIndexDialog> > base_class;
+typedef QController<ControlCommand, QView<QIndexDialog> > index_base_class;
 
 
 QIndex::QIndex(Dialog & parent, docstring const & title, QString const & label)
-	: base_class(parent, title), label_(label)
+	: index_base_class(parent, title), label_(label)
 {
 }
 
diff --git a/src/frontends/qt4/QLog.C b/src/frontends/qt4/QLog.C
index f975d38b9e..c8f04e45b7 100644
--- a/src/frontends/qt4/QLog.C
+++ b/src/frontends/qt4/QLog.C
@@ -24,10 +24,10 @@
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlLog, QView<QLogDialog> > base_class;
+typedef QController<ControlLog, QView<QLogDialog> > log_base_class;
 
 QLog::QLog(Dialog & parent)
-	: base_class(parent, lyx::docstring())
+	: log_base_class(parent, lyx::docstring())
 {}
 
 
diff --git a/src/frontends/qt4/QNomencl.C b/src/frontends/qt4/QNomencl.C
index 1ece965b41..df0ee3aafd 100644
--- a/src/frontends/qt4/QNomencl.C
+++ b/src/frontends/qt4/QNomencl.C
@@ -28,11 +28,11 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlCommand, QView<QNomenclDialog> > base_class;
+typedef QController<ControlCommand, QView<QNomenclDialog> > nomencl_base_class;
 
 
 QNomencl::QNomencl(Dialog & parent, docstring const & title)
-	: base_class(parent, title)
+	: nomencl_base_class(parent, title)
 {
 }
 
diff --git a/src/frontends/qt4/QNote.C b/src/frontends/qt4/QNote.C
index 24118ad6d5..7dd158f4e5 100644
--- a/src/frontends/qt4/QNote.C
+++ b/src/frontends/qt4/QNote.C
@@ -27,11 +27,11 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlNote, QView<QNoteDialog> > base_class;
+typedef QController<ControlNote, QView<QNoteDialog> > note_base_class;
 
 
 QNote::QNote(Dialog & parent)
-	: base_class(parent, _("Note Settings"))
+	: note_base_class(parent, _("Note Settings"))
 {}
 
 
diff --git a/src/frontends/qt4/QParagraph.C b/src/frontends/qt4/QParagraph.C
index 1c6d7add91..1c0db613b2 100644
--- a/src/frontends/qt4/QParagraph.C
+++ b/src/frontends/qt4/QParagraph.C
@@ -31,11 +31,11 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlParagraph, QView<QParagraphDialog> > base_class;
+typedef QController<ControlParagraph, QView<QParagraphDialog> > paragraph_base_class;
 
 
 QParagraph::QParagraph(Dialog & parent)
-	: base_class(parent, _("Paragraph Settings"))
+	: paragraph_base_class(parent, _("Paragraph Settings"))
 {}
 
 
diff --git a/src/frontends/qt4/QPrefs.C b/src/frontends/qt4/QPrefs.C
index 09b9465412..13bd7cb170 100644
--- a/src/frontends/qt4/QPrefs.C
+++ b/src/frontends/qt4/QPrefs.C
@@ -32,10 +32,10 @@ using namespace Ui;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlPrefs, QView<QPrefsDialog> > base_class;
+typedef QController<ControlPrefs, QView<QPrefsDialog> > prefs_base_class;
 
 QPrefs::QPrefs(Dialog & parent)
-	: base_class(parent, _("Preferences"))
+	: prefs_base_class(parent, _("Preferences"))
 {
 
 }
diff --git a/src/frontends/qt4/QPrefsDialog.C b/src/frontends/qt4/QPrefsDialog.C
index c6307b13fa..8583b34a04 100644
--- a/src/frontends/qt4/QPrefsDialog.C
+++ b/src/frontends/qt4/QPrefsDialog.C
@@ -85,7 +85,7 @@ namespace {
 
 template<class A>
 typename std::vector<A>::size_type
-findPos(std::vector<A> const & vec, A const & val)
+findPos_helper(std::vector<A> const & vec, A const & val)
 {
 	typedef typename std::vector<A>::const_iterator Cit;
 
@@ -1522,7 +1522,7 @@ void PrefLanguage::update(LyXRC const & rc)
 	startCommandED->setText(toqstr(rc.language_command_begin));
 	endCommandED->setText(toqstr(rc.language_command_end));
 
-	int const pos = int(findPos(lang_, rc.default_language));
+	int const pos = int(findPos_helper(lang_, rc.default_language));
 	defaultLanguageCO->setCurrentIndex(pos);
 }
 
diff --git a/src/frontends/qt4/QPrint.C b/src/frontends/qt4/QPrint.C
index 325fc3c4cb..e9706cabed 100644
--- a/src/frontends/qt4/QPrint.C
+++ b/src/frontends/qt4/QPrint.C
@@ -29,11 +29,11 @@
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlPrint, QView<QLPrintDialog> > base_class;
+typedef QController<ControlPrint, QView<QLPrintDialog> > print_base_class;
 
 
 QPrint::QPrint(Dialog & parent)
-	: base_class(parent, _("Print Document"))
+	: print_base_class(parent, _("Print Document"))
 {
 }
 
diff --git a/src/frontends/qt4/QRef.C b/src/frontends/qt4/QRef.C
index 25e67180ec..6cc3933a67 100644
--- a/src/frontends/qt4/QRef.C
+++ b/src/frontends/qt4/QRef.C
@@ -38,11 +38,11 @@ namespace lyx {
 namespace frontend {
 
 // full qualification because qt4 has also a ControlRef type
-typedef QController<lyx::frontend::ControlRef, QView<QRefDialog> > base_class;
+typedef QController<lyx::frontend::ControlRef, QView<QRefDialog> > ref_base_class;
 
 
 QRef::QRef(Dialog & parent)
-	: base_class(parent, _("Cross-reference")),
+	: ref_base_class(parent, _("Cross-reference")),
 	sort_(false), at_ref_(false)
 {
 }
diff --git a/src/frontends/qt4/QSearch.C b/src/frontends/qt4/QSearch.C
index 31f720e4ba..11107b5e00 100644
--- a/src/frontends/qt4/QSearch.C
+++ b/src/frontends/qt4/QSearch.C
@@ -23,11 +23,11 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlSearch, QView<QSearchDialog> > base_class;
+typedef QController<ControlSearch, QView<QSearchDialog> > search_base_class;
 
 
 QSearch::QSearch(Dialog & parent)
-	: base_class(parent, _("Find and Replace"))
+	: search_base_class(parent, _("Find and Replace"))
 {
 }
 
diff --git a/src/frontends/qt4/QSendto.C b/src/frontends/qt4/QSendto.C
index 874c2d727e..9cf5a2a951 100644
--- a/src/frontends/qt4/QSendto.C
+++ b/src/frontends/qt4/QSendto.C
@@ -28,11 +28,11 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlSendto, QView<QSendtoDialog> > base_class;
+typedef QController<ControlSendto, QView<QSendtoDialog> > sendto_base_class;
 
 
 QSendto::QSendto(Dialog & parent)
-	: base_class(parent, _("Send Document to Command"))
+	: sendto_base_class(parent, _("Send Document to Command"))
 {
 }
 
diff --git a/src/frontends/qt4/QShowFile.C b/src/frontends/qt4/QShowFile.C
index 42789a4220..f34e154843 100644
--- a/src/frontends/qt4/QShowFile.C
+++ b/src/frontends/qt4/QShowFile.C
@@ -25,11 +25,11 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlShowFile, QView<QShowFileDialog> > base_class;
+typedef QController<ControlShowFile, QView<QShowFileDialog> > showfile_base_class;
 
 
 QShowFile::QShowFile(Dialog & parent)
-	: base_class(parent, _("Show File"))
+	: showfile_base_class(parent, _("Show File"))
 {
 }
 
diff --git a/src/frontends/qt4/QSpellchecker.C b/src/frontends/qt4/QSpellchecker.C
index 42988873b9..1c43e69ef9 100644
--- a/src/frontends/qt4/QSpellchecker.C
+++ b/src/frontends/qt4/QSpellchecker.C
@@ -28,10 +28,10 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlSpellchecker, QView<QSpellcheckerDialog> > base_class;
+typedef QController<ControlSpellchecker, QView<QSpellcheckerDialog> > spellchecker_base_class;
 
 QSpellchecker::QSpellchecker(Dialog & parent)
-	: base_class(parent, _("Spellchecker"))
+	: spellchecker_base_class(parent, _("Spellchecker"))
 {}
 
 
diff --git a/src/frontends/qt4/QTabular.C b/src/frontends/qt4/QTabular.C
index b259d8f7af..25aec250f4 100644
--- a/src/frontends/qt4/QTabular.C
+++ b/src/frontends/qt4/QTabular.C
@@ -36,10 +36,10 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlTabular, QView<QTabularDialog> > base_class;
+typedef QController<ControlTabular, QView<QTabularDialog> > tabular_base_class;
 
 QTabular::QTabular(Dialog & parent)
-	: base_class(parent, _("Table Settings"))
+	: tabular_base_class(parent, _("Table Settings"))
 {
 }
 
diff --git a/src/frontends/qt4/QTabularCreate.C b/src/frontends/qt4/QTabularCreate.C
index 1bd9701c0f..aa561878a8 100644
--- a/src/frontends/qt4/QTabularCreate.C
+++ b/src/frontends/qt4/QTabularCreate.C
@@ -22,11 +22,11 @@
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlTabularCreate, QView<QTabularCreateDialog> > base_class;
+typedef QController<ControlTabularCreate, QView<QTabularCreateDialog> > tabularcreate_base_class;
 
 
 QTabularCreate::QTabularCreate(Dialog & parent)
-	: base_class(parent, _("Insert Table"))
+	: tabularcreate_base_class(parent, _("Insert Table"))
 {
 }
 
diff --git a/src/frontends/qt4/QTexinfo.C b/src/frontends/qt4/QTexinfo.C
index 6556770173..7f91fa57eb 100644
--- a/src/frontends/qt4/QTexinfo.C
+++ b/src/frontends/qt4/QTexinfo.C
@@ -26,10 +26,10 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlTexinfo, QView<QTexinfoDialog> > base_class;
+typedef QController<ControlTexinfo, QView<QTexinfoDialog> > texinfo_base_class;
 
 QTexinfo::QTexinfo(Dialog & parent)
-	: base_class(parent, _("TeX Information")),
+	: texinfo_base_class(parent, _("TeX Information")),
 	  warningPosted(false), activeStyle(ControlTexinfo::cls)
 {
 }
diff --git a/src/frontends/qt4/QThesaurus.C b/src/frontends/qt4/QThesaurus.C
index 7d50710c64..4e92c9ec1d 100644
--- a/src/frontends/qt4/QThesaurus.C
+++ b/src/frontends/qt4/QThesaurus.C
@@ -23,10 +23,10 @@
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlThesaurus, QView<QThesaurusDialog> > base_class;
+typedef QController<ControlThesaurus, QView<QThesaurusDialog> > theasaurus_base_class;
 
 QThesaurus::QThesaurus(Dialog & parent)
-	: base_class(parent, _("Thesaurus"))
+	: theasaurus_base_class(parent, _("Thesaurus"))
 {
 }
 
diff --git a/src/frontends/qt4/QVSpace.C b/src/frontends/qt4/QVSpace.C
index 7faa734115..2bdded75f8 100644
--- a/src/frontends/qt4/QVSpace.C
+++ b/src/frontends/qt4/QVSpace.C
@@ -126,10 +126,10 @@ VSpace setVSpaceFromWidgets(int spacing,
 } // namespace anon
 
 
-typedef QController<ControlVSpace, QView<QVSpaceDialog> > base_class;
+typedef QController<ControlVSpace, QView<QVSpaceDialog> > vspace_base_class;
 
 QVSpace::QVSpace(Dialog & parent)
-	: base_class(parent, _("Vertical Space Settings"))
+	: vspace_base_class(parent, _("Vertical Space Settings"))
 {}
 
 
diff --git a/src/frontends/qt4/QViewSource.C b/src/frontends/qt4/QViewSource.C
index 8d0ee528fd..ad81a744b2 100644
--- a/src/frontends/qt4/QViewSource.C
+++ b/src/frontends/qt4/QViewSource.C
@@ -27,11 +27,11 @@
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlViewSource, QView<QViewSourceDialog> > base_class;
+typedef QController<ControlViewSource, QView<QViewSourceDialog> > viewsource_base_class;
 
 
 QViewSource::QViewSource(Dialog & parent)
-	: base_class(parent, lyx::docstring())
+	: viewsource_base_class(parent, lyx::docstring())
 {}
 
 
diff --git a/src/frontends/qt4/QWrap.C b/src/frontends/qt4/QWrap.C
index a3befaa2b3..04e1f138d4 100644
--- a/src/frontends/qt4/QWrap.C
+++ b/src/frontends/qt4/QWrap.C
@@ -33,10 +33,10 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlWrap, QView<QWrapDialog> > base_class;
+typedef QController<ControlWrap, QView<QWrapDialog> > wrap_base_class;
 
 QWrap::QWrap(Dialog & parent)
-	: base_class(parent, _("Text Wrap Settings"))
+	: wrap_base_class(parent, _("Text Wrap Settings"))
 {
 }
 
diff --git a/src/frontends/qt4/UrlView.C b/src/frontends/qt4/UrlView.C
index f69c4e8443..0815d72ee6 100644
--- a/src/frontends/qt4/UrlView.C
+++ b/src/frontends/qt4/UrlView.C
@@ -27,10 +27,10 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController< ControlCommand, QView<QURLDialog> > base_class;
+typedef QController< ControlCommand, QView<QURLDialog> > urlview_base_class;
 
 UrlView::UrlView(Dialog & parent)
-	: base_class(parent, _("URL"))
+	: urlview_base_class(parent, _("URL"))
 {
 }