From 2e11d3ca916849c669b9a0029a6262140de044ce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Sun, 20 Apr 2008 16:32:40 +0000 Subject: [PATCH] use cheaper includes in ui files git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24389 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiSendto.cpp | 15 +++++++-------- src/frontends/qt4/GuiSendto.h | 2 +- src/frontends/qt4/GuiSymbols.h | 3 ++- src/frontends/qt4/Makefile.am | 1 + src/frontends/qt4/qt_helpers.h | 9 +-------- src/frontends/qt4/ui/AboutUi.ui | 2 +- src/frontends/qt4/ui/AskForTextUi.ui | 2 +- src/frontends/qt4/ui/BibitemUi.ui | 2 +- src/frontends/qt4/ui/BiblioUi.ui | 2 +- src/frontends/qt4/ui/BibtexAddUi.ui | 2 +- src/frontends/qt4/ui/BibtexUi.ui | 2 +- src/frontends/qt4/ui/BoxUi.ui | 2 +- src/frontends/qt4/ui/BranchUi.ui | 2 +- src/frontends/qt4/ui/BranchesUi.ui | 2 +- src/frontends/qt4/ui/BulletsUi.ui | 2 +- src/frontends/qt4/ui/ChangesUi.ui | 2 +- src/frontends/qt4/ui/CharacterUi.ui | 2 +- src/frontends/qt4/ui/CitationUi.ui | 2 +- src/frontends/qt4/ui/DelimiterUi.ui | 2 +- src/frontends/qt4/ui/DocumentUi.ui | 2 +- src/frontends/qt4/ui/ERTUi.ui | 2 +- src/frontends/qt4/ui/ErrorListUi.ui | 2 +- src/frontends/qt4/ui/ExternalUi.ui | 2 +- src/frontends/qt4/ui/FloatPlacementUi.ui | 2 +- src/frontends/qt4/ui/FloatUi.ui | 2 +- src/frontends/qt4/ui/FontUi.ui | 2 +- src/frontends/qt4/ui/GraphicsUi.ui | 2 +- src/frontends/qt4/ui/HSpaceUi.ui | 2 +- src/frontends/qt4/ui/HyperlinkUi.ui | 2 +- src/frontends/qt4/ui/IncludeUi.ui | 2 +- src/frontends/qt4/ui/LaTeXUi.ui | 2 +- src/frontends/qt4/ui/LabelUi.ui | 2 +- src/frontends/qt4/ui/LanguageUi.ui | 2 +- src/frontends/qt4/ui/ListingsUi.ui | 2 +- src/frontends/qt4/ui/LogUi.ui | 2 +- src/frontends/qt4/ui/MarginsUi.ui | 2 +- src/frontends/qt4/ui/MathMatrixUi.ui | 2 +- src/frontends/qt4/ui/MathsUi.ui | 2 +- src/frontends/qt4/ui/NomenclUi.ui | 2 +- src/frontends/qt4/ui/NoteUi.ui | 2 +- src/frontends/qt4/ui/NumberingUi.ui | 2 +- src/frontends/qt4/ui/PageLayoutUi.ui | 2 +- src/frontends/qt4/ui/ParagraphUi.ui | 2 +- src/frontends/qt4/ui/PreambleUi.ui | 2 +- src/frontends/qt4/ui/PrefColorsUi.ui | 2 +- src/frontends/qt4/ui/PrefCompletionUi.ui | 2 +- src/frontends/qt4/ui/PrefConvertersUi.ui | 2 +- src/frontends/qt4/ui/PrefDateUi.ui | 2 +- src/frontends/qt4/ui/PrefDisplayUi.ui | 2 +- src/frontends/qt4/ui/PrefEditUi.ui | 2 +- src/frontends/qt4/ui/PrefFileformatsUi.ui | 2 +- src/frontends/qt4/ui/PrefIdentityUi.ui | 2 +- src/frontends/qt4/ui/PrefInputUi.ui | 2 +- src/frontends/qt4/ui/PrefLanguageUi.ui | 2 +- src/frontends/qt4/ui/PrefLatexUi.ui | 2 +- src/frontends/qt4/ui/PrefPathsUi.ui | 2 +- src/frontends/qt4/ui/PrefPlaintextUi.ui | 2 +- src/frontends/qt4/ui/PrefPrinterUi.ui | 2 +- src/frontends/qt4/ui/PrefScreenFontsUi.ui | 2 +- src/frontends/qt4/ui/PrefShortcutsUi.ui | 2 +- src/frontends/qt4/ui/PrefSpellcheckerUi.ui | 2 +- src/frontends/qt4/ui/PrefUi.ui | 2 +- src/frontends/qt4/ui/PrefsUi.ui | 2 +- src/frontends/qt4/ui/PrintUi.ui | 2 +- src/frontends/qt4/ui/RefUi.ui | 2 +- src/frontends/qt4/ui/SearchUi.ui | 2 +- src/frontends/qt4/ui/SendtoUi.ui | 2 +- src/frontends/qt4/ui/ShortcutUi.ui | 2 +- src/frontends/qt4/ui/ShowFileUi.ui | 2 +- src/frontends/qt4/ui/SpellcheckerUi.ui | 2 +- src/frontends/qt4/ui/SymbolsUi.ui | 2 +- src/frontends/qt4/ui/TabularCreateUi.ui | 2 +- src/frontends/qt4/ui/TabularUi.ui | 2 +- src/frontends/qt4/ui/TexinfoUi.ui | 2 +- src/frontends/qt4/ui/TextLayoutUi.ui | 2 +- src/frontends/qt4/ui/ThesaurusUi.ui | 2 +- src/frontends/qt4/ui/TocUi.ui | 2 +- src/frontends/qt4/ui/VSpaceUi.ui | 2 +- src/frontends/qt4/ui/ViewSourceUi.ui | 2 +- src/frontends/qt4/ui/WrapUi.ui | 2 +- 80 files changed, 87 insertions(+), 93 deletions(-) diff --git a/src/frontends/qt4/GuiSendto.cpp b/src/frontends/qt4/GuiSendto.cpp index 1d744fcae0..d0da7f926e 100644 --- a/src/frontends/qt4/GuiSendto.cpp +++ b/src/frontends/qt4/GuiSendto.cpp @@ -18,10 +18,9 @@ #include "Format.h" #include "FuncRequest.h" #include "LyXRC.h" -#include "qt_helpers.h" +#include "support/qstring_helpers.h" #include "support/filetools.h" -#include "support/lstrings.h" #include #include @@ -87,7 +86,7 @@ void GuiSendTo::updateContents() formatLW->addItem(toqstr(*it)); } - commandCO->addItem(toqstr(command_)); + commandCO->addItem(command_); } @@ -95,11 +94,11 @@ void GuiSendTo::applyView() { int const line = formatLW->currentRow(); - if (line < 0 || line > int(formatLW->count())) + if (line < 0 || line > formatLW->count()) return; format_ = all_formats_[line]; - command_ = trim(fromqstr(commandCO->currentText())); + command_ = commandCO->currentText().trimmed(); } @@ -118,17 +117,17 @@ bool GuiSendTo::isValid() bool GuiSendTo::initialiseParams(string const &) { format_ = 0; - command_ = lyxrc.custom_export_command; + command_ = toqstr(lyxrc.custom_export_command); return true; } void GuiSendTo::dispatchParams() { - if (command_.empty() || !format_ || format_->name().empty()) + if (command_.isEmpty() || !format_ || format_->name().empty()) return; - string const data = format_->name() + " " + command_; + string const data = format_->name() + " " + fromqstr(command_); dispatch(FuncRequest(getLfun(), data)); } diff --git a/src/frontends/qt4/GuiSendto.h b/src/frontends/qt4/GuiSendto.h index af13be4627..5e30bb868a 100644 --- a/src/frontends/qt4/GuiSendto.h +++ b/src/frontends/qt4/GuiSendto.h @@ -66,7 +66,7 @@ private: /// Format const * format_; /// - std::string command_; + QString command_; }; } // namespace frontend diff --git a/src/frontends/qt4/GuiSymbols.h b/src/frontends/qt4/GuiSymbols.h index 94126f94a2..18d28994a9 100644 --- a/src/frontends/qt4/GuiSymbols.h +++ b/src/frontends/qt4/GuiSymbols.h @@ -16,6 +16,7 @@ #include "ui_SymbolsUi.h" #include +#include #include namespace lyx { @@ -34,7 +35,7 @@ public: void dispatchParams(); void enableView(bool enable); bool isBufferDependent() const { return true; } - virtual FuncCode getLfun() const { return LFUN_SELF_INSERT; } + FuncCode getLfun() const { return LFUN_SELF_INSERT; } //@} public Q_SLOTS: diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am index eba02e902a..6486be4b46 100644 --- a/src/frontends/qt4/Makefile.am +++ b/src/frontends/qt4/Makefile.am @@ -150,6 +150,7 @@ NOMOCHEADER = \ GuiPainter.h \ GuiToolbars.h \ LaTeXHighlighter.h \ + qt_i18n.h \ qt_helpers.h MOCHEADER = \ diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h index f42c993361..a088c00efe 100644 --- a/src/frontends/qt4/qt_helpers.h +++ b/src/frontends/qt4/qt_helpers.h @@ -16,6 +16,7 @@ #include "Length.h" #include "support/qstring_helpers.h" #include "support/strfwd.h" +#include "qt_i18n.h" class QComboBox; class QLineEdit; @@ -55,14 +56,6 @@ void setValid(QWidget * widget, bool valid); } // namespace frontend -/** -* qt_ - i18nize string and convert to QString - * - * Use this in qt4/ instead of _() - */ -QString const qt_(char const * str, const char * comment = 0); - - /** * qt_ - i18nize string and convert to QString * diff --git a/src/frontends/qt4/ui/AboutUi.ui b/src/frontends/qt4/ui/AboutUi.ui index af52b3313b..774ca6318d 100644 --- a/src/frontends/qt4/ui/AboutUi.ui +++ b/src/frontends/qt4/ui/AboutUi.ui @@ -141,7 +141,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/AskForTextUi.ui b/src/frontends/qt4/ui/AskForTextUi.ui index 2a5520adaa..b4e9d82fb6 100644 --- a/src/frontends/qt4/ui/AskForTextUi.ui +++ b/src/frontends/qt4/ui/AskForTextUi.ui @@ -104,7 +104,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/BibitemUi.ui b/src/frontends/qt4/ui/BibitemUi.ui index ee7cb1c364..a03c38298e 100644 --- a/src/frontends/qt4/ui/BibitemUi.ui +++ b/src/frontends/qt4/ui/BibitemUi.ui @@ -128,7 +128,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/BiblioUi.ui b/src/frontends/qt4/ui/BiblioUi.ui index 477a3d5148..8435e1286a 100644 --- a/src/frontends/qt4/ui/BiblioUi.ui +++ b/src/frontends/qt4/ui/BiblioUi.ui @@ -144,7 +144,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/BibtexAddUi.ui b/src/frontends/qt4/ui/BibtexAddUi.ui index 5ab18e7f28..b9bbaca9ae 100644 --- a/src/frontends/qt4/ui/BibtexAddUi.ui +++ b/src/frontends/qt4/ui/BibtexAddUi.ui @@ -137,7 +137,7 @@ - qt_helpers.h + qt_i18n.h bibLW diff --git a/src/frontends/qt4/ui/BibtexUi.ui b/src/frontends/qt4/ui/BibtexUi.ui index a32eefcc91..21f72c4733 100644 --- a/src/frontends/qt4/ui/BibtexUi.ui +++ b/src/frontends/qt4/ui/BibtexUi.ui @@ -280,7 +280,7 @@ - qt_helpers.h + qt_i18n.h addBibPB diff --git a/src/frontends/qt4/ui/BoxUi.ui b/src/frontends/qt4/ui/BoxUi.ui index a309ca4e79..ce6eec4b28 100644 --- a/src/frontends/qt4/ui/BoxUi.ui +++ b/src/frontends/qt4/ui/BoxUi.ui @@ -406,7 +406,7 @@ applyPB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/BranchUi.ui b/src/frontends/qt4/ui/BranchUi.ui index d67333ea73..73f6953787 100644 --- a/src/frontends/qt4/ui/BranchUi.ui +++ b/src/frontends/qt4/ui/BranchUi.ui @@ -76,7 +76,7 @@ - qt_helpers.h + qt_i18n.h branchCO diff --git a/src/frontends/qt4/ui/BranchesUi.ui b/src/frontends/qt4/ui/BranchesUi.ui index 3e742ec5c8..c0579605ad 100644 --- a/src/frontends/qt4/ui/BranchesUi.ui +++ b/src/frontends/qt4/ui/BranchesUi.ui @@ -108,7 +108,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/BulletsUi.ui b/src/frontends/qt4/ui/BulletsUi.ui index 3aec820931..3ecb726b5e 100644 --- a/src/frontends/qt4/ui/BulletsUi.ui +++ b/src/frontends/qt4/ui/BulletsUi.ui @@ -193,7 +193,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/ChangesUi.ui b/src/frontends/qt4/ui/ChangesUi.ui index 1e2a835dbb..e6a979a29b 100644 --- a/src/frontends/qt4/ui/ChangesUi.ui +++ b/src/frontends/qt4/ui/ChangesUi.ui @@ -137,7 +137,7 @@ - qt_helpers.h + qt_i18n.h changeTB diff --git a/src/frontends/qt4/ui/CharacterUi.ui b/src/frontends/qt4/ui/CharacterUi.ui index 1338d79af6..444749b8f8 100644 --- a/src/frontends/qt4/ui/CharacterUi.ui +++ b/src/frontends/qt4/ui/CharacterUi.ui @@ -416,7 +416,7 @@ closePB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/CitationUi.ui b/src/frontends/qt4/ui/CitationUi.ui index 578afce4f6..6e385752d2 100644 --- a/src/frontends/qt4/ui/CitationUi.ui +++ b/src/frontends/qt4/ui/CitationUi.ui @@ -455,7 +455,7 @@ cancelPB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/DelimiterUi.ui b/src/frontends/qt4/ui/DelimiterUi.ui index ef56636ae6..343bc59c8a 100644 --- a/src/frontends/qt4/ui/DelimiterUi.ui +++ b/src/frontends/qt4/ui/DelimiterUi.ui @@ -307,7 +307,7 @@ closePB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/DocumentUi.ui b/src/frontends/qt4/ui/DocumentUi.ui index 2c555b4bab..4858ed4e29 100644 --- a/src/frontends/qt4/ui/DocumentUi.ui +++ b/src/frontends/qt4/ui/DocumentUi.ui @@ -162,7 +162,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/ERTUi.ui b/src/frontends/qt4/ui/ERTUi.ui index 8b73442884..26e9d8d4b7 100644 --- a/src/frontends/qt4/ui/ERTUi.ui +++ b/src/frontends/qt4/ui/ERTUi.ui @@ -110,7 +110,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/ErrorListUi.ui b/src/frontends/qt4/ui/ErrorListUi.ui index 024202482f..a731acdc0d 100644 --- a/src/frontends/qt4/ui/ErrorListUi.ui +++ b/src/frontends/qt4/ui/ErrorListUi.ui @@ -67,7 +67,7 @@ - qt_helpers.h + qt_i18n.h errorsLW diff --git a/src/frontends/qt4/ui/ExternalUi.ui b/src/frontends/qt4/ui/ExternalUi.ui index 278144fa88..664f9d20d3 100644 --- a/src/frontends/qt4/ui/ExternalUi.ui +++ b/src/frontends/qt4/ui/ExternalUi.ui @@ -732,7 +732,7 @@ closePB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/FloatPlacementUi.ui b/src/frontends/qt4/ui/FloatPlacementUi.ui index 3383ae480d..94f7069265 100644 --- a/src/frontends/qt4/ui/FloatPlacementUi.ui +++ b/src/frontends/qt4/ui/FloatPlacementUi.ui @@ -126,7 +126,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/FloatUi.ui b/src/frontends/qt4/ui/FloatUi.ui index 69d415d98a..1178bd3208 100644 --- a/src/frontends/qt4/ui/FloatUi.ui +++ b/src/frontends/qt4/ui/FloatUi.ui @@ -92,7 +92,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/FontUi.ui b/src/frontends/qt4/ui/FontUi.ui index 7f072a195a..64ac16e8bd 100644 --- a/src/frontends/qt4/ui/FontUi.ui +++ b/src/frontends/qt4/ui/FontUi.ui @@ -195,7 +195,7 @@ fontOsfCB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/GraphicsUi.ui b/src/frontends/qt4/ui/GraphicsUi.ui index 99129c2a05..642681fc53 100644 --- a/src/frontends/qt4/ui/GraphicsUi.ui +++ b/src/frontends/qt4/ui/GraphicsUi.ui @@ -765,7 +765,7 @@ displayscale - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/HSpaceUi.ui b/src/frontends/qt4/ui/HSpaceUi.ui index 0c7184c6b6..7b1c84bc7b 100644 --- a/src/frontends/qt4/ui/HSpaceUi.ui +++ b/src/frontends/qt4/ui/HSpaceUi.ui @@ -218,7 +218,7 @@ keepCB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/HyperlinkUi.ui b/src/frontends/qt4/ui/HyperlinkUi.ui index 25111e073d..d189385954 100644 --- a/src/frontends/qt4/ui/HyperlinkUi.ui +++ b/src/frontends/qt4/ui/HyperlinkUi.ui @@ -165,7 +165,7 @@ closePB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/IncludeUi.ui b/src/frontends/qt4/ui/IncludeUi.ui index 161c864920..b78526ea1a 100644 --- a/src/frontends/qt4/ui/IncludeUi.ui +++ b/src/frontends/qt4/ui/IncludeUi.ui @@ -357,7 +357,7 @@ closePB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/LaTeXUi.ui b/src/frontends/qt4/ui/LaTeXUi.ui index 215575e95a..c3b663d559 100644 --- a/src/frontends/qt4/ui/LaTeXUi.ui +++ b/src/frontends/qt4/ui/LaTeXUi.ui @@ -218,7 +218,7 @@ infoML - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/LabelUi.ui b/src/frontends/qt4/ui/LabelUi.ui index 3edf562d9f..a32d96dda4 100644 --- a/src/frontends/qt4/ui/LabelUi.ui +++ b/src/frontends/qt4/ui/LabelUi.ui @@ -104,7 +104,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/LanguageUi.ui b/src/frontends/qt4/ui/LanguageUi.ui index 37c2e812f1..8ed17185f8 100644 --- a/src/frontends/qt4/ui/LanguageUi.ui +++ b/src/frontends/qt4/ui/LanguageUi.ui @@ -149,7 +149,7 @@ encodingCO - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/ListingsUi.ui b/src/frontends/qt4/ui/ListingsUi.ui index 8fb82abd12..5b6726a278 100644 --- a/src/frontends/qt4/ui/ListingsUi.ui +++ b/src/frontends/qt4/ui/ListingsUi.ui @@ -659,7 +659,7 @@ listingsED - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/LogUi.ui b/src/frontends/qt4/ui/LogUi.ui index 5e98af846a..8efe0e834b 100644 --- a/src/frontends/qt4/ui/LogUi.ui +++ b/src/frontends/qt4/ui/LogUi.ui @@ -81,7 +81,7 @@ closePB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/MarginsUi.ui b/src/frontends/qt4/ui/MarginsUi.ui index 081a86c4ed..a5c4acb20a 100644 --- a/src/frontends/qt4/ui/MarginsUi.ui +++ b/src/frontends/qt4/ui/MarginsUi.ui @@ -412,7 +412,7 @@ footskipLE - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/MathMatrixUi.ui b/src/frontends/qt4/ui/MathMatrixUi.ui index 93b470bbf2..0c578a6dea 100644 --- a/src/frontends/qt4/ui/MathMatrixUi.ui +++ b/src/frontends/qt4/ui/MathMatrixUi.ui @@ -272,7 +272,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/MathsUi.ui b/src/frontends/qt4/ui/MathsUi.ui index d1c704d2c8..7aaebd3fa2 100644 --- a/src/frontends/qt4/ui/MathsUi.ui +++ b/src/frontends/qt4/ui/MathsUi.ui @@ -73,7 +73,7 @@ - qt_helpers.h + qt_i18n.h amsautoCB diff --git a/src/frontends/qt4/ui/NomenclUi.ui b/src/frontends/qt4/ui/NomenclUi.ui index 74788d07bb..c011c394b8 100644 --- a/src/frontends/qt4/ui/NomenclUi.ui +++ b/src/frontends/qt4/ui/NomenclUi.ui @@ -122,7 +122,7 @@ closePB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/NoteUi.ui b/src/frontends/qt4/ui/NoteUi.ui index 252595b50d..246a38ae10 100644 --- a/src/frontends/qt4/ui/NoteUi.ui +++ b/src/frontends/qt4/ui/NoteUi.ui @@ -97,7 +97,7 @@ closePB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/NumberingUi.ui b/src/frontends/qt4/ui/NumberingUi.ui index d7c3d4806a..63a7bfa8cb 100644 --- a/src/frontends/qt4/ui/NumberingUi.ui +++ b/src/frontends/qt4/ui/NumberingUi.ui @@ -78,7 +78,7 @@ - qt_helpers.h + qt_i18n.h tocSL diff --git a/src/frontends/qt4/ui/PageLayoutUi.ui b/src/frontends/qt4/ui/PageLayoutUi.ui index e35105b264..10d8619940 100644 --- a/src/frontends/qt4/ui/PageLayoutUi.ui +++ b/src/frontends/qt4/ui/PageLayoutUi.ui @@ -304,7 +304,7 @@ facingPagesCB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/ParagraphUi.ui b/src/frontends/qt4/ui/ParagraphUi.ui index 5916f36aa0..c16fd24d4b 100644 --- a/src/frontends/qt4/ui/ParagraphUi.ui +++ b/src/frontends/qt4/ui/ParagraphUi.ui @@ -271,7 +271,7 @@ applyPB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PreambleUi.ui b/src/frontends/qt4/ui/PreambleUi.ui index effc54441b..8dc8dd74a0 100644 --- a/src/frontends/qt4/ui/PreambleUi.ui +++ b/src/frontends/qt4/ui/PreambleUi.ui @@ -26,7 +26,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefColorsUi.ui b/src/frontends/qt4/ui/PrefColorsUi.ui index f01c3f7235..2f5444564b 100644 --- a/src/frontends/qt4/ui/PrefColorsUi.ui +++ b/src/frontends/qt4/ui/PrefColorsUi.ui @@ -67,7 +67,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefCompletionUi.ui b/src/frontends/qt4/ui/PrefCompletionUi.ui index 131c9042b5..def0a8edda 100644 --- a/src/frontends/qt4/ui/PrefCompletionUi.ui +++ b/src/frontends/qt4/ui/PrefCompletionUi.ui @@ -254,7 +254,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefConvertersUi.ui b/src/frontends/qt4/ui/PrefConvertersUi.ui index 771e05e17c..aa6708e559 100644 --- a/src/frontends/qt4/ui/PrefConvertersUi.ui +++ b/src/frontends/qt4/ui/PrefConvertersUi.ui @@ -317,7 +317,7 @@ converterRemovePB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefDateUi.ui b/src/frontends/qt4/ui/PrefDateUi.ui index 8a97c1c267..0783c33ab0 100644 --- a/src/frontends/qt4/ui/PrefDateUi.ui +++ b/src/frontends/qt4/ui/PrefDateUi.ui @@ -66,7 +66,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefDisplayUi.ui b/src/frontends/qt4/ui/PrefDisplayUi.ui index 9108197b19..49c7b1079a 100644 --- a/src/frontends/qt4/ui/PrefDisplayUi.ui +++ b/src/frontends/qt4/ui/PrefDisplayUi.ui @@ -118,7 +118,7 @@ instantPreviewCO - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefEditUi.ui b/src/frontends/qt4/ui/PrefEditUi.ui index a242940124..072055e782 100644 --- a/src/frontends/qt4/ui/PrefEditUi.ui +++ b/src/frontends/qt4/ui/PrefEditUi.ui @@ -218,7 +218,7 @@ macroEditStyleCO - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefFileformatsUi.ui b/src/frontends/qt4/ui/PrefFileformatsUi.ui index 9b4e305c81..7c17346c73 100644 --- a/src/frontends/qt4/ui/PrefFileformatsUi.ui +++ b/src/frontends/qt4/ui/PrefFileformatsUi.ui @@ -188,7 +188,7 @@ copierED - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefIdentityUi.ui b/src/frontends/qt4/ui/PrefIdentityUi.ui index 186b6aee65..bd146b31d7 100644 --- a/src/frontends/qt4/ui/PrefIdentityUi.ui +++ b/src/frontends/qt4/ui/PrefIdentityUi.ui @@ -83,7 +83,7 @@ - qt_helpers.h + qt_i18n.h nameED diff --git a/src/frontends/qt4/ui/PrefInputUi.ui b/src/frontends/qt4/ui/PrefInputUi.ui index 8c52b35b46..f9eafa5319 100644 --- a/src/frontends/qt4/ui/PrefInputUi.ui +++ b/src/frontends/qt4/ui/PrefInputUi.ui @@ -209,7 +209,7 @@ mouseWheelSpeedSB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefLanguageUi.ui b/src/frontends/qt4/ui/PrefLanguageUi.ui index 5d220ca2c7..813baaa49a 100644 --- a/src/frontends/qt4/ui/PrefLanguageUi.ui +++ b/src/frontends/qt4/ui/PrefLanguageUi.ui @@ -283,7 +283,7 @@ markForeignCB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefLatexUi.ui b/src/frontends/qt4/ui/PrefLatexUi.ui index a70b74e445..5d1220a461 100644 --- a/src/frontends/qt4/ui/PrefLatexUi.ui +++ b/src/frontends/qt4/ui/PrefLatexUi.ui @@ -228,7 +228,7 @@ latexAutoresetCB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefPathsUi.ui b/src/frontends/qt4/ui/PrefPathsUi.ui index 10b91e0645..9cce8fb73b 100644 --- a/src/frontends/qt4/ui/PrefPathsUi.ui +++ b/src/frontends/qt4/ui/PrefPathsUi.ui @@ -195,7 +195,7 @@ tempDirPB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefPlaintextUi.ui b/src/frontends/qt4/ui/PrefPlaintextUi.ui index af89076cd7..e09d71e5b4 100644 --- a/src/frontends/qt4/ui/PrefPlaintextUi.ui +++ b/src/frontends/qt4/ui/PrefPlaintextUi.ui @@ -91,7 +91,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefPrinterUi.ui b/src/frontends/qt4/ui/PrefPrinterUi.ui index 3aa604d9b9..7124e447bc 100644 --- a/src/frontends/qt4/ui/PrefPrinterUi.ui +++ b/src/frontends/qt4/ui/PrefPrinterUi.ui @@ -358,7 +358,7 @@ printerSpoolPrefixED - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefScreenFontsUi.ui b/src/frontends/qt4/ui/PrefScreenFontsUi.ui index bec84f6611..443d0f2a58 100644 --- a/src/frontends/qt4/ui/PrefScreenFontsUi.ui +++ b/src/frontends/qt4/ui/PrefScreenFontsUi.ui @@ -415,7 +415,7 @@ screenHugerED - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefShortcutsUi.ui b/src/frontends/qt4/ui/PrefShortcutsUi.ui index 96860da3af..4c28135300 100644 --- a/src/frontends/qt4/ui/PrefShortcutsUi.ui +++ b/src/frontends/qt4/ui/PrefShortcutsUi.ui @@ -121,7 +121,7 @@ newPB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefSpellcheckerUi.ui b/src/frontends/qt4/ui/PrefSpellcheckerUi.ui index d75b646fc9..c56603c2c1 100644 --- a/src/frontends/qt4/ui/PrefSpellcheckerUi.ui +++ b/src/frontends/qt4/ui/PrefSpellcheckerUi.ui @@ -147,7 +147,7 @@ inputEncodingCB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui index a9d1beab0c..6bfb6a2dd9 100644 --- a/src/frontends/qt4/ui/PrefUi.ui +++ b/src/frontends/qt4/ui/PrefUi.ui @@ -255,7 +255,7 @@ useBundledCB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrefsUi.ui b/src/frontends/qt4/ui/PrefsUi.ui index 3827e1acc0..fc990471ee 100644 --- a/src/frontends/qt4/ui/PrefsUi.ui +++ b/src/frontends/qt4/ui/PrefsUi.ui @@ -103,7 +103,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/PrintUi.ui b/src/frontends/qt4/ui/PrintUi.ui index 7482b86d98..0462e5c3f6 100644 --- a/src/frontends/qt4/ui/PrintUi.ui +++ b/src/frontends/qt4/ui/PrintUi.ui @@ -321,7 +321,7 @@ - qt_helpers.h + qt_i18n.h printerRB diff --git a/src/frontends/qt4/ui/RefUi.ui b/src/frontends/qt4/ui/RefUi.ui index d50f52266b..ca8c474f27 100644 --- a/src/frontends/qt4/ui/RefUi.ui +++ b/src/frontends/qt4/ui/RefUi.ui @@ -257,7 +257,7 @@ - qt_helpers.h + qt_i18n.h bufferCO diff --git a/src/frontends/qt4/ui/SearchUi.ui b/src/frontends/qt4/ui/SearchUi.ui index 5fc233e223..d7019cf70f 100644 --- a/src/frontends/qt4/ui/SearchUi.ui +++ b/src/frontends/qt4/ui/SearchUi.ui @@ -212,7 +212,7 @@ - qt_helpers.h + qt_i18n.h findCO diff --git a/src/frontends/qt4/ui/SendtoUi.ui b/src/frontends/qt4/ui/SendtoUi.ui index 5c56dc3a72..430fb8b48b 100644 --- a/src/frontends/qt4/ui/SendtoUi.ui +++ b/src/frontends/qt4/ui/SendtoUi.ui @@ -119,7 +119,7 @@ - qt_helpers.h + qt_i18n.h formatLW diff --git a/src/frontends/qt4/ui/ShortcutUi.ui b/src/frontends/qt4/ui/ShortcutUi.ui index 9b9eb9d59e..1315b67fb2 100644 --- a/src/frontends/qt4/ui/ShortcutUi.ui +++ b/src/frontends/qt4/ui/ShortcutUi.ui @@ -136,7 +136,7 @@ cancelPB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/ShowFileUi.ui b/src/frontends/qt4/ui/ShowFileUi.ui index 77c7cae916..9aaaaf2b27 100644 --- a/src/frontends/qt4/ui/ShowFileUi.ui +++ b/src/frontends/qt4/ui/ShowFileUi.ui @@ -65,7 +65,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/SpellcheckerUi.ui b/src/frontends/qt4/ui/SpellcheckerUi.ui index dd9c153a9e..5411c88cc3 100644 --- a/src/frontends/qt4/ui/SpellcheckerUi.ui +++ b/src/frontends/qt4/ui/SpellcheckerUi.ui @@ -169,7 +169,7 @@ - qt_helpers.h + qt_i18n.h wordED diff --git a/src/frontends/qt4/ui/SymbolsUi.ui b/src/frontends/qt4/ui/SymbolsUi.ui index f50c788940..fa3df70595 100644 --- a/src/frontends/qt4/ui/SymbolsUi.ui +++ b/src/frontends/qt4/ui/SymbolsUi.ui @@ -156,7 +156,7 @@ closePB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/TabularCreateUi.ui b/src/frontends/qt4/ui/TabularCreateUi.ui index 2a1d662811..49613d26dd 100644 --- a/src/frontends/qt4/ui/TabularCreateUi.ui +++ b/src/frontends/qt4/ui/TabularCreateUi.ui @@ -153,7 +153,7 @@ - qt_helpers.h + qt_i18n.h rowsSB diff --git a/src/frontends/qt4/ui/TabularUi.ui b/src/frontends/qt4/ui/TabularUi.ui index 1173175986..64b976abb2 100644 --- a/src/frontends/qt4/ui/TabularUi.ui +++ b/src/frontends/qt4/ui/TabularUi.ui @@ -1138,7 +1138,7 @@ - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/TexinfoUi.ui b/src/frontends/qt4/ui/TexinfoUi.ui index 06a254576f..7d5c91d9cc 100644 --- a/src/frontends/qt4/ui/TexinfoUi.ui +++ b/src/frontends/qt4/ui/TexinfoUi.ui @@ -179,7 +179,7 @@ closePB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/TextLayoutUi.ui b/src/frontends/qt4/ui/TextLayoutUi.ui index 56d2b44359..a34443c39c 100644 --- a/src/frontends/qt4/ui/TextLayoutUi.ui +++ b/src/frontends/qt4/ui/TextLayoutUi.ui @@ -336,7 +336,7 @@ twoColumnCB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/ThesaurusUi.ui b/src/frontends/qt4/ui/ThesaurusUi.ui index 9aaca44fce..09326cb9fa 100644 --- a/src/frontends/qt4/ui/ThesaurusUi.ui +++ b/src/frontends/qt4/ui/ThesaurusUi.ui @@ -148,7 +148,7 @@ - qt_helpers.h + qt_i18n.h entryED diff --git a/src/frontends/qt4/ui/TocUi.ui b/src/frontends/qt4/ui/TocUi.ui index ee354455d1..61c9ea2bfb 100644 --- a/src/frontends/qt4/ui/TocUi.ui +++ b/src/frontends/qt4/ui/TocUi.ui @@ -205,7 +205,7 @@ depthSL - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/VSpaceUi.ui b/src/frontends/qt4/ui/VSpaceUi.ui index 01ea84a1c5..6e4cb43085 100644 --- a/src/frontends/qt4/ui/VSpaceUi.ui +++ b/src/frontends/qt4/ui/VSpaceUi.ui @@ -176,7 +176,7 @@ keepCB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/ViewSourceUi.ui b/src/frontends/qt4/ui/ViewSourceUi.ui index 51486a6591..a43d8528c5 100644 --- a/src/frontends/qt4/ui/ViewSourceUi.ui +++ b/src/frontends/qt4/ui/ViewSourceUi.ui @@ -88,7 +88,7 @@ updatePB - qt_helpers.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/WrapUi.ui b/src/frontends/qt4/ui/WrapUi.ui index 4ac1027fe5..33f7fba20d 100644 --- a/src/frontends/qt4/ui/WrapUi.ui +++ b/src/frontends/qt4/ui/WrapUi.ui @@ -309,7 +309,7 @@ restorePB - qt_helpers.h + qt_i18n.h -- 2.39.2