mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Do not use the qt "keyword" emit. Make qt not emit it at all. (pun intended)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14269 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
ad3a07c4f2
commit
96a7b5d0af
@ -244,7 +244,7 @@ AC_DEFUN([QT_DO_IT_ALL],
|
||||
AC_SUBST(QT_LDFLAGS)
|
||||
|
||||
dnl Preprocessor flags
|
||||
QT_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL"
|
||||
QT_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_EMIT"
|
||||
case ${host} in
|
||||
*mingw*) QT_CPPFLAGS="-DQT_DLL $QT_CPPFLAGS";;
|
||||
esac
|
||||
@ -472,7 +472,7 @@ AC_DEFUN([QT4_DO_IT_ALL],
|
||||
AC_SUBST(QT4_LDFLAGS)
|
||||
|
||||
dnl Preprocessor flags
|
||||
QT4_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT3_SUPPORT"
|
||||
QT4_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT3_SUPPORT -DQT_NO_EMIT"
|
||||
case ${host} in
|
||||
*mingw*) QT4_CPPFLAGS="-DQT_DLL $QT4_CPPFLAGS";;
|
||||
esac
|
||||
|
@ -142,7 +142,7 @@ BulletsModule::~BulletsModule()
|
||||
|
||||
void BulletsModule::updateSizes()
|
||||
{
|
||||
emit changed();
|
||||
changed();
|
||||
|
||||
// -1 apparently means default...
|
||||
bullets_[0].setSize(bulletsize1CO->currentItem() - 1);
|
||||
@ -185,7 +185,7 @@ void BulletsModule::selected1()
|
||||
tmpbulletset = false;
|
||||
bullets_[0] = tmpbullet;
|
||||
setBullet(bullet1PB, bulletsize1CO, bullets_[0]);
|
||||
emit changed();
|
||||
changed();
|
||||
}
|
||||
|
||||
|
||||
@ -196,7 +196,7 @@ void BulletsModule::selected2()
|
||||
tmpbulletset = false;
|
||||
bullets_[1] = tmpbullet;
|
||||
setBullet(bullet2PB, bulletsize2CO, bullets_[1]);
|
||||
emit changed();
|
||||
changed();
|
||||
}
|
||||
|
||||
|
||||
@ -207,7 +207,7 @@ void BulletsModule::selected3()
|
||||
tmpbulletset = false;
|
||||
bullets_[2] = tmpbullet;
|
||||
setBullet(bullet3PB, bulletsize3CO, bullets_[2]);
|
||||
emit changed();
|
||||
changed();
|
||||
}
|
||||
|
||||
|
||||
@ -218,7 +218,7 @@ void BulletsModule::selected4()
|
||||
tmpbulletset = false;
|
||||
bullets_[3] = tmpbullet;
|
||||
setBullet(bullet4PB, bulletsize4CO, bullets_[3]);
|
||||
emit changed();
|
||||
changed();
|
||||
}
|
||||
|
||||
|
||||
|
@ -161,7 +161,7 @@ void QBrowseBox::keyPressEvent(QKeyEvent * e)
|
||||
moveRight();
|
||||
break;
|
||||
case Key_Return:
|
||||
emit selected(activecell_.x(), activecell_.y());
|
||||
selected(activecell_.x(), activecell_.y());
|
||||
if ( isVisible() && parentWidget() &&
|
||||
parentWidget()->inherits("QPopupMenu") )
|
||||
parentWidget()->close();
|
||||
@ -186,7 +186,7 @@ void QBrowseBox::contentsMouseReleaseEvent(QMouseEvent *)
|
||||
if (firstrelease_)
|
||||
firstrelease_ = false;
|
||||
else {
|
||||
emit selected( activecell_.x(), activecell_.y());
|
||||
selected( activecell_.x(), activecell_.y());
|
||||
if ( isVisible() && parentWidget() &&
|
||||
parentWidget()->inherits("QPopupMenu") )
|
||||
parentWidget()->close();
|
||||
|
@ -50,7 +50,7 @@ protected:
|
||||
|| e->x() > width() || e->y() > height()) {
|
||||
hide();
|
||||
} else {
|
||||
emit selected(currentText());
|
||||
selected(currentText());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -26,15 +26,15 @@ void QCommandEdit::keyPressEvent(QKeyEvent * e)
|
||||
{
|
||||
switch (e->key()) {
|
||||
case Key_Escape:
|
||||
emit escapePressed();
|
||||
escapePressed();
|
||||
break;
|
||||
|
||||
case Key_Up:
|
||||
emit upPressed();
|
||||
upPressed();
|
||||
break;
|
||||
|
||||
case Key_Down:
|
||||
emit downPressed();
|
||||
downPressed();
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -54,7 +54,7 @@ bool QCommandEdit::event(QEvent * e)
|
||||
if (ev->key() != Key_Tab)
|
||||
return QLineEdit::event(e);
|
||||
|
||||
emit tabPressed();
|
||||
tabPressed();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -75,7 +75,7 @@ void EmptyTable::setNumberColumns(int nr_cols)
|
||||
updateGeometry();
|
||||
setAutoUpdate(true);
|
||||
update();
|
||||
emit colsChanged(nr_cols);
|
||||
colsChanged(nr_cols);
|
||||
}
|
||||
|
||||
|
||||
@ -90,7 +90,7 @@ void EmptyTable::setNumberRows(int nr_rows)
|
||||
updateGeometry();
|
||||
setAutoUpdate(true);
|
||||
update();
|
||||
emit rowsChanged(nr_rows);
|
||||
rowsChanged(nr_rows);
|
||||
}
|
||||
|
||||
|
||||
|
@ -101,7 +101,7 @@ void FloatPlacement::useSideways()
|
||||
|
||||
void FloatPlacement::changedSlot()
|
||||
{
|
||||
emit changed();
|
||||
changed();
|
||||
}
|
||||
|
||||
|
||||
|
@ -57,7 +57,7 @@ void IconPalette::clicked()
|
||||
vector<Button>::const_iterator const end(buttons_.end());
|
||||
for (; it != end; ++it) {
|
||||
if (sender() == it->first) {
|
||||
emit button_clicked(it->second);
|
||||
button_clicked(it->second);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -35,7 +35,7 @@ LyXLength::UNIT LengthCombo::currentLengthItem() const
|
||||
|
||||
void LengthCombo::has_activated(int)
|
||||
{
|
||||
emit selectionChanged(currentLengthItem());
|
||||
selectionChanged(currentLengthItem());
|
||||
}
|
||||
|
||||
|
||||
|
@ -71,29 +71,29 @@ void QSetBorder::mousePressEvent(QMouseEvent * e)
|
||||
if (e->y() < height() - e->x()) {
|
||||
if (left_.enabled) {
|
||||
setLeft(!left_.set);
|
||||
emit leftSet(left_.set);
|
||||
leftSet(left_.set);
|
||||
}
|
||||
} else {
|
||||
if (bottom_.enabled) {
|
||||
setBottom(!bottom_.set);
|
||||
emit bottomSet(bottom_.set);
|
||||
bottomSet(bottom_.set);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (e->y() < height() - e->x()) {
|
||||
if (top_.enabled) {
|
||||
setTop(!top_.set);
|
||||
emit topSet(top_.set);
|
||||
topSet(top_.set);
|
||||
}
|
||||
} else {
|
||||
if (right_.enabled) {
|
||||
setRight(!right_.set);
|
||||
emit rightSet(right_.set);
|
||||
rightSet(right_.set);
|
||||
}
|
||||
}
|
||||
}
|
||||
update();
|
||||
emit clicked();
|
||||
clicked();
|
||||
}
|
||||
|
||||
|
||||
|
@ -560,7 +560,7 @@ void PrefColors::change_color()
|
||||
QPixmap coloritem(32, 32);
|
||||
coloritem.fill(c);
|
||||
lyxObjectsLW->currentItem()->setIcon(QIcon(coloritem));
|
||||
emit changed();
|
||||
changed();
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user