From 82a90fceb77907fcbf97629cad88978b0a62ecf6 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Thu, 17 Aug 2006 08:36:59 +0000 Subject: [PATCH] get rid of QT3_SUPPORT and some cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14716 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/Action.C | 19 ++++++++++--------- src/frontends/qt4/Action.h | 3 --- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/frontends/qt4/Action.C b/src/frontends/qt4/Action.C index 7f34a09026..58b58f2987 100644 --- a/src/frontends/qt4/Action.C +++ b/src/frontends/qt4/Action.C @@ -10,22 +10,23 @@ #include +#include "Action.h" + #include "BufferView.h" #include "lyx_cb.h" #include "lyxfunc.h" #include "FuncStatus.h" - #include "debug.h" -#include - #include "frontends/LyXView.h" -#include "qt_helpers.h" -#include "Action.h" +#include "qt_helpers.h" #include "support/lstrings.h" +#include + + using std::string; using std::endl; @@ -43,8 +44,8 @@ Action::Action(LyXView & lyxView, string const & text, FuncRequest const & func, string const & tooltip) : QAction(this), func_(func), lyxView_(lyxView) { - setText(tr(toqstr(text))); - setToolTip(tr(toqstr(tooltip))); + setText(toqstr(text)); + setToolTip(toqstr(tooltip)); setStatusTip(toqstr(tooltip)); connect(this, SIGNAL(triggered()), this, SLOT(action())); this->setCheckable(true); @@ -55,8 +56,8 @@ Action::Action(LyXView & lyxView, string const & icon, string const & text, : QAction(this), func_(func), lyxView_(lyxView) { setIcon(QPixmap(icon.c_str())); - setText(tr(toqstr(text))); - setToolTip(tr(toqstr(tooltip))); + setText(toqstr(text)); + setToolTip(toqstr(tooltip)); setStatusTip(toqstr(tooltip)); connect(this, SIGNAL(triggered()), this, SLOT(action())); this->setCheckable(true); diff --git a/src/frontends/qt4/Action.h b/src/frontends/qt4/Action.h index ba00167e0e..570732653c 100644 --- a/src/frontends/qt4/Action.h +++ b/src/frontends/qt4/Action.h @@ -12,9 +12,6 @@ #ifndef ACTION_H #define ACTION_H -// Must be here because of moc. -#include - #include "frontends/LyXView.h" #include "funcrequest.h" -- 2.39.2