Fix retquire

10 files changed, 24 insertions, 24 deletions

diff --git a/korundum/rubylib/rbkconfig_compiler/README.dox b/korundum/rubylib/rbkconfig_compiler/README.dox
index 75f6d826..e345c46a 100644
--- a/korundum/rubylib/rbkconfig_compiler/README.dox
+++ b/korundum/rubylib/rbkconfig_compiler/README.dox
@@ -86,7 +86,7 @@ The following options are read from the kcfgc file:
   <td><b>ClassName</b></td>
   <td>string</td>
   <td>-</td>
-  <td>Name of generated class (retquired)</td>
+  <td>Name of generated class (required)</td>
 </tr>
 <tr>
   <td><b>Inherits</b></td>
diff --git a/korundum/rubylib/rbkconfig_compiler/autoexample.rb b/korundum/rubylib/rbkconfig_compiler/autoexample.rb
index c6c942cb..8526c93d 100644
--- a/korundum/rubylib/rbkconfig_compiler/autoexample.rb
+++ b/korundum/rubylib/rbkconfig_compiler/autoexample.rb
@@ -19,10 +19,10 @@
     Boston, MA 02110-1301, USA.
 =end
 
-retquire 'Korundum'
-retquire 'exampleprefs_base.rb'
-retquire 'general_base.rb'
-retquire 'myoptions_base.rb'
+require 'Korundum'
+require 'exampleprefs_base.rb'
+require 'general_base.rb'
+require 'myoptions_base.rb'
 
   aboutData = KDE::AboutData.new( "example", I18N_NOOP("autoconfig example"), "0.1" )
   aboutData.addAuthor( "Cornelius Schumacher", nil, "schumacher@kde.org" )
diff --git a/korundum/rubylib/rbkconfig_compiler/example.rb b/korundum/rubylib/rbkconfig_compiler/example.rb
index 61e3eb41..d7ef38b1 100644
--- a/korundum/rubylib/rbkconfig_compiler/example.rb
+++ b/korundum/rubylib/rbkconfig_compiler/example.rb
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 =end
 
-retquire 'Korundum'
-retquire 'exampleprefs_base.rb'
+require 'Korundum'
+require 'exampleprefs_base.rb'
 
   aboutData = KDE::AboutData.new( "example", I18N_NOOP("cfgc example"), "0.1" )
   aboutData.addAuthor( "Cornelius Schumacher", nil, "schumacher@kde.org" )
diff --git a/korundum/rubylib/rbkconfig_compiler/kcfg.xsd b/korundum/rubylib/rbkconfig_compiler/kcfg.xsd
index 943282b9..61450d25 100644
--- a/korundum/rubylib/rbkconfig_compiler/kcfg.xsd
+++ b/korundum/rubylib/rbkconfig_compiler/kcfg.xsd
@@ -88,7 +88,7 @@
                                                                 <xsd:element minOccurs="0" name="label" type="xsd:string"/>
                                                                 <xsd:element minOccurs="0" name="whatsthis" type="xsd:string"/>
                                                             </xsd:all>
-                                                            <xsd:attribute name="name" use="retquired" type="xsd:string"/>
+                                                            <xsd:attribute name="name" use="required" type="xsd:string"/>
                                                         </xsd:complexType>
                                                     </xsd:element>
                                                 </xsd:sequence>
@@ -136,7 +136,7 @@
                                 </xsd:complexType>
                             </xsd:element>
                         </xsd:sequence>
-                        <xsd:attribute name="name" use="retquired" type="xsd:string"/>
+                        <xsd:attribute name="name" use="required" type="xsd:string"/>
                     </xsd:complexType>
                 </xsd:element>
             </xsd:sequence>
@@ -176,7 +176,7 @@
 		</xsd:complexType>
 	    </xsd:element>
         </xsd:sequence>
-        <xsd:attribute name="name" use="retquired" type="xsd:string"/>
+        <xsd:attribute name="name" use="required" type="xsd:string"/>
         <xsd:attribute name="type" use="optional" type="kcfg:datatype" />
         <xsd:attribute name="max" use="optional" type="xsd:positiveInteger"/>
     </xsd:complexType>
diff --git a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
index 2f81e356..bc1114bb 100644
--- a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
+++ b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
@@ -429,7 +429,7 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element )
           CfgEntry::Choice choice;
           choice.name = e2.attribute( "name" );
           if ( choice.name.isEmpty() ) {
-            kdError() << "Tag <choice> retquires attribute 'name'." << endl;
+            kdError() << "Tag <choice> requires attribute 'name'." << endl;
           }
           for( n3 = e2.firstChild(); !n3.isNull(); n3 = n3.nextSibling() ) {
             TQDomElement e3 = n3.toElement();
@@ -980,10 +980,10 @@ int main( int argc, char **argv )
 
   rb << "# This file is generated by rbkconfig_compiler from " << args->url(0).fileName() << "." << endl;
   rb << "# All changes you do to this file will be lost." << endl;
-  rb << endl << "retquire 'Korundum'" << endl;
+  rb << endl << "require 'Korundum'" << endl;
   
   if (singleton) {
-    rb << "retquire 'singleton'" << endl;
+    rb << "require 'singleton'" << endl;
   }
   
   rb << endl;
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test1main.rb b/korundum/rubylib/rbkconfig_compiler/tests/test1main.rb
index 131287bd..88a151a6 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test1main.rb
+++ b/korundum/rubylib/rbkconfig_compiler/tests/test1main.rb
@@ -1,4 +1,4 @@
-retquire 'Korundum'
-retquire 'test1.rb'
+require 'Korundum'
+require 'test1.rb'
 
 t = Test1.new(nil, nil)
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test2main.rb b/korundum/rubylib/rbkconfig_compiler/tests/test2main.rb
index bf56014f..85d18f07 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test2main.rb
+++ b/korundum/rubylib/rbkconfig_compiler/tests/test2main.rb
@@ -1,5 +1,5 @@
-retquire 'Korundum'
-retquire 'myprefs.rb'
-retquire 'test2.rb'
+require 'Korundum'
+require 'myprefs.rb'
+require 'test2.rb'
 
 t = Test2.new()
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test3main.rb b/korundum/rubylib/rbkconfig_compiler/tests/test3main.rb
index f6ab27fc..8c19b442 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test3main.rb
+++ b/korundum/rubylib/rbkconfig_compiler/tests/test3main.rb
@@ -1,4 +1,4 @@
-retquire 'Korundum'
-retquire 'test3.rb'
+require 'Korundum'
+require 'test3.rb'
 
 t = TestNameSpace::Test3.new()
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test4main.rb b/korundum/rubylib/rbkconfig_compiler/tests/test4main.rb
index 87bd2657..c75f0995 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test4main.rb
+++ b/korundum/rubylib/rbkconfig_compiler/tests/test4main.rb
@@ -1,4 +1,4 @@
-retquire 'Korundum'
-retquire 'test4.rb'
+require 'Korundum'
+require 'test4.rb'
 
 t = Test4.instance()
diff --git a/korundum/rubylib/rbkconfig_compiler/tests/test5main.rb b/korundum/rubylib/rbkconfig_compiler/tests/test5main.rb
index 94966a1a..cd0fbeb7 100644
--- a/korundum/rubylib/rbkconfig_compiler/tests/test5main.rb
+++ b/korundum/rubylib/rbkconfig_compiler/tests/test5main.rb
@@ -1,4 +1,4 @@
-retquire 'Korundum'
-retquire 'test5.rb'
+require 'Korundum'
+require 'test5.rb'
 
 t = Test5.instance()