diff options
Diffstat (limited to 'perl-install/unused')
| -rw-r--r-- | perl-install/unused/.cvsignore | 1 | ||||
| -rw-r--r-- | perl-install/unused/cdrom.pm | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | perl-install/unused/migrate-ugtk2-to-mygtk2.pl | 15 |
3 files changed, 11 insertions, 7 deletions
diff --git a/perl-install/unused/.cvsignore b/perl-install/unused/.cvsignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/perl-install/unused/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/perl-install/unused/cdrom.pm b/perl-install/unused/cdrom.pm index 040ac7e98..b9b6ea699 100644 --- a/perl-install/unused/cdrom.pm +++ b/perl-install/unused/cdrom.pm @@ -1,4 +1,4 @@ -package cdrom; # $Id$ +package cdrom; use diagnostics; use strict; diff --git a/perl-install/unused/migrate-ugtk2-to-mygtk2.pl b/perl-install/unused/migrate-ugtk2-to-mygtk2.pl index 8528eaac2..aabeb8a36 100644..100755 --- a/perl-install/unused/migrate-ugtk2-to-mygtk2.pl +++ b/perl-install/unused/migrate-ugtk2-to-mygtk2.pl @@ -2,7 +2,7 @@ use MDK::Common; BEGIN { @ARGV or warn(<<EOF), exit 1; -usage: unused/migrate-ugtk2-to-mygtk2.pl -pi <file.pm> +usage: $0 -pi <file.pm> - an emacs is launched with a script fixing the closing "children => [ ...", simply save the file and exit this emacs @@ -23,7 +23,7 @@ $b = 1; while ($b) { $b = 0; - if (my ($before, $class, undef, $new, $arg, $after, $after2) = /(.*?)Gtk2::(\w+(::\w+)*)->(new\w*)(?:\(($re)\)(.*)|([^(].*))/s) { + if (my ($before, $class, undef, $new, $arg, $after, $after2) = /(.*?)Gtk3::(\w+(::\w+)*)->(new\w*)(?:\(($re)\)(.*)|([^(].*))/s) { $after ||= $after2; my $s; @@ -174,6 +174,10 @@ sub dorepl_new { if ($class_ eq 'TextView' || !$class) { $s = "$pre, text => "; } + } elsif ($f eq 'gtkset_text') { + if ($class_ eq 'Entry' || !$class) { + $s = "$pre, text => "; + } } if (!$s) { @@ -196,8 +200,8 @@ sub dorepl_new { } sub dorepl { - s/gtkdestroy\(/mygtk2::may_destroy(/ || - s/gtkset_background\(/mygtk2::set_root_window_background(/ || + s/gtkdestroy\(/mygtk3::may_destroy(/ || + s/gtkset_background\(/mygtk3::set_root_window_background(/ || s/gtkset_tip\($re,\s*($re),\s*($re)\)/gtkset($1, tip => $2)/ || s/gtkset_size_request\(($re),\s*($re), ($re)\)/"gtkset($1" . ($2 && $2 ne '-1' ? ", width => $2" : '') . ($3 && $3 ne '-1' ? ", height => $3" : '') . ')'/e || s/gtkset_(modal)\(($re),\s*($re)\)/gtkset($2, $1 => $3)/ || @@ -217,7 +221,8 @@ END { if (defined $^I) { foreach (@args) { warn "$_: closing children using emacs\n"; - system('emacs', '-q', '-l', 'unused/migrate-ugtk2-to-mygtk2.el', $_, '-f', 'my-close-children') + (my $el = $0) =~ s/\.pl$/.el/ or die ".el missing"; + system('emacs', '-q', '-l', $el, $_, '-f', 'my-close-children') } } } |