TDE
/
tdebindings
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebindings
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/3/head
Michele Calgaro 6 years ago
parent 4fd9c59113
commit 9055b21d6a
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

6
qtjava/javalib/org/trinitydesktop/qt/TQVariant.java
Unescape View File

@ -158,10 +158,10 @@ public class TQVariant implements QtSupport {
newTQVariant(arg1); newTQVariant(arg1);
} }
private native void newTQVariant(long arg1); private native void newTQVariant(long arg1);
public TQVariant(boolean arg1, int arg2) { public TQVariant(boolean arg1) {
newTQVariant(arg1,arg2); newTQVariant(arg1);
} }
private native void newTQVariant(boolean arg1, int arg2); private native void newTQVariant(boolean arg1);
public TQVariant(double arg1) { public TQVariant(double arg1) {
newTQVariant(arg1); newTQVariant(arg1);
} }

6
qtjava/javalib/qtjava/TQVariant.cpp
Unescape View File

@ -58,7 +58,7 @@ public:
TQVariantJBridge(const TQPen& arg1) : TQVariant(arg1) {}; TQVariantJBridge(const TQPen& arg1) : TQVariant(arg1) {};
TQVariantJBridge(int arg1) : TQVariant(arg1) {}; TQVariantJBridge(int arg1) : TQVariant(arg1) {};
TQVariantJBridge(TQ_LLONG 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(double arg1) : TQVariant(arg1) {};
TQVariantJBridge(TQSizePolicy arg1) : TQVariant(arg1) {}; TQVariantJBridge(TQSizePolicy arg1) : TQVariant(arg1) {};
~TQVariantJBridge() {QtSupport::qtKeyDeleted(this);} ~TQVariantJBridge() {QtSupport::qtKeyDeleted(this);}
@ -622,10 +622,10 @@ Java_org_trinitydesktop_qt_QVariant_newTQVariant__Lorg_trinitydesktop_qt_QVarian
} }
JNIEXPORT void JNICALL 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) { 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)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
} }
return; return;

2
qtjava/javalib/qtjava/TQVariant.h
Unescape View File

@ -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__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__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__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__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 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); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QVariant_op_1equals (JNIEnv *env, jobject, jobject);

2
qtruby/rubylib/designer/rbuic/domtool.cpp
Unescape View File

@ -192,7 +192,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def
v = TQVariant( e.firstChild().toText().data().toDouble() ); v = TQVariant( e.firstChild().toText().data().toDouble() );
} else if ( e.tagName() == "bool" ) { } else if ( e.tagName() == "bool" ) {
TQString t = e.firstChild().toText().data(); TQString t = e.firstChild().toText().data();
v = TQVariant( t == "true" || t == "1", 0 ); v = TQVariant( t == "true" || t == "1" );
} else if ( e.tagName() == "pixmap" ) { } else if ( e.tagName() == "pixmap" ) {
v = TQVariant( e.firstChild().toText().data() ); v = TQVariant( e.firstChild().toText().data() );
} else if ( e.tagName() == "iconset" ) { } else if ( e.tagName() == "iconset" ) {

2
qtruby/rubylib/designer/rbuic/form.cpp
Unescape View File

@ -625,7 +625,7 @@ void Uic::createFormImpl( const TQDomElement &e )
TQString label = DomTool::readAttribute( n, "title", "", comment ).toString(); TQString label = DomTool::readAttribute( n, "title", "", comment ).toString();
out << indent << "addPage(" << page << ", "<< trcall( label ) << ")" << endl; out << indent << "addPage(" << page << ", "<< trcall( label ) << ")" << endl;
trout << indent << "setTitle( " << page << ", " << trcall( label, comment ) << " )" << endl; trout << indent << "setTitle( " << page << ", " << trcall( label, comment ) << " )" << endl;
TQVariant def( false, 0 ); TQVariant def( false );
if ( DomTool::hasAttribute( n, "backEnabled" ) ) if ( DomTool::hasAttribute( n, "backEnabled" ) )
out << indent << "setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ");" << endl; out << indent << "setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ");" << endl;
if ( DomTool::hasAttribute( n, "nextEnabled" ) ) if ( DomTool::hasAttribute( n, "nextEnabled" ) )

2
qtruby/rubylib/designer/rbuic/uic.cpp
Unescape View File

@ -259,7 +259,7 @@ bool Uic::isFrameworkCodeGenerated( const TQDomElement& e )
{ {
TQDomElement n = getObjectProperty( e, "frameworkCode" ); TQDomElement n = getObjectProperty( e, "frameworkCode" );
if ( n.attribute("name") == "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 false;
return true; return true;
} }

Write Preview
Loading…
Cancel
Save