From 2625b8521cf0494178d78f75d75f2182e73c3163 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Thu, 12 Jul 2012 18:01:17 +0200 Subject: [PATCH] Bug 8315 - remove use C4::* version This patch touches a lot of code, but basically it removes version information from use C4::* in our code. Signed-off-by: Chris Cormack Signed-off-by: Paul Poulain All script still compiles after the patch (confirmed by pre-applypatch hook) Signed-off-by: Chris Cormack Signed-off-by: Jared Camins-Esakov --- C4/Creators.pm | 4 ++-- C4/Creators/Profile.pm | 2 +- C4/Creators/Template.pm | 4 ++-- C4/Installer.pm | 2 +- C4/Labels.pm | 10 +++++----- C4/Patroncards.pm | 12 ++++++------ C4/Patroncards/Patroncard.pm | 6 +++--- labels/label-create-csv.pl | 4 ++-- labels/label-create-pdf.pl | 4 ++-- labels/label-create-xml.pl | 4 ++-- labels/label-edit-batch.pl | 4 ++-- labels/label-edit-layout.pl | 4 ++-- labels/label-edit-profile.pl | 4 ++-- labels/label-edit-template.pl | 4 ++-- labels/label-manage.pl | 4 ++-- labels/label-print.pl | 4 ++-- patroncards/card-print.pl | 4 ++-- patroncards/create-pdf.pl | 4 ++-- patroncards/edit-batch.pl | 4 ++-- patroncards/edit-layout.pl | 4 ++-- patroncards/edit-profile.pl | 4 ++-- patroncards/edit-template.pl | 4 ++-- patroncards/image-manage.pl | 4 ++-- patroncards/manage.pl | 6 +++--- patroncards/print.pl | 4 ++-- tags/review.pl | 2 +- tools/manage-marc-import.pl | 2 +- 27 files changed, 59 insertions(+), 59 deletions(-) diff --git a/C4/Creators.pm b/C4/Creators.pm index 8be368c196..2602b41ef5 100644 --- a/C4/Creators.pm +++ b/C4/Creators.pm @@ -38,8 +38,8 @@ BEGIN { get_unit_values html_table ); - use C4::Creators::Lib 1.000000; - use C4::Creators::PDF 1.000000; + use C4::Creators::Lib; + use C4::Creators::PDF; } 1; diff --git a/C4/Creators/Profile.pm b/C4/Creators/Profile.pm index 6b6e192a57..d34cedd34a 100644 --- a/C4/Creators/Profile.pm +++ b/C4/Creators/Profile.pm @@ -7,7 +7,7 @@ use autouse 'Data::Dumper' => qw(Dumper); use C4::Context; use C4::Debug; -use C4::Creators::Lib 1.000000 qw(get_unit_values); +use C4::Creators::Lib qw(get_unit_values); BEGIN { use version; our $VERSION = qv('1.0.0_1'); diff --git a/C4/Creators/Template.pm b/C4/Creators/Template.pm index 8a7564c491..a9553fbf2a 100644 --- a/C4/Creators/Template.pm +++ b/C4/Creators/Template.pm @@ -7,8 +7,8 @@ use autouse 'Data::Dumper' => qw(Dumper); use C4::Context; use C4::Debug; -use C4::Creators::Profile 1.000000; -use C4::Creators::Lib 1.000000 qw(get_unit_values); +use C4::Creators::Profile; +use C4::Creators::Lib qw(get_unit_values); BEGIN { use version; our $VERSION = qv('1.0.0_1'); diff --git a/C4/Installer.pm b/C4/Installer.pm index a7eb1f6ed6..573540a882 100644 --- a/C4/Installer.pm +++ b/C4/Installer.pm @@ -22,7 +22,7 @@ use strict; our $VERSION = 3.00; use C4::Context; -use C4::Installer::PerlModules 1.000000; +use C4::Installer::PerlModules; =head1 NAME diff --git a/C4/Labels.pm b/C4/Labels.pm index 43fa99d4e3..f3ea41f1e9 100644 --- a/C4/Labels.pm +++ b/C4/Labels.pm @@ -3,11 +3,11 @@ package C4::Labels; BEGIN { use version; our $VERSION = qv('1.0.0_1'); - use C4::Labels::Batch 1.000000; - use C4::Labels::Label 1.000000; - use C4::Labels::Layout 1.000000; - use C4::Labels::Profile 1.000000; - use C4::Labels::Template 1.000000; + use C4::Labels::Batch; + use C4::Labels::Label; + use C4::Labels::Layout; + use C4::Labels::Profile; + use C4::Labels::Template; } 1; diff --git a/C4/Patroncards.pm b/C4/Patroncards.pm index e833193998..5d74d3542d 100644 --- a/C4/Patroncards.pm +++ b/C4/Patroncards.pm @@ -13,12 +13,12 @@ BEGIN { get_image rm_image ); - use C4::Patroncards::Batch 1.000000; - use C4::Patroncards::Layout 1.000000; - use C4::Patroncards::Lib 1.000000; - use C4::Patroncards::Patroncard 1.000000; - use C4::Patroncards::Profile 1.000000; - use C4::Patroncards::Template 1.000000; + use C4::Patroncards::Batch; + use C4::Patroncards::Layout; + use C4::Patroncards::Lib; + use C4::Patroncards::Patroncard; + use C4::Patroncards::Profile; + use C4::Patroncards::Template; } 1; diff --git a/C4/Patroncards/Patroncard.pm b/C4/Patroncards/Patroncard.pm index 56abe58281..4f526ae0e3 100644 --- a/C4/Patroncards/Patroncard.pm +++ b/C4/Patroncards/Patroncard.pm @@ -24,9 +24,9 @@ use autouse 'Data::Dumper' => qw(Dumper); use Text::Wrap qw(wrap); #use Font::TTFMetrics; -use C4::Creators::Lib 1.000000 qw(get_font_types); -use C4::Creators::PDF 1.000000 qw(StrWidth); -use C4::Patroncards::Lib 1.000000 qw(unpack_UTF8 text_alignment leading box get_borrower_attributes); +use C4::Creators::Lib qw(get_font_types); +use C4::Creators::PDF qw(StrWidth); +use C4::Patroncards::Lib qw(unpack_UTF8 text_alignment leading box get_borrower_attributes); BEGIN { use version; our $VERSION = qv('1.0.0_1'); diff --git a/labels/label-create-csv.pl b/labels/label-create-csv.pl index 6e2263f5d3..1229c0a484 100755 --- a/labels/label-create-csv.pl +++ b/labels/label-create-csv.pl @@ -26,8 +26,8 @@ use Text::CSV_XS; use Data::Dumper; use C4::Debug; -use C4::Creators 1.000000; -use C4::Labels 1.000000; +use C4::Creators; +use C4::Labels; my $cgi = new CGI; diff --git a/labels/label-create-pdf.pl b/labels/label-create-pdf.pl index 106b37d741..bcf75811b2 100755 --- a/labels/label-create-pdf.pl +++ b/labels/label-create-pdf.pl @@ -24,8 +24,8 @@ use warnings; use CGI; use C4::Auth; use C4::Debug; -use C4::Creators 1.000000; -use C4::Labels 1.000000; +use C4::Creators; +use C4::Labels; my $cgi = new CGI; diff --git a/labels/label-create-xml.pl b/labels/label-create-xml.pl index 8eac2210cf..6604dc4ee4 100755 --- a/labels/label-create-xml.pl +++ b/labels/label-create-xml.pl @@ -26,8 +26,8 @@ use XML::Simple; use Data::Dumper; use C4::Debug; -use C4::Creators 1.000000; -use C4::Labels 1.000000; +use C4::Creators; +use C4::Labels; my $cgi = new CGI; diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl index fbcfe0a277..d534b873c1 100755 --- a/labels/label-edit-batch.pl +++ b/labels/label-edit-batch.pl @@ -28,8 +28,8 @@ use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); use C4::Branch qw(get_branch_code_from_name); use C4::Items qw(GetItemnumberFromBarcode); -use C4::Creators 1.000000; -use C4::Labels 1.000000; +use C4::Creators; +use C4::Labels; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/labels/label-edit-layout.pl b/labels/label-edit-layout.pl index 5a45d5cfe0..05b34d95b4 100755 --- a/labels/label-edit-layout.pl +++ b/labels/label-edit-layout.pl @@ -26,8 +26,8 @@ use POSIX; use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); -use C4::Creators 1.000000; -use C4::Labels 1.000000; +use C4::Creators; +use C4::Labels; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/labels/label-edit-profile.pl b/labels/label-edit-profile.pl index b1145548f2..59c6abcfd5 100755 --- a/labels/label-edit-profile.pl +++ b/labels/label-edit-profile.pl @@ -25,8 +25,8 @@ use CGI; use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); -use C4::Creators 1.000000; -use C4::Labels 1.000000; +use C4::Creators; +use C4::Labels; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/labels/label-edit-template.pl b/labels/label-edit-template.pl index 9917f6b827..f367a65eca 100755 --- a/labels/label-edit-template.pl +++ b/labels/label-edit-template.pl @@ -25,8 +25,8 @@ use CGI; use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); -use C4::Creators 1.000000; -use C4::Labels 1.000000; +use C4::Creators; +use C4::Labels; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/labels/label-manage.pl b/labels/label-manage.pl index c70ea6cfd3..7ef3300a43 100755 --- a/labels/label-manage.pl +++ b/labels/label-manage.pl @@ -28,8 +28,8 @@ use Data::Dumper; use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); use autouse 'C4::Branch' => qw(get_branch_code_from_name); -use C4::Creators 1.000000; -use C4::Labels 1.000000; +use C4::Creators; +use C4::Labels; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/labels/label-print.pl b/labels/label-print.pl index 3947163eca..b65c7a6c55 100755 --- a/labels/label-print.pl +++ b/labels/label-print.pl @@ -25,8 +25,8 @@ use Data::Dumper; use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); -use C4::Creators::Lib 1.000000 qw(get_all_templates get_all_layouts get_output_formats); -use C4::Labels::Batch 1.000000; +use C4::Creators::Lib qw(get_all_templates get_all_layouts get_output_formats); +use C4::Labels::Batch; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/patroncards/card-print.pl b/patroncards/card-print.pl index e4bcb8ed57..1ca0c91332 100755 --- a/patroncards/card-print.pl +++ b/patroncards/card-print.pl @@ -25,8 +25,8 @@ use Data::Dumper; use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); -use C4::Creators 1.000000; -use C4::Labels 1.000000; +use C4::Creators; +use C4::Labels; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/patroncards/create-pdf.pl b/patroncards/create-pdf.pl index 961dfbfc05..6a1b67a573 100755 --- a/patroncards/create-pdf.pl +++ b/patroncards/create-pdf.pl @@ -30,8 +30,8 @@ use autouse 'Data::Dumper' => qw(Dumper); use C4::Debug; use C4::Context; use autouse 'C4::Members' => qw(GetPatronImage GetMember); -use C4::Creators 1.000000; -use C4::Patroncards 1.000000; +use C4::Creators; +use C4::Patroncards; my $cgi = new CGI; diff --git a/patroncards/edit-batch.pl b/patroncards/edit-batch.pl index fb0abf5f22..4897e5f4e6 100755 --- a/patroncards/edit-batch.pl +++ b/patroncards/edit-batch.pl @@ -28,8 +28,8 @@ use autouse 'Data::Dumper' => qw(Dumper); use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); use C4::Branch qw(get_branch_code_from_name); -use C4::Creators 1.000000; -use C4::Patroncards 1.000000; +use C4::Creators; +use C4::Patroncards; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/patroncards/edit-layout.pl b/patroncards/edit-layout.pl index 0e4a70274e..0c4dfe47bb 100755 --- a/patroncards/edit-layout.pl +++ b/patroncards/edit-layout.pl @@ -28,8 +28,8 @@ use autouse 'Data::Dumper' => qw(Dumper); use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); -use C4::Creators 1.000000; -use C4::Patroncards 1.000000; +use C4::Creators; +use C4::Patroncards; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/patroncards/edit-profile.pl b/patroncards/edit-profile.pl index 5c4eb3b5a5..6189cb3f6c 100755 --- a/patroncards/edit-profile.pl +++ b/patroncards/edit-profile.pl @@ -25,8 +25,8 @@ use CGI; use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); -use C4::Creators::Lib 1.000000 qw(get_all_templates get_unit_values); -use C4::Patroncards::Profile 1.000000; +use C4::Creators::Lib qw(get_all_templates get_unit_values); +use C4::Patroncards::Profile; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/patroncards/edit-template.pl b/patroncards/edit-template.pl index a125eb530e..8f60b9cf9d 100755 --- a/patroncards/edit-template.pl +++ b/patroncards/edit-template.pl @@ -26,8 +26,8 @@ use autouse 'Data::Dumper' => qw(Dumper); use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); -use C4::Creators 1.000000; -use C4::Patroncards 1.000000; +use C4::Creators; +use C4::Patroncards; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/patroncards/image-manage.pl b/patroncards/image-manage.pl index ba3267cb45..f9f7eac984 100755 --- a/patroncards/image-manage.pl +++ b/patroncards/image-manage.pl @@ -12,8 +12,8 @@ use C4::Context; use C4::Auth; use C4::Output; use C4::Debug; -use C4::Creators 1.000000; -use C4::Patroncards 1.000000; +use C4::Creators; +use C4::Patroncards; my $cgi = CGI->new; diff --git a/patroncards/manage.pl b/patroncards/manage.pl index 46361cc6f1..d052f677df 100755 --- a/patroncards/manage.pl +++ b/patroncards/manage.pl @@ -28,9 +28,9 @@ use autouse 'Data::Dumper' => qw(Dumper); use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); use autouse 'C4::Branch' => qw(get_branch_code_from_name); -use C4::Creators 1.000000; -use C4::Patroncards 1.000000; -use C4::Labels 1.000000; +use C4::Creators; +use C4::Patroncards; +use C4::Labels; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/patroncards/print.pl b/patroncards/print.pl index feeb65eef1..fcd1dc153b 100755 --- a/patroncards/print.pl +++ b/patroncards/print.pl @@ -25,8 +25,8 @@ use autouse 'Data::Dumper' => qw(Dumper); use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); -use C4::Creators 1.000000; -use C4::Patroncards 1.000000; +use C4::Creators; +use C4::Patroncards; my $cgi = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/tags/review.pl b/tags/review.pl index 2300396ee5..7517f4167e 100755 --- a/tags/review.pl +++ b/tags/review.pl @@ -32,7 +32,7 @@ use C4::Dates qw(format_date format_date_in_iso); # use C4::Koha; use C4::Output qw(:html :ajax pagination_bar); use C4::Debug; -use C4::Tags 0.03 qw(get_tags get_approval_rows approval_counts whitelist blacklist is_approved); +use C4::Tags qw(get_tags get_approval_rows approval_counts whitelist blacklist is_approved); my $script_name = "/cgi-bin/koha/tags/review.pl"; my $needed_flags = { tools => 'moderate_tags' }; # FIXME: replace when more specific permission is created. diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl index 34d2639c1a..a8e455e1ec 100755 --- a/tools/manage-marc-import.pl +++ b/tools/manage-marc-import.pl @@ -34,7 +34,7 @@ use C4::Biblio; use C4::ImportBatch; use C4::Matcher; use C4::BackgroundJob; -use C4::Labels::Batch 1.000000; +use C4::Labels::Batch; use C4::Branch qw(get_branch_code_from_name); my $script_name = "/cgi-bin/koha/tools/manage-marc-import.pl"; -- 2.39.5