Adjusted to latest TQVariant::TQVariant(bool) function.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

6 files changed, 10 insertions, 10 deletions

diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQVariant.java b/qtjava/javalib/org/trinitydesktop/qt/TQVariant.java
index 2e9e7994..45d092de 100644
--- a/qtjava/javalib/org/trinitydesktop/qt/TQVariant.java
+++ b/qtjava/javalib/org/trinitydesktop/qt/TQVariant.java
@@ -158,10 +158,10 @@ public class TQVariant implements QtSupport {
 		newTQVariant(arg1);
 	}
 	private native void newTQVariant(long arg1);
-	public TQVariant(boolean arg1, int arg2) {
-		newTQVariant(arg1,arg2);
+	public TQVariant(boolean arg1) {
+		newTQVariant(arg1);
 	}
-	private native void newTQVariant(boolean arg1, int arg2);
+	private native void newTQVariant(boolean arg1);
 	public TQVariant(double arg1) {
 		newTQVariant(arg1);
 	}
diff --git a/qtjava/javalib/qtjava/TQVariant.cpp b/qtjava/javalib/qtjava/TQVariant.cpp
index 66802a44..4faeca81 100644
--- a/qtjava/javalib/qtjava/TQVariant.cpp
+++ b/qtjava/javalib/qtjava/TQVariant.cpp
@@ -58,7 +58,7 @@ public:
 	TQVariantJBridge(const TQPen& arg1) : TQVariant(arg1) {};
 	TQVariantJBridge(int arg1) : TQVariant(arg1) {};
 	TQVariantJBridge(TQ_LLONG arg1) : TQVariant(arg1) {};
-	TQVariantJBridge(bool arg1,int arg2) : TQVariant(arg1,arg2) {};
+	TQVariantJBridge(bool arg1) : TQVariant(arg1) {};
 	TQVariantJBridge(double arg1) : TQVariant(arg1) {};
 	TQVariantJBridge(TQSizePolicy arg1) : TQVariant(arg1) {};
 	~TQVariantJBridge() {QtSupport::qtKeyDeleted(this);}
@@ -622,10 +622,10 @@ Java_org_trinitydesktop_qt_QVariant_newTQVariant__Lorg_trinitydesktop_qt_QVarian
 }
 
 JNIEXPORT void JNICALL
-Java_org_trinitydesktop_qt_QVariant_newTQVariant__ZI(JNIEnv* env, jobject obj, jboolean arg1, jint arg2)
+Java_org_trinitydesktop_qt_QVariant_newTQVariant__ZI(JNIEnv* env, jobject obj, jboolean arg1)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new TQVariantJBridge((bool) arg1, (int) arg2));
+		QtSupport::setQt(env, obj, new TQVariantJBridge((bool) arg1));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
diff --git a/qtjava/javalib/qtjava/TQVariant.h b/qtjava/javalib/qtjava/TQVariant.h
index 30e15158..d0c1c9ed 100644
--- a/qtjava/javalib/qtjava/TQVariant.h
+++ b/qtjava/javalib/qtjava/TQVariant.h
@@ -37,7 +37,7 @@ extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QVariant_newTQVariant__
 extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QVariant_newTQVariant__Lorg_trinitydesktop_qt_QPen_2 (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QVariant_newTQVariant__I (JNIEnv *env, jobject, jint);
 extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QVariant_newTQVariant__J (JNIEnv *env, jobject, jlong);
-extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QVariant_newTQVariant__ZI (JNIEnv *env, jobject, jboolean, jint);
+extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QVariant_newTQVariant__ZI (JNIEnv *env, jobject, jboolean);
 extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QVariant_newTQVariant__D (JNIEnv *env, jobject, jdouble);
 extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QVariant_newTQVariant__Lorg_trinitydesktop_qt_QSizePolicy_2 (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QVariant_op_1equals (JNIEnv *env, jobject, jobject);
diff --git a/qtruby/rubylib/designer/rbuic/domtool.cpp b/qtruby/rubylib/designer/rbuic/domtool.cpp
index 65ea3a71..0636caa1 100644
--- a/qtruby/rubylib/designer/rbuic/domtool.cpp
+++ b/qtruby/rubylib/designer/rbuic/domtool.cpp
@@ -192,7 +192,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def
 	    v = TQVariant( e.firstChild().toText().data().toDouble() );
     } else if ( e.tagName() == "bool" ) {
 	TQString t = e.firstChild().toText().data();
-	v = TQVariant( t == "true" || t == "1", 0 );
+	v = TQVariant( t == "true" || t == "1" );
     } else if ( e.tagName() == "pixmap" ) {
 	v = TQVariant( e.firstChild().toText().data() );
     } else if ( e.tagName() == "iconset" ) {
diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp
index 937c32eb..8d30b0d7 100644
--- a/qtruby/rubylib/designer/rbuic/form.cpp
+++ b/qtruby/rubylib/designer/rbuic/form.cpp
@@ -625,7 +625,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 		TQString label = DomTool::readAttribute( n, "title", "", comment ).toString();
 		out << indent << "addPage(" << page << ", "<< trcall( label ) << ")" << endl;
 		trout << indent << "setTitle( " << page << ", " << trcall( label, comment ) << " )" << endl;
-		TQVariant def( false, 0 );
+		TQVariant def( false );
 		if ( DomTool::hasAttribute( n, "backEnabled" ) )
 		    out << indent << "setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ");" << endl;
 		if ( DomTool::hasAttribute( n, "nextEnabled" ) )
diff --git a/qtruby/rubylib/designer/rbuic/uic.cpp b/qtruby/rubylib/designer/rbuic/uic.cpp
index 9343b4e6..8bbf64fe 100644
--- a/qtruby/rubylib/designer/rbuic/uic.cpp
+++ b/qtruby/rubylib/designer/rbuic/uic.cpp
@@ -259,7 +259,7 @@ bool Uic::isFrameworkCodeGenerated( const TQDomElement& e )
 {
     TQDomElement n = getObjectProperty( e, "frameworkCode" );
     if ( n.attribute("name") == "frameworkCode" &&
-	 !DomTool::elementToVariant( n.firstChild().toElement(), TQVariant( true, 0 ) ).toBool() )
+	 !DomTool::elementToVariant( n.firstChild().toElement(), TQVariant( true ) ).toBool() )
 	return false;
     return true;
 }