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

diff --git a/src/frontends/qt4/Action.C b/src/frontends/qt4/Action.C
index 7f34a09026c9bb52658e0904ea268c9d64007f79..58b58f2987f60bd38c26932679fe89820ca2bc71 100644 (file)
--- a/src/frontends/qt4/Action.C
+++ b/src/frontends/qt4/Action.C
@@ -10,22 +10,23 @@
 
 #include <config.h>
 
+#include "Action.h"
+
 #include "BufferView.h"
 #include "lyx_cb.h"
 #include "lyxfunc.h"
 #include "FuncStatus.h"
-
 #include "debug.h"
 
-#include <boost/bind.hpp>
-
 #include "frontends/LyXView.h"
-#include "qt_helpers.h"
 
-#include "Action.h"
+#include "qt_helpers.h"
 
 #include "support/lstrings.h"
 
+#include <boost/bind.hpp>
+
+
 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 ba00167e0e709551b23b9a91e18ce84373a40b47..570732653c95527bf0966a424314729326a8d505 100644 (file)
--- 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 <config.h>
-
 #include "frontends/LyXView.h"
 #include "funcrequest.h"