Fix retquire

6 files changed, 44 insertions, 44 deletions

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().
 	  */