use cheaper includes in ui files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24389 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2008-04-20 16:32:40 +00:00
parent 08c6355a94
commit 2e11d3ca91
80 changed files with 87 additions and 93 deletions

View File

@ -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 <QListWidget>
#include <QPushButton>
@ -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));
}

View File

@ -66,7 +66,7 @@ private:
///
Format const * format_;
///
std::string command_;
QString command_;
};
} // namespace frontend

View File

@ -16,6 +16,7 @@
#include "ui_SymbolsUi.h"
#include <map>
#include <string>
#include <vector>
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:

View File

@ -150,6 +150,7 @@ NOMOCHEADER = \
GuiPainter.h \
GuiToolbars.h \
LaTeXHighlighter.h \
qt_i18n.h \
qt_helpers.h
MOCHEADER = \

View File

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

View File

@ -141,7 +141,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -104,7 +104,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -128,7 +128,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -144,7 +144,7 @@
</layout>
</widget>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -137,7 +137,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>bibLW</tabstop>

View File

@ -280,7 +280,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>addBibPB</tabstop>

View File

@ -406,7 +406,7 @@
<tabstop>applyPB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections>

View File

@ -76,7 +76,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>branchCO</tabstop>

View File

@ -108,7 +108,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -193,7 +193,7 @@
</layout>
</widget>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections>

View File

@ -137,7 +137,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>changeTB</tabstop>

View File

@ -416,7 +416,7 @@
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -455,7 +455,7 @@
<tabstop>cancelPB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -307,7 +307,7 @@
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -162,7 +162,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<customwidgets>
<customwidget>

View File

@ -110,7 +110,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -67,7 +67,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>errorsLW</tabstop>

View File

@ -732,7 +732,7 @@
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -126,7 +126,7 @@
</layout>
</widget>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections>

View File

@ -92,7 +92,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<customwidgets>
<customwidget>

View File

@ -195,7 +195,7 @@
<tabstop>fontOsfCB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -765,7 +765,7 @@
<tabstop>displayscale</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -218,7 +218,7 @@
<tabstop>keepCB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -165,7 +165,7 @@
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -357,7 +357,7 @@
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -218,7 +218,7 @@
<tabstop>infoML</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -104,7 +104,7 @@
</layout>
</widget>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -149,7 +149,7 @@
<tabstop>encodingCO</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections>

View File

@ -659,7 +659,7 @@
<tabstop>listingsED</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -81,7 +81,7 @@
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -412,7 +412,7 @@
<tabstop>footskipLE</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -272,7 +272,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<customwidgets>
<customwidget>

View File

@ -73,7 +73,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>amsautoCB</tabstop>

View File

@ -122,7 +122,7 @@
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -97,7 +97,7 @@
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -78,7 +78,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>tocSL</tabstop>

View File

@ -304,7 +304,7 @@
<tabstop>facingPagesCB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -271,7 +271,7 @@
<tabstop>applyPB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -26,7 +26,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -67,7 +67,7 @@
</layout>
</widget>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -254,7 +254,7 @@
</layout>
</widget>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -317,7 +317,7 @@
<tabstop>converterRemovePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -66,7 +66,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -118,7 +118,7 @@
<tabstop>instantPreviewCO</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -218,7 +218,7 @@
<tabstop>macroEditStyleCO</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -188,7 +188,7 @@
<tabstop>copierED</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -83,7 +83,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>nameED</tabstop>

View File

@ -209,7 +209,7 @@
<tabstop>mouseWheelSpeedSB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -283,7 +283,7 @@
<tabstop>markForeignCB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections>

View File

@ -228,7 +228,7 @@
<tabstop>latexAutoresetCB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -195,7 +195,7 @@
<tabstop>tempDirPB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -91,7 +91,7 @@
</layout>
</widget>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -358,7 +358,7 @@
<tabstop>printerSpoolPrefixED</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -415,7 +415,7 @@
<tabstop>screenHugerED</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -121,7 +121,7 @@
<tabstop>newPB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -147,7 +147,7 @@
<tabstop>inputEncodingCB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -255,7 +255,7 @@
<tabstop>useBundledCB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -103,7 +103,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<customwidgets>
<customwidget>

View File

@ -321,7 +321,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>printerRB</tabstop>

View File

@ -257,7 +257,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>bufferCO</tabstop>

View File

@ -212,7 +212,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>findCO</tabstop>

View File

@ -119,7 +119,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>formatLW</tabstop>

View File

@ -136,7 +136,7 @@
<tabstop>cancelPB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -65,7 +65,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -169,7 +169,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>wordED</tabstop>

View File

@ -156,7 +156,7 @@
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -153,7 +153,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>rowsSB</tabstop>

View File

@ -1138,7 +1138,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<customwidgets>
<customwidget>

View File

@ -179,7 +179,7 @@
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -336,7 +336,7 @@
<tabstop>twoColumnCB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -148,7 +148,7 @@
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>entryED</tabstop>

View File

@ -205,7 +205,7 @@
<tabstop>depthSL</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -176,7 +176,7 @@
<tabstop>keepCB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -88,7 +88,7 @@
<tabstop>updatePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -309,7 +309,7 @@
<tabstop>restorePB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections>