anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 12:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code simplification.

Browse Source 
TocTypeModel is not needed outside TocModel.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33707 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2010-03-10 21:00:34 +00:00
parent e50264577c
commit 2a3f27a80c
2 changed files with 30 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/frontends/qt4/TocModel.cpp
View File

@ -33,34 +33,37 @@ using namespace std;
namespace lyx { namespace lyx {
namespace frontend { namespace frontend {
/////////////////////////////////////////////////////////////////////////////// /// A QStandardItemModel that gives access to the reset method.
// /// This is needed in order to fix http://www.lyx.org/trac/ticket/3740
// TocTypeModel class TocTypeModel : public QStandardItemModel
//
///////////////////////////////////////////////////////////////////////////////
TocTypeModel::TocTypeModel(QObject * parent)
: QStandardItemModel(parent)
{}
void TocTypeModel::reset()
{ {
QStandardItemModel::reset(); public:
} ///
TocTypeModel(QObject * parent) : QStandardItemModel(parent)
#if QT_VERSION >= 0x040600 {}
void TocTypeModel::beginResetModel() {
QStandardItemModel::beginResetModel();
}
void TocTypeModel::endResetModel()
{
QStandardItemModel::endResetModel();
}
#endif
///
void reset()
{
QStandardItemModel::reset();
}
///
void beginResetModel()
{
#if QT_VERSION >= 0x040600
QStandardItemModel::beginResetModel();
#endif
}
///
void endResetModel()
{
#if QT_VERSION >= 0x040600
QStandardItemModel::endResetModel();
#else
reset();
#endif
}
};
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -350,9 +353,7 @@ void TocModels::reset(BufferView const * bv)
} }
names_->blockSignals(true); names_->blockSignals(true);
#if QT_VERSION >= 0x040600
names_->beginResetModel(); names_->beginResetModel();
#endif
names_->insertColumns(0, 1); names_->insertColumns(0, 1);
TocList const & tocs = bv_->buffer().masterBuffer()->tocBackend().tocs(); TocList const & tocs = bv_->buffer().masterBuffer()->tocBackend().tocs();
TocList::const_iterator it = tocs.begin(); TocList::const_iterator it = tocs.begin();
@ -375,11 +376,7 @@ void TocModels::reset(BufferView const * bv)
names_->setData(index, type, Qt::UserRole); names_->setData(index, type, Qt::UserRole);
} }
names_->blockSignals(false); names_->blockSignals(false);
#if QT_VERSION >= 0x040600
names_->endResetModel(); names_->endResetModel();
#else
names_->reset();
#endif
} }

15
src/frontends/qt4/TocModel.h
View File

@ -29,20 +29,7 @@ class TocItem;
namespace frontend { namespace frontend {
/// A QStandardItemModel that gives access to the reset method. class TocTypeModel;
/// This is needed in order to fix http://www.lyx.org/trac/ticket/3740
class TocTypeModel : public QStandardItemModel
{
public:
///
TocTypeModel(QObject * parent);
///
void reset();
#if QT_VERSION >= 0x040600
void beginResetModel();
void endResetModel();
#endif
};
/// A class that adapt the TocBackend of a Buffer into standard Qt models for /// A class that adapt the TocBackend of a Buffer into standard Qt models for
/// GUI visualisation. /// GUI visualisation.