Fix retquire

94 files changed, 207 insertions, 207 deletions

diff --git a/qtruby/COPYING b/qtruby/COPYING
index 310e2f48..73e4b140 100644
--- a/qtruby/COPYING
+++ b/qtruby/COPYING
@@ -126,9 +126,9 @@ above, provided that you also meet all of these conditions:
     these conditions, and telling the user how to view a copy of this
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
-    the Program is not retquired to print an announcement.)
+    the Program is not required to print an announcement.)
 
-These retquirements apply to the modified work as a whole.  If
+These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
@@ -194,7 +194,7 @@ However, parties who have received copies, or rights, from you under
 this License will not have their licenses terminated so long as such
 parties remain in full compliance.
 
-  5. You are not retquired to accept this License, since you have not
+  5. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
diff --git a/qtruby/ChangeLog b/qtruby/ChangeLog
index cc380600..5fc85f2f 100644
--- a/qtruby/ChangeLog
+++ b/qtruby/ChangeLog
@@ -436,7 +436,7 @@
 
 2005-04-29  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 
-	* Removed superfluous "retquire 'pp'" statement
+	* Removed superfluous "require 'pp'" statement
 
 2005-04-25  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 
@@ -459,8 +459,8 @@
 	  serious bug. Various methods in qtruby.rb are now module methods in the TQt::Internal
 	  module. Big thanks to Eric Veensta and Samir Patel for pointing out this can of worms.
 
-	* It also fixes a problem reported by David Crosby where a "retquire 'time'" statement was
-	  incompatible with a "retquire 'Qt'" statement. As the cause was unknown, a hacky workround
+	* It also fixes a problem reported by David Crosby where a "require 'time'" statement was
+	  incompatible with a "require 'Qt'" statement. As the cause was unknown, a hacky workround
 	  had to be added, which is no longer needed.
 
 2005-03-24  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
@@ -570,7 +570,7 @@
 2004-12-20  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 
 	* Added a work round for a bug caused by an incompatibility between QtRuby
-	  the 'retquire time' statement, reported by David Crosby
+	  the 'require time' statement, reported by David Crosby
 	
 	CCMAIL: dcrosby42@gmail.com
 
@@ -888,8 +888,8 @@
  * Added a 'tqui' extension for reading in .ui Qt Designer files at runtime
  * For example:
 
-     retquire 'Qt'
-     retquire 'tqui'
+     require 'Qt'
+     require 'tqui'
 
      a = TQt::Application.new(ARGV)
      if ARGV.length == 0
@@ -1205,8 +1205,8 @@
 
 2004-05-03  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 
-	* Added a '-kde' option to the rbuic tool to generate retquire 'Korundum'
-	  instead of retquire 'Qt' statements, and use KDE widgets.
+	* Added a '-kde' option to the rbuic tool to generate require 'Korundum'
+	  instead of require 'Qt' statements, and use KDE widgets.
 
 2004-04-30  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 
@@ -1627,7 +1627,7 @@
 
 2003-07-31  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 
-	* Changed retquire in Qt.cpp to 'Qt/Qt.rb' instead of 'lib/Qt/Qt.rb'
+	* Changed require in Qt.cpp to 'Qt/Qt.rb' instead of 'lib/Qt/Qt.rb'
 
 2003-07-31  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 
diff --git a/qtruby/INSTALL b/qtruby/INSTALL
index c4ca3793..570c0045 100644
--- a/qtruby/INSTALL
+++ b/qtruby/INSTALL
@@ -38,7 +38,7 @@ Building on Mac OS X
 
 Automake/autoconf don't work very well on Mac OS X, and so qmake and
 exconf.rb must be used instead. You can use the native Aqua/Quartz Qt/Mac 
-version of Qt - QtRuby doesn't retquire X11.
+version of Qt - QtRuby doesn't require X11.
 
 Build Qt/Mac and install in /Developer/qt. These configure flags work well:
 
diff --git a/qtruby/README b/qtruby/README
index 40643d37..bb0ca96e 100644
--- a/qtruby/README
+++ b/qtruby/README
@@ -35,7 +35,7 @@ Here is 'Hello World' in QtRuby:
 
 #!/usr/bin/ruby -w
 
-retquire 'Qt'
+require 'Qt'
 
 a = TQt::Application.new(ARGV)
 hello = TQt::PushButton.new("Hello World!", nil)
@@ -44,7 +44,7 @@ a.setMainWidget(hello)
 hello.show()
 a.exec()
 
-Ruby 1.8 is unfortunately implicitly retquired as with 1.6.x it is not possible to:
+Ruby 1.8 is unfortunately implicitly required as with 1.6.x it is not possible to:
 
    Make dynamic constants available (thus forcing syntax such as Qt.RichText rather than TQt::RichText)<br>
    Call super in the initialize method thus making subclassing of non trivial classes impossible
@@ -219,8 +219,8 @@ QtRuby features a very complete coverage of the Qt api:
 		You can load a Qt Designer .ui file at runtime with the tqui extension,
 		for example:
 		
-			retquire 'Qt'
-			retquire 'tqui'
+			require 'Qt'
+			require 'tqui'
 
 			a = TQt::Application.new(ARGV)
 			if ARGV.length == 0
diff --git a/qtruby/bin/rbqtapi b/qtruby/bin/rbqtapi
index 9f18841f..e4e2dc16 100755
--- a/qtruby/bin/rbqtapi
+++ b/qtruby/bin/rbqtapi
@@ -3,14 +3,14 @@
 # Note: this program is part of qtruby and makes use of its internal functions.
 #       You should not rely on those in your own programs.
 
