mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-05 13:26:21 +00:00
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
This commit is contained in:
parent
9e87592940
commit
82a90fceb7
@ -10,21 +10,22 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "Action.h"
|
||||
|
||||
#include "BufferView.h"
|
||||
#include "lyx_cb.h"
|
||||
#include "lyxfunc.h"
|
||||
#include "FuncStatus.h"
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
#include "frontends/LyXView.h"
|
||||
|
||||
#include "qt_helpers.h"
|
||||
|
||||
#include "support/lstrings.h"
|
||||
|
||||
#include <boost/bind.hpp>
|
||||
|
||||
#include "frontends/LyXView.h"
|
||||
#include "qt_helpers.h"
|
||||
|
||||
#include "Action.h"
|
||||
|
||||
#include "support/lstrings.h"
|
||||
|
||||
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);
|
||||
|
@ -12,9 +12,6 @@
|
||||
#ifndef ACTION_H
|
||||
#define ACTION_H
|
||||
|
||||
// Must be here because of moc.
|
||||
#include <config.h>
|
||||
|
||||
#include "frontends/LyXView.h"
|
||||
#include "funcrequest.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user