eliminate use vars

tonycoz · Jun 13, 2020 · ee64a81 · ee64a81
1 parent c443788
commit ee64a81
Show file tree

Hide file tree

Showing 44 changed files with 150 additions and 120 deletions.
diff --git a/CountColor/CountColor.pm b/CountColor/CountColor.pm
@@ -1,14 +1,14 @@
 package Imager::CountColor;
+use 5.006;
 use strict;
 use Imager;
-use vars qw($VERSION @ISA @EXPORT_OK);
 require Exporter;
-@EXPORT_OK = 'count_color';
+our @EXPORT_OK = 'count_color';
 
 BEGIN {
-  $VERSION = "0.02";
-  @ISA = qw(Exporter);
-  
+  our $VERSION = "0.03";
+  our @ISA = qw(Exporter);
+
   require XSLoader;
   XSLoader::load('Imager::CountColor', $VERSION);
 }

diff --git a/DynTest/DynTest.pm b/DynTest/DynTest.pm
@@ -1,10 +1,10 @@
 package Imager::Filter::DynTest;
+use 5.006;
 use strict;
 use Imager;
-use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.02";
+  our $VERSION = "0.03";
 
   require XSLoader;
   XSLoader::load('Imager::Filter::DynTest', $VERSION);

diff --git a/FT2/FT2.pm b/FT2/FT2.pm
@@ -1,9 +1,11 @@
 package Imager::Font::FT2;
+use 5.006;
 use strict;
 use Imager;
 use Scalar::Util ();
-use vars qw($VERSION @ISA);
-@ISA = qw(Imager::Font);
+our @ISA = qw(Imager::Font);
+
+our $VERSION;
 
 BEGIN {
   $VERSION = "0.98";

diff --git a/Flines/Flines.pm b/Flines/Flines.pm
@@ -1,10 +1,10 @@
 package Imager::Filter::Flines;
+use 5.006;
 use strict;
 use Imager;
-use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.03";
+  our $VERSION = "0.04";
 
   require XSLoader;
   XSLoader::load('Imager::Filter::Flines', $VERSION);

diff --git a/GIF/GIF.pm b/GIF/GIF.pm
@@ -1,10 +1,10 @@
 package Imager::File::GIF;
+use 5.006;
 use strict;
 use Imager;
-use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.96";
+  our $VERSION = "0.96";
 
   require XSLoader;
   XSLoader::load('Imager::File::GIF', $VERSION);

diff --git a/ICO/ICO.pm b/ICO/ICO.pm
@@ -1,10 +1,10 @@
 package Imager::File::ICO;
+use 5.006;
 use strict;
 use Imager;
-use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.06";
+  our $VERSION = "0.07";
 
   require XSLoader;
   XSLoader::load('Imager::File::ICO', $VERSION);

diff --git a/ICO/lib/Imager/File/CUR.pm b/ICO/lib/Imager/File/CUR.pm
@@ -1,5 +1,7 @@
 package Imager::File::CUR;
+use 5.006;
 use strict;
+our $VERSION = "1.000";
 
 # all the work is done by Imager::File::ICO
 use Imager::File::ICO;

diff --git a/Imager.pm b/Imager.pm
@@ -1,14 +1,16 @@
 package Imager;
+use 5.006;
 
 use strict;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS %formats $DEBUG %filters %DSOs $ERRSTR %OPCODES $I2P $FORMATGUESS $warn_obsolete);
 use IO::File;
 use Scalar::Util;
 use Imager::Color;
 use Imager::Font;
 use Config;
 
