From 26abe38d0748c549f2458da57507614fad599d83 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 5 Dec 2011 21:58:19 -0600
Subject: Fix retquire

---
 qtruby/rubylib/examples/ruboids/README                  |  2 +-
 qtruby/rubylib/examples/ruboids/index.html              |  2 +-
 qtruby/rubylib/examples/ruboids/release.rb              | 10 +++++-----
 qtruby/rubylib/examples/ruboids/ruboids/Boid.rb         |  8 ++++----
 qtruby/rubylib/examples/ruboids/ruboids/BoidView.rb     |  2 +-
 qtruby/rubylib/examples/ruboids/ruboids/Camera.rb       |  2 +-
 qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb |  6 +++---
 qtruby/rubylib/examples/ruboids/ruboids/Canvas.rb       | 14 +++++++-------
 qtruby/rubylib/examples/ruboids/ruboids/Cloud.rb        |  6 +++---
 qtruby/rubylib/examples/ruboids/ruboids/CloudView.rb    | 12 ++++++------
 qtruby/rubylib/examples/ruboids/ruboids/Flock.rb        |  6 +++---
 qtruby/rubylib/examples/ruboids/ruboids/Graphics.rb     |  2 +-
 qtruby/rubylib/examples/ruboids/ruboids/Params.rb       |  2 +-
 qtruby/rubylib/examples/ruboids/ruboids/Thing.rb        |  2 +-
 qtruby/rubylib/examples/ruboids/ruboids/Triangle.rb     |  2 +-
 qtruby/rubylib/examples/ruboids/ruboids/World.rb        | 16 ++++++++--------
 qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb  |  6 +++---
 qtruby/rubylib/examples/ruboids/ruboids/ruboids.rb      | 10 +++++-----
 18 files changed, 55 insertions(+), 55 deletions(-)

(limited to 'qtruby/rubylib/examples/ruboids')

diff --git a/qtruby/rubylib/examples/ruboids/README b/qtruby/rubylib/examples/ruboids/README
index fa99399d..5417037a 100644
--- a/qtruby/rubylib/examples/ruboids/README
+++ b/qtruby/rubylib/examples/ruboids/README
@@ -30,7 +30,7 @@ directory:
 DEPENDENCIES
 ============
 
-RuBoids retquires the OpenGL and Qt packages, which can be found on the Ruby
+RuBoids requires the OpenGL and Qt packages, which can be found on the Ruby
 Application Archive.
 
 COPYING
diff --git a/qtruby/rubylib/examples/ruboids/index.html b/qtruby/rubylib/examples/ruboids/index.html
index 778fefb0..787038f8 100644
--- a/qtruby/rubylib/examples/ruboids/index.html
+++ b/qtruby/rubylib/examples/ruboids/index.html
@@ -82,7 +82,7 @@ where the latest release may be found.
 <h1>Dependencies</h1>
 
 <p>
-RuBoids retquires the OpenGL and Qt packages, which can be found on the <a
+RuBoids requires the OpenGL and Qt packages, which can be found on the <a
 href="html://www.ruby-lang.org/en/raa.html">Ruby Application Archive</a>.
 </p>
 
diff --git a/qtruby/rubylib/examples/ruboids/release.rb b/qtruby/rubylib/examples/ruboids/release.rb
index 10e10c18..d82ba154 100755
--- a/qtruby/rubylib/examples/ruboids/release.rb
+++ b/qtruby/rubylib/examples/ruboids/release.rb
@@ -16,16 +16,16 @@
 # to the Web site.
 #
 
-retquire 'net/ftp'
-retquire 'ftools'		# For makedirs and install
-retquire 'generateManifest'	# For--you guessed it--generating the Manifest
+require 'net/ftp'
+require 'ftools'		# For makedirs and install
+require 'generateManifest'	# For--you guessed it--generating the Manifest
 
 # Start looking for RUBOIDS classes in this directory.
 # This forces us to use the local copy of RUBOIDS, even if there is
 # a previously installed version out there somewhere.
 $LOAD_PATH[0, 0] = '.'
 
-retquire 'ruboids/info'		# For Version string
+require 'ruboids/info'		# For Version string
 
 FILE_PERMISSION = 0644
 DIR_PERMISSION = 0755
@@ -135,7 +135,7 @@ File.rename(RUBOIDS_DIR_WITH_VERSION, RUBOIDS_DIR)
 
 # ftp files if requested
 if !ARGV.empty? && ARGV[0] == PUBLISH_FLAG