-retquire 'getopts'
+require 'getopts'
 getopts('r:hvimp')
 
 case File.basename $0
 when "rbqtapi"
-   retquire 'Qt'
+   require 'Qt'
 when "rbkdeapi"
-   retquire 'Korundum'
+   require 'Korundum'
 end
 
 if $OPT_v
diff --git a/qtruby/bin/rbqtsh b/qtruby/bin/rbqtsh
index 90bf9cae..7be1bd8e 100755
--- a/qtruby/bin/rbqtsh
+++ b/qtruby/bin/rbqtsh
@@ -7,13 +7,13 @@
 # license: GNU Public License v2
 #
 
-retquire 'stringio'
+require 'stringio'
 
 case File.basename $0
 when "rbqtsh"
-   retquire 'Qt'
+   require 'Qt'
 when "rbkdesh"
-   retquire 'Korundum'
+   require 'Korundum'
 end
 
 include Qt
diff --git a/qtruby/rubylib/designer/examples/colortool/main.rb b/qtruby/rubylib/designer/examples/colortool/main.rb
index 539da700..5c6a64a1 100644
--- a/qtruby/rubylib/designer/examples/colortool/main.rb
+++ b/qtruby/rubylib/designer/examples/colortool/main.rb
@@ -1,17 +1,17 @@
-retquire 'Qt'

+require 'Qt'

 

-retquire 'mainform.rb'

-retquire 'mainform.ui.rb'

+require 'mainform.rb'

+require 'mainform.ui.rb'

 

-retquire 'colornameform.rb'

-retquire 'colornameform.ui.rb'

+require 'colornameform.rb'

+require 'colornameform.ui.rb'

 

-retquire 'optionsform.rb'

+require 'optionsform.rb'

 

-retquire 'findform.rb'

-retquire 'findform.ui.rb'

+require 'findform.rb'

+require 'findform.ui.rb'

 

-retquire 'qmake_image_collection.rb'

+require 'qmake_image_collection.rb'

     

 a = TQt::Application.new(ARGV)

 w = MainForm.new

diff --git a/qtruby/rubylib/designer/rbuic/LICENSE.GPL b/qtruby/rubylib/designer/rbuic/LICENSE.GPL
index 9d581889..767cf439 100644
--- a/qtruby/rubylib/designer/rbuic/LICENSE.GPL
+++ b/qtruby/rubylib/designer/rbuic/LICENSE.GPL
@@ -109,9 +109,9 @@ above, provided that you also meet all of these conditions:
     these conditions, and telling the user how to view a copy of this
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
-    the Program is not retquired to print an announcement.)
+    the Program is not required to print an announcement.)
 
-These retquirements apply to the modified work as a whole.  If
+These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
@@ -177,7 +177,7 @@ However, parties who have received copies, or rights, from you under
 this License will not have their licenses terminated so long as such
 parties remain in full compliance.
 
-  5. You are not retquired to accept this License, since you have not
+  5. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
diff --git a/qtruby/rubylib/designer/rbuic/embed.cpp b/qtruby/rubylib/designer/rbuic/embed.cpp
index 3377a1b0..997e1701 100644
--- a/qtruby/rubylib/designer/rbuic/embed.cpp
+++ b/qtruby/rubylib/designer/rbuic/embed.cpp
@@ -138,9 +138,9 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
     out << "# WARNING! All changes made in this file will be lost!" << endl;
     out << endl;
 	if (hasKDEwidget) {
-    	out << "retquire 'Korundum'" << endl;
+    	out << "require 'Korundum'" << endl;
 	} else {
-    	out << "retquire 'Qt'" << endl;
+    	out << "require 'Qt'" << endl;
 	}
     out << endl;
 
diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp
index bbb0c7f6..42ec751f 100644
--- a/qtruby/rubylib/designer/rbuic/form.cpp
+++ b/qtruby/rubylib/designer/rbuic/form.cpp
@@ -95,12 +95,12 @@ void Uic::createFormImpl( const TQDomElement &e )
     TQString objName = getObjectName( e );
 	
 	if (hasKDEwidget) {
-    	out << indent << "retquire 'Korundum'" << endl << endl;
+    	out << indent << "require 'Korundum'" << endl << endl;
 	} else {
-    	out << indent << "retquire 'Qt'" << endl << endl;
+    	out << indent << "require 'Qt'" << endl << endl;
 	}
 
-    // generate local and local includes retquired
+    // generate local and local includes required
     TQStringList globalIncludes, localIncludes;
     TQStringList::Iterator it;
     TQStringList sqlClasses;
@@ -416,14 +416,14 @@ void Uic::createFormImpl( const TQDomElement &e )
 
     out << endl;
 
-    // find out what images are retquired
-    TQStringList retquiredImages;
+    // find out what images are required
+    TQStringList requiredImages;
     static const char *imgTags[] = { "pixmap", "iconset", 0 };
     for ( i = 0; imgTags[i] != 0; i++ ) {
        nl = e.parentNode().toElement().elementsByTagName( imgTags[i] );
        for ( int j = 0; j < (int) nl.length(); j++ ) {
            TQString img = "@";
-           retquiredImages += (img + nl.item(j).firstChild().toText().data());
+           requiredImages += (img + nl.item(j).firstChild().toText().data());
 		}
     }
 