-@EXPORT_OK = qw(
+our $ERRSTR;
+
+our @EXPORT_OK = qw(
 		init
 		init_log
 		DSO_open
@@ -89,10 +91,10 @@ use Config;
                 NCF
 );
 
-@EXPORT=qw(
+our @EXPORT=qw(
 	  );
 
-%EXPORT_TAGS=
+our %EXPORT_TAGS=
   (handy => [qw(
 		newfont
 		newcolor
@@ -138,11 +140,13 @@ $combine_types{sat}  = $combine_types{saturation};
 # this will be used to store global defaults at some point
 my %defaults;
 
+our $VERSION;
+
 BEGIN {
   require Exporter;
   my $ex_version = eval $Exporter::VERSION;
   if ($ex_version < 5.57) {
-    @ISA = qw(Exporter);
+    our @ISA = qw(Exporter);
   }
   $VERSION = '1.011';
   require XSLoader;
@@ -161,8 +165,17 @@ my %format_classes =
    t1 => "Imager::Font::T1",
   );
 
+our %formats;
+
 tie %formats, "Imager::FORMATS", \%formats_low, \%format_classes;
 
+our %filters;
+
+our $DEBUG;
+our %OPCODES;
+our $FORMATGUESS;
+our $warn_obsolete;
+
 BEGIN {
   for(i_list_formats()) { $formats_low{$_}++; }
 
@@ -526,7 +539,9 @@ END {
   }
 }
 
-# Load a filter plugin 
+# Load a filter plugin
+
+our %DSOs;
 
 sub load_plugin {
   my ($filename)=@_;
@@ -2425,6 +2440,8 @@ sub scaleY {
 # NOTE - should make a utility function to check transforms for
 # stack overruns
 
+our $I2P;
+
 sub transform {
   my $self=shift;
   my %opts=@_;

diff --git a/JPEG/JPEG.pm b/JPEG/JPEG.pm
@@ -1,10 +1,10 @@
 package Imager::File::JPEG;
+use 5.006;
 use strict;
 use Imager;
-use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.94";
+  our $VERSION = "0.94";
 
   require XSLoader;
   XSLoader::load('Imager::File::JPEG', $VERSION);

diff --git a/MANIFEST b/MANIFEST
@@ -385,6 +385,7 @@ t/950-kwalitee/040-strict.t	Check use strict is usede
 t/950-kwalitee/050-meta.t	Check META.yml is valid
 t/950-kwalitee/060-podstruct.t
 t/950-kwalitee/070-mymeta.t
+t/950-kwalitee/080-nousevars.t	Check various standards
 t/GoodTestFont.pm		A dummy (hardly implemented) font driver.
 t/Pod/Coverage/Imager.pm
 t/t1000lib/Imager/File/BAD.pm	Test failing to load a file handler

diff --git a/Mandelbrot/Mandelbrot.pm b/Mandelbrot/Mandelbrot.pm
@@ -1,10 +1,10 @@
 package Imager::Filter::Mandelbrot;
+use 5.006;
 use strict;
 use Imager;
-use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.04";
+  our $VERSION = "0.05";
 
   require XSLoader;
   XSLoader::load('Imager::Filter::Mandelbrot', $VERSION);

diff --git a/PNG/PNG.pm b/PNG/PNG.pm
@@ -1,10 +1,10 @@
 package Imager::File::PNG;
+use 5.006;
 use strict;
 use Imager;
-use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.95";
+  our $VERSION = "0.95";
 
   require XSLoader;
   XSLoader::load('Imager::File::PNG', $VERSION);

diff --git a/SGI/SGI.pm b/SGI/SGI.pm
@@ -1,10 +1,10 @@
 package Imager::File::SGI;
+use 5.006;
 use strict;
 use Imager;
-use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.04";
+  our $VERSION = "0.05";
 
   require XSLoader;
   XSLoader::load('Imager::File::SGI', $VERSION);

diff --git a/T1/T1.pm b/T1/T1.pm
@@ -1,12 +1,12 @@
 package Imager::Font::T1;
+use 5.006;
 use strict;
 use Imager::Color;
-use vars qw(@ISA $VERSION);
-@ISA = qw(Imager::Font);
+our @ISA = qw(Imager::Font);
 use Scalar::Util ();
 
 BEGIN {
-  $VERSION = "1.027";
+  our $VERSION = "1.027";
 
   require XSLoader;
   XSLoader::load('Imager::Font::T1', $VERSION);

diff --git a/TIFF/TIFF.pm b/TIFF/TIFF.pm
@@ -1,10 +1,10 @@
 package Imager::File::TIFF;
+use 5.006;
 use strict;
 use Imager;
-use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.92";
+  our $VERSION = "0.92";
 
   require XSLoader;
   XSLoader::load('Imager::File::TIFF', $VERSION);

diff --git a/W32/W32.pm b/W32/W32.pm
@@ -1,11 +1,11 @@
 package Imager::Font::W32;
+use 5.006;
 use strict;
 use Imager;
-use vars qw($VERSION @ISA);
-@ISA = qw(Imager::Font);
+our @ISA = qw(Imager::Font);
 
 BEGIN {
-  $VERSION = "0.91";
+  our $VERSION = "0.91";
 
   require XSLoader;
   XSLoader::load('Imager::Font::W32', $VERSION);

diff --git a/W32/lib/Imager/Font/Win32.pm b/W32/lib/Imager/Font/Win32.pm
@@ -1,7 +1,9 @@
 package Imager::Font::Win32;
+use 5.006;
 use strict;
-use vars qw(@ISA);
-@ISA = qw(Imager::Font::W32);
+our @ISA = qw(Imager::Font::W32);
+
+our $VERSION = "1.000";
 
 require Imager::Font::W32;
 

diff --git a/lib/Imager/Color.pm b/lib/Imager/Color.pm
@@ -1,10 +1,9 @@
 package Imager::Color;
-
+use 5.006;
 use Imager;
 use strict;
-use vars qw($VERSION);
 
-$VERSION = "1.013";
+our $VERSION = "1.013";
 
 # It's just a front end to the XS creation functions.
 

diff --git a/lib/Imager/Color/Float.pm b/lib/Imager/Color/Float.pm
@@ -1,10 +1,9 @@
 package Imager::Color::Float;
-
+use 5.006;
 use Imager;
 use strict;
-use vars qw($VERSION);
 
-$VERSION = "1.006";
+our $VERSION = "1.006";
 
 # It's just a front end to the XS creation functions.
 

diff --git a/lib/Imager/Color/Table.pm b/lib/Imager/Color/Table.pm
@@ -1,8 +1,8 @@
 package Imager::Color::Table;
 use strict;
-use vars qw($VERSION);
+use 5.006;
 
-$VERSION = "1.003";
+our $VERSION = "1.004";
 
     my %colors;
 

diff --git a/lib/Imager/Expr.pm b/lib/Imager/Expr.pm
@@ -1,10 +1,9 @@
 package Imager::Expr;
-
+use 5.006;
 use Imager::Regops;
 use strict;
-use vars qw($VERSION);
 
-$VERSION = "1.007";
+our $VERSION = "1.008";
 
 my %expr_types;
 
@@ -296,8 +295,7 @@ sub dumpcode {
 }
 
 package Imager::Expr::Postfix;
-use vars qw(@ISA);
-@ISA = qw(Imager::Expr);
+our @ISA = qw(Imager::Expr);
 
 Imager::Expr::Postfix->register_type('rpnexpr');
 
@@ -319,8 +317,7 @@ sub compile {
 
 package Imager::Expr::Infix;
 
-use vars qw(@ISA);
-@ISA = qw(Imager::Expr);
+our @ISA = qw(Imager::Expr);
 use Imager::Regops qw(%Attr $MaxOperands);
 
 {

diff --git a/lib/Imager/Expr/Assem.pm b/lib/Imager/Expr/Assem.pm
@@ -1,13 +1,12 @@
 package Imager::Expr::Assem;
+use 5.006;
 use strict;
 use Imager::Expr;
 use Imager::Regops;
-use vars qw($VERSION);
 
-$VERSION = "1.003";
+our $VERSION = "1.004";
 
-use vars qw(@ISA);
-@ISA = qw(Imager::Expr);
+our @ISA = qw(Imager::Expr);
 
 __PACKAGE__->register_type('assem');
 

diff --git a/lib/Imager/ExtUtils.pm b/lib/Imager/ExtUtils.pm
@@ -1,10 +1,9 @@
 package Imager::ExtUtils;
+use 5.006;
 use strict;
 use File::Spec;
 
-use vars qw($VERSION);
-
-$VERSION = "1.002";
+our $VERSION = "1.003";
 
 =head1 NAME