TabularUi: follow our naming convention

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30483 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index 91b68678a682101c8f44b729b7b4a475b35de334..8a63096d4361a89940edd77fc2fc16e288d3bd0a 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -127,7 +127,7 @@ GuiTabular::GuiTabular(GuiView & lv)
                this, SLOT(specialAlignment_changed()));
        connect(widthED, SIGNAL(editingFinished()),
                this, SLOT(width_changed()));
-       connect(widthUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
+       connect(widthUnitCB, SIGNAL(selectionChanged(lyx::Length::UNIT)),
                this, SLOT(width_changed()));
        connect(closePB, SIGNAL(clicked()),
                this, SLOT(close_clicked()));
@@ -173,7 +173,7 @@ GuiTabular::GuiTabular(GuiView & lv)
        bc().addReadOnly(rotateTabularCB);
        bc().addReadOnly(specialAlignmentED);
        bc().addReadOnly(widthED);
-       bc().addReadOnly(widthUnit);
+       bc().addReadOnly(widthUnitCB);
        bc().addReadOnly(hAlignCB);
        bc().addReadOnly(vAlignCB);
        bc().addReadOnly(TableAlignCB);
@@ -382,7 +382,7 @@ void GuiTabular::specialAlignment_changed()
 void GuiTabular::width_changed()
 {
        changed();
-       string const width = widgetsToLength(widthED, widthUnit);
+       string const width = widgetsToLength(widthED, widthUnitCB);
        setWidth(width);
 }
 
@@ -771,11 +771,11 @@ void GuiTabular::updateContents()
        string colwidth;
        if (!pwidth.zero())
                colwidth = pwidth.asString();
-       lengthToWidgets(widthED, widthUnit,
+       lengthToWidgets(widthED, widthUnitCB,
                colwidth, default_unit);
 
        widthED->setEnabled(!isReadonly);
-       widthUnit->setEnabled(!isReadonly);
+       widthUnitCB->setEnabled(!isReadonly);
 
        hAlignCB->clear();
        hAlignCB->addItem(qt_("Left"));
@@ -1016,7 +1016,7 @@ void GuiTabular::closeGUI()
        // apply the fixed width values
        size_t const cell = getActiveCell();
        bool const multicol = tabular_.isMultiColumn(cell);
-       string width = widgetsToLength(widthED, widthUnit);
+       string width = widgetsToLength(widthED, widthUnitCB);
        string width2;
 
        Length llen = getColumnPWidth(tabular_, cell);

diff --git a/src/frontends/qt4/ui/TabularUi.ui b/src/frontends/qt4/ui/TabularUi.ui
index 1801386cb243810882b56d8f8dd7b225f84fba9b..73be92c504c87740db3f460ca024dfd3be14319a 100644 (file)
--- a/src/frontends/qt4/ui/TabularUi.ui
+++ b/src/frontends/qt4/ui/TabularUi.ui
@@ -214,7 +214,7 @@
            </widget>
           </item>
           <item row="1" column="2">
-           <widget class="LengthCombo" name="widthUnit"/>
+           <widget class="LengthCombo" name="widthUnitCB"/>
           </item>
           <item row="1" column="3">
            <spacer name="spacer_3">
@@ -1490,7 +1490,7 @@
   <tabstop>TabWidget</tabstop>
   <tabstop>hAlignCB</tabstop>
   <tabstop>widthED</tabstop>
-  <tabstop>widthUnit</tabstop>
+  <tabstop>widthUnitCB</tabstop>
   <tabstop>vAlignCB</tabstop>
   <tabstop>multicolumnCB</tabstop>
   <tabstop>rotateTabularCB</tabstop>