namespace lyx {
namespace frontend {
-typedef QController<ControlRef, QView<QRefDialog> > base_class;
+// full qualification because qt4 has also a ControlRef type
+typedef QController<lyx::frontend::ControlRef, QView<QRefDialog> > base_class;
QRef::QRef(Dialog & parent)
- : base_class(parent, _("Cross-reference")),
+ : base_class(parent, lyx::to_utf8(_("Cross-reference"))),
sort_(false), at_ref_(false)
{
}
{
InsetCommandParams const & params = controller().params();
- int orig_type = dialog_->typeCO->currentItem();
+ int orig_type = dialog_->typeCO->currentIndex();
dialog_->referenceED->setText(toqstr(params.getContents()));
// restore type settings for new insets
if (params.getContents().empty())
- dialog_->typeCO->setCurrentItem(orig_type);
+ dialog_->typeCO->setCurrentIndex(orig_type);
else
- dialog_->typeCO->setCurrentItem(InsetRef::getType(params.getCmdName()));
+ dialog_->typeCO->setCurrentIndex(InsetRef::getType(params.getCmdName()));
dialog_->typeCO->setEnabled(typeAllowed() && !readOnly());
if (!typeAllowed())
- dialog_->typeCO->setCurrentItem(0);
+ dialog_->typeCO->setCurrentIndex(0);
dialog_->sortCB->setChecked(sort_);
vector<string> const buffers = controller().getBufferList();
for (vector<string>::const_iterator it = buffers.begin();
it != buffers.end(); ++it) {
- dialog_->bufferCO->insertItem(toqstr(*it));
+ dialog_->bufferCO->addItem(toqstr(*it));
}
// restore the buffer combo setting for new insets
if (params.getContents().empty() && restored_buffer_ != -1
&& restored_buffer_ < dialog_->bufferCO->count())
- dialog_->bufferCO->setCurrentItem(restored_buffer_);
+ dialog_->bufferCO->setCurrentIndex(restored_buffer_);
else
- dialog_->bufferCO->setCurrentItem(controller().getBufferNum());
+ dialog_->bufferCO->setCurrentIndex(controller().getBufferNum());
updateRefs();
bc().valid(false);
{
InsetCommandParams & params = controller().params();
- params.setCmdName(InsetRef::getName(dialog_->typeCO->currentItem()));
+ params.setCmdName(InsetRef::getName(dialog_->typeCO->currentIndex()));
params.setContents(fromqstr(dialog_->referenceED->text()));
params.setOptions(fromqstr(dialog_->nameED->text()));
- restored_buffer_ = dialog_->bufferCO->currentItem();
+ restored_buffer_ = dialog_->bufferCO->currentIndex();
}
bool QRef::typeAllowed()
{
Kernel::DocType const doc_type = kernel().docType();
- return doc_type != Kernel::LINUXDOC &&
- doc_type != Kernel::DOCBOOK;
+ return doc_type != Kernel::DOCBOOK;
}
void QRef::setGoBack()
{
dialog_->gotoPB->setText(qt_("&Go Back"));
- QToolTip::remove(dialog_->gotoPB);
- QToolTip::add(dialog_->gotoPB, qt_("Jump back"));
+ dialog_->gotoPB->setToolTip("");
+ dialog_->gotoPB->setToolTip(qt_("Jump back"));
}
void QRef::setGotoRef()
{
dialog_->gotoPB->setText(qt_("&Go to Label"));
- QToolTip::remove(dialog_->gotoPB);
- QToolTip::add(dialog_->gotoPB, qt_("Jump to label"));
+ dialog_->gotoPB->setToolTip("");
+ dialog_->gotoPB->setToolTip(qt_("Jump to label"));
}
dialog_->refsLW->setCurrentRow(lastref);
dialog_->refsLW->clearSelection();
} else
- for (unsigned int i = 0; i < dialog_->refsLW->count(); ++i) {
- if (tmp == dialog_->refsLW->item(i)->text()) {
- QListWidgetItem * const item = dialog_->refsLW->item(i);
+ for (int i = 0; i < dialog_->refsLW->count(); ++i) {
+ QListWidgetItem * item = dialog_->refsLW->item(i);
+ if (tmp == item->text()) {
dialog_->refsLW->setItemSelected(item, true);
-
}
}
refs_.clear();
if (at_ref_)
gotoRef();
- string const name = controller().getBufferName(dialog_->bufferCO->currentItem());
+ string const name = controller().getBufferName(dialog_->bufferCO->currentIndex());
refs_ = controller().getLabelList(name);
dialog_->sortCB->setEnabled(!refs_.empty());
dialog_->refsLW->setEnabled(!refs_.empty());