Fix retquire

9 files changed, 30 insertions, 30 deletions

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