The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 8db4faa160d0785e6cecf6df5e450daded2e7733 Author: Vincent van Ravesteijn <[email protected]> Date: Mon Dec 17 21:13:40 2012 +0100 Move LengthCombo into namespace lyx::frontend diff --git a/src/frontends/qt4/LengthCombo.cpp b/src/frontends/qt4/LengthCombo.cpp index 727eebf..f028684 100644 --- a/src/frontends/qt4/LengthCombo.cpp +++ b/src/frontends/qt4/LengthCombo.cpp @@ -21,6 +21,9 @@ #include <string> +namespace lyx { +namespace frontend { + LengthCombo::LengthCombo(QWidget * parent) : QComboBox(parent) { @@ -122,5 +125,7 @@ void LengthCombo::addUnit(lyx::Length::UNIT unit) lyx::toqstr(lyx::unit_name[int(unit)])); } +} // namespace frontend +} // namespace lyx #include "moc_LengthCombo.cpp" diff --git a/src/frontends/qt4/LengthCombo.h b/src/frontends/qt4/LengthCombo.h index 7c7557f..1701dcf 100644 --- a/src/frontends/qt4/LengthCombo.h +++ b/src/frontends/qt4/LengthCombo.h @@ -17,7 +17,8 @@ #include "VSpace.h" -//namespace lyx { +namespace lyx { +namespace frontend { /** * A combo box for selecting Length::UNIT types. @@ -53,6 +54,7 @@ Q_SIGNALS: }; -//} // namespace lyx +} // namesapce frontend +} // namespace lyx #endif // LENGTHCOMBO_H diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h index 4a3855d..44e6b0e 100644 --- a/src/frontends/qt4/qt_helpers.h +++ b/src/frontends/qt4/qt_helpers.h @@ -26,8 +26,6 @@ class QString; class QWidget; template <class T> class QList; -class LengthCombo; - namespace lyx { namespace support { class FileName; } @@ -36,6 +34,8 @@ class BufferParams; namespace frontend { +class LengthCombo; + /// method to get a Length from widgets (LengthCombo) std::string widgetsToLength(QLineEdit const * input, LengthCombo const * combo); /// method to get a Length from widgets (QComboBox) diff --git a/src/frontends/qt4/ui/BoxUi.ui b/src/frontends/qt4/ui/BoxUi.ui index 9a6fd9a..6f37853 100644 --- a/src/frontends/qt4/ui/BoxUi.ui +++ b/src/frontends/qt4/ui/BoxUi.ui @@ -182,7 +182,7 @@ </widget> </item> <item row="3" column="2"> - <widget class="LengthCombo" name="heightUnitsLC"> + <widget class="lyx::frontend::LengthCombo" name="heightUnitsLC"> <property name="enabled"> <bool>false</bool> </property> @@ -218,7 +218,7 @@ </widget> </item> <item row="2" column="2"> - <widget class="LengthCombo" name="widthUnitsLC"/> + <widget class="lyx::frontend::LengthCombo" name="widthUnitsLC"/> </item> <item row="0" column="0"> <widget class="QLabel" name="typeLA"> @@ -296,7 +296,7 @@ </widget> <customwidgets> <customwidget> - <class>LengthCombo</class> + <class>lyx::frontend::LengthCombo</class> <extends>QComboBox</extends> <header>LengthCombo.h</header> </customwidget> diff --git a/src/frontends/qt4/ui/ExternalUi.ui b/src/frontends/qt4/ui/ExternalUi.ui index 810698a..5fc219e 100644 --- a/src/frontends/qt4/ui/ExternalUi.ui +++ b/src/frontends/qt4/ui/ExternalUi.ui @@ -386,10 +386,10 @@ <number>6</number> </property> <item row="1" column="2" > - <widget class="LengthCombo" name="heightUnitCO" /> + <widget class="lyx::frontend::LengthCombo" name="heightUnitCO" /> </item> <item row="0" column="2" > - <widget class="LengthCombo" name="widthUnitCO" /> + <widget class="lyx::frontend::LengthCombo" name="widthUnitCO" /> </item> <item row="1" column="1" > <widget class="QLineEdit" name="heightED" > @@ -621,7 +621,7 @@ </widget> <customwidgets> <customwidget> - <class>LengthCombo</class> + <class>lyx::frontend::LengthCombo</class> <extends>QComboBox</extends> <header>LengthCombo.h</header> </customwidget> diff --git a/src/frontends/qt4/ui/GraphicsUi.ui b/src/frontends/qt4/ui/GraphicsUi.ui index c320f2a..1891ce8 100644 --- a/src/frontends/qt4/ui/GraphicsUi.ui +++ b/src/frontends/qt4/ui/GraphicsUi.ui @@ -75,10 +75,10 @@ <number>6</number> </property> <item row="1" column="2" > - <widget class="LengthCombo" name="widthUnit" /> + <widget class="lyx::frontend::LengthCombo" name="widthUnit" /> </item> <item row="2" column="2" > - <widget class="LengthCombo" name="heightUnit" /> + <widget class="lyx::frontend::LengthCombo" name="heightUnit" /> </item> <item row="1" column="1" > <widget class="QLineEdit" name="Width" > @@ -773,7 +773,7 @@ </widget> <customwidgets> <customwidget> - <class>LengthCombo</class> + <class>lyx::frontend::LengthCombo</class> <extends>QComboBox</extends> <header>LengthCombo.h</header> </customwidget> diff --git a/src/frontends/qt4/ui/HSpaceUi.ui b/src/frontends/qt4/ui/HSpaceUi.ui index fa944be..026b157 100644 --- a/src/frontends/qt4/ui/HSpaceUi.ui +++ b/src/frontends/qt4/ui/HSpaceUi.ui @@ -102,7 +102,7 @@ </widget> </item> <item row="1" column="2" > - <widget class="LengthCombo" name="unitCO" /> + <widget class="lyx::frontend::LengthCombo" name="unitCO" /> </item> <item row="2" column="0" > <widget class="QLabel" name="fillPatternL" > @@ -141,7 +141,7 @@ </widget> <customwidgets> <customwidget> - <class>LengthCombo</class> + <class>lyx::frontend::LengthCombo</class> <extends>QComboBox</extends> <header>LengthCombo.h</header> </customwidget> diff --git a/src/frontends/qt4/ui/LineUi.ui b/src/frontends/qt4/ui/LineUi.ui index 80f0b75..6b2cdbd 100644 --- a/src/frontends/qt4/ui/LineUi.ui +++ b/src/frontends/qt4/ui/LineUi.ui @@ -37,7 +37,7 @@ </widget> </item> <item row="0" column="3" > - <widget class="LengthCombo" name="OffsetUnitCO" > + <widget class="lyx::frontend::LengthCombo" name="OffsetUnitCO" > <property name="sizePolicy" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <horstretch>0</horstretch> @@ -73,7 +73,7 @@ </widget> </item> <item row="1" column="3" > - <widget class="LengthCombo" name="WidthUnitCO" > + <widget class="lyx::frontend::LengthCombo" name="WidthUnitCO" > <property name="sizePolicy" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <horstretch>0</horstretch> @@ -109,7 +109,7 @@ </widget> </item> <item row="2" column="3" > - <widget class="LengthCombo" name="HeightUnitCO" > + <widget class="lyx::frontend::LengthCombo" name="HeightUnitCO" > <property name="sizePolicy" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <horstretch>0</horstretch> @@ -128,7 +128,7 @@ </widget> <customwidgets> <customwidget> - <class>LengthCombo</class> + <class>lyx::frontend::LengthCombo</class> <extends>QComboBox</extends> <header>LengthCombo.h</header> </customwidget> diff --git a/src/frontends/qt4/ui/MarginsUi.ui b/src/frontends/qt4/ui/MarginsUi.ui index a5c4acb..62e5233 100644 --- a/src/frontends/qt4/ui/MarginsUi.ui +++ b/src/frontends/qt4/ui/MarginsUi.ui @@ -210,7 +210,7 @@ </widget> </item> <item> - <widget class="LengthCombo" native="1" name="topUnit" > + <widget class="lyx::frontend::LengthCombo" native="1" name="topUnit" > <property name="enabled" > <bool>false</bool> </property> @@ -237,7 +237,7 @@ </widget> </item> <item> - <widget class="LengthCombo" native="1" name="bottomUnit" > + <widget class="lyx::frontend::LengthCombo" native="1" name="bottomUnit" > <property name="enabled" > <bool>false</bool> </property> @@ -261,7 +261,7 @@ </widget> </item> <item> - <widget class="LengthCombo" native="1" name="innerUnit" > + <widget class="lyx::frontend::LengthCombo" native="1" name="innerUnit" > <property name="enabled" > <bool>false</bool> </property> @@ -285,7 +285,7 @@ </widget> </item> <item> - <widget class="LengthCombo" native="1" name="outerUnit" > + <widget class="lyx::frontend::LengthCombo" native="1" name="outerUnit" > <property name="enabled" > <bool>false</bool> </property> @@ -309,7 +309,7 @@ </widget> </item> <item> - <widget class="LengthCombo" native="1" name="headsepUnit" > + <widget class="lyx::frontend::LengthCombo" native="1" name="headsepUnit" > <property name="enabled" > <bool>false</bool> </property> @@ -333,7 +333,7 @@ </widget> </item> <item> - <widget class="LengthCombo" native="1" name="headheightUnit" > + <widget class="lyx::frontend::LengthCombo" native="1" name="headheightUnit" > <property name="enabled" > <bool>false</bool> </property> @@ -357,7 +357,7 @@ </widget> </item> <item> - <widget class="LengthCombo" native="1" name="footskipUnit" > + <widget class="lyx::frontend::LengthCombo" native="1" name="footskipUnit" > <property name="enabled" > <bool>false</bool> </property> @@ -381,7 +381,7 @@ </widget> </item> <item> - <widget class="LengthCombo" native="1" name="columnsepUnit" > + <widget class="lyx::frontend::LengthCombo" native="1" name="columnsepUnit" > <property name="enabled" > <bool>false</bool> </property> @@ -397,7 +397,7 @@ </widget> <customwidgets> <customwidget> - <class>LengthCombo</class> + <class>lyx::frontend::LengthCombo</class> <extends>QWidget</extends> <header>LengthCombo.h</header> </customwidget> diff --git a/src/frontends/qt4/ui/PageLayoutUi.ui b/src/frontends/qt4/ui/PageLayoutUi.ui index b5a4952..1e1bdb6 100644 --- a/src/frontends/qt4/ui/PageLayoutUi.ui +++ b/src/frontends/qt4/ui/PageLayoutUi.ui @@ -88,7 +88,7 @@ </widget> </item> <item row="1" column="2"> - <widget class="LengthCombo" name="paperheightUnitCO"/> + <widget class="lyx::frontend::LengthCombo" name="paperheightUnitCO"/> </item> <item row="2" column="0"> <widget class="QLabel" name="paperwidthL"> @@ -117,7 +117,7 @@ </widget> </item> <item row="2" column="2"> - <widget class="LengthCombo" name="paperwidthUnitCO"/> + <widget class="lyx::frontend::LengthCombo" name="paperwidthUnitCO"/> </item> <item row="3" column="0"> <widget class="QLabel" name="label_3"> @@ -233,7 +233,7 @@ </widget> <customwidgets> <customwidget> - <class>LengthCombo</class> + <class>lyx::frontend::LengthCombo</class> <extends>QComboBox</extends> <header>LengthCombo.h</header> </customwidget> diff --git a/src/frontends/qt4/ui/PrintNomenclUi.ui b/src/frontends/qt4/ui/PrintNomenclUi.ui index 160e48b..1378db5 100644 --- a/src/frontends/qt4/ui/PrintNomenclUi.ui +++ b/src/frontends/qt4/ui/PrintNomenclUi.ui @@ -54,13 +54,13 @@ </widget> </item> <item row="1" column="3" > - <widget class="LengthCombo" name="unitLC" /> + <widget class="lyx::frontend::LengthCombo" name="unitLC" /> </item> </layout> </widget> <customwidgets> <customwidget> - <class>LengthCombo</class> + <class>lyx::frontend::LengthCombo</class> <extends>QComboBox</extends> <header>LengthCombo.h</header> </customwidget> diff --git a/src/frontends/qt4/ui/TabularUi.ui b/src/frontends/qt4/ui/TabularUi.ui index ce59ae2..1c66527 100644 --- a/src/frontends/qt4/ui/TabularUi.ui +++ b/src/frontends/qt4/ui/TabularUi.ui @@ -151,7 +151,7 @@ </widget> </item> <item row="0" column="2" > - <widget class="LengthCombo" name="multirowOffsetUnitLC" /> + <widget class="lyx::frontend::LengthCombo" name="multirowOffsetUnitLC" /> </item> </layout> </item> @@ -252,7 +252,7 @@ <widget class="QLineEdit" name="tabularWidthED" /> </item> <item row="0" column="2" > - <widget class="LengthCombo" name="tabularWidthUnitLC" /> + <widget class="lyx::frontend::LengthCombo" name="tabularWidthUnitLC" /> </item> <item row="1" column="0" > <widget class="QLabel" name="TableAlignLA" > @@ -498,7 +498,7 @@ </widget> </item> <item> - <widget class="LengthCombo" name="columnWidthUnitLC" /> + <widget class="lyx::frontend::LengthCombo" name="columnWidthUnitLC" /> </item> </layout> </item> @@ -1193,7 +1193,7 @@ <widget class="QLineEdit" name="topspaceED" /> </item> <item row="0" column="3" > - <widget class="LengthCombo" name="topspaceUnitLC" /> + <widget class="lyx::frontend::LengthCombo" name="topspaceUnitLC" /> </item> <item row="0" column="1" > <widget class="QComboBox" name="topspaceCO" > @@ -1234,7 +1234,7 @@ </widget> </item> <item row="1" column="3" > - <widget class="LengthCombo" name="bottomspaceUnitLC" /> + <widget class="lyx::frontend::LengthCombo" name="bottomspaceUnitLC" /> </item> <item row="1" column="2" > <widget class="QLineEdit" name="bottomspaceED" /> @@ -1282,7 +1282,7 @@ </widget> </item> <item row="2" column="3" > - <widget class="LengthCombo" name="interlinespaceUnitLC" /> + <widget class="lyx::frontend::LengthCombo" name="interlinespaceUnitLC" /> </item> </layout> </widget> @@ -1594,7 +1594,7 @@ </widget> <customwidgets> <customwidget> - <class>LengthCombo</class> + <class>lyx::frontend::LengthCombo</class> <extends>QComboBox</extends> <header>LengthCombo.h</header> </customwidget> diff --git a/src/frontends/qt4/ui/TextLayoutUi.ui b/src/frontends/qt4/ui/TextLayoutUi.ui index 116cd59..bdc12d0 100644 --- a/src/frontends/qt4/ui/TextLayoutUi.ui +++ b/src/frontends/qt4/ui/TextLayoutUi.ui @@ -79,7 +79,7 @@ </widget> </item> <item row="1" column="2"> - <widget class="LengthCombo" name="indentLengthCO"> + <widget class="lyx::frontend::LengthCombo" name="indentLengthCO"> <property name="enabled"> <bool>false</bool> </property> @@ -154,7 +154,7 @@ </widget> </item> <item row="3" column="2"> - <widget class="LengthCombo" name="skipLengthCO"> + <widget class="lyx::frontend::LengthCombo" name="skipLengthCO"> <property name="enabled"> <bool>false</bool> </property> @@ -289,7 +289,7 @@ </widget> <customwidgets> <customwidget> - <class>LengthCombo</class> + <class>lyx::frontend::LengthCombo</class> <extends>QComboBox</extends> <header>LengthCombo.h</header> </customwidget> diff --git a/src/frontends/qt4/ui/VSpaceUi.ui b/src/frontends/qt4/ui/VSpaceUi.ui index cfaa237..0e4a83d 100644 --- a/src/frontends/qt4/ui/VSpaceUi.ui +++ b/src/frontends/qt4/ui/VSpaceUi.ui @@ -50,7 +50,7 @@ </widget> </item> <item row="1" column="2"> - <widget class="LengthCombo" name="unitCO"/> + <widget class="lyx::frontend::LengthCombo" name="unitCO"/> </item> <item row="1" column="1"> <widget class="QLineEdit" name="valueLE"> @@ -113,7 +113,7 @@ </widget> <customwidgets> <customwidget> - <class>LengthCombo</class> + <class>lyx::frontend::LengthCombo</class> <extends>QComboBox</extends> <header>LengthCombo.h</header> </customwidget> diff --git a/src/frontends/qt4/ui/WrapUi.ui b/src/frontends/qt4/ui/WrapUi.ui index 33f7fba..b9cff42 100644 --- a/src/frontends/qt4/ui/WrapUi.ui +++ b/src/frontends/qt4/ui/WrapUi.ui @@ -23,7 +23,7 @@ <number>6</number> </property> <item row="1" column="3" > - <widget class="LengthCombo" name="widthUnitLC" > + <widget class="lyx::frontend::LengthCombo" name="widthUnitLC" > <property name="sizePolicy" > <sizepolicy> <hsizetype>0</hsizetype> @@ -248,7 +248,7 @@ </widget> </item> <item row="2" column="3" > - <widget class="LengthCombo" name="overhangUnitLC" > + <widget class="lyx::frontend::LengthCombo" name="overhangUnitLC" > <property name="enabled" > <bool>false</bool> </property> @@ -288,7 +288,7 @@ </widget> <customwidgets> <customwidget> - <class>LengthCombo</class> + <class>lyx::frontend::LengthCombo</class> <extends>QComboBox</extends> <header>LengthCombo.h</header> </customwidget> ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/LengthCombo.cpp | 5 +++++ src/frontends/qt4/LengthCombo.h | 6 ++++-- src/frontends/qt4/qt_helpers.h | 4 ++-- src/frontends/qt4/ui/BoxUi.ui | 6 +++--- src/frontends/qt4/ui/ExternalUi.ui | 6 +++--- src/frontends/qt4/ui/GraphicsUi.ui | 6 +++--- src/frontends/qt4/ui/HSpaceUi.ui | 4 ++-- src/frontends/qt4/ui/LineUi.ui | 8 ++++---- src/frontends/qt4/ui/MarginsUi.ui | 18 +++++++++--------- src/frontends/qt4/ui/PageLayoutUi.ui | 6 +++--- src/frontends/qt4/ui/PrintNomenclUi.ui | 4 ++-- src/frontends/qt4/ui/TabularUi.ui | 14 +++++++------- src/frontends/qt4/ui/TextLayoutUi.ui | 6 +++--- src/frontends/qt4/ui/VSpaceUi.ui | 4 ++-- src/frontends/qt4/ui/WrapUi.ui | 6 +++--- 15 files changed, 55 insertions(+), 48 deletions(-) hooks/post-receive -- The LyX Source Repository
