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

diff --git a/src/frontends/qt4/Action.C b/src/frontends/qt4/Action.C
index 3f05a0c4fd403fe1d01024c004648a805ff13669..bd4512727fa937995a7253b7e50749a1125bedd3 100644 (file)
--- 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 667d316a627493bde0c50f21d76b1fcc4a868fb2..fc5e4bea88d2d740759cb44973acc10ec1d21864 100644 (file)
--- 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 435ec1f3ef64761fd976f1ac0b7c912f5dd4d541..7d36b72a54e1be6bbdb20fc4ce4d9c5d6f7311d1 100644 (file)
--- 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 50cc3e203f6a185fbd196d95c28754c3bf475958..0e45c8ab3e58158d7affe50ba90e469f86f3af77 100644 (file)
--- 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 262900d3065e85695859213b60f08262d4aeee1e..ca3ecbe6d8053e0a459be7a6b432e5c88362928f 100644 (file)
--- 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 c37cc29e582d660eca9a903be0861ab038a40a08..2da8fa9261a1db00414ce60a4043b0464475299d 100644 (file)
--- 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 4891a77c96ade845965d96b4d2b600a4ec35b4ae..d95f0fdfab2e338db80a509b220a677f7a29d5cc 100644 (file)
--- 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 81e3d6e8914b11e6671a808ef036e2d6c42aa753..a4f87048bfa427603409d7c637486d9d311497be 100644 (file)
--- 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 b0dbab59ae3e371677a3c6eee223c3927739c4d5..ef5de14e23f5a6db457040f47c085da8eabaa1ce 100644 (file)
--- 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 fcf40832196eddf82bb37820afca7f68e0688b1b..d02469d758eff62508bafe4f369434358b063aee 100644 (file)
--- 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 061447ab654cef30a649df552b5be99d26bfa32c..aef8c3003cf06a2492c4289eb145f1d4e5de651b 100644 (file)
--- 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 8d7a131bf82760e0f0294e3826a024671291e3b5..8784b4f3e1c6c91c15b4a51f526e778aa06d820a 100644 (file)
--- 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 1d1ccfc581c70f547e19dfae85a124a2a661d223..0c10f09ef5da0ec95b242ca719fb2d1f5469eef7 100644 (file)
--- 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 5c3c7c53b1789188f95005a9865ab03f5e702b75..b225c106a47885858e1d54faa18a701bbc13be84 100644 (file)
--- 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 c820f33b4a5976043c723bfddeb45f980826b85c..162fb183b337b054aac286dc5a0054c333c17b97 100644 (file)
--- 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 47ba8ab94c5cdfc6bcd159960fb6d4967dbe857d..d727b1b770344e1763b0023ca83aedb304939085 100644 (file)
--- 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 f975d38b9e841364ca0577606b4f073d6330c705..c8f04e45b7db17bf11aebb395d7ff9d4d20987fe 100644 (file)
--- 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 1ece965b4156ccd3a01b072a631b214100376f45..df0ee3aafdce74d8674cce325aa597782e84071c 100644 (file)
--- 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 24118ad6d551913276534593fb3bc12757b6373a..7dd158f4e56d197ea67ffec51a0d4bf8ecad3f4d 100644 (file)
--- 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 1c6d7add91ffd31dd94c3b165de0f4e24fd75713..1c0db613b2bab0702a813b0ba0763998ac87bf17 100644 (file)
--- 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 09b9465412f9b522e7332df03f11deb07e946eea..13bd7cb170a9a3de5190bf5851c7568ba79cfda6 100644 (file)
--- 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 c6307b13fa802737ee46decf652d2bebc5f69ee0..8583b34a04becd12117c30e75c3819640514905d 100644 (file)
--- 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 325fc3c4cb1493ba7a502000f050bf174148606b..e9706cabedc504daf0e66f29b968873969757132 100644 (file)
--- 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 25e67180ec1e70a1b7984187f6f4de603bb57cbf..6cc3933a67ce5ab7fd64f784d42d6ec9e3170c37 100644 (file)
--- 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 31f720e4ba2989b97a22af6f3c27500d1c4cd484..11107b5e0003a8c1fada5e21119c0fca63af71f3 100644 (file)
--- 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 874c2d727eacfec50b6f1cf8ee6163c5e23668e3..9cf5a2a9512d5132283df4f07876d304f069cce1 100644 (file)
--- 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 42789a4220f2c361556d2ae78afdc919d74115df..f34e154843d762dbcbaffb98fec859e339100082 100644 (file)
--- 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 42988873b9def9f1dbaffec79172baf44768d666..1c43e69ef97cb87a6719989b64eab4a239f446bf 100644 (file)
--- 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 b259d8f7afff067425299fb000fb98bdc272e157..25aec250f48ef29f37249872ab430b4329b6cd9f 100644 (file)
--- 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 1bd9701c0ffa67f8f5e71d6c7c25605415c2618d..aa561878a8dc876d888e9e7bb5a4a47496314893 100644 (file)
--- 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 6556770173c121de502396bc8cda91631120e3f3..7f91fa57eb18b05bb170a22604912b35d0d19f4d 100644 (file)
--- 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 7d50710c642738e7ffb90190322b851c17cb738b..4e92c9ec1df19be91196230980160dfc9c7791e3 100644 (file)
--- 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 7faa7341157d5612f88d0560175031ac12678571..2bdded75f8abe97b6015860e5b5f3fa8ecf24793 100644 (file)
--- 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 8d0ee528fd7781a4265d72b59b874da8ce14a15d..ad81a744b27157ada702b79d371586f2aefbbf41 100644 (file)
--- 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 a3befaa2b34b68a34a9629bd85bffad9158a3936..04e1f138d47687cac742d46864c51189e53ddcf7 100644 (file)
--- 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 f69c4e84432c6965e81841b6723564cf630fcbe2..0815d72ee6368d1dd0b3fc196c9e615ef84a16d6 100644 (file)
--- 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"))
 {
 }