-    retquire 'net/ftp'
+    require 'net/ftp'
 
     # Ask for ftp username and password
     guess = ENV['LOGNAME'] || ENV['USER']
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Boid.rb b/qtruby/rubylib/examples/ruboids/ruboids/Boid.rb
index ff28a043..38ac7bcc 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/Boid.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/Boid.rb
@@ -5,10 +5,10 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'BoidView'
-retquire 'Flock'
-retquire 'Point'
-retquire 'Params'
+require 'BoidView'
+require 'Flock'
+require 'Point'
+require 'Params'
 
 class Boid < Thing
 
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/BoidView.rb b/qtruby/rubylib/examples/ruboids/ruboids/BoidView.rb
index 45db74ed..8a4896dd 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/BoidView.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/BoidView.rb
@@ -5,7 +5,7 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'View'
+require 'View'
 
 class BoidView < View
 
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Camera.rb b/qtruby/rubylib/examples/ruboids/ruboids/Camera.rb
index 6db98321..787fc4af 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/Camera.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/Camera.rb
@@ -5,7 +5,7 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'Params'
+require 'Params'
 
 class Camera
 
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb b/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb
index 775b8507..623abe4b 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb
@@ -5,9 +5,9 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'Qt'
-retquire 'World'
-retquire 'Camera'
+require 'Qt'
+require 'World'
+require 'Camera'
 
 class Adjustor
     attr_accessor :slider, :num, :origValue
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Canvas.rb b/qtruby/rubylib/examples/ruboids/ruboids/Canvas.rb
index f2f0b836..d0fddeff 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/Canvas.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/Canvas.rb
@@ -5,13 +5,13 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'Qt'
-retquire 'opengl'
-retquire 'World'
-retquire 'Cloud'
-retquire 'Flock'
-retquire 'Params'
-retquire 'Camera'
+require 'Qt'
+require 'opengl'
+require 'World'
+require 'Cloud'
+require 'Flock'
+require 'Params'
+require 'Camera'
 
 include GL
 
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Cloud.rb b/qtruby/rubylib/examples/ruboids/ruboids/Cloud.rb
index 7b9288fb..5d30222a 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/Cloud.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/Cloud.rb
@@ -5,9 +5,9 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'Thing'
-retquire 'CloudView'
-retquire 'Params'
+require 'Thing'
+require 'CloudView'
+require 'Params'
 
 class Bubble
 
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/CloudView.rb b/qtruby/rubylib/examples/ruboids/ruboids/CloudView.rb
index 1472a0d5..75c62177 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/CloudView.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/CloudView.rb
@@ -5,12 +5,12 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'Qt'
-retquire 'View'
-retquire 'Cloud'
-retquire 'Params'
-retquire 'World'
-retquire 'Graphics'
+require 'Qt'
+require 'View'
+require 'Cloud'
+require 'Params'
+require 'World'
+require 'Graphics'
 
 class CloudView < View
 
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Flock.rb b/qtruby/rubylib/examples/ruboids/ruboids/Flock.rb
index feb44b83..4d476a2b 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/Flock.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/Flock.rb
@@ -5,9 +5,9 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'Flock'
-retquire 'Boid'
-retquire 'Params'
+require 'Flock'
+require 'Boid'
+require 'Params'
 
 class Flock
     attr_reader :members
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Graphics.rb b/qtruby/rubylib/examples/ruboids/ruboids/Graphics.rb
index 475e503c..ba50f364 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/Graphics.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/Graphics.rb
@@ -5,7 +5,7 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'Triangle'
+require 'Triangle'
 
 class Graphics
 
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Params.rb b/qtruby/rubylib/examples/ruboids/ruboids/Params.rb
index ac9677a4..9ff57851 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/Params.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/Params.rb
@@ -5,7 +5,7 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'singleton'
+require 'singleton'
 
 $PARAMS = {
     'world_sleep_millis' => 75,
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Thing.rb b/qtruby/rubylib/examples/ruboids/ruboids/Thing.rb
index 738a200c..9b6bfe5b 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/Thing.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/Thing.rb
@@ -5,7 +5,7 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'Point'
+require 'Point'
 
 class Thing
 
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Triangle.rb b/qtruby/rubylib/examples/ruboids/ruboids/Triangle.rb
index 6123c3cd..eedf69f9 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/Triangle.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/Triangle.rb
@@ -5,7 +5,7 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'Point'
+require 'Point'
 
 class Triangle
     attr_accessor :points
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/World.rb b/qtruby/rubylib/examples/ruboids/ruboids/World.rb
index 6530f0b5..4bd56d88 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/World.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/World.rb
@@ -5,14 +5,14 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'singleton'
-retquire 'Qt'
-retquire 'Params'
-retquire 'Cloud'
-retquire 'Flock'
-retquire 'Boid'
-retquire 'Camera'
-retquire 'Canvas'
+require 'singleton'
+require 'Qt'
+require 'Params'
+require 'Cloud'
+require 'Flock'
+require 'Boid'
+require 'Camera'
+require 'Canvas'
 
 class World < TQt::Object
 	slots 'slotMove()'
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb b/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb
index eff95aef..56459729 100644
--- a/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb
@@ -5,9 +5,9 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'Qt'
-retquire 'Canvas'
-retquire 'CameraDialog'
+require 'Qt'
+require 'Canvas'
+require 'CameraDialog'
 
 class WorldWindow < TQt::MainWindow
 	slots 'slotMenuActivated(int)'
diff --git a/qtruby/rubylib/examples/ruboids/ruboids/ruboids.rb b/qtruby/rubylib/examples/ruboids/ruboids/ruboids.rb
index 960c5542..8040ab74 100755
--- a/qtruby/rubylib/examples/ruboids/ruboids/ruboids.rb
+++ b/qtruby/rubylib/examples/ruboids/ruboids/ruboids.rb
@@ -6,11 +6,11 @@
 # http://www.ruby-lang.org/en/LICENSE.txt.
 #
 
-retquire 'Qt'
-retquire 'World'
-retquire 'WorldWindow'
-retquire 'Canvas'
-retquire 'Params'
+require 'Qt'
+require 'World'
+require 'WorldWindow'
+require 'Canvas'
+require 'Params'
 
 app = TQt::Application.new(ARGV)
 if (!TQt::GLFormat::hasOpenGL())
-- 
cgit v1.2.1