anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compile qt4 three times faster with msvc:

Browse Source 
- only trivial renaming
 - one used variable removed



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17514 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2007-03-22 23:07:24 +00:00
parent 13f6fb1712
commit df55785b5a
36 changed files with 70 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt4/Action.C
View File

@ -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)

4
src/frontends/qt4/QAbout.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QBibitem.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QBibtex.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QBox.C
View File

@ -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"))
{}

4
src/frontends/qt4/QBranch.C
View File

@ -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"))
{}

4
src/frontends/qt4/QChanges.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QCharacter.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QDocument.C
View File

@ -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"))
{}

4
src/frontends/qt4/QERT.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QErrorList.C
View File

@ -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())
{}

4
src/frontends/qt4/QExternal.C
View File

@ -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"))
{}

4
src/frontends/qt4/QFloat.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QGraphics.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QInclude.C
View File

@ -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"))
{}

4
src/frontends/qt4/QIndex.C
View File

@ -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)
{
}

4
src/frontends/qt4/QLog.C
View File

@ -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())
{}

4
src/frontends/qt4/QNomencl.C
View File

@ -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)
{
}

4
src/frontends/qt4/QNote.C
View File

@ -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"))
{}

4
src/frontends/qt4/QParagraph.C
View File

@ -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"))
{}

4
src/frontends/qt4/QPrefs.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QPrefsDialog.C
View File

@ -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);
}

4
src/frontends/qt4/QPrint.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QRef.C
View File

@ -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)
{
}

4
src/frontends/qt4/QSearch.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QSendto.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QShowFile.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QSpellchecker.C
View File

@ -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"))
{}

4
src/frontends/qt4/QTabular.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QTabularCreate.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QTexinfo.C
View File

@ -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)
{
}

4
src/frontends/qt4/QThesaurus.C
View File

@ -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"))
{
}

4
src/frontends/qt4/QVSpace.C
View File

@ -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"))
{}

4
src/frontends/qt4/QViewSource.C
View File

@ -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())
{}

4
src/frontends/qt4/QWrap.C
View File

@ -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"))
{
}

4
src/frontends/qt4/UrlView.C
View File

@ -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"))
{
}