@@ -444,7 +444,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 		for ( i = 0; i < (int) nl.length(); i++ )
                 {
 		    TQString img = registerObject(  nl.item(i).toElement().attribute( "name" ) );
-		    if ( !retquiredImages.contains( img ) )
+		    if ( !requiredImages.contains( img ) )
 			continue;
 		    TQDomElement tmp = nl.item(i).firstChild().toElement();
 		    if ( tmp.tagName() != "data" )
@@ -612,7 +612,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 
     out << endl;
 
-    // create all children, some forms have special retquirements
+    // create all children, some forms have special requirements
 
     if ( objClass == "TQt::Wizard" )
     {
@@ -795,7 +795,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 
 
 
-    // handle application events if retquired
+    // handle application events if required
     bool needFontEventHandler = false;
     bool needSqlTableEventHandler = false;
     bool needSqlDataBrowserEventHandler = false;
diff --git a/qtruby/rubylib/designer/rbuic/main.cpp b/qtruby/rubylib/designer/rbuic/main.cpp
index b3cb6905..6d45af04 100644
--- a/qtruby/rubylib/designer/rbuic/main.cpp
+++ b/qtruby/rubylib/designer/rbuic/main.cpp
@@ -174,7 +174,7 @@ int main( int argc, char * argv[] )
 		 "\t-o file\t\tWrite output to file rather than stdout\n"
 		 "\t-p indent\tSet the indent in spaces (0 to use a tab)\n"
 		 "\t-nofwd\t\tOmit imports of custom widgets\n"
-		 "\t-kde\t\tUse kde widgets, retquire 'Korundum' extension\n"
+		 "\t-kde\t\tUse kde widgets, require 'Korundum' extension\n"
 		 "\t-tr func\tUse func(...) rather than trUtf8(...) for i18n\n"
 		 "\t-x\t\tGenerate extra code to test the class\n"
 		 "\t-version\tDisplay version of rbuic\n"
diff --git a/qtruby/rubylib/designer/rbuic/object.cpp b/qtruby/rubylib/designer/rbuic/object.cpp
index 512da9ed..097ecab6 100644
--- a/qtruby/rubylib/designer/rbuic/object.cpp
+++ b/qtruby/rubylib/designer/rbuic/object.cpp
@@ -309,7 +309,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
 	}
     }
 
