remove references to Qt3/Gtk

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15630 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/INSTALL b/INSTALL
index ec59153c50cc1390dd27da4c55ebccd024163190..c9b2235c8a01ec9a805b1c79a613c7280989895c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -55,9 +55,7 @@ library to be able to compile this version of LyX. Users of gcc 2.95.x
 will have to install the STLPort version of these libraries as the
 ones that come with gcc 2.95.x are too broken for us to use.
 
-* Qt frontend
-
-LyX has been tested with Qt 3.x and 4.x. The only special point to 
+LyX has been tested with Qt 4.x. The only special point to 
 make is that you must ensure that both LyX and the Qt libraries are 
 compiled with the same C++ compiler.
 

diff --git a/development/TodoPlan-1.3 b/development/TodoPlan-1.3
index 44aeacd6e00cc48e13901356c18d1dba44635652..a544f248639fbf3aa1b4a01ff1468b6c9b3a8ea7 100644 (file)
--- a/development/TodoPlan-1.3
+++ b/development/TodoPlan-1.3
@@ -25,10 +25,7 @@ Martin:
 
 Michael:
 
-- upgrade of libsigc version to 1.4/1.3 whatever the release version
-ends up getting called.
 - GUII
-- Gtkmm2 frontend.
 
 Lgb:
 - upgrade boost
@@ -36,4 +33,3 @@ Lgb:
 - textclass as string
 - force arg check on lyxfuns
 - move towards no-next code in paragraph,cursor and row.
-- remove 1.2.x compability code.

diff --git a/src/frontends/WorkArea.h b/src/frontends/WorkArea.h
index 6876bf7972726e78058d9e1c538f5e1e5086fd2d..2916a66760a0f0f544c55a3b83551f21cb64c73a 100644 (file)
--- a/src/frontends/WorkArea.h
+++ b/src/frontends/WorkArea.h
@@ -22,8 +22,6 @@
 
 #include <boost/signals/trackable.hpp>
 
-// FIXME: defined in X.h, spuriously pulled in by Qt 3 headers
-#undef CursorShape
 
 namespace lyx {
 

diff --git a/src/frontends/qt4/GuiApplication.C b/src/frontends/qt4/GuiApplication.C
index 08b17a1f09520b68051075e4ba11aaffbf8f8f1a..a535f2e877248d9c9ba528c33a9cd82c71e64dfc 100644 (file)
--- a/src/frontends/qt4/GuiApplication.C
+++ b/src/frontends/qt4/GuiApplication.C
@@ -106,7 +106,6 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
 #endif
 
        // install translation file for Qt built-in dialogs
-       // These are only installed since Qt 3.2.x
        QTranslator qt_trans;
        QString language_name = QString("qt_") + QLocale::system().name();
        language_name.truncate(5);

diff --git a/src/frontends/qt4/GuiFontLoader.C b/src/frontends/qt4/GuiFontLoader.C
index 1dba6dd03705092eed0f3d6b47361bd2edbbf112..d3fbd581566431a7201d10bc07d595859bea3867 100644 (file)
--- a/src/frontends/qt4/GuiFontLoader.C
+++ b/src/frontends/qt4/GuiFontLoader.C
@@ -141,7 +141,6 @@ bool isChosenFont(QFont & font, string const & family)
                return true;
        }
 
-       // Qt 3.2 beta1 returns "xft" for all xft fonts
        // Qt 4.1 returns "Multi" for all ? xft fonts
        if (font.rawName() == "xft" || font.rawName() == "Multi") {
                if (contains(fromqstr(fi.family()), family)) {

diff --git a/src/frontends/qt4/README b/src/frontends/qt4/README
index 83a54c041a649591dd32011537c12a786ec90d28..1cf0eae7cb9403c67cec022dd016599ccfb7866d 100644 (file)
--- a/src/frontends/qt4/README
+++ b/src/frontends/qt4/README
@@ -15,9 +15,6 @@ to use QWhatsThis too, but this must be done in the derived class's
 constructor, and use _("..."). Non-trivial means that things like "OK"
 /must not/ have a tooltip.
 
-*DO NOT USE DESIGNER FROM Qt 3*. You must use a designer from Qt 2 to
-maintain compatibility.
-
 moc is incredibly stupid and sometimes you need a fully qualified
 "std::string" for .connect() statements to work. Be very, very careful.