anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

get rid of QT3_SUPPORT and some cleanup

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14732 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2006-08-17 08:49:57 +00:00
parent 8eb5da91da
commit 43a8d1529b
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/frontends/qt4/lengthcombo.C
View File

@ -16,21 +16,11 @@
#include "lengthcommon.h"
LengthCombo::LengthCombo(QWidget * parent, char * name)
: QComboBox(parent, name)
{
for (int i = 0; i < num_units; i++)
insertItem(unit_name_gui[i]);
connect(this, SIGNAL(activated(int)),
this, SLOT(has_activated(int)));
}
LengthCombo::LengthCombo(QWidget * parent)
: QComboBox(parent)
{
for (int i = 0; i < num_units; i++)
insertItem(unit_name_gui[i]);
addItem(unit_name_gui[i]);
connect(this, SIGNAL(activated(int)),
this, SLOT(has_activated(int)));
@ -38,7 +28,7 @@ LengthCombo::LengthCombo(QWidget * parent)
LyXLength::UNIT LengthCombo::currentLengthItem() const
{
return static_cast<LyXLength::UNIT>(currentItem());
return static_cast<LyXLength::UNIT>(currentIndex());
}
@ -51,13 +41,13 @@ void LengthCombo::has_activated(int)
void LengthCombo::setCurrentItem(LyXLength::UNIT unit)
{
QComboBox::setCurrentItem(int(unit));
QComboBox::setCurrentIndex(int(unit));
}
void LengthCombo::setCurrentItem(int item)
{
QComboBox::setCurrentItem(item);
QComboBox::setCurrentIndex(item);
}
@ -71,7 +61,7 @@ void LengthCombo::noPercents()
{
int num = QComboBox::count();
for (int i = 0; i < num; i++) {
if (QComboBox::text(i).contains('%') > 0) {
if (QComboBox::itemText(i).contains('%') > 0) {
QComboBox::removeItem(i);
i -= 1;
num -= 1;

2
src/frontends/qt4/lengthcombo.h
View File

@ -23,8 +23,6 @@
class LengthCombo : public QComboBox {
Q_OBJECT
public:
LengthCombo(QWidget * parent, char * name);
LengthCombo(QWidget * parent);
/// set the current item from unit