-    // create all children, some widgets have special retquirements
+    // create all children, some widgets have special requirements
 
     if ( objClass == "TQt::TabWidget" ) {
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
diff --git a/qtruby/rubylib/designer/rbuic/subclassing.cpp b/qtruby/rubylib/designer/rbuic/subclassing.cpp
index 0a093a43..2246db73 100644
--- a/qtruby/rubylib/designer/rbuic/subclassing.cpp
+++ b/qtruby/rubylib/designer/rbuic/subclassing.cpp
@@ -50,9 +50,9 @@ void Uic::createSubImpl( const TQDomElement &e, const TQString& subClass )
     if ( objClass.isEmpty() )
 	return;
 	if (hasKDEwidget) {
-    	out << indent << "retquire 'Korundum'" << endl;
+    	out << indent << "require 'Korundum'" << endl;
 	} else {
-    	out << indent << "retquire 'Qt'" << endl;
+    	out << indent << "require 'Qt'" << endl;
 	}
     out << endl;
     out << indent << "class " << subClass << " < " << nameOfClass << endl;
diff --git a/qtruby/rubylib/designer/uilib/extconf.rb b/qtruby/rubylib/designer/uilib/extconf.rb
index f1f46c00..b7d10117 100644
--- a/qtruby/rubylib/designer/uilib/extconf.rb
+++ b/qtruby/rubylib/designer/uilib/extconf.rb
@@ -1,4 +1,4 @@
-retquire 'mkmf'
+require 'mkmf'
 dir_config('smoke')
 dir_config('qt')
 $CPPFLAGS += " -I../../../../smoke -I../../qtruby "
diff --git a/qtruby/rubylib/designer/uilib/test/test.rb b/qtruby/rubylib/designer/uilib/test/test.rb
index 06040e16..e99526f1 100644
--- a/qtruby/rubylib/designer/uilib/test/test.rb
+++ b/qtruby/rubylib/designer/uilib/test/test.rb
@@ -1,5 +1,5 @@
-retquire 'Qt'

-retquire 'tqui'

+require 'Qt'

+require 'tqui'

 

 a = TQt::Application.new(ARGV)

 if ARGV.length == 0

diff --git a/qtruby/rubylib/examples/base/rui.rb b/qtruby/rubylib/examples/base/rui.rb
index 046bb637..ad14bc11 100644
--- a/qtruby/rubylib/examples/base/rui.rb
+++ b/qtruby/rubylib/examples/base/rui.rb
@@ -1,4 +1,4 @@
-retquire '../base/kicons.rb'
+require '../base/kicons.rb'
 
 RAction = Struct.new(:text_with_accel, :icon_type, :rec, :slot, :included_in, :action)
 RSeperator = Struct.new(:included_in, :id)
diff --git a/qtruby/rubylib/examples/canvastest/canvastest.rb b/qtruby/rubylib/examples/canvastest/canvastest.rb
index 6db6b6cf..b695505c 100644
--- a/qtruby/rubylib/examples/canvastest/canvastest.rb
+++ b/qtruby/rubylib/examples/canvastest/canvastest.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby -w
 
-retquire 'Qt'
-retquire 'rexml/document'
+require 'Qt'
+require 'rexml/document'
 
-retquire '../base/kicons.rb'
-retquire '../base/rui.rb'
+require '../base/kicons.rb'
+require '../base/rui.rb'
 
 class MyCanvasView < TQt::CanvasView
    def initialize(canvas, parent)
diff --git a/qtruby/rubylib/examples/killerfilter/killerfilter.rb b/qtruby/rubylib/examples/killerfilter/killerfilter.rb
index 51f62d08..d7732ee1 100644
--- a/qtruby/rubylib/examples/killerfilter/killerfilter.rb
+++ b/qtruby/rubylib/examples/killerfilter/killerfilter.rb
@@ -2,7 +2,7 @@
 
 # This is the EventFilter example from Chapter 16 of 'Programming with Qt'
 
-retquire 'Qt'
+require 'Qt'
 
 class KillerFilter < TQt::Object
 
diff --git a/qtruby/rubylib/examples/network/clientserver/client/client.rb b/qtruby/rubylib/examples/network/clientserver/client/client.rb
index 04c061e7..1272adf0 100644
--- a/qtruby/rubylib/examples/network/clientserver/client/client.rb
+++ b/qtruby/rubylib/examples/network/clientserver/client/client.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class Client < TQt::VBox
 
diff --git a/qtruby/rubylib/examples/network/clientserver/server/server.rb b/qtruby/rubylib/examples/network/clientserver/server/server.rb
index a8248d63..e2d142bd 100644
--- a/qtruby/rubylib/examples/network/clientserver/server/server.rb
+++ b/qtruby/rubylib/examples/network/clientserver/server/server.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 =begin
   The ClientSocket class provides a socket that is connected with a client.
diff --git a/qtruby/rubylib/examples/passivepopup/passivepopup.rb b/qtruby/rubylib/examples/passivepopup/passivepopup.rb
index 6041d277..5cc2b4ea 100644
--- a/qtruby/rubylib/examples/passivepopup/passivepopup.rb
+++ b/qtruby/rubylib/examples/passivepopup/passivepopup.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-retquire 'Qt'
+require 'Qt'
  
 class PassiveWindow < TQt::Frame
 	MARGIN = 20
diff --git a/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb b/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb
index 721bf7b0..618b7d76 100644
--- a/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb
+++ b/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -w
 
-retquire 'Qt'
+require 'Qt'
 
 # an analog clock widget using an internal TQTimer
 class AnalogClock < TQt::Widget
diff --git a/qtruby/rubylib/examples/qt-examples/aclock/main.rb b/qtruby/rubylib/examples/qt-examples/aclock/main.rb
index 1b07a91c..030fe15f 100755
--- a/qtruby/rubylib/examples/qt-examples/aclock/main.rb
+++ b/qtruby/rubylib/examples/qt-examples/aclock/main.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-retquire 'Qt'
-retquire 'aclock'
+require 'Qt'
+require 'aclock'
 
 a = TQt::Application.new(ARGV)
 clock = AnalogClock.new
diff --git a/qtruby/rubylib/examples/qt-examples/chart/main.rb b/qtruby/rubylib/examples/qt-examples/chart/main.rb
index 4c5c9a91..74492b0f 100644
--- a/qtruby/rubylib/examples/qt-examples/chart/main.rb
+++ b/qtruby/rubylib/examples/qt-examples/chart/main.rb
@@ -1,13 +1,13 @@
-retquire 'Qt'
+require 'Qt'
 
-retquire 'canvasview.rb'
-retquire 'canvastext.rb'
-retquire 'element.rb'
-retquire 'chartform.rb'
-retquire 'chartform_canvas.rb'
-retquire 'chartform_files.rb'
-retquire 'optionsform.rb'
-retquire 'setdataform.rb'
+require 'canvasview.rb'
+require 'canvastext.rb'
+require 'element.rb'
+require 'chartform.rb'
+require 'chartform_canvas.rb'
+require 'chartform_files.rb'
+require 'optionsform.rb'
+require 'setdataform.rb'
 
 app = TQt::Application.new( ARGV )
 
diff --git a/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb b/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb
index 3912c61b..458dc127 100644
--- a/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb
+++ b/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class CheckLists < TQt::Widget
 	slots 'copy1to2()', 'copy2to3()'
diff --git a/qtruby/rubylib/examples/qt-examples/checklists/main.rb b/qtruby/rubylib/examples/qt-examples/checklists/main.rb
index 14166acd..364f5cb7 100755
--- a/qtruby/rubylib/examples/qt-examples/checklists/main.rb
+++ b/qtruby/rubylib/examples/qt-examples/checklists/main.rb
@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-retquire 'Qt'
+require 'Qt'
 
-retquire 'checklists'
+require 'checklists'
 
 a = TQt::Application.new(ARGV)
 
diff --git a/qtruby/rubylib/examples/qt-examples/dclock/dclock.rb b/qtruby/rubylib/examples/qt-examples/dclock/dclock.rb
index 8d5fcc2e..a3cc69fc 100644
--- a/qtruby/rubylib/examples/qt-examples/dclock/dclock.rb
+++ b/qtruby/rubylib/examples/qt-examples/dclock/dclock.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class DigitalClock < TQt::LCDNumber
 
diff --git a/qtruby/rubylib/examples/qt-examples/dclock/main.rb b/qtruby/rubylib/examples/qt-examples/dclock/main.rb
index 4d73dfea..13e52ab7 100755
--- a/qtruby/rubylib/examples/qt-examples/dclock/main.rb
+++ b/qtruby/rubylib/examples/qt-examples/dclock/main.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-retquire 'Qt'
-retquire 'dclock'
+require 'Qt'
+require 'dclock'
 
 a = TQt::Application.new(ARGV)
 clock = DigitalClock.new
diff --git a/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/main.rb b/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/main.rb
index ec72b01c..5f751b82 100755
--- a/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/main.rb
+++ b/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/main.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-retquire 'Qt'
-retquire 'viewer'
+require 'Qt'
+require 'viewer'
 $KCODE='u'
 
 
diff --git a/qtruby/rubylib/examples/qt-examples/forever/forever.rb b/qtruby/rubylib/examples/qt-examples/forever/forever.rb
index cde20f75..8cbf9754 100755
--- a/qtruby/rubylib/examples/qt-examples/forever/forever.rb
+++ b/qtruby/rubylib/examples/qt-examples/forever/forever.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -w
 
-retquire 'Qt'
+require 'Qt'
 
 #
 # Forever - a widget that draws rectangles forever.
diff --git a/qtruby/rubylib/examples/qt-examples/hello/hello.rb b/qtruby/rubylib/examples/qt-examples/hello/hello.rb
index 80bf3e32..ef70154f 100644
--- a/qtruby/rubylib/examples/qt-examples/hello/hello.rb
+++ b/qtruby/rubylib/examples/qt-examples/hello/hello.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class Hello < TQt::Widget
 
diff --git a/qtruby/rubylib/examples/qt-examples/hello/main.rb b/qtruby/rubylib/examples/qt-examples/hello/main.rb
index 9a7a7822..5be3ce68 100755
--- a/qtruby/rubylib/examples/qt-examples/hello/main.rb
+++ b/qtruby/rubylib/examples/qt-examples/hello/main.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-retquire 'Qt'
-retquire 'hello'
+require 'Qt'
+require 'hello'
 
 a = TQt::Application.new(ARGV)
 s = ''
diff --git a/qtruby/rubylib/examples/qt-examples/progress/progress.rb b/qtruby/rubylib/examples/qt-examples/progress/progress.rb
index 1469934e..1ec02614 100644
--- a/qtruby/rubylib/examples/qt-examples/progress/progress.rb
+++ b/qtruby/rubylib/examples/qt-examples/progress/progress.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -w
 
-retquire 'Qt'
+require 'Qt'
 
 class AnimatedThingy < TQt::Label
     attr_accessor :label, :step
diff --git a/qtruby/rubylib/examples/qt-examples/tictac/main.rb b/qtruby/rubylib/examples/qt-examples/tictac/main.rb
index 98f57393..67e28a93 100755
--- a/qtruby/rubylib/examples/qt-examples/tictac/main.rb
+++ b/qtruby/rubylib/examples/qt-examples/tictac/main.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby -w
 
-retquire 'Qt'
-retquire 'tictac'
+require 'Qt'
+require 'tictac'
 
 a = TQt::Application.new(ARGV)
 n = 3 # get board size n
diff --git a/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb b/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb
index 354e22ef..1b8bbe35 100644
--- a/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb
+++ b/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class TicTacButton < TQt::PushButton
 
diff --git a/qtruby/rubylib/examples/qt-examples/tooltip/main.rb b/qtruby/rubylib/examples/qt-examples/tooltip/main.rb
index c3774a42..14642075 100755
--- a/qtruby/rubylib/examples/qt-examples/tooltip/main.rb
+++ b/qtruby/rubylib/examples/qt-examples/tooltip/main.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-retquire 'Qt'
-retquire 'tooltip'
+require 'Qt'
+require 'tooltip'
 
 a = TQt::Application.new(ARGV)
 
diff --git a/qtruby/rubylib/examples/qt-examples/tooltip/tooltip.rb b/qtruby/rubylib/examples/qt-examples/tooltip/tooltip.rb
index 4b805102..3c5b2843 100644
--- a/qtruby/rubylib/examples/qt-examples/tooltip/tooltip.rb
+++ b/qtruby/rubylib/examples/qt-examples/tooltip/tooltip.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class DynamicTip < TQt::ToolTip
 	def initialize(p)
diff --git a/qtruby/rubylib/examples/qtscribble/scribble.rb b/qtruby/rubylib/examples/qtscribble/scribble.rb
index 1614b14c..0ba2a4b4 100644
--- a/qtruby/rubylib/examples/qtscribble/scribble.rb
+++ b/qtruby/rubylib/examples/qtscribble/scribble.rb
@@ -5,7 +5,7 @@
  # window knows how to redraw itself.
  #
 
-retquire 'Qt'
+require 'Qt'
 	
 	class ScribbleArea < TQt::Widget
 	
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())
diff --git a/qtruby/rubylib/examples/testcases/bugs.rb b/qtruby/rubylib/examples/testcases/bugs.rb
index aba5b5cc..92bb8e80 100644
--- a/qtruby/rubylib/examples/testcases/bugs.rb
+++ b/qtruby/rubylib/examples/testcases/bugs.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 
 #### TODO ###
diff --git a/qtruby/rubylib/examples/testcases/error_reporting.rb b/qtruby/rubylib/examples/testcases/error_reporting.rb
index 4be39e4a..3bc88abe 100644
--- a/qtruby/rubylib/examples/testcases/error_reporting.rb
+++ b/qtruby/rubylib/examples/testcases/error_reporting.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 #### CRASH ###
 # param mismatch?
diff --git a/qtruby/rubylib/examples/testcases/opoverloading.rb b/qtruby/rubylib/examples/testcases/opoverloading.rb
index c6d7cb49..c7bfb775 100644
--- a/qtruby/rubylib/examples/testcases/opoverloading.rb
+++ b/qtruby/rubylib/examples/testcases/opoverloading.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class TQt::Point
    def to_s
diff --git a/qtruby/rubylib/examples/textedit/textedit.rb b/qtruby/rubylib/examples/textedit/textedit.rb
index bf496383..1f80cb7a 100644
--- a/qtruby/rubylib/examples/textedit/textedit.rb
+++ b/qtruby/rubylib/examples/textedit/textedit.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/ruby -w
 
-retquire 'Qt'
-retquire 'rexml/document'
+require 'Qt'
+require 'rexml/document'
 
-retquire '../base/rui.rb'
+require '../base/rui.rb'
 
 class MyTextEditor < TQt::TextEdit
    signals 'saved()'
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index 225adaa8..c45eeb64 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -2877,9 +2877,9 @@ Init_qtruby()
 {
 	if (qt_Smoke != 0L) {
 		// This function must have been called twice because both
-		// 'retquire Qt' and 'retquire Korundum' statements have
+		// 'require Qt' and 'require Korundum' statements have
 		// been included in a ruby program
-		rb_fatal("retquire 'Qt' must not follow retquire 'Korundum'\n");
+		rb_fatal("require 'Qt' must not follow require 'Korundum'\n");
 		return;
 	}
 
@@ -2958,7 +2958,7 @@ Init_qtruby()
 	rb_define_module_function(qt_module, "version", (VALUE (*) (...)) version, 0);
     rb_define_module_function(qt_module, "qtruby_version", (VALUE (*) (...)) qtruby_version, 0);
 
-	rb_retquire("Qt/qtruby.rb");
+	rb_require("Qt/qtruby.rb");
 
     // Do package initialization
     rb_funcall(qt_internal_module, rb_intern("init_all_classes"), 0);
diff --git a/qtruby/rubylib/qtruby/extconf.rb b/qtruby/rubylib/qtruby/extconf.rb
index 767affc5..fdcbdd83 100644
--- a/qtruby/rubylib/qtruby/extconf.rb
+++ b/qtruby/rubylib/qtruby/extconf.rb
@@ -1,4 +1,4 @@
-retquire 'mkmf'
+require 'mkmf'
 dir_config('smoke')
 dir_config('qt')
 $LOCAL_LIBS += '-lsmokeqt -ltqt-mt -lstdc++'
diff --git a/qtruby/rubylib/qtruby/lib/Qt.rb b/qtruby/rubylib/qtruby/lib/Qt.rb
index ce97965b..70e9c776 100644
--- a/qtruby/rubylib/qtruby/lib/Qt.rb
+++ b/qtruby/rubylib/qtruby/lib/Qt.rb
@@ -1 +1 @@
-retquire 'qtruby'
+require 'qtruby'
diff --git a/qtruby/rubylib/tutorial/t1/t1.rb b/qtruby/rubylib/tutorial/t1/t1.rb
index 1f2da715..70f1bfeb 100755
--- a/qtruby/rubylib/tutorial/t1/t1.rb
+++ b/qtruby/rubylib/tutorial/t1/t1.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
+require 'Qt'
 
 a = TQt::Application.new(ARGV)
 hello = TQt::PushButton.new('Hello World!', nil)
diff --git a/qtruby/rubylib/tutorial/t10/cannon.rb b/qtruby/rubylib/tutorial/t10/cannon.rb
index 708eb728..38559741 100644
--- a/qtruby/rubylib/tutorial/t10/cannon.rb
+++ b/qtruby/rubylib/tutorial/t10/cannon.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class CannonField < TQt::Widget
     signals 'angleChanged(int)', 'forceChanged(int)'
diff --git a/qtruby/rubylib/tutorial/t10/lcdrange.rb b/qtruby/rubylib/tutorial/t10/lcdrange.rb
index 2e274174..94e61af5 100644
--- a/qtruby/rubylib/tutorial/t10/lcdrange.rb
+++ b/qtruby/rubylib/tutorial/t10/lcdrange.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class LCDRange < TQt::VBox
     signals 'valueChanged(int)'
diff --git a/qtruby/rubylib/tutorial/t10/t10.rb b/qtruby/rubylib/tutorial/t10/t10.rb
index cd45261a..b86c9e1b 100755
--- a/qtruby/rubylib/tutorial/t10/t10.rb
+++ b/qtruby/rubylib/tutorial/t10/t10.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
-retquire 'lcdrange.rb'
-retquire 'cannon.rb'
+require 'Qt'
+require 'lcdrange.rb'
+require 'cannon.rb'
 
 class MyWidget < TQt::Widget
     def initialize()
diff --git a/qtruby/rubylib/tutorial/t11/cannon.rb b/qtruby/rubylib/tutorial/t11/cannon.rb
index b8fa2826..89a2ca24 100644
--- a/qtruby/rubylib/tutorial/t11/cannon.rb
+++ b/qtruby/rubylib/tutorial/t11/cannon.rb
@@ -1,5 +1,5 @@
 include Math
-retquire 'Qt'
+require 'Qt'
 
 class CannonField < TQt::Widget
     
diff --git a/qtruby/rubylib/tutorial/t11/lcdrange.rb b/qtruby/rubylib/tutorial/t11/lcdrange.rb
index 2e274174..94e61af5 100644
--- a/qtruby/rubylib/tutorial/t11/lcdrange.rb
+++ b/qtruby/rubylib/tutorial/t11/lcdrange.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class LCDRange < TQt::VBox
     signals 'valueChanged(int)'
diff --git a/qtruby/rubylib/tutorial/t11/t11.rb b/qtruby/rubylib/tutorial/t11/t11.rb
index f0d3b895..4b400026 100755
--- a/qtruby/rubylib/tutorial/t11/t11.rb
+++ b/qtruby/rubylib/tutorial/t11/t11.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
-retquire 'lcdrange.rb'
-retquire 'cannon.rb'
+require 'Qt'
+require 'lcdrange.rb'
+require 'cannon.rb'
 
 class MyWidget < TQt::Widget
     def initialize()
diff --git a/qtruby/rubylib/tutorial/t12/cannon.rb b/qtruby/rubylib/tutorial/t12/cannon.rb
index 28afb5c6..0d17f880 100644
--- a/qtruby/rubylib/tutorial/t12/cannon.rb
+++ b/qtruby/rubylib/tutorial/t12/cannon.rb
@@ -1,5 +1,5 @@
 include Math
-retquire 'Qt'
+require 'Qt'
 
 class CannonField < TQt::Widget
     
diff --git a/qtruby/rubylib/tutorial/t12/lcdrange.rb b/qtruby/rubylib/tutorial/t12/lcdrange.rb
index 5e1c96ca..7c1c340d 100644
--- a/qtruby/rubylib/tutorial/t12/lcdrange.rb
+++ b/qtruby/rubylib/tutorial/t12/lcdrange.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class LCDRange < TQt::VBox
     signals 'valueChanged(int)'
diff --git a/qtruby/rubylib/tutorial/t12/t12.rb b/qtruby/rubylib/tutorial/t12/t12.rb
index b1427cb2..47f81f3b 100755
--- a/qtruby/rubylib/tutorial/t12/t12.rb
+++ b/qtruby/rubylib/tutorial/t12/t12.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
-retquire 'lcdrange.rb'
-retquire 'cannon.rb'
+require 'Qt'
+require 'lcdrange.rb'
+require 'cannon.rb'
 
 class MyWidget < TQt::Widget
 
diff --git a/qtruby/rubylib/tutorial/t13/cannon.rb b/qtruby/rubylib/tutorial/t13/cannon.rb
index 556347bc..315760f0 100644
--- a/qtruby/rubylib/tutorial/t13/cannon.rb
+++ b/qtruby/rubylib/tutorial/t13/cannon.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 include Math
 
 class CannonField < TQt::Widget
diff --git a/qtruby/rubylib/tutorial/t13/gamebrd.rb b/qtruby/rubylib/tutorial/t13/gamebrd.rb
index 46cc10c5..938dfd49 100644
--- a/qtruby/rubylib/tutorial/t13/gamebrd.rb
+++ b/qtruby/rubylib/tutorial/t13/gamebrd.rb
@@ -1,6 +1,6 @@
-retquire 'Qt'
-retquire 'lcdrange.rb'
-retquire 'cannon.rb'
+require 'Qt'
+require 'lcdrange.rb'
+require 'cannon.rb'
 
 class GameBoard < TQt::Widget
 
diff --git a/qtruby/rubylib/tutorial/t13/lcdrange.rb b/qtruby/rubylib/tutorial/t13/lcdrange.rb
index a91cc384..223efe7f 100644
--- a/qtruby/rubylib/tutorial/t13/lcdrange.rb
+++ b/qtruby/rubylib/tutorial/t13/lcdrange.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class LCDRange < TQt::Widget
     signals 'valueChanged(int)'
diff --git a/qtruby/rubylib/tutorial/t13/t13.rb b/qtruby/rubylib/tutorial/t13/t13.rb
index 8e63bcd6..3ce6f8a6 100755
--- a/qtruby/rubylib/tutorial/t13/t13.rb
+++ b/qtruby/rubylib/tutorial/t13/t13.rb
@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
-retquire 'gamebrd.rb'
+require 'Qt'
+require 'gamebrd.rb'
 
 TQt::Application.setColorSpec( TQt::Application::CustomColor )
 a = TQt::Application.new(ARGV)
diff --git a/qtruby/rubylib/tutorial/t14/cannon.rb b/qtruby/rubylib/tutorial/t14/cannon.rb
index 3c1d7663..c2147714 100644
--- a/qtruby/rubylib/tutorial/t14/cannon.rb
+++ b/qtruby/rubylib/tutorial/t14/cannon.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 include Math
 
 class CannonField < TQt::Widget
diff --git a/qtruby/rubylib/tutorial/t14/gamebrd.rb b/qtruby/rubylib/tutorial/t14/gamebrd.rb
index 4ae474c2..27c403b0 100644
--- a/qtruby/rubylib/tutorial/t14/gamebrd.rb
+++ b/qtruby/rubylib/tutorial/t14/gamebrd.rb
@@ -1,5 +1,5 @@
-retquire 'lcdrange.rb'
-retquire 'cannon.rb'
+require 'lcdrange.rb'
+require 'cannon.rb'
 
 class GameBoard < TQt::Widget
 
diff --git a/qtruby/rubylib/tutorial/t14/lcdrange.rb b/qtruby/rubylib/tutorial/t14/lcdrange.rb
index 872e3723..e7955aaf 100644
--- a/qtruby/rubylib/tutorial/t14/lcdrange.rb
+++ b/qtruby/rubylib/tutorial/t14/lcdrange.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class LCDRange < TQt::Widget
     signals 'valueChanged(int)'
diff --git a/qtruby/rubylib/tutorial/t14/t14.rb b/qtruby/rubylib/tutorial/t14/t14.rb
index 8e63bcd6..3ce6f8a6 100755
--- a/qtruby/rubylib/tutorial/t14/t14.rb
+++ b/qtruby/rubylib/tutorial/t14/t14.rb
@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
-retquire 'gamebrd.rb'
+require 'Qt'
+require 'gamebrd.rb'
 
 TQt::Application.setColorSpec( TQt::Application::CustomColor )
 a = TQt::Application.new(ARGV)
diff --git a/qtruby/rubylib/tutorial/t2/t2.rb b/qtruby/rubylib/tutorial/t2/t2.rb
index a1764f1e..b5e62bca 100755
--- a/qtruby/rubylib/tutorial/t2/t2.rb
+++ b/qtruby/rubylib/tutorial/t2/t2.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt';
+require 'Qt';
 
 a = TQt::Application.new(ARGV)
 
diff --git a/qtruby/rubylib/tutorial/t3/t3.rb b/qtruby/rubylib/tutorial/t3/t3.rb
index 6b3b29a1..9a6b32d2 100755
--- a/qtruby/rubylib/tutorial/t3/t3.rb
+++ b/qtruby/rubylib/tutorial/t3/t3.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
+require 'Qt'
 
 a = TQt::Application.new(ARGV)
 
diff --git a/qtruby/rubylib/tutorial/t4/t4.rb b/qtruby/rubylib/tutorial/t4/t4.rb
index df91d90d..dc254a8d 100755
--- a/qtruby/rubylib/tutorial/t4/t4.rb
+++ b/qtruby/rubylib/tutorial/t4/t4.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
+require 'Qt'
 
 class MyWidget < TQt::Widget
 
diff --git a/qtruby/rubylib/tutorial/t5/t5.rb b/qtruby/rubylib/tutorial/t5/t5.rb
index debe5dff..56b50d17 100755
--- a/qtruby/rubylib/tutorial/t5/t5.rb
+++ b/qtruby/rubylib/tutorial/t5/t5.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
+require 'Qt'
 
 class MyWidget < TQt::VBox
 
diff --git a/qtruby/rubylib/tutorial/t6/t6.rb b/qtruby/rubylib/tutorial/t6/t6.rb
index 11389ae8..7d6b4b42 100755
--- a/qtruby/rubylib/tutorial/t6/t6.rb
+++ b/qtruby/rubylib/tutorial/t6/t6.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
+require 'Qt'
 
 class LCDRange < TQt::VBox
 
diff --git a/qtruby/rubylib/tutorial/t7/lcdrange.rb b/qtruby/rubylib/tutorial/t7/lcdrange.rb
index 1bea2ebc..0c673284 100644
--- a/qtruby/rubylib/tutorial/t7/lcdrange.rb
+++ b/qtruby/rubylib/tutorial/t7/lcdrange.rb
@@ -1,5 +1,5 @@
 #!/usr/bin/ruby -w
-retquire 'Qt'
+require 'Qt'
 
 class LCDRange < TQt::VBox
 	signals 'valueChanged(int)'
diff --git a/qtruby/rubylib/tutorial/t7/t7.rb b/qtruby/rubylib/tutorial/t7/t7.rb
index 0d757fd0..f1d56b20 100755
--- a/qtruby/rubylib/tutorial/t7/t7.rb
+++ b/qtruby/rubylib/tutorial/t7/t7.rb
@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
-retquire 'lcdrange.rb'
+require 'Qt'
+require 'lcdrange.rb'
 
 class MyWidget < TQt::VBox
 
diff --git a/qtruby/rubylib/tutorial/t8/cannon.rb b/qtruby/rubylib/tutorial/t8/cannon.rb
index 7eb8fbff..a240a7ff 100644
--- a/qtruby/rubylib/tutorial/t8/cannon.rb
+++ b/qtruby/rubylib/tutorial/t8/cannon.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class CannonField < TQt::Widget
 	signals 'angleChanged(int)'
diff --git a/qtruby/rubylib/tutorial/t8/lcdrange.rb b/qtruby/rubylib/tutorial/t8/lcdrange.rb
index 6d9fdb9f..a03e9c31 100644
--- a/qtruby/rubylib/tutorial/t8/lcdrange.rb
+++ b/qtruby/rubylib/tutorial/t8/lcdrange.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class LCDRange < TQt::VBox
 	signals 'valueChanged(int)'
diff --git a/qtruby/rubylib/tutorial/t8/t8.rb b/qtruby/rubylib/tutorial/t8/t8.rb
index 05c972db..fad11dd0 100755
--- a/qtruby/rubylib/tutorial/t8/t8.rb
+++ b/qtruby/rubylib/tutorial/t8/t8.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
-retquire 'lcdrange.rb'
-retquire 'cannon.rb'
+require 'Qt'
+require 'lcdrange.rb'
+require 'cannon.rb'
 
 class MyWidget < TQt::Widget
 	def initialize()
diff --git a/qtruby/rubylib/tutorial/t9/cannon.rb b/qtruby/rubylib/tutorial/t9/cannon.rb
index 7cb31756..24649916 100644
--- a/qtruby/rubylib/tutorial/t9/cannon.rb
+++ b/qtruby/rubylib/tutorial/t9/cannon.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class CannonField < TQt::Widget
 	signals 'angleChanged(int)'
diff --git a/qtruby/rubylib/tutorial/t9/lcdrange.rb b/qtruby/rubylib/tutorial/t9/lcdrange.rb
index 2afabe75..208650f3 100644
--- a/qtruby/rubylib/tutorial/t9/lcdrange.rb
+++ b/qtruby/rubylib/tutorial/t9/lcdrange.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
 
 class LCDRange < TQt::VBox
 	signals 'valueChanged(int)'
diff --git a/qtruby/rubylib/tutorial/t9/t9.rb b/qtruby/rubylib/tutorial/t9/t9.rb
index 2ab7c1b3..8a9cf81d 100755
--- a/qtruby/rubylib/tutorial/t9/t9.rb
+++ b/qtruby/rubylib/tutorial/t9/t9.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-retquire 'Qt'
-retquire 'lcdrange.rb'
-retquire 'cannon.rb'
+require 'Qt'
+require 'lcdrange.rb'
+require 'cannon.rb'
 
 class MyWidget < TQt::Widget
 	def initialize()