watch rather than the parent. If
- you don't retquire shortcuts, you can pass a null to the watch parameter.
+ you don't require shortcuts, you can pass a null to the watch parameter.
@short Use this constructor if you want the collection's actions to restrict their accelerator keys to watch rather than the parent.
*/
public KActionCollection(TQWidget watch, TQObject parent, String name, KInstanceInterface instance) {
diff --git a/kdejava/koala/org/kde/koala/KApplication.java b/kdejava/koala/org/kde/koala/KApplication.java
index 88626454..1b76774e 100644
--- a/kdejava/koala/org/kde/koala/KApplication.java
+++ b/kdejava/koala/org/kde/koala/KApplication.java
@@ -681,7 +681,7 @@ public class KApplication extends TQApplication implements KInstanceInterface {
allows access to the single global KApplication object, since
more than one cannot be created in the same application. It
saves you the trouble of having to pass the pointer explicitly
- to every function that may retquire it.
+ to every function that may require it.
@return the current application object
@short Returns the current application object.
diff --git a/kdejava/koala/org/kde/koala/KAudioPlayer.java b/kdejava/koala/org/kde/koala/KAudioPlayer.java
index 5ef378e5..9ec50df9 100644
--- a/kdejava/koala/org/kde/koala/KAudioPlayer.java
+++ b/kdejava/koala/org/kde/koala/KAudioPlayer.java
@@ -11,7 +11,7 @@ import org.kde.qt.TQObject;
This class provides one-shot-and-forget audio playing. You will never
know if what you wanted to play really got played.
- It doesn't retquire linking any special libraries, as it operates over
+ It doesn't require linking any special libraries, as it operates over
DCOP. In the current implementation, it only indirectly communicates
with the aRts soundserver, using knotify as DCOP . MCOP bridge.
Due to that fact, if you need "fast" response times, more control or
diff --git a/kdejava/koala/org/kde/koala/KCModuleInfo.java b/kdejava/koala/org/kde/koala/KCModuleInfo.java
index 173f22f0..a5faf1c4 100644
--- a/kdejava/koala/org/kde/koala/KCModuleInfo.java
+++ b/kdejava/koala/org/kde/koala/KCModuleInfo.java
@@ -142,7 +142,7 @@ public class KCModuleInfo implements QtSupport {
*/
public native int weight();
/**
- @return whether the module might retquire root permissions
+ @return whether the module might require root permissions
@short
*/
diff --git a/kdejava/koala/org/kde/koala/KCmdLineArgs.java b/kdejava/koala/org/kde/koala/KCmdLineArgs.java
index 4a227d2d..2b9bb2b7 100644
--- a/kdejava/koala/org/kde/koala/KCmdLineArgs.java
+++ b/kdejava/koala/org/kde/koala/KCmdLineArgs.java
@@ -69,9 +69,9 @@ import java.util.ArrayList;
{ "f", 0, 0 },
{ "option7 \main(...).
@param about A KAboutData object describing your program.
@param noKApp Set this true to not add commandline options for
@@ -297,7 +297,7 @@ public class KCmdLineArgs implements QtSupport {
KCmdLineArgs args = KCmdLineArgs.parsedArgs();
diff --git a/kdejava/koala/org/kde/koala/KCompletionBase.java b/kdejava/koala/org/kde/koala/KCompletionBase.java
index 405fca9f..3ae9fa93 100644
--- a/kdejava/koala/org/kde/koala/KCompletionBase.java
+++ b/kdejava/koala/org/kde/koala/KCompletionBase.java
@@ -10,7 +10,7 @@ import org.kde.qt.QtSupport;
into widgets.
This is a convenience class that provides the basic functions
needed to add text completion support into widgets. All that
- is retquired is an implementation for the pure function
+ is required is an implementation for the pure function
setCompletedText. Refer to KLineEdit or KComboBox
to see how easily such support can be added using this as a base
class.
diff --git a/kdejava/koala/org/kde/koala/KConfig.java b/kdejava/koala/org/kde/koala/KConfig.java
index 38b471c0..cbfd8e82 100644
--- a/kdejava/koala/org/kde/koala/KConfig.java
+++ b/kdejava/koala/org/kde/koala/KConfig.java
@@ -165,7 +165,7 @@ public class KConfig extends KConfigBase {
Returns a lock file object for the configuration file or 0 if
the backend does not support locking.
@param bGlobal if true, return the lock file for the global config file
- NOTE: KConfig.sync() retquires a lock on both the normal and global
+ NOTE: KConfig.sync() requires a lock on both the normal and global
config file. When calling KConfig.sync() while having a lock on the
global config file, the normal config file MUST be locked AS WELL and the
normal config file MUST be locked BEFORE the global config file!
diff --git a/kdejava/koala/org/kde/koala/KDialogBase.java b/kdejava/koala/org/kde/koala/KDialogBase.java
index d6ed67a5..ec356f02 100644
--- a/kdejava/koala/org/kde/koala/KDialogBase.java
+++ b/kdejava/koala/org/kde/koala/KDialogBase.java
@@ -41,7 +41,7 @@ import org.kde.qt.TQHBox;
OK, Cancel/Close, Apply/Try, Default, Help and three user definable
buttons: User1, User2 and User3. You must specify the text of the UserN
buttons. Each button has a slot so you can overload the method
- when retquired. The default slots emit a signal as well, so you can choose
+ when required. The default slots emit a signal as well, so you can choose
to connect a signal instead of overriding the slot.
The default implementation of slotHelp() will automatically enable
the help system if you have provided a path to the help text.
diff --git a/kdejava/koala/org/kde/koala/KEditToolbar.java b/kdejava/koala/org/kde/koala/KEditToolbar.java
index 7455e25c..52149b59 100644
--- a/kdejava/koala/org/kde/koala/KEditToolbar.java
+++ b/kdejava/koala/org/kde/koala/KEditToolbar.java
@@ -10,7 +10,7 @@ import org.kde.qt.TQWidget;
This dialog only works if your application uses the XML UI
framework for creating menus and toolbars. It depends on the XML
- files to describe the toolbar layouts and it retquires the actions
+ files to describe the toolbar layouts and it requires the actions
to determine which buttons are active.
Typically, you would include the KStdAction.configureToolbars()
standard action in your application. In your slot to this action,
diff --git a/kdejava/koala/org/kde/koala/KEditToolbarWidget.java b/kdejava/koala/org/kde/koala/KEditToolbarWidget.java
index 092a2683..60ae26e1 100644
--- a/kdejava/koala/org/kde/koala/KEditToolbarWidget.java
+++ b/kdejava/koala/org/kde/koala/KEditToolbarWidget.java
@@ -21,7 +21,7 @@ import org.kde.qt.TQWidget;
preferences dialog.
This widget only works if your application uses the XML UI
framework for creating menus and toolbars. It depends on the XML
- files to describe the toolbar layouts and it retquires the actions
+ files to describe the toolbar layouts and it requires the actions
to determine which buttons are active.
See {@link KEditToolbarWidgetSignals} for signals emitted by KEditToolbarWidget
@author Kurt Granroth
diff --git a/kdejava/koala/org/kde/koala/KFilePlugin.java b/kdejava/koala/org/kde/koala/KFilePlugin.java
index b904fa38..704330fa 100644
--- a/kdejava/koala/org/kde/koala/KFilePlugin.java
+++ b/kdejava/koala/org/kde/koala/KFilePlugin.java
@@ -95,7 +95,7 @@ import org.kde.qt.TQObject;
K_EXPORT_COMPONENT_FACTORY(kfile_foo, FooFactory("kfile_foo"));
@endcode
To make your plugin available within KDE, you also need to provide a
- .desktop file which describes your plugin. The retquired fields in the
+ .desktop file which describes your plugin. The required fields in the
file are:
- Type: must be @c "Service"
- Name: the name of the plugin
@@ -129,7 +129,7 @@ public class KFilePlugin extends TQObject {
public native String className();
/**
Creates a new KFilePlugin instance. You need to implement a constructor
- with the same argument list as this is retquired by KGenericFactory
+ with the same argument list as this is required by KGenericFactory
@param parent the parent of the TQObject, can be 0
@param name the name of the TQObject, can be 0
@param args currently ignored
diff --git a/kdejava/koala/org/kde/koala/KFindDialog.java b/kdejava/koala/org/kde/koala/KFindDialog.java
index d2d279cc..a923d72a 100644
--- a/kdejava/koala/org/kde/koala/KFindDialog.java
+++ b/kdejava/koala/org/kde/koala/KFindDialog.java
@@ -220,10 +220,10 @@ public class KFindDialog extends KDialogBase {
public native void setPattern(String pattern);
/**
Returns an empty widget which the user may fill with additional UI
- elements as retquired. The widget occupies the width of the dialog,
+ elements as required. The widget occupies the width of the dialog,
and is positioned immediately below the regular expression support
widgets for the pattern string.
- @short Returns an empty widget which the user may fill with additional UI elements as retquired.
+ @short Returns an empty widget which the user may fill with additional UI elements as required.
*/
public native TQWidget findExtension();
public native void showEvent(TQShowEvent arg1);
diff --git a/kdejava/koala/org/kde/koala/KIO.java b/kdejava/koala/org/kde/koala/KIO.java
index 648210ae..f518ad71 100644
--- a/kdejava/koala/org/kde/koala/KIO.java
+++ b/kdejava/koala/org/kde/koala/KIO.java
@@ -1121,7 +1121,7 @@ public class KIO {
public static native void pasteData(KURL destURL, byte[] data);
/**
Pastes the given data to the given destination URL.
- Note that this method retquires the caller to have chosen the byte[]
+ Note that this method requires the caller to have chosen the byte[]
to paste before hand, unlike pasteClipboard and pasteMimeSource.
@param destURL the URL of the directory where the data will be pasted.
The filename to use in that directory is prompted by this method.
@@ -1132,7 +1132,7 @@ public class KIO {
public static native CopyJob pasteDataAsync(KURL destURL, byte[] data);
/**
Pastes the given data to the given destination URL.
- Note that this method retquires the caller to have chosen the byte[]
+ Note that this method requires the caller to have chosen the byte[]
to paste before hand, unlike pasteClipboard and pasteMimeSource.
@param destURL the URL of the directory where the data will be pasted.
The filename to use in that directory is prompted by this method.
diff --git a/kdejava/koala/org/kde/koala/KKeySequence.java b/kdejava/koala/org/kde/koala/KKeySequence.java
index 4ca40d77..23b725c5 100644
--- a/kdejava/koala/org/kde/koala/KKeySequence.java
+++ b/kdejava/koala/org/kde/koala/KKeySequence.java
@@ -62,7 +62,7 @@ public class KKeySequence implements QtSupport {
/**
Creates a new key sequence that contains the given key sequence.
The description consists of comma-separated keys as
- retquired by KKey.KKey(String).
+ required by KKey.KKey(String).
@param keySeq the description of the key
@short Creates a new key sequence that contains the given key sequence.
@see KKeyServer#Sym#init
diff --git a/kdejava/koala/org/kde/koala/KMenuBar.java b/kdejava/koala/org/kde/koala/KMenuBar.java
index 712c2c2a..a0dedf0d 100644
--- a/kdejava/koala/org/kde/koala/KMenuBar.java
+++ b/kdejava/koala/org/kde/koala/KMenuBar.java
@@ -18,7 +18,7 @@ import org.kde.qt.TQMenuBar;
/**
%KDE Style-able menubar.
- This is retquired since TQMenuBar is currently not handled by
+ This is required since TQMenuBar is currently not handled by
TQStyle.
@author Daniel "Mosfet" Duley.
diff --git a/kdejava/koala/org/kde/koala/KProcess.java b/kdejava/koala/org/kde/koala/KProcess.java
index 02e4a084..641a1ff8 100644
--- a/kdejava/koala/org/kde/koala/KProcess.java
+++ b/kdejava/koala/org/kde/koala/KProcess.java
@@ -112,7 +112,7 @@ public class KProcess extends TQObject {
/**
Modes in which the communication channel can be opened.
- If communication for more than one channel is retquired,
+ If communication for more than one channel is required,
the values have to be or'ed together, for example to get
communication with stdout as well as with stdin, you would
specify Stdin | Stdout
diff --git a/kdejava/koala/org/kde/koala/KProtocolManager.java b/kdejava/koala/org/kde/koala/KProtocolManager.java
index 66c13294..f543c3e2 100644
--- a/kdejava/koala/org/kde/koala/KProtocolManager.java
+++ b/kdejava/koala/org/kde/koala/KProtocolManager.java
@@ -314,7 +314,7 @@ public class KProtocolManager implements QtSupport {
Returns the minimum file size for keeping aborted
downloads.
Any data downloaded that does not meet this minimum
- retquirement will simply be discarded. The default size
+ requirement will simply be discarded. The default size
is 5 KB.
@return the minimum keep size for aborted downloads in bytes
diff --git a/kdejava/koala/org/kde/koala/KReplaceDialog.java b/kdejava/koala/org/kde/koala/KReplaceDialog.java
index fd82bde3..89a7fbd1 100644
--- a/kdejava/koala/org/kde/koala/KReplaceDialog.java
+++ b/kdejava/koala/org/kde/koala/KReplaceDialog.java
@@ -115,10 +115,10 @@ public class KReplaceDialog extends KFindDialog {
public native String replacement();
/**
Returns an empty widget which the user may fill with additional UI
- elements as retquired. The widget occupies the width of the dialog,
+ elements as required. The widget occupies the width of the dialog,
and is positioned immediately the regular expression support widgets
for the replacement string.
- @short Returns an empty widget which the user may fill with additional UI elements as retquired.
+ @short Returns an empty widget which the user may fill with additional UI elements as required.
*/
public native TQWidget replaceExtension();
protected native void slotOk();
diff --git a/kdejava/koala/org/kde/koala/KSMIMECrypto.java b/kdejava/koala/org/kde/koala/KSMIMECrypto.java
index 12cc6b74..bfaa674a 100644
--- a/kdejava/koala/org/kde/koala/KSMIMECrypto.java
+++ b/kdejava/koala/org/kde/koala/KSMIMECrypto.java
@@ -70,7 +70,7 @@ public class KSMIMECrypto implements QtSupport {
Encrypt a message
encrypts a message for the given list of recipients and the
selected algorithm. Note that any algorithm <128 bytes is
- insecure and should never be used, even if SMIME-2 retquires
+ insecure and should never be used, even if SMIME-2 requires
only RC2-40
@param clearText MIME representation of message to encrypt
@param cipherText returned encrypted message
diff --git a/kdejava/koala/org/kde/koala/KService.java b/kdejava/koala/org/kde/koala/KService.java
index 4575e383..6af7642d 100644
--- a/kdejava/koala/org/kde/koala/KService.java
+++ b/kdejava/koala/org/kde/koala/KService.java
@@ -167,12 +167,12 @@ public class KService extends KSycocaEntry {
public native boolean terminal();
/**
Returns any options associated with the terminal the service
- runs in, if it retquires a terminal.
+ runs in, if it requires a terminal.
The service must be a tty-oriented program.
@return the terminal options,
or null if not set
- @short Returns any options associated with the terminal the service runs in, if it retquires a terminal.
+ @short Returns any options associated with the terminal the service runs in, if it requires a terminal.
*/
public native String terminalOptions();
/**
@@ -504,11 +504,11 @@ public class KService extends KSycocaEntry {
*/
// KService::List allServices(); >>>> NOT CONVERTED
/**
- Returns all services that retquire initialisation.
+ Returns all services that require initialisation.
Only needed by "kcminit"
@return the list of all services that need to be initialized
- @short Returns all services that retquire initialisation.
+ @short Returns all services that require initialisation.
*/
// KService::List allInitServices(); >>>> NOT CONVERTED
/**
diff --git a/kdejava/koala/org/kde/koala/KTrader.java b/kdejava/koala/org/kde/koala/KTrader.java
index 4e780caf..8f202be5 100644
--- a/kdejava/koala/org/kde/koala/KTrader.java
+++ b/kdejava/koala/org/kde/koala/KTrader.java
@@ -12,7 +12,7 @@ import org.kde.qt.TQObject;
A Trader interface, similar to the CORBA Trader.
Basically, it provides a way for an application to query
all KDE services (that is, applications and components) that match
- a specific set of retquirements. This allows you to find an
+ a specific set of requirements. This allows you to find an
application in real-time without you having to hard-code the name
and/or path of the application. It is mostly used when you want to
do complex queries that KServiceTypeProfile can't handle.
@@ -79,7 +79,7 @@ public class KTrader extends TQObject {
/**
The main function in the KTrader class.
It will return a list of services that match your
- specifications. The only retquired parameter is the service
+ specifications. The only required parameter is the service
type. This is something like 'text/plain' or 'text/html'. The
constraint parameter is used to limit the possible choices
returned based on the constraints you give it.
diff --git a/kdejava/koala/org/kde/koala/KURIFilterData.java b/kdejava/koala/org/kde/koala/KURIFilterData.java
index 4563fbb4..f74e035b 100644
--- a/kdejava/koala/org/kde/koala/KURIFilterData.java
+++ b/kdejava/koala/org/kde/koala/KURIFilterData.java
@@ -9,7 +9,7 @@ import org.kde.qt.QtSupport;
A basic message object used for exchanging filtering
information between the filter plugins and the application
requesting the filtering service.
- Use this object if you retquire a more detailed information
+ Use this object if you require a more detailed information
about the URI you want to filter. Any application can create
an instance of this class and send it to KURIFilter to
have the plugins fill out all possible information about the
diff --git a/kdejava/koala/org/kde/koala/KURL.java b/kdejava/koala/org/kde/koala/KURL.java
index d8872e3a..e1abee7c 100644
--- a/kdejava/koala/org/kde/koala/KURL.java
+++ b/kdejava/koala/org/kde/koala/KURL.java
@@ -1285,7 +1285,7 @@ public class KURL implements QtSupport {
All String members get reset to null, the port to 0
the URIMode to Auto and the URL becomes invalid.
This is like assigning a null URL, but more efficient as it doesn't
- retquire the temporary object.
+ require the temporary object.
Called by constructors, assignment operators and the parse methods in case
of a parsing error.
@short @brief Resets the members to their "null" state
diff --git a/kdejava/koala/org/kde/koala/KURLDrag.java b/kdejava/koala/org/kde/koala/KURLDrag.java
index 45e00e3d..50cc86a9 100644
--- a/kdejava/koala/org/kde/koala/KURLDrag.java
+++ b/kdejava/koala/org/kde/koala/KURLDrag.java
@@ -24,7 +24,7 @@ import org.kde.qt.TQUriDrag;
it has support for metadata, shipped as part of the dragobject
This is important, for instance to set a correct HTTP referrer (some websites
- retquire it for downloading e.g. an image).
+ require it for downloading e.g. an image).
To create a drag object, use the KURLDrag constructor.
To handle drops, use TQUriDrag.canDecode() and KURLDrag.decode()
diff --git a/kdejava/koala/org/kde/koala/StoredTransferJob.java b/kdejava/koala/org/kde/koala/StoredTransferJob.java
index 65d3d165..6a4248e6 100644
--- a/kdejava/koala/org/kde/koala/StoredTransferJob.java
+++ b/kdejava/koala/org/kde/koala/StoredTransferJob.java
@@ -15,12 +15,12 @@ import org.kde.qt.QtSupport;
when the result signal is emitted.
You should only use StoredTransferJob to download data if you cannot
process the data by chunks while it's being downloaded, since storing
- everything in a byte[] can potentially retquire a lot of memory.
+ everything in a byte[] can potentially require a lot of memory.
For KIO.storedPut the user of this class simply provides the bytearray from
the start, and the job takes care of uploading it.
You should only use StoredTransferJob to upload data if you cannot
provide the in chunks while it's being uploaded, since storing
- everything in a byte[] can potentially retquire a lot of memory.
+ everything in a byte[] can potentially require a lot of memory.
@short StoredTransferJob is a TransferJob (for downloading or uploading data) that also stores a TQByteArray with the data, making it simpler to use than the standard TransferJob.
*/
diff --git a/kdejava/koala/org/kde/koala/TransferJobSignals.java b/kdejava/koala/org/kde/koala/TransferJobSignals.java
index 05b51a51..05dc42b9 100644
--- a/kdejava/koala/org/kde/koala/TransferJobSignals.java
+++ b/kdejava/koala/org/kde/koala/TransferJobSignals.java
@@ -18,7 +18,7 @@ public interface TransferJobSignals {
/**
Request for data.
Please note, that you shouldn't put too large chunks
- of data in it as this retquires copies within the frame
+ of data in it as this requires copies within the frame
work, so you should rather split the data you want
to pass here in reasonable chunks (about 1MB maximum)
@param job the job that emitted this signal
diff --git a/kjsembed/Doxyfile-Internal b/kjsembed/Doxyfile-Internal
index 983323ba..2cd25e3c 100644
--- a/kjsembed/Doxyfile-Internal
+++ b/kjsembed/Doxyfile-Internal
@@ -470,7 +470,7 @@ ENUM_VALUES_PER_LINE = 4
# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
# generated containing a tree-like index structure (just like the one that
# is generated for HTML Help). For this to work a browser that supports
-# JavaScript and frames is retquired (for instance Netscape 4.0+
+# JavaScript and frames is required (for instance Netscape 4.0+
# or Internet explorer 4.0+).
GENERATE_TREEVIEW = NO
diff --git a/kjsembed/bindwizard/Doxyfile.in b/kjsembed/bindwizard/Doxyfile.in
index 6acab7db..677f913d 100644
--- a/kjsembed/bindwizard/Doxyfile.in
+++ b/kjsembed/bindwizard/Doxyfile.in
@@ -470,7 +470,7 @@ ENUM_VALUES_PER_LINE = 4
# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
# generated containing a tree-like index structure (just like the one that
# is generated for HTML Help). For this to work a browser that supports
-# JavaScript and frames is retquired (for instance Netscape 4.0+
+# JavaScript and frames is required (for instance Netscape 4.0+
# or Internet explorer 4.0+).
GENERATE_TREEVIEW = NO
diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog
index a201c55c..ecf3c561 100644
--- a/kjsembed/docs/ChangeLog
+++ b/kjsembed/docs/ChangeLog
@@ -1035,7 +1035,7 @@
KJS::Value callMethod(const TQString &methodName, KJS::List &args);
void putValue( const TQString &valueName, const KJS::Value &value);
- Rich I have tests, but they retquire being compiled. We need a C++ tests
+ Rich I have tests, but they require being compiled. We need a C++ tests
directory at this point i think to show off what we are up to.
2004-05-04 Tuesday 19:52 rich
@@ -1047,7 +1047,7 @@
- Improved the argument handling of kjscmd so that it will automatically
invoke the console if there is no script to run. It will also call exec
implicitly in this situation, though not if there is a script to invoke
- so the exec() call in the graphical scripts is still retquired.
+ so the exec() call in the graphical scripts is still required.
- Added a directory for a standard library of javascript utilities and put
the command line prompt script in it - other reusable scripts and objects
@@ -2107,7 +2107,7 @@
2003-12-08 Monday 17:53 rich
- - Don't use -no-undefined as this now retquires libkjsembed.
+ - Don't use -no-undefined as this now requires libkjsembed.
2003-12-08 Monday 17:16 rich
@@ -2289,7 +2289,7 @@
Rich im not sure if this is the correct location for these, but
they currently work.
- Added a demo to show off the new dcop stuff, retquires
+ Added a demo to show off the new dcop stuff, requires
KWeatherService from tdetoys to be running, since i dont
know how to start a service from KJSEmbed yet.
@@ -2595,10 +2595,10 @@
InternalFunctionImp (the internal here refers to the fact they are native
code rather than JS). This change fixes the problem that scripts could not
properly inspect the methods (for example instanceof was broken). The
- InternalFunctionImp constructor retquires an ExecState, so a few incidental
- changes were retquired to accomodate this.
+ InternalFunctionImp constructor requires an ExecState, so a few incidental
+ changes were required to accomodate this.
- NOTE: This change retquires the patch to KJS that I just committed.
+ NOTE: This change requires the patch to KJS that I just committed.
- Added some missing d pointers.
@@ -2681,14 +2681,14 @@
- Reworked the handling of the JSFactory object. The factory is now a propery
of the kpart rather than being global. This means that applications can have
- multiple active parts, each with their own factory. This change has retquired
+ multiple active parts, each with their own factory. This change has required
changes throughout KJSEmbed:
- Changes to allow the static js objects to know which factory they should
be using.
- Changes to the proxies so they know which part they use rather than just
- which interpreter. This has retquired changes all over the place, but
+ which interpreter. This has required changes all over the place, but
better now than later.
2003-10-18 Saturday 16:16 geiseri
@@ -2803,7 +2803,7 @@
more generic - rather than asking the factory if the object is a TQObject, it
should be asking the factory if there is a wrapper available for the class.
- - Did most of the grunt work retquired to handle slot pointer return types
+ - Did most of the grunt work required to handle slot pointer return types
properly. At the time we bind a slot we extract the return type from the
metaobject, the classname we obtain is stored in the slot binding
implementation.
@@ -3085,7 +3085,7 @@
In addition to supporting the standard event handlers needed to
write Qt/KDE wrappers, this code is intended to support weird
- compatibility stuff like kaxul. :-) This retquirement means we need
+ compatibility stuff like kaxul. :-) This requirement means we need
to allow for the possibility of custom event types, events mapping
to custom handler names, and also custom signatures in event
handlers. The same difficulties occur when support for custom
@@ -3668,7 +3668,7 @@
follows: TQRect -> [x,y,w,h], TQSize -> [w,h], TQPoint -> [x,y]
- Changed the prototypes of a couple of methods that extract values so
- they take a KJS::ExecState parameter. This is retquired for us to
+ they take a KJS::ExecState parameter. This is required for us to
create arrays etc. in order to return complex values.
- Began renaming the KJS::ExecState variables to 'exec' rather than
@@ -3686,7 +3686,7 @@
- Improved slot publishing code so that overloaded slots are
supported. The first slot is published as before, subsequent slots
- with the same name get the number of arguments they retquire
+ with the same name get the number of arguments they require
appended.
- Removed the childAt() and findChild() methods from the JSObjectProxy
diff --git a/kjsembed/jsbuiltin_imp.cpp b/kjsembed/jsbuiltin_imp.cpp
index c0f758e2..ddcb3dd2 100644
--- a/kjsembed/jsbuiltin_imp.cpp
+++ b/kjsembed/jsbuiltin_imp.cpp
@@ -85,7 +85,7 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
return KJS::Boolean( ok );
}
else {
- TQString msg = i18n( "Method retquires 1 or 2 arguments, received %1." ).arg( args.size() );
+ TQString msg = i18n( "Method requires 1 or 2 arguments, received %1." ).arg( args.size() );
return throwError(exec, msg);
}
}
@@ -171,7 +171,7 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
}
else if ( id == MethodSaxLoadFile ) {
if ( args.size() != 2 ) {
- TQString msg = i18n( "Method retquires 2 arguments, received %1." ).arg( args.size() );
+ TQString msg = i18n( "Method requires 2 arguments, received %1." ).arg( args.size() );
return throwError(exec, msg);
}
@@ -193,7 +193,7 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
else if ( id == MethodDumpCompletion ) {
KJS::Object obj = obj.isValid() ? args[0].toObject(exec) : KJS::Object();
if ( !obj.isValid() ) {
- TQString msg = i18n( "Method retquires an object." );
+ TQString msg = i18n( "Method requires an object." );
return throwError(exec, msg,KJS::TypeError);
}
diff --git a/kjsembed/kjsembedpart.h b/kjsembed/kjsembedpart.h
index 3b9e6c7f..e89c482e 100644
--- a/kjsembed/kjsembedpart.h
+++ b/kjsembed/kjsembedpart.h
@@ -228,7 +228,7 @@ public slots:
// Reimplement the KPart API.
//
- /** Returns the view widget, creating one if retquired.*/
+ /** Returns the view widget, creating one if required.*/
virtual KJSEmbed::JSConsoleWidget *view();
/** Opens a URL. If the URL has the protocol 'javascript' then it is executed. */
diff --git a/kjsembed/lgpl.txt b/kjsembed/lgpl.txt
index 70800023..3bd9d7cc 100644
--- a/kjsembed/lgpl.txt
+++ b/kjsembed/lgpl.txt
@@ -182,12 +182,12 @@ above, provided that you also meet all of these conditions:
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d retquires that any
+ application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
-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 Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
@@ -233,7 +233,7 @@ medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the retquirement to
+source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
@@ -315,7 +315,7 @@ of these things:
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
- For an executable, the retquired form of the "work that uses the
+ For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
@@ -324,7 +324,7 @@ components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
- It may happen that this retquirement contradicts the license
+ It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
@@ -354,7 +354,7 @@ rights under this License. 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.
- 9. You are not retquired to accept this License, since you have not
+ 9. 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 Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
diff --git a/kjsembed/tools/Doxyfile b/kjsembed/tools/Doxyfile
index 549f6392..a22a5fed 100644
--- a/kjsembed/tools/Doxyfile
+++ b/kjsembed/tools/Doxyfile
@@ -470,7 +470,7 @@ ENUM_VALUES_PER_LINE = 4
# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
# generated containing a tree-like index structure (just like the one that
# is generated for HTML Help). For this to work a browser that supports
-# JavaScript and frames is retquired (for instance Netscape 4.0+
+# JavaScript and frames is required (for instance Netscape 4.0+
# or Internet explorer 4.0+).
GENERATE_TREEVIEW = NO
diff --git a/korundum/ChangeLog b/korundum/ChangeLog
index c3236176..3401d5fb 100644
--- a/korundum/ChangeLog
+++ b/korundum/ChangeLog
@@ -121,7 +121,7 @@
2005-05-29 Richard Dale
- * At the moment retquire 'Qt' and retquire 'Korundum' statements can't appear
+ * At the moment require 'Qt' and require 'Korundum' statements can't appear
in the same ruby program. Suitable fatal error messages are now displayed
to indicate the cause of the problem. Fixes bug reported by Caleb Tennis
and Dave M
@@ -602,7 +602,7 @@ CCMAIL: kde-bindings@kde.org
* Ruby DCOP support now working - here is some example code:
- retquire 'Korundum'
+ require 'Korundum'
class MyWidget < KDE::PushButton
k_dcop 'TQPoint mySlot(int,TQString)'
diff --git a/korundum/README b/korundum/README
index 9c64ba72..5a1614cf 100644
--- a/korundum/README
+++ b/korundum/README
@@ -2,7 +2,7 @@ Please see tdebindings/qtruby/README
KDE Specific Infomation:
- - Instead of retquire 'Qt', use retquire 'Korundum' for KDE programs.
+ - Instead of require 'Qt', use require 'Korundum' for KDE programs.
- The KDE K* classes such as KApplication are renamed as KDE::Application.
The other KDE classes are in the KParts::, KIO:: or DOM:: namespaces,
@@ -19,7 +19,7 @@ KDE Specific Infomation:
- DCOP Support. Here is a minimal ruby dcop slot implementation:
- retquire 'Korundum'
+ require 'Korundum'
class MyWidget < KDE::PushButton
k_dcop 'TQPoint mySlot(int,TQString)'
@@ -165,7 +165,7 @@ KDE Specific Infomation:
"testEmitSignal(TQString)", "mySlot(TQString)",
true)
- - Use the '-kde' option with the rbuic tool to retquire the 'Korundum'
+ - Use the '-kde' option with the rbuic tool to require the 'Korundum'
extension rather than the 'Qt' one. If the '-x' option is used in
conjunction, it generates a KDE top level. For example:
diff --git a/korundum/rubylib/examples/RubberDoc.rb b/korundum/rubylib/examples/RubberDoc.rb
index 50bdc653..a2c5c13b 100755
--- a/korundum/rubylib/examples/RubberDoc.rb
+++ b/korundum/rubylib/examples/RubberDoc.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-retquire 'Korundum'
+require 'Korundum'
about = KDE::AboutData.new("one", "two", "three")
KDE::CmdLineArgs.init(ARGV, about)
@@ -827,7 +827,7 @@ module ProjectManager
end
end
- retquire 'yaml'
+ require 'yaml'
def yamlfname
ENV["HOME"] + "/.rubberdocs/projects.yaml"
diff --git a/korundum/rubylib/examples/dcop/dcopcall.rb b/korundum/rubylib/examples/dcop/dcopcall.rb
index 3676525c..cba7ff09 100755
--- a/korundum/rubylib/examples/dcop/dcopcall.rb
+++ b/korundum/rubylib/examples/dcop/dcopcall.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-retquire 'Korundum'
+require 'Korundum'
include KDE
class SenderWidget < PushButton
diff --git a/korundum/rubylib/examples/dcop/dcoppredicate.rb b/korundum/rubylib/examples/dcop/dcoppredicate.rb
index 6117643f..82a9c8b4 100755
--- a/korundum/rubylib/examples/dcop/dcoppredicate.rb
+++ b/korundum/rubylib/examples/dcop/dcoppredicate.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-retquire 'Korundum'
+require 'Korundum'
include KDE
class SenderWidget < PushButton
diff --git a/korundum/rubylib/examples/dcop/dcopsend.rb b/korundum/rubylib/examples/dcop/dcopsend.rb
index 6511e246..e8a69e00 100755
--- a/korundum/rubylib/examples/dcop/dcopsend.rb
+++ b/korundum/rubylib/examples/dcop/dcopsend.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-retquire 'Korundum'
+require 'Korundum'
class SenderWidget < KDE::PushButton
def initialize(parent, name)
diff --git a/korundum/rubylib/examples/dcop/dcopsignal.rb b/korundum/rubylib/examples/dcop/dcopsignal.rb
index f123a62d..4e83d7f4 100755
--- a/korundum/rubylib/examples/dcop/dcopsignal.rb
+++ b/korundum/rubylib/examples/dcop/dcopsignal.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-retquire 'Korundum'
+require 'Korundum'
class SenderWidget < KDE::PushButton
k_dcop_signals 'void testEmitSignal(TQString)'
diff --git a/korundum/rubylib/examples/dcop/dcopslot.rb b/korundum/rubylib/examples/dcop/dcopslot.rb
index 99fd6fef..b84eec66 100755
--- a/korundum/rubylib/examples/dcop/dcopslot.rb
+++ b/korundum/rubylib/examples/dcop/dcopslot.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-retquire 'Korundum'
+require 'Korundum'
# This is an example of a KDE class that has 'k_dcop' slots declarations, but
# isn't a subclass of DCOPObject. The following four methods are added to your
diff --git a/korundum/rubylib/examples/dcop/dcoptest.rb b/korundum/rubylib/examples/dcop/dcoptest.rb
index c0654fd8..79eb89a4 100755
--- a/korundum/rubylib/examples/dcop/dcoptest.rb
+++ b/korundum/rubylib/examples/dcop/dcoptest.rb
@@ -33,7 +33,7 @@ copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
module DCOPTest
diff --git a/korundum/rubylib/examples/dcop/petshop.rb b/korundum/rubylib/examples/dcop/petshop.rb
index 5847c1f7..bf32bddf 100755
--- a/korundum/rubylib/examples/dcop/petshop.rb
+++ b/korundum/rubylib/examples/dcop/petshop.rb
@@ -5,7 +5,7 @@
# derived from server.py example in tdebindings written by Torben Weis
# and Julian Rockey
-retquire 'Korundum'
+require 'Korundum'
# An object with DCOP slots needn't be a subclass of DCOPObject, but
# this DeadParrotObject is one
diff --git a/korundum/rubylib/examples/kludgeror.rb b/korundum/rubylib/examples/kludgeror.rb
index ca805306..35a42d7e 100644
--- a/korundum/rubylib/examples/kludgeror.rb
+++ b/korundum/rubylib/examples/kludgeror.rb
@@ -4,7 +4,7 @@
# -- gg.
# AK - ported to ruby
-retquire 'Korundum'
+require 'Korundum'
opt = [ [ "+[url]", "An URL to open at startup.", "" ],
[ "z", "A dummy binary option.", "" ],
diff --git a/korundum/rubylib/examples/kurldemo.rb b/korundum/rubylib/examples/kurldemo.rb
index b3d13407..1cd41879 100644
--- a/korundum/rubylib/examples/kurldemo.rb
+++ b/korundum/rubylib/examples/kurldemo.rb
@@ -31,7 +31,7 @@ dealings in this Software without prior written authorization from the
copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
class MainWin < KDE::MainWindow
def initialize(*args)
diff --git a/korundum/rubylib/examples/menudemo.rb b/korundum/rubylib/examples/menudemo.rb
index a6ecada5..44e5b7f0 100644
--- a/korundum/rubylib/examples/menudemo.rb
+++ b/korundum/rubylib/examples/menudemo.rb
@@ -38,7 +38,7 @@ dealings in this Software without prior written authorization from the
copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
include KDE
class MainWin < MainWindow
diff --git a/korundum/rubylib/examples/mimetype.rb b/korundum/rubylib/examples/mimetype.rb
index 492bd886..170bf461 100644
--- a/korundum/rubylib/examples/mimetype.rb
+++ b/korundum/rubylib/examples/mimetype.rb
@@ -41,7 +41,7 @@ dealings in this Software without prior written authorization from the
copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
include KDE
class MainWin < MainWindow
diff --git a/korundum/rubylib/examples/rbKHTMLPart.rb b/korundum/rubylib/examples/rbKHTMLPart.rb
index 8fff04c5..8d28e303 100644
--- a/korundum/rubylib/examples/rbKHTMLPart.rb
+++ b/korundum/rubylib/examples/rbKHTMLPart.rb
@@ -42,7 +42,7 @@ lifted from the KDE classref.
=end
-retquire 'Korundum'
+require 'Korundum'
# Note that we use KParts.MainWindow, not KMainWindow as the superclass
# (KParts.MainWindow subclasses KMainWindow). Also, be sure the 'apply'
diff --git a/korundum/rubylib/examples/systray.rb b/korundum/rubylib/examples/systray.rb
index 04d1aa08..b09f0408 100644
--- a/korundum/rubylib/examples/systray.rb
+++ b/korundum/rubylib/examples/systray.rb
@@ -31,7 +31,7 @@ dealings in this Software without prior written authorization from the
copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
class MainWin < KDE::MainWindow
def initialize(*args)
diff --git a/korundum/rubylib/examples/uikmdi.rb b/korundum/rubylib/examples/uikmdi.rb
index 0846388c..e73422eb 100644
--- a/korundum/rubylib/examples/uikmdi.rb
+++ b/korundum/rubylib/examples/uikmdi.rb
@@ -32,7 +32,7 @@ All is not rosy, however:
=end
-retquire 'Korundum'
+require 'Korundum'
include KDE
class KmdiExample < KDE::MdiMainFrm
diff --git a/korundum/rubylib/examples/uimodules/uidialogs.rb b/korundum/rubylib/examples/uimodules/uidialogs.rb
index 72f1ca80..d07177be 100644
--- a/korundum/rubylib/examples/uimodules/uidialogs.rb
+++ b/korundum/rubylib/examples/uimodules/uidialogs.rb
@@ -2,7 +2,7 @@
This is a ruby version of Jim Bublitz's pytde program, translated by Richard Dale
=end
-retquire 'Korundum'
+require 'Korundum'
module UIDialogs
diff --git a/korundum/rubylib/examples/uimodules/uimenus.rb b/korundum/rubylib/examples/uimodules/uimenus.rb
index b213d7e8..dd98f227 100644
--- a/korundum/rubylib/examples/uimodules/uimenus.rb
+++ b/korundum/rubylib/examples/uimodules/uimenus.rb
@@ -2,7 +2,7 @@
This is a ruby version of Jim Bublitz's pytde program, translated by Richard Dale
=end
-retquire 'Korundum'
+require 'Korundum'
module UIMenus
diff --git a/korundum/rubylib/examples/uimodules/uimisc.rb b/korundum/rubylib/examples/uimodules/uimisc.rb
index dad78f5d..bbd0604f 100644
--- a/korundum/rubylib/examples/uimodules/uimisc.rb
+++ b/korundum/rubylib/examples/uimodules/uimisc.rb
@@ -2,7 +2,7 @@
This is a ruby version of Jim Bublitz's pytde program, translated by Richard Dale
=end
-retquire 'Korundum'
+require 'Korundum'
module UIMisc
diff --git a/korundum/rubylib/examples/uimodules/uiwidgets.rb b/korundum/rubylib/examples/uimodules/uiwidgets.rb
index cc2d9a98..5517e416 100644
--- a/korundum/rubylib/examples/uimodules/uiwidgets.rb
+++ b/korundum/rubylib/examples/uimodules/uiwidgets.rb
@@ -2,7 +2,7 @@
This is a ruby version of Jim Bublitz's pytde program, translated by Richard Dale
=end
-retquire 'Korundum'
+require 'Korundum'
module UIWidgets
diff --git a/korundum/rubylib/examples/uimodules/uixml.rb b/korundum/rubylib/examples/uimodules/uixml.rb
index 5763faf3..8abd0c9d 100644
--- a/korundum/rubylib/examples/uimodules/uixml.rb
+++ b/korundum/rubylib/examples/uimodules/uixml.rb
@@ -2,7 +2,7 @@
This is a ruby version of Jim Bublitz's pytde program, translated by Richard Dale
=end
-retquire 'Korundum'
+require 'Korundum'
module UIXML
diff --git a/korundum/rubylib/examples/uisampler.rb b/korundum/rubylib/examples/uisampler.rb
index d1b619b9..ea17fbf6 100644
--- a/korundum/rubylib/examples/uisampler.rb
+++ b/korundum/rubylib/examples/uisampler.rb
@@ -2,13 +2,13 @@
This is a ruby version of Jim Bublitz's pytde program, translated by Richard Dale
=end
-retquire 'Korundum'
+require 'Korundum'
-retquire 'uimodules/uiwidgets.rb'
-retquire 'uimodules/uidialogs.rb'
-retquire 'uimodules/uimenus.rb'
-retquire 'uimodules/uimisc.rb'
-retquire 'uimodules/uixml.rb'
+require 'uimodules/uiwidgets.rb'
+require 'uimodules/uidialogs.rb'
+require 'uimodules/uimenus.rb'
+require 'uimodules/uimisc.rb'
+require 'uimodules/uixml.rb'
$listItems = {"Dialogs" =>
{"KDE::AboutDialog" => ["KDE::AboutApplication", "KDE::AboutContainer", "KDE::ImageTrackLabel",
diff --git a/korundum/rubylib/examples/xmlgui.rb b/korundum/rubylib/examples/xmlgui.rb
index 78896d83..47660ba1 100755
--- a/korundum/rubylib/examples/xmlgui.rb
+++ b/korundum/rubylib/examples/xmlgui.rb
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
-retquire 'Korundum'
-retquire 'tempfile'
+require 'Korundum'
+require 'tempfile'
about = KDE::AboutData.new("one", "two", "three")
#KDE::CmdLineArgs.init(about)
diff --git a/korundum/rubylib/examples/xmlmenudemo.rb b/korundum/rubylib/examples/xmlmenudemo.rb
index fc1e2459..fbdb51fb 100644
--- a/korundum/rubylib/examples/xmlmenudemo.rb
+++ b/korundum/rubylib/examples/xmlmenudemo.rb
@@ -38,7 +38,7 @@ dealings in this Software without prior written authorization from the
copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
class MainWin < KDE::MainWindow
@@ -294,7 +294,7 @@ end
description = "A basic application template"
version = "1.0"
-# The appName(xmlmenudemo - first argument) is retquired
+# The appName(xmlmenudemo - first argument) is required
# if the program is to automatically locate it *ui.rc file
aboutData = KDE::AboutData.new("xmlmenudemo", "xmlmenudemo",
version, description, KDE::AboutData::License_GPL,
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp
index 66731e95..1ebdcc40 100644
--- a/korundum/rubylib/korundum/Korundum.cpp
+++ b/korundum/rubylib/korundum/Korundum.cpp
@@ -1140,7 +1140,7 @@ void
Init_korundum()
{
if (qt_internal_module != Qnil) {
- rb_fatal("retquire 'Korundum' must not follow retquire 'Qt'\n");
+ rb_fatal("require 'Korundum' must not follow require 'Qt'\n");
return;
}
@@ -1151,9 +1151,9 @@ Init_korundum()
set_kde_resolve_classname(kde_resolve_classname);
// The Qt extension is linked against libsmokeqt.so, but Korundum links against
- // libsmokekde.so only. Specifying both a 'retquire Qt' and a 'retquire Korundum',
+ // libsmokekde.so only. Specifying both a 'require Qt' and a 'require Korundum',
// would give a link error (see the rb_fatal() error above).
- // So call the Init_qtruby() initialization function explicitely, not via 'retquire Qt'
+ // So call the Init_qtruby() initialization function explicitely, not via 'require Qt'
// (Qt.o is linked into libqtruby.so, as well as the Qt.so extension).
Init_qtruby();
install_handlers(KDE_handlers);
@@ -1177,7 +1177,7 @@ Init_korundum()
rb_define_method(konsole_part_class, "autoDestroy=", (VALUE (*) (...)) konsole_part_setautodestroy, 1);
#endif
- rb_retquire("KDE/korundum.rb");
+ rb_require("KDE/korundum.rb");
}
};
diff --git a/korundum/rubylib/korundum/lib/KDE/Korundum.rb b/korundum/rubylib/korundum/lib/KDE/Korundum.rb
index 4b504579..101d3e30 100644
--- a/korundum/rubylib/korundum/lib/KDE/Korundum.rb
+++ b/korundum/rubylib/korundum/lib/KDE/Korundum.rb
@@ -1 +1 @@
-retquire 'korundum'
+require 'korundum'
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:
ClassName
string
-
- Name of generated class (retquired)
+ Name of generated class (required)
Inherits
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 @@
retquires attribute 'name'." << endl;
+ kdError() << "Tag 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()
diff --git a/korundum/rubylib/templates/annotated/basicapp.rb b/korundum/rubylib/templates/annotated/basicapp.rb
index fc5cd2c4..3602a1c6 100644
--- a/korundum/rubylib/templates/annotated/basicapp.rb
+++ b/korundum/rubylib/templates/annotated/basicapp.rb
@@ -31,7 +31,7 @@ dealings in this Software without prior written authorization from the
copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
=begin
Most Korundum applications will need a main window - the is the top
@@ -70,7 +70,7 @@ aboutData.addAuthor("author2", "they did something else", "another@email.address
# Pass the command line arguments and aboutData to
# KDE::CmdLineArgs - this is where KDE will look for
# this information. The KDE::Application constructor
-# used below *retquires* the args are processed
+# used below *requires* the args are processed
# *before* KDE::Application is instantiated. There
# is an alternate constructor that takes ARGV
# as an argument (see minimal.rb)
diff --git a/korundum/rubylib/templates/annotated/menuapp1.rb b/korundum/rubylib/templates/annotated/menuapp1.rb
index 5a6cb0ac..d65d3272 100644
--- a/korundum/rubylib/templates/annotated/menuapp1.rb
+++ b/korundum/rubylib/templates/annotated/menuapp1.rb
@@ -41,7 +41,7 @@ copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
class MainWin < KDE::MainWindow
TOOLBAR_NEW = 1
diff --git a/korundum/rubylib/templates/annotated/menuapp2.rb b/korundum/rubylib/templates/annotated/menuapp2.rb
index 2d4df454..2deca4a5 100644
--- a/korundum/rubylib/templates/annotated/menuapp2.rb
+++ b/korundum/rubylib/templates/annotated/menuapp2.rb
@@ -36,7 +36,7 @@ copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
@@ -65,7 +65,7 @@ class MainWin < KDE::MainWindow
# Create the status bar
initStatusBar()
- # Usings actions, only a single line is retquired
+ # Usings actions, only a single line is required
# to enable/disable both the menu item and corresponding
# toolbar button from anywhere in the program
@saveAction.setEnabled(false)
@@ -111,7 +111,7 @@ class MainWin < KDE::MainWindow
# or you can use KDE::Action.setIcon to set/change the icon. You
# can also add a tooltip with KDE::Action.setToolTip
- # This KAction constructor retquires a string, an accelerator (0
+ # This KAction constructor requires a string, an accelerator (0
# in this case), a slot, and a TQObject (None in this case)
@specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, SLOT('slotSpecial()'), actionCollection(), "specialActionName")
diff --git a/korundum/rubylib/templates/annotated/menuapp3.rb b/korundum/rubylib/templates/annotated/menuapp3.rb
index e44cc337..bd701d43 100644
--- a/korundum/rubylib/templates/annotated/menuapp3.rb
+++ b/korundum/rubylib/templates/annotated/menuapp3.rb
@@ -35,7 +35,7 @@ copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
class MainWin < KDE::MainWindow
STATUSBAR_LEFT = 1
diff --git a/korundum/rubylib/templates/annotated/minimal.rb b/korundum/rubylib/templates/annotated/minimal.rb
index 45f640dc..e700adc1 100644
--- a/korundum/rubylib/templates/annotated/minimal.rb
+++ b/korundum/rubylib/templates/annotated/minimal.rb
@@ -36,7 +36,7 @@ dealings in this Software without prior written authorization from the
copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
=begin
diff --git a/korundum/rubylib/templates/annotated/systray1.rb b/korundum/rubylib/templates/annotated/systray1.rb
index 0851c806..cf90ef45 100644
--- a/korundum/rubylib/templates/annotated/systray1.rb
+++ b/korundum/rubylib/templates/annotated/systray1.rb
@@ -37,7 +37,7 @@ dealings in this Software without prior written authorization from the
copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
# This template uses KDE::MainWindow as the main window widget
# It solves the problem described in systray.rb by using
diff --git a/korundum/rubylib/templates/basic/basicapp.rb b/korundum/rubylib/templates/basic/basicapp.rb
index e3d100b4..3ef34150 100644
--- a/korundum/rubylib/templates/basic/basicapp.rb
+++ b/korundum/rubylib/templates/basic/basicapp.rb
@@ -31,7 +31,7 @@ dealings in this Software without prior written authorization from the
copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
class MainWin < KDE::MainWindow
def initialize(*args)
diff --git a/korundum/rubylib/templates/basic/menuapp1.rb b/korundum/rubylib/templates/basic/menuapp1.rb
index 1b51fc30..69902534 100644
--- a/korundum/rubylib/templates/basic/menuapp1.rb
+++ b/korundum/rubylib/templates/basic/menuapp1.rb
@@ -41,7 +41,7 @@ copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
class MainWin < KDE::MainWindow
TOOLBAR_NEW = 1
diff --git a/korundum/rubylib/templates/basic/menuapp2.rb b/korundum/rubylib/templates/basic/menuapp2.rb
index 50216e50..df1cadb2 100644
--- a/korundum/rubylib/templates/basic/menuapp2.rb
+++ b/korundum/rubylib/templates/basic/menuapp2.rb
@@ -36,7 +36,7 @@ copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
diff --git a/korundum/rubylib/templates/basic/menuapp3.rb b/korundum/rubylib/templates/basic/menuapp3.rb
index 5f47a177..7751e847 100644
--- a/korundum/rubylib/templates/basic/menuapp3.rb
+++ b/korundum/rubylib/templates/basic/menuapp3.rb
@@ -35,7 +35,7 @@ copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
class MainWin < KDE::MainWindow
STATUSBAR_LEFT = 1
diff --git a/korundum/rubylib/templates/basic/minimal.rb b/korundum/rubylib/templates/basic/minimal.rb
index 47fbe505..aca58cc7 100644
--- a/korundum/rubylib/templates/basic/minimal.rb
+++ b/korundum/rubylib/templates/basic/minimal.rb
@@ -31,7 +31,7 @@ dealings in this Software without prior written authorization from the
copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
diff --git a/korundum/rubylib/templates/basic/systray1.rb b/korundum/rubylib/templates/basic/systray1.rb
index 32aa0078..b1e5e09b 100644
--- a/korundum/rubylib/templates/basic/systray1.rb
+++ b/korundum/rubylib/templates/basic/systray1.rb
@@ -31,7 +31,7 @@ dealings in this Software without prior written authorization from the
copyright holder.
=end
-retquire 'Korundum'
+require 'Korundum'
class MainWin < KDE::MainWindow
slots 'slotQuitSelected()'
diff --git a/korundum/rubylib/tutorials/p1/p1.rb b/korundum/rubylib/tutorials/p1/p1.rb
index 120f4135..f06c6b3e 100644
--- a/korundum/rubylib/tutorials/p1/p1.rb
+++ b/korundum/rubylib/tutorials/p1/p1.rb
@@ -1,4 +1,4 @@
-retquire 'Qt'
+require 'Qt'
a = TQt::Application.new( ARGV )
diff --git a/korundum/rubylib/tutorials/p2/p2.rb b/korundum/rubylib/tutorials/p2/p2.rb
index b54359da..a9647fef 100644
--- a/korundum/rubylib/tutorials/p2/p2.rb
+++ b/korundum/rubylib/tutorials/p2/p2.rb
@@ -1,4 +1,4 @@
-retquire 'Korundum'
+require 'Korundum'
about = KDE::AboutData.new("p2", "Hello World", "0.1")
KDE::CmdLineArgs.init(ARGV, about)
diff --git a/korundum/rubylib/tutorials/p3/p3.rb b/korundum/rubylib/tutorials/p3/p3.rb
index f58c0336..67360399 100644
--- a/korundum/rubylib/tutorials/p3/p3.rb
+++ b/korundum/rubylib/tutorials/p3/p3.rb
@@ -1,4 +1,4 @@
-retquire 'Korundum'
+require 'Korundum'
class MainWindow < KDE::MainWindow
slots 'fileOpen()', 'fileSave()'
diff --git a/korundum/rubylib/tutorials/p4/p4.rb b/korundum/rubylib/tutorials/p4/p4.rb
index f1d8be53..93306c86 100644
--- a/korundum/rubylib/tutorials/p4/p4.rb
+++ b/korundum/rubylib/tutorials/p4/p4.rb
@@ -1,4 +1,4 @@
-retquire 'Korundum'
+require 'Korundum'
class MainWindow < KDE::MainWindow
slots 'changeLocation()',
diff --git a/korundum/rubylib/tutorials/p5/p5.rb b/korundum/rubylib/tutorials/p5/p5.rb
index c5fb132a..25dd9190 100644
--- a/korundum/rubylib/tutorials/p5/p5.rb
+++ b/korundum/rubylib/tutorials/p5/p5.rb
@@ -1,4 +1,4 @@
-retquire 'Korundum'
+require 'Korundum'
class MainWindow < KDE::MainWindow
slots 'changeLocation()',
diff --git a/korundum/rubylib/tutorials/p6/p6.rb b/korundum/rubylib/tutorials/p6/p6.rb
index 86ea4ede..e9bdc7e5 100644
--- a/korundum/rubylib/tutorials/p6/p6.rb
+++ b/korundum/rubylib/tutorials/p6/p6.rb
@@ -1,4 +1,4 @@
-retquire 'Korundum'
+require 'Korundum'
class BookMarkList < KDE::ListView
k_dcop 'void add( TQString )'
diff --git a/korundum/rubylib/tutorials/p7/p7.rb b/korundum/rubylib/tutorials/p7/p7.rb
index 8e6eaf6c..1dca0ddd 100644
--- a/korundum/rubylib/tutorials/p7/p7.rb
+++ b/korundum/rubylib/tutorials/p7/p7.rb
@@ -1,4 +1,4 @@
-retquire 'Korundum'
+require 'Korundum'
class Browser < KDE::MainWindow
k_dcop 'void setURL(TQString)'
diff --git a/korundum/rubylib/tutorials/p8/p8.rb b/korundum/rubylib/tutorials/p8/p8.rb
index 817f72f9..0d0e5342 100644
--- a/korundum/rubylib/tutorials/p8/p8.rb
+++ b/korundum/rubylib/tutorials/p8/p8.rb
@@ -1,4 +1,4 @@
-retquire 'Korundum'
+require 'Korundum'
class BookMarkList < KDE::ListView
k_dcop 'void add(TQString)'
diff --git a/korundum/rubylib/tutorials/p9/p9.rb b/korundum/rubylib/tutorials/p9/p9.rb
index 48a01fdc..5ddfeae3 100644
--- a/korundum/rubylib/tutorials/p9/p9.rb
+++ b/korundum/rubylib/tutorials/p9/p9.rb
@@ -1,4 +1,4 @@
-retquire 'Korundum'
+require 'Korundum'
class Browser < KDE::MainWindow
k_dcop 'void setURL(TQString)'
diff --git a/qtjava/COPYING b/qtjava/COPYING
index 06f39cf2..4a636678 100644
--- a/qtjava/COPYING
+++ b/qtjava/COPYING
@@ -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/qtjava/INSTALL b/qtjava/INSTALL
index 11303504..4f43e1e4 100644
--- a/qtjava/INSTALL
+++ b/qtjava/INSTALL
@@ -45,7 +45,7 @@ The simplest way to compile this package is:
Compilers and Options
=====================
- Some systems retquire unusual options for compilation or linking that
+ Some systems require unusual options for compilation or linking that
the `configure' script does not know about. You can give `configure'
initial values for variables by setting them in the environment. Using
a Bourne-compatible shell, you can do that on the command line like
diff --git a/qtjava/javalib/examples/picture/PictureDisplay.java b/qtjava/javalib/examples/picture/PictureDisplay.java
index 2f311d51..1db43b88 100644
--- a/qtjava/javalib/examples/picture/PictureDisplay.java
+++ b/qtjava/javalib/examples/picture/PictureDisplay.java
@@ -83,7 +83,7 @@ protected void keyPressEvent( TQKeyEvent k )
static public void main( String[] args )
{
- TQApplication a = new TQApplication( args ); // TQApplication retquired!
+ TQApplication a = new TQApplication( args ); // TQApplication required!
String fileName = "car.pic"; // default picture file name
diff --git a/qtjava/javalib/examples/widgets/README b/qtjava/javalib/examples/widgets/README
index 46a11824..8e1767e4 100644
--- a/qtjava/javalib/examples/widgets/README
+++ b/qtjava/javalib/examples/widgets/README
@@ -1,4 +1,4 @@
Click the right mouse button + CTRL to identify a widget.
The classes MyWhatsThis and MyMenuItem can't be translated to java
-yet, as the retquired virtual methods callbacks aren't implemented
+yet, as the required virtual methods callbacks aren't implemented
diff --git a/qtjava/javalib/examples/wizard/Wizard.java b/qtjava/javalib/examples/wizard/Wizard.java
index ab355e08..22a3cb28 100644
--- a/qtjava/javalib/examples/wizard/Wizard.java
+++ b/qtjava/javalib/examples/wizard/Wizard.java
@@ -78,7 +78,7 @@ void setupPage2()
info.setText( "\n"
+ " Enter your personal \n"
+ " data here. \n\n"
- + " The retquired fields are \n"
+ + " The required fields are \n"
+ " First Name, Last Name \n"
+ " and E-Mail. \n" );
info.setIndent(8);
diff --git a/qtjava/javalib/org/kde/qt/TQSqlFieldInfo.java b/qtjava/javalib/org/kde/qt/TQSqlFieldInfo.java
index 98e4cd47..70173a72 100644
--- a/qtjava/javalib/org/kde/qt/TQSqlFieldInfo.java
+++ b/qtjava/javalib/org/kde/qt/TQSqlFieldInfo.java
@@ -8,38 +8,38 @@ public class TQSqlFieldInfo implements QtSupport {
private boolean _allocatedInJavaWorld = true;
protected TQSqlFieldInfo(Class dummy){}
- public TQSqlFieldInfo(String name, int typ, int retquired, int len, int prec, TQVariant defValue, int sqlType, boolean generated, boolean trim, boolean calculated) {
- newTQSqlFieldInfo(name,typ,retquired,len,prec,defValue,sqlType,generated,trim,calculated);
+ public TQSqlFieldInfo(String name, int typ, int required, int len, int prec, TQVariant defValue, int sqlType, boolean generated, boolean trim, boolean calculated) {
+ newTQSqlFieldInfo(name,typ,required,len,prec,defValue,sqlType,generated,trim,calculated);
}
- private native void newTQSqlFieldInfo(String name, int typ, int retquired, int len, int prec, TQVariant defValue, int sqlType, boolean generated, boolean trim, boolean calculated);
- public TQSqlFieldInfo(String name, int typ, int retquired, int len, int prec, TQVariant defValue, int sqlType, boolean generated, boolean trim) {
- newTQSqlFieldInfo(name,typ,retquired,len,prec,defValue,sqlType,generated,trim);
+ private native void newTQSqlFieldInfo(String name, int typ, int required, int len, int prec, TQVariant defValue, int sqlType, boolean generated, boolean trim, boolean calculated);
+ public TQSqlFieldInfo(String name, int typ, int required, int len, int prec, TQVariant defValue, int sqlType, boolean generated, boolean trim) {
+ newTQSqlFieldInfo(name,typ,required,len,prec,defValue,sqlType,generated,trim);
}
- private native void newTQSqlFieldInfo(String name, int typ, int retquired, int len, int prec, TQVariant defValue, int sqlType, boolean generated, boolean trim);
- public TQSqlFieldInfo(String name, int typ, int retquired, int len, int prec, TQVariant defValue, int sqlType, boolean generated) {
- newTQSqlFieldInfo(name,typ,retquired,len,prec,defValue,sqlType,generated);
+ private native void newTQSqlFieldInfo(String name, int typ, int required, int len, int prec, TQVariant defValue, int sqlType, boolean generated, boolean trim);
+ public TQSqlFieldInfo(String name, int typ, int required, int len, int prec, TQVariant defValue, int sqlType, boolean generated) {
+ newTQSqlFieldInfo(name,typ,required,len,prec,defValue,sqlType,generated);
}
- private native void newTQSqlFieldInfo(String name, int typ, int retquired, int len, int prec, TQVariant defValue, int sqlType, boolean generated);
- public TQSqlFieldInfo(String name, int typ, int retquired, int len, int prec, TQVariant defValue, int sqlType) {
- newTQSqlFieldInfo(name,typ,retquired,len,prec,defValue,sqlType);
+ private native void newTQSqlFieldInfo(String name, int typ, int required, int len, int prec, TQVariant defValue, int sqlType, boolean generated);
+ public TQSqlFieldInfo(String name, int typ, int required, int len, int prec, TQVariant defValue, int sqlType) {
+ newTQSqlFieldInfo(name,typ,required,len,prec,defValue,sqlType);
}
- private native void newTQSqlFieldInfo(String name, int typ, int retquired, int len, int prec, TQVariant defValue, int sqlType);
- public TQSqlFieldInfo(String name, int typ, int retquired, int len, int prec, TQVariant defValue) {
- newTQSqlFieldInfo(name,typ,retquired,len,prec,defValue);
+ private native void newTQSqlFieldInfo(String name, int typ, int required, int len, int prec, TQVariant defValue, int sqlType);
+ public TQSqlFieldInfo(String name, int typ, int required, int len, int prec, TQVariant defValue) {
+ newTQSqlFieldInfo(name,typ,required,len,prec,defValue);
}
- private native void newTQSqlFieldInfo(String name, int typ, int retquired, int len, int prec, TQVariant defValue);
- public TQSqlFieldInfo(String name, int typ, int retquired, int len, int prec) {
- newTQSqlFieldInfo(name,typ,retquired,len,prec);
+ private native void newTQSqlFieldInfo(String name, int typ, int required, int len, int prec, TQVariant defValue);
+ public TQSqlFieldInfo(String name, int typ, int required, int len, int prec) {
+ newTQSqlFieldInfo(name,typ,required,len,prec);
}
- private native void newTQSqlFieldInfo(String name, int typ, int retquired, int len, int prec);
- public TQSqlFieldInfo(String name, int typ, int retquired, int len) {
- newTQSqlFieldInfo(name,typ,retquired,len);
+ private native void newTQSqlFieldInfo(String name, int typ, int required, int len, int prec);
+ public TQSqlFieldInfo(String name, int typ, int required, int len) {
+ newTQSqlFieldInfo(name,typ,required,len);
}
- private native void newTQSqlFieldInfo(String name, int typ, int retquired, int len);
- public TQSqlFieldInfo(String name, int typ, int retquired) {
- newTQSqlFieldInfo(name,typ,retquired);
+ private native void newTQSqlFieldInfo(String name, int typ, int required, int len);
+ public TQSqlFieldInfo(String name, int typ, int required) {
+ newTQSqlFieldInfo(name,typ,required);
}
- private native void newTQSqlFieldInfo(String name, int typ, int retquired);
+ private native void newTQSqlFieldInfo(String name, int typ, int required);
public TQSqlFieldInfo(String name, int typ) {
newTQSqlFieldInfo(name,typ);
}
diff --git a/qtjava/javalib/qtjava/TQSqlFieldInfo.cpp b/qtjava/javalib/qtjava/TQSqlFieldInfo.cpp
index 670fa519..ee612b27 100644
--- a/qtjava/javalib/qtjava/TQSqlFieldInfo.cpp
+++ b/qtjava/javalib/qtjava/TQSqlFieldInfo.cpp
@@ -132,88 +132,88 @@ static TQString* _qstring_name = 0;
}
JNIEXPORT void JNICALL
-Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2II(JNIEnv* env, jobject obj, jstring name, jint typ, jint retquired)
+Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2II(JNIEnv* env, jobject obj, jstring name, jint typ, jint required)
{
static TQString* _qstring_name = 0;
if (QtSupport::getQt(env, obj) == 0) {
- QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) retquired));
+ QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) required));
QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
}
return;
}
JNIEXPORT void JNICALL
-Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2III(JNIEnv* env, jobject obj, jstring name, jint typ, jint retquired, jint len)
+Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2III(JNIEnv* env, jobject obj, jstring name, jint typ, jint required, jint len)
{
static TQString* _qstring_name = 0;
if (QtSupport::getQt(env, obj) == 0) {
- QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) retquired, (int) len));
+ QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) required, (int) len));
QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
}
return;
}
JNIEXPORT void JNICALL
-Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2IIII(JNIEnv* env, jobject obj, jstring name, jint typ, jint retquired, jint len, jint prec)
+Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2IIII(JNIEnv* env, jobject obj, jstring name, jint typ, jint required, jint len, jint prec)
{
static TQString* _qstring_name = 0;
if (QtSupport::getQt(env, obj) == 0) {
- QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) retquired, (int) len, (int) prec));
+ QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) required, (int) len, (int) prec));
QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
}
return;
}
JNIEXPORT void JNICALL
-Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2IIIILorg_kde_qt_QVariant_2(JNIEnv* env, jobject obj, jstring name, jint typ, jint retquired, jint len, jint prec, jobject defValue)
+Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2IIIILorg_kde_qt_QVariant_2(JNIEnv* env, jobject obj, jstring name, jint typ, jint required, jint len, jint prec, jobject defValue)
{
static TQString* _qstring_name = 0;
if (QtSupport::getQt(env, obj) == 0) {
- QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) retquired, (int) len, (int) prec, (const TQVariant&)*(const TQVariant*) QtSupport::getQt(env, defValue)));
+ QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) required, (int) len, (int) prec, (const TQVariant&)*(const TQVariant*) QtSupport::getQt(env, defValue)));
QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
}
return;
}
JNIEXPORT void JNICALL
-Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2IIIILorg_kde_qt_QVariant_2I(JNIEnv* env, jobject obj, jstring name, jint typ, jint retquired, jint len, jint prec, jobject defValue, jint sqlType)
+Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2IIIILorg_kde_qt_QVariant_2I(JNIEnv* env, jobject obj, jstring name, jint typ, jint required, jint len, jint prec, jobject defValue, jint sqlType)
{
static TQString* _qstring_name = 0;
if (QtSupport::getQt(env, obj) == 0) {
- QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) retquired, (int) len, (int) prec, (const TQVariant&)*(const TQVariant*) QtSupport::getQt(env, defValue), (int) sqlType));
+ QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) required, (int) len, (int) prec, (const TQVariant&)*(const TQVariant*) QtSupport::getQt(env, defValue), (int) sqlType));
QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
}
return;
}
JNIEXPORT void JNICALL
-Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2IIIILorg_kde_qt_QVariant_2IZ(JNIEnv* env, jobject obj, jstring name, jint typ, jint retquired, jint len, jint prec, jobject defValue, jint sqlType, jboolean generated)
+Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2IIIILorg_kde_qt_QVariant_2IZ(JNIEnv* env, jobject obj, jstring name, jint typ, jint required, jint len, jint prec, jobject defValue, jint sqlType, jboolean generated)
{
static TQString* _qstring_name = 0;
if (QtSupport::getQt(env, obj) == 0) {
- QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) retquired, (int) len, (int) prec, (const TQVariant&)*(const TQVariant*) QtSupport::getQt(env, defValue), (int) sqlType, (bool) generated));
+ QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) required, (int) len, (int) prec, (const TQVariant&)*(const TQVariant*) QtSupport::getQt(env, defValue), (int) sqlType, (bool) generated));
QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
}
return;
}
JNIEXPORT void JNICALL
-Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2IIIILorg_kde_qt_QVariant_2IZZ(JNIEnv* env, jobject obj, jstring name, jint typ, jint retquired, jint len, jint prec, jobject defValue, jint sqlType, jboolean generated, jboolean trim)
+Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2IIIILorg_kde_qt_QVariant_2IZZ(JNIEnv* env, jobject obj, jstring name, jint typ, jint required, jint len, jint prec, jobject defValue, jint sqlType, jboolean generated, jboolean trim)
{
static TQString* _qstring_name = 0;
if (QtSupport::getQt(env, obj) == 0) {
- QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) retquired, (int) len, (int) prec, (const TQVariant&)*(const TQVariant*) QtSupport::getQt(env, defValue), (int) sqlType, (bool) generated, (bool) trim));
+ QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) required, (int) len, (int) prec, (const TQVariant&)*(const TQVariant*) QtSupport::getQt(env, defValue), (int) sqlType, (bool) generated, (bool) trim));
QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
}
return;
}
JNIEXPORT void JNICALL
-Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2IIIILorg_kde_qt_QVariant_2IZZZ(JNIEnv* env, jobject obj, jstring name, jint typ, jint retquired, jint len, jint prec, jobject defValue, jint sqlType, jboolean generated, jboolean trim, jboolean calculated)
+Java_org_kde_qt_QSqlFieldInfo_newTQSqlFieldInfo__Ljava_lang_String_2IIIILorg_kde_qt_QVariant_2IZZZ(JNIEnv* env, jobject obj, jstring name, jint typ, jint required, jint len, jint prec, jobject defValue, jint sqlType, jboolean generated, jboolean trim, jboolean calculated)
{
static TQString* _qstring_name = 0;
if (QtSupport::getQt(env, obj) == 0) {
- QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) retquired, (int) len, (int) prec, (const TQVariant&)*(const TQVariant*) QtSupport::getQt(env, defValue), (int) sqlType, (bool) generated, (bool) trim, (bool) calculated));
+ QtSupport::setQt(env, obj, new TQSqlFieldInfoJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TQVariant::Type) typ, (int) required, (int) len, (int) prec, (const TQVariant&)*(const TQVariant*) QtSupport::getQt(env, defValue), (int) sqlType, (bool) generated, (bool) trim, (bool) calculated));
QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
}
return;
diff --git a/qtjava/javalib/test/ISBNValidator.java b/qtjava/javalib/test/ISBNValidator.java
index 67f32ac7..1e247f44 100644
--- a/qtjava/javalib/test/ISBNValidator.java
+++ b/qtjava/javalib/test/ISBNValidator.java
@@ -99,7 +99,7 @@ public class ISBNValidator extends TQValidator
/**
* This method is called when the user has pressed return, but
* validate() has judged the string valid but not acceptable. Note
- * that fixup() is not retquired to return an acceptable string. It is
+ * that fixup() is not required to return an acceptable string. It is
* guaranteed that the caller will validate() the string once again
* after the call to fixup().
*/
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
- * Removed superfluous "retquire 'pp'" statement
+ * Removed superfluous "require 'pp'" statement
2005-04-25 Richard Dale
@@ -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
@@ -570,7 +570,7 @@
2004-12-20 Richard Dale
* 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
- * 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
@@ -1627,7 +1627,7 @@
2003-07-31 Richard Dale
- * 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
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)
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.
Dependencies
-RuBoids retquires the OpenGL and Qt packages, which can be found on the Ruby Application Archive.
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()
diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml
index e779d99e..d4f15ae1 100644
--- a/qtsharp/src/api/qt.xml
+++ b/qtsharp/src/api/qt.xml
@@ -14791,7 +14791,7 @@ id="0">
-
Those advantages are unvaluable for a lightweight and tightly
integrated office suite like KOffice. However, there are no silver
bullets and most certainly there are drawbacks when the system is
- used in settings with different retquirements.
+ used in settings with different requirements.
Take the fourth item, it's comprehensive power while
- maintaining simplicity. This was one of the main retquirements of
+ maintaining simplicity. This was one of the main requirements of
the KOffice team, and it alone almost determines an in-process
approach with dynamically loadable shared objects. In a generic
- browser like Konqueror, the retquirements for integrated components
+ browser like Konqueror, the requirements for integrated components
are not as high as with an office suite. In an office suite,
different components operate on one single document, whereas in a
browser, the components basically provide different views for
@@ -108,7 +108,7 @@
If a component handles the event loop differently from the
embedding application, an complete event loop merger is
- retquired. This glueing code can be tricky and might not work well
+ required. This glueing code can be tricky and might not work well
in all cases. It's much easier for out-of-process components to
provide full toolkit independence.
@@ -131,7 +131,7 @@
the networking protocol implementations, the javascript
interpreter and whatever else Mozilla.org comes up with. The
MozEmbed library works pretty similar to KParts. Once
- instantiated, it dynamically loads all libraries retquired by
+ instantiated, it dynamically loads all libraries required by
Mozilla. As an interesting side note, all Unix filemanager
projects that utilize Mozilla (for example the Nautilus
filemanager) use this library to embed mozilla. This means you are
@@ -157,7 +157,7 @@
and ugly details. First of all, Mozilla uses the event loop of
glib, while Konqueror uses Qt. Unfortunatly, mixing both event
loops is not possible with the current release of glib, unless one
- want to end up with an application that constantly retquires some
+ want to end up with an application that constantly requires some
CPU to run, even when being idle. While this seems to be ok for
today's Java virtual machines, it's not acceptable by KDE's
quality standards. Until glib 2.0 is released, you need to patch
@@ -276,7 +276,7 @@
By writing a small wrapper it is possible to embed any kind of
visual component. In addition, we can provide generic wrappers for
any kind of visual component model, as long as those models are
- powerful enough to describe their interfaces and GUI retquirements
+ powerful enough to describe their interfaces and GUI requirements
at runtime. This includes KParts (eg. KOffice components), Bonobo
components (like the Nautilus MP3 viewer) and Uno components
provided by OpenOffice (formerly known as StarOffice).