Skip to content

Commit 365c068

Browse files
author
Poor Yorick
committed
More tcl::oo.
1 parent 2a63bf2 commit 365c068

File tree

15 files changed

+69
-15
lines changed

15 files changed

+69
-15
lines changed

‎modules/virtchannel_base/cat.tcl

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323
# # ## ### ##### ######## #############
2424

2525
package require Tcl 8.5 9
26-
package require TclOO
26+
try {
27+
package require tcl::oo
28+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
29+
package require TclOO
30+
}
2731
package require tcl::chan::core
2832

2933
# # ## ### ##### ######## #############

‎modules/virtchannel_base/facade.tcl

+5-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@
3535
## TODO document that facada takes ownership of the channel.
3636

3737
package require Tcl 8.5 9
38-
package require TclOO
38+
try {
39+
package require tcl::oo
40+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
41+
package require TclOO
42+
}
3943
package require logger
4044
package require tcl::chan::core
4145

‎modules/virtchannel_base/fifo.tcl

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
# # ## ### ##### ######## #############
2222

2323
package require Tcl 8.5 9
24-
package require TclOO
24+
try {
25+
package require tcl::oo
26+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
27+
package require TclOO
28+
}
2529
package require tcl::chan::events
2630

2731
# # ## ### ##### ######## #############

‎modules/virtchannel_base/fifo2.tcl

+5-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@
3434
# # ## ### ##### ######## #############
3535

3636
package require Tcl 8.5 9
37-
package require TclOO
37+
try {
38+
package require tcl::oo
39+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
40+
package require TclOO
41+
}
3842
package require tcl::chan::halfpipe
3943

4044
# # ## ### ##### ######## #############

‎modules/virtchannel_base/halfpipe.tcl

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
# # ## ### ##### ######## #############
2323

2424
package require Tcl 8.5 9
25-
package require TclOO
25+
try {
26+
package require tcl::oo
27+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
28+
package require TclOO
29+
}
2630
package require tcl::chan::events
2731

2832
# # ## ### ##### ######## #############

‎modules/virtchannel_base/null.tcl

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
# # ## ### ##### ######## #############
2323

2424
package require Tcl 8.5 9
25-
package require TclOO
25+
try {
26+
package require tcl::oo
27+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
28+
package require TclOO
29+
}
2630
package require tcl::chan::events
2731

2832
# # ## ### ##### ######## #############

‎modules/virtchannel_base/nullzero.tcl

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323
# # ## ### ##### ######## #############
2424

2525
package require Tcl 8.5 9
26-
package require TclOO
26+
try {
27+
package require tcl::oo
28+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
29+
package require TclOO
30+
}
2731
package require tcl::chan::events
2832

2933
# # ## ### ##### ######## #############

‎modules/virtchannel_base/random.tcl

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@
2626

2727
package require tcl::chan::events
2828
package require Tcl 8.5 9
29-
package require TclOO
29+
try {
30+
package require tcl::oo
31+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
32+
package require TclOO
33+
}
3034

3135
# # ## ### ##### ######## #############
3236

‎modules/virtchannel_base/std.tcl

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@
2626
# # ## ### ##### ######## #############
2727

2828
package require Tcl 8.5 9
29-
package require TclOO
29+
try {
30+
package require tcl::oo
31+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
32+
package require TclOO
33+
}
3034
package require tcl::chan::core
3135

3236
# # ## ### ##### ######## #############

‎modules/virtchannel_base/string.tcl

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
# # ## ### ##### ######## #############
2727

2828
package require Tcl 8.5 9
29-
if {[catch {package require tcl::oo}]} {
29+
try {
30+
package require tcl::oo
31+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
3032
package require TclOO
3133
}
3234
package require tcl::chan::events

‎modules/virtchannel_base/textwindow.tcl

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@
2626
# # ## ### ##### ######## #############
2727

2828
package require Tcl 8.5 9
29-
package require TclOO
29+
try {
30+
package require tcl::oo
31+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
32+
package require TclOO
33+
}
3034
package require tcl::chan::events
3135

3236
# # ## ### ##### ######## #############

‎modules/virtchannel_base/variable.tcl

+5-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@
2929
# # ## ### ##### ######## #############
3030

3131
package require Tcl 8.5 9
32-
package require TclOO
32+
try {
33+
package require tcl::oo
34+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
35+
package require TclOO
36+
}
3337
package require tcl::chan::events
3438

3539
# # ## ### ##### ######## #############

‎modules/virtchannel_base/zero.tcl

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
# # ## ### ##### ######## #############
2323

2424
package require Tcl 8.5 9
25-
package require TclOO
25+
try {
26+
package require tcl::oo
27+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
28+
package require TclOO
29+
}
2630
package require tcl::chan::events
2731

2832
# # ## ### ##### ######## #############

‎modules/virtchannel_core/core.tcl

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
# # ## ### ##### ######## #############
2323

2424
package require Tcl 8.5 9
25-
if {[catch {package require tcl::oo}]} {
25+
try {
26+
package require tcl::oo
27+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
2628
package require TclOO
2729
}
2830

‎modules/virtchannel_core/events.tcl

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
# # ## ### ##### ######## #############
2828

2929
package require Tcl 8.5 9
30-
if {[catch {package require tcl::oo}]} {
30+
try {
31+
package require tcl::oo
32+
} trap {TCL PACKAGE UNFOUND} {tres topts} {
3133
package require TclOO
3234
}
3335
package require tcl::chan::core

0 commit comments

Comments
 (0)