From 96a7b5d0afcd2fc079669847103d33193e929335 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Fri, 30 Jun 2006 11:57:17 +0000 Subject: [PATCH] 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 --- config/qt.m4 | 4 ++-- src/frontends/qt3/BulletsModule.C | 10 +++++----- src/frontends/qt3/QBrowseBox.C | 4 ++-- src/frontends/qt3/QCommandBuffer.C | 2 +- src/frontends/qt3/QCommandEdit.C | 8 ++++---- src/frontends/qt3/emptytable.C | 4 ++-- src/frontends/qt3/floatplacement.C | 2 +- src/frontends/qt3/iconpalette.C | 2 +- src/frontends/qt3/lengthcombo.C | 2 +- src/frontends/qt3/qsetborder.C | 10 +++++----- src/frontends/qt4/QPrefsDialog.C | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/config/qt.m4 b/config/qt.m4 index 96b89d97fb..42ae774326 100644 --- a/config/qt.m4 +++ b/config/qt.m4 @@ -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 diff --git a/src/frontends/qt3/BulletsModule.C b/src/frontends/qt3/BulletsModule.C index 6e9a2b8508..fcc356500e 100644 --- a/src/frontends/qt3/BulletsModule.C +++ b/src/frontends/qt3/BulletsModule.C @@ -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(); } diff --git a/src/frontends/qt3/QBrowseBox.C b/src/frontends/qt3/QBrowseBox.C index c910abad49..4bca767263 100644 --- a/src/frontends/qt3/QBrowseBox.C +++ b/src/frontends/qt3/QBrowseBox.C @@ -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(); diff --git a/src/frontends/qt3/QCommandBuffer.C b/src/frontends/qt3/QCommandBuffer.C index 65d29bf99c..70fb5f4f1a 100644 --- a/src/frontends/qt3/QCommandBuffer.C +++ b/src/frontends/qt3/QCommandBuffer.C @@ -50,7 +50,7 @@ protected: || e->x() > width() || e->y() > height()) { hide(); } else { - emit selected(currentText()); + selected(currentText()); } } diff --git a/src/frontends/qt3/QCommandEdit.C b/src/frontends/qt3/QCommandEdit.C index 13e74b8e56..540d70140f 100644 --- a/src/frontends/qt3/QCommandEdit.C +++ b/src/frontends/qt3/QCommandEdit.C @@ -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; } diff --git a/src/frontends/qt3/emptytable.C b/src/frontends/qt3/emptytable.C index ce64cde1d1..a82235ceba 100644 --- a/src/frontends/qt3/emptytable.C +++ b/src/frontends/qt3/emptytable.C @@ -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); } diff --git a/src/frontends/qt3/floatplacement.C b/src/frontends/qt3/floatplacement.C index 4efb7eff42..37ee9fbe17 100644 --- a/src/frontends/qt3/floatplacement.C +++ b/src/frontends/qt3/floatplacement.C @@ -101,7 +101,7 @@ void FloatPlacement::useSideways() void FloatPlacement::changedSlot() { - emit changed(); + changed(); } diff --git a/src/frontends/qt3/iconpalette.C b/src/frontends/qt3/iconpalette.C index 4ed8a936bd..1a814b067e 100644 --- a/src/frontends/qt3/iconpalette.C +++ b/src/frontends/qt3/iconpalette.C @@ -57,7 +57,7 @@ void IconPalette::clicked() vector