remove xforms relicts

        * src/frontends/qt3/QPrefs.C:
        * src/frontends/controllers/BCView.tmpl:
        * src/support/package.h: fix/remove comment

        * po/pocheck.pl: no longer check for xforms shortcuts
        * development/Win32/lyx.vcproj: ignore ControlPreamble.[Ch]

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

diff --git a/development/Win32/lyx.vcproj b/development/Win32/lyx.vcproj
index 7773c275869b3a062bc27a6f7d1594b1cc3aceb8..532301c69fa7478a0cb6512ef0c73f55e1991fb2 100644 (file)
--- a/development/Win32/lyx.vcproj
+++ b/development/Win32/lyx.vcproj
@@ -1877,18 +1877,6 @@
                                        <File
                                                RelativePath="..\..\src\frontends\controllers\ControlParagraph.h">
                                        </File>
-                                       <File
-                                               RelativePath="..\..\src\frontends\controllers\ControlPreamble.C">
-                                               <FileConfiguration
-                                                       Name="Debug|Win32">
-                                                       <Tool
-                                                               Name="VCCLCompilerTool"
-                                                               CompileAs="2"/>
-                                               </FileConfiguration>
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\src\frontends\controllers\ControlPreamble.h">
-                                       </File>
                                        <File
                                                RelativePath="..\..\src\frontends\controllers\ControlPrefs.C">
                                                <FileConfiguration

diff --git a/po/pocheck.pl b/po/pocheck.pl
index 491935962ebe05e068d26ede34d49ffead5b539b..b46bacfe354cecbbbc4add712db8b20438c52f06 100755 (executable)
--- a/po/pocheck.pl
+++ b/po/pocheck.pl
@@ -81,18 +81,9 @@ foreach $pofilename ( @ARGV )
           $warn++;
         }
 
-        # Check for "|..." shortcut(s)
-        if ( ( $msgid =~ m/\|[^ ]/ ) != ( $msgstr =~ m/\|[^ ]/ ) ) {
-          print( "Missing or unexpected xforms shortcut:\n" );
-          print( "  '$msgid' => '$msgstr'\n" );
-          $warn++;
-        }
-
         $msgid_clean  = lc($msgid);
         $msgstr_clean = lc($msgstr);
 
-        $msgid_clean  =~ s/(.*)\|.*?$/$1/;  # strip xforms shortcuts
-        $msgstr_clean =~ s/(.*)\|.*?$/$1/;
         $msgid_clean  =~ s/&([^ ])/$1/;     # strip Qt shortcuts
         $msgstr_clean =~ s/&([^ ])/$1/;
 

diff --git a/src/frontends/controllers/BCView.tmpl b/src/frontends/controllers/BCView.tmpl
index 69e6ffbe0850a90357f0f2d58789ad5a47802248..cb7f895fc3d783c444b63f3e1018af1ec9059c21 100644 (file)
--- a/src/frontends/controllers/BCView.tmpl
+++ b/src/frontends/controllers/BCView.tmpl
@@ -12,7 +12,6 @@
  *
  * GuiBC is a base class and so these templatised methods will be
  * instantiated if this file is #included in the derived classes' .C file.
- * see, e.g., xforms/xformsBC.C
  */
 
 #include "BCView.h"

diff --git a/src/frontends/qt3/QPrefs.C b/src/frontends/qt3/QPrefs.C
index 9dfc1cb22df9bea64dc55242f98f5d7736827d87..bf9365965d51bec02dae0bfd3c96a8cd2dd10ec4 100644 (file)
--- a/src/frontends/qt3/QPrefs.C
+++ b/src/frontends/qt3/QPrefs.C
@@ -362,7 +362,7 @@ void QPrefs::apply()
                LColor::color const col(dialog_->colors_[i]);
                QColor const & qcol(lcolorcache.get(col));
 
-               // FIXME: dubious, but it's what xforms does
+               // FIXME: dubious, but it's what xforms did
                if (qcol != ci->color()) {
                        ostringstream ostr;
 

diff --git a/src/support/package.h b/src/support/package.h
index f764adc6a9b74cf4f6f13d970bf37a79357b95c0..0a46601172bd75a895bc442c7fbbc25416419103 100644 (file)
--- a/src/support/package.h
+++ b/src/support/package.h
@@ -113,7 +113,6 @@ public:
 
        /** Used when setting the user_support directory.
         *  Used also when expanding "~/" or contracting to "~/". (filetools.C)
-        *  Used by the XForms file dialog.
         *  Used in emergencyWrite (bufferlist.C) as one possible location
         *  for the dump.
         *  This may be empty (e. g. when run under a CGI environment)