From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Mon, 30 Oct 2006 21:45:37 +0000 (+0000)
Subject: remove references to Qt3/Gtk
X-Git-Tag: 1.6.10~12127
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4292f4e9e916ee8a9ea97013d0c0d176f05b49a1;hp=27ef7c726f4e688b615798bad160c5e6af47c3d5;p=features.git

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 ec59153c50..c9b2235c8a 100644
--- 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 44aeacd6e0..a544f24863 100644
--- 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 6876bf7972..2916a66760 100644
--- 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 08b17a1f09..a535f2e877 100644
--- 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 1dba6dd037..d3fbd58156 100644
--- 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 83a54c041a..1cf0eae7cb 100644
--- 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.