diff options
520 files changed, 2261 insertions, 4014 deletions
diff --git a/.gitmodules b/.gitmodules index bdec8fca..934def7f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "admin"] path = admin url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin -[submodule "cmake"] - path = cmake - url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake diff --git a/admin b/admin -Subproject ae96f3ea4882e243513827da7c2ab889af3b160 +Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7 diff --git a/cmake b/cmake deleted file mode 160000 -Subproject 3bbc0e4d62a37030bf87675a33002ecf91b2710 diff --git a/configure.in.in b/configure.in.in index ae82a862..d9367d31 100644 --- a/configure.in.in +++ b/configure.in.in @@ -195,7 +195,11 @@ AC_DEFUN([KDE_CHECK_JAVA], AC_REQUIRE([KDE_CHECK_JAVA_DIR]) if test "$kde_java_bindir" = "no"; then DO_NOT_COMPILE="$DO_NOT_COMPILE $1"; + BUILD_$1=false + else + BUILD_$1=true fi + AM_CONDITIONAL(BUILD_$1, ${BUILD_$1}) ] ) diff --git a/dcopc/dcopc.c b/dcopc/dcopc.c index 5db11c1d..3c29f6e8 100644 --- a/dcopc/dcopc.c +++ b/dcopc/dcopc.c @@ -351,7 +351,7 @@ static gboolean dcop_client_attach_internal( DcopClient *client, gboolean anonym (char *)(DCOPReleaseString), 1, DCOPVersions, DCOPAuthCount, - (char **)(DCOPAuthNames), + DCOPAuthNames, DCOPClientAuthProcs, 0 ) ) < 0 ) { ERR( "Communications could not be established." ); diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am index de9d832a..45617ab7 100644 --- a/dcopjava/binding/Makefile.am +++ b/dcopjava/binding/Makefile.am @@ -1,8 +1,8 @@ lib_LTLIBRARIES = libjavadcop.la libjavadcop_la_SOURCES = client.cpp -libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -libjavadcop_la_LIBADD = $(LIB_TDECORE) +libjavadcop_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(KDE_PLUGIN) +libjavadcop_la_LIBADD = $(LIB_TDECORE) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx INCLUDES = $(jni_includes) $(all_includes) diff --git a/dcoppython/configure.in.in b/dcoppython/configure.in.in index c4d84ea2..719b4682 100644 --- a/dcoppython/configure.in.in +++ b/dcoppython/configure.in.in @@ -6,7 +6,11 @@ fi AC_ARG_VAR([XSLTPROC]) AC_ARG_VAR([PYTHON]) AC_PATH_PROG([XSLTPROC],[xsltproc],[echo]) -AC_PATH_PROG([PYTHON],[python2]) +AC_PATH_PROG([PYTHON],[python3]) if test -z "$PYTHON"; then AC_PATH_PROG([PYTHON],[python]) fi +if test -n "$PYTHON"; then + python_site=$($PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())') + AC_SUBST(PYTHON_SITE, $python_site) +fi diff --git a/dcoppython/lib/Makefile.am b/dcoppython/lib/Makefile.am index c72a0662..bfa7890c 100644 --- a/dcoppython/lib/Makefile.am +++ b/dcoppython/lib/Makefile.am @@ -1,4 +1,3 @@ pyt_DATA = pydcop.py -pytdir = $(PYTHONMODDIR)/site-packages - +pytdir = $(PYTHON_SITE) diff --git a/dcoppython/lib/pydcop.py b/dcoppython/lib/pydcop.py index 81875bd7..6b3a7fac 100644 --- a/dcoppython/lib/pydcop.py +++ b/dcoppython/lib/pydcop.py @@ -1,78 +1,78 @@ import pcop def registeredApplications(): - """Return a list of current DCOP registered applications.""" - return pcop.app_list() + """Return a list of current DCOP registered applications.""" + return pcop.app_list() def apps(): - """Return a list of current DCOP registered applications.""" - return pcop.app_list() + """Return a list of current DCOP registered applications.""" + return pcop.app_list() def anyAppCalled(appName): - """Return any application instance called appName, or None if none currently registered.""" - for app in apps(): - if appName==app or appName+'-'==app[:len(appName)+1]: - return DCOPApplication(app) - return None + """Return any application instance called appName, or None if none currently registered.""" + for app in apps(): + if appName==app or appName+'-'==app[:len(appName)+1]: + return DCOPApplication(app) + return None def registerAs(appid, addpid=1): - """Register the application with DCOP and return the ID. This is needed in order to receive DCOP requests.""" - return pcop.register_as(appid,addpid) + """Register the application with DCOP and return the ID. This is needed in order to receive DCOP requests.""" + return pcop.register_as(appid,addpid) def processEvents(): - """Process any waiting QT events, then return.""" - pcop.process_events() + """Process any waiting QT events, then return.""" + pcop.process_events() def connectDCOPSignal(sender,senderObj,signal,receiverObj,slot,vol=1): - """Connect a dcop signal""" - return pcop.connect_dcop_signal(sender,senderObj,signal,receiverObj,slot,vol) + """Connect a dcop signal""" + return pcop.connect_dcop_signal(sender,senderObj,signal,receiverObj,slot,vol) def disconnectDCOPSignal(sender,senderObj,signal,receiverObj,slot): - """Connect a dcop signal""" - return pcop.disconnect_dcop_signal(sender,senderObj,signal,receiverObj,slot) + """Connect a dcop signal""" + return pcop.disconnect_dcop_signal(sender,senderObj,signal,receiverObj,slot) class DCOPApplication(object): def __init__( self, name ): self.name = name def __getattr__( self, item ): - if item == "__repr__": - return object.__repr__ - if item == "__str__": - return object.__str__ - if item == "__call__": - return object.__call__ - if item == "_objects_": - return pcop.obj_list(self.name) + if item == "__repr__": + return object.__repr__ + if item == "__str__": + return object.__str__ + if item == "__call__": + return object.__call__ + if item == "_objects_": + return pcop.obj_list(self.name) return DCOPObject( self.name, item ) - def _object_(self, object): - return DCOPObject( self.name, object ) + def _object_(self, object): + return DCOPObject( self.name, object ) class DCOPObject(object): def __init__( self, appname, name ): self.appname = appname self.name = name - def __repr__( self ): - return "DCOPObject(%s,%s)" % ( self.appname, self.name ) + def __repr__( self ): + return "DCOPObject(%s,%s)" % ( self.appname, self.name ) - def __str__( self ): - return "DCOPObject(%s,%s)" % ( self.appname, self.name ) + def __str__( self ): + return "DCOPObject(%s,%s)" % ( self.appname, self.name ) def __getattr__( self, item ): - if item == "__repr__": - return object.__repr__ - if item == "__str__": - return object.__str__ - if item == "__call__": - return object.__call__ - if item == "_methods_": - return pcop.method_list( self.appname, self.name ) + if item == "__repr__": + return object.__repr__ + if item == "__str__": + return object.__str__ + if item == "__call__": + return object.__call__ + if item == "_methods_": + return pcop.method_list( self.appname, self.name ) return DCOPMethod( self.appname, self.name, item ) - def _method_(self, method): - return DCOPMethod( self.appname, self.name, method ) + def _method_(self, method): + return DCOPMethod( self.appname, self.name, method ) class DCOPMethod(object): def __init__( self, appname, objname, name ): @@ -80,43 +80,43 @@ class DCOPMethod(object): self.objname = objname self.name = name - def __repr__( self ): - return "DCOPMethod(%s,%s,%s)" % ( self.appname, self.objname, self.name ) + def __repr__( self ): + return "DCOPMethod(%s,%s,%s)" % ( self.appname, self.objname, self.name ) - def __str__( self ): - return "DCOPMethod(%s,%s,%s)" % ( self.appname, self.objname, self.name ) + def __str__( self ): + return "DCOPMethod(%s,%s,%s)" % ( self.appname, self.objname, self.name ) def __call__( self, *args ): - return pcop.dcop_call( self.appname, self.objname, self.name, args ) + return pcop.dcop_call( self.appname, self.objname, self.name, args ) class DCOPServer(object): - def __init__( self, appid, addpid = 1): - self.app_id = pcop.register_as(appid, addpid) + def __init__( self, appid, addpid = 1): + self.app_id = pcop.register_as(appid, addpid) class DCOPServerObject: - """Inherit from this class to DCOP enabled your object. - - Remember to call the base class constructor, and in your own constructor - you should called setMethods to set the methods to DCOP enable. - """ - - def __init__(self, objName=None): - """objName is the name of the object. If omitted, it will default to a hex - address. It is best to supply it.""" - if objName: - self.dcop_obj = pcop.create_dcop_object(self, objName) - else: - self.dcop_obj = pcop.create_dcop_object(self) - - def setMethods(self, methods): - """Set the method list for this object. - - methods is a list of tuple pairs. Each pair consists of the - method signature and the Python method that handles it. - - For example, setMethods([ ('TQString cheeseType()', self.cheese_type), - ('void setGreatWines(bool perthPink, bool hobartMuddy, bool chateauChunder)') - """ - pcop.set_method_list(self.dcop_obj, methods) + """Inherit from this class to DCOP enabled your object. + + Remember to call the base class constructor, and in your own constructor + you should called setMethods to set the methods to DCOP enable. + """ + + def __init__(self, objName=None): + """objName is the name of the object. If omitted, it will default to a hex + address. It is best to supply it.""" + if objName: + self.dcop_obj = pcop.create_dcop_object(self, objName) + else: + self.dcop_obj = pcop.create_dcop_object(self) + + def setMethods(self, methods): + """Set the method list for this object. + + methods is a list of tuple pairs. Each pair consists of the + method signature and the Python method that handles it. + + For example, setMethods([ ('TQString cheeseType()', self.cheese_type), + ('void setGreatWines(bool perthPink, bool hobartMuddy, bool chateauChunder)') + """ + pcop.set_method_list(self.dcop_obj, methods) diff --git a/dcoppython/shell/Makefile.am b/dcoppython/shell/Makefile.am index 2d4a5b01..3dbbc907 100644 --- a/dcoppython/shell/Makefile.am +++ b/dcoppython/shell/Makefile.am @@ -13,13 +13,10 @@ marshal_funcs_doc.html: $(srcdir)/marshal_funcs_doc.xsl marshal_funcs_doc.xml INCLUDES = $(PYTHONINC) $(all_includes) pythlib_LTLIBRARIES = pcop.la -pythlibdir = $(PYTHONMODDIR)/site-packages +pythlibdir = $(PYTHON_SITE) pcop_la_SOURCES = pcop.cpp marshaller.cpp importedmodules.cpp pcop_la_LDFLAGS = $(all_libraries) -module -avoid-version pcop_la_LIBADD = -lDCOP -ltdecore $(LIB_TQT) $(LIBPYTHON) noinst_HEADERS = pcop.h marshaller.h marshal_funcs.h importedmodules.h - - - diff --git a/dcoppython/shell/gen_marshal_code.py b/dcoppython/shell/gen_marshal_code.py index b6ae516f..5d947102 100644 --- a/dcoppython/shell/gen_marshal_code.py +++ b/dcoppython/shell/gen_marshal_code.py @@ -33,13 +33,13 @@ class DictMaker: def handle_string_marsh(self, attribute): """Handle marshalling of string item from the dictionary.""" - return ["if (%s && !PyString_Check(%s)) return false;" % (attribute, attribute), - "if (%s) { qobj.%s(TQString(PyString_AsString(%s)));" % (attribute, set_method(attribute), attribute), + return ["if (%s && !PyBytes_Check(%s)) return false;" % (attribute, attribute), + "if (%s) { qobj.%s(TQString::fromUtf8(PyBytes_AS_STRING(%s)));" % (attribute, set_method(attribute), attribute), "PyDict_DelItemString(dict,(char*)\"%s\"); } " % (attribute)] def handle_string_demarsh(self, attribute): """Handle demarshalling of string items into the dictionary.""" - return ["PyObject *%s = PyString_FromString(qobj.%s().utf8().data() );" % (attribute ,attribute), + return ["PyObject *%s = PyBytes_FromString(qobj.%s().utf8().data() );" % (attribute ,attribute), "PyDict_SetItemString(dict, (char*)\"%s\", %s);" % (attribute, attribute) ] @@ -141,7 +141,7 @@ class DocType: MARSHAL, DEMARSHAL, TOPYOBJ, FROMPYOBJ = 0,1,2,3 if len(sys.argv)!=4: - print "Use: gen_marshal_code.py <input file> <output file> <doc-xml-output file>" + print("Use: gen_marshal_code.py <input file> <output file> <doc-xml-output file>") raise RuntimeError nowt, in_name, code_name, doc_xml_name = tuple(sys.argv) @@ -267,10 +267,10 @@ out_file.writelines([x + '\n' for x in gen_code_comments]) out_file.writelines([x + '\n' for x in code]) out_file.close() -xml_file = file(doc_xml_name,"w") -print >>xml_file, '<?xml version="1.0" ?>' -print >>xml_file, '<!-- This file was auto-generated by gen_marshal_code.py. Changes will be lost! -->' -print >>xml_file, "<types>" -[ [xml_file.write(x+"\n") for x in doc.xml()] for doc in doc_types.values() ] # silly one-liner -print >>xml_file, "</types>" +xml_file = open(doc_xml_name,"w") +print('<?xml version="1.0" ?>', file=xml_file) +print('<!-- This file was auto-generated by gen_marshal_code.py. Changes will be lost! -->', file=xml_file) +print("<types>", file=xml_file) +[ [xml_file.write(x+"\n") for x in doc.xml()] for doc in list(doc_types.values()) ] # silly one-liner +print("</types>", file=xml_file) xml_file.close() diff --git a/dcoppython/shell/importedmodules.cpp b/dcoppython/shell/importedmodules.cpp index 4b2a23bb..cc352954 100644 --- a/dcoppython/shell/importedmodules.cpp +++ b/dcoppython/shell/importedmodules.cpp @@ -40,8 +40,8 @@ namespace PythonDCOP { return 0; PyObject* args = PyTuple_New( 2 ); - PyTuple_SetItem( args, 0, PyString_FromString( appname ) ); - PyTuple_SetItem( args, 1, PyString_FromString( objname ) ); + PyTuple_SetItem( args, 0, PyBytes_FromString( appname ) ); + PyTuple_SetItem( args, 1, PyBytes_FromString( objname ) ); return PyObject_CallObject( cl, args ); } diff --git a/dcoppython/shell/marshal_funcs.data b/dcoppython/shell/marshal_funcs.data index 6cf4d34f..f8c00050 100644 --- a/dcoppython/shell/marshal_funcs.data +++ b/dcoppython/shell/marshal_funcs.data @@ -46,7 +46,7 @@ type: bool } %% to_pyobj { - return PyInt_FromLong(val ? 1 : 0); + return PyLong_FromLong(val ? 1 : 0); } %% marshal { @@ -69,9 +69,9 @@ type:int %doc as int i %% marshal { - if (!PyInt_Check(obj)) return false; + if (!PyLong_Check(obj)) return false; if (str) { - (*str) << (TQ_INT32)PyInt_AsLong(obj); + (*str) << (TQ_INT32)PyLong_AsLong(obj); } return true; } @@ -79,7 +79,7 @@ type:int { TQ_INT32 i; (*str) >> i; - return PyInt_FromLong( (long)i ); + return PyLong_FromLong( (long)i ); } %% @@ -87,9 +87,9 @@ type:uint %doc as int i %% marshal { - if (!PyInt_Check(obj)) return false; + if (!PyLong_Check(obj)) return false; if (str) { - (*str) << (TQ_INT32)PyInt_AsLong(obj); + (*str) << (TQ_INT32)PyLong_AsLong(obj); } return true; } @@ -97,7 +97,7 @@ type:uint { TQ_INT32 i; (*str) >> i; - return PyInt_FromLong( (long)i ); + return PyLong_FromLong( (long)i ); } %% @@ -124,17 +124,17 @@ type:uchar %doc as int c %% marshal { - if (PyString_Check(obj) && PyString_Size(obj)==1) { + if (PyBytes_Check(obj) && PyBytes_Size(obj)==1) { if (str) { - char *c = PyString_AsString(obj); + char *c = PyBytes_AS_STRING(obj); (*str) << (*c); } return true; } - if (PyInt_Check(obj)) { + if (PyLong_Check(obj)) { if (str) { - long l = PyInt_AsLong(obj); + long l = PyLong_AsLong(obj); TQ_UINT8 c = (TQ_UINT8)(l & 0xff); (*str) << c; } @@ -147,7 +147,7 @@ type:uchar { TQ_UINT8 c; (*str) >> c; - return PyString_FromStringAndSize((const char *)(&c),1); + return PyBytes_FromStringAndSize((const char *)(&c),1); } %% @@ -155,9 +155,9 @@ type:char %doc as int c %% marshal { - if (PyInt_Check(obj)) { + if (PyLong_Check(obj)) { if (str) { - long l = PyInt_AsLong(obj); + long l = PyLong_AsLong(obj); TQ_INT8 c = (TQ_INT8)(l & 0xff); (*str) << c; } @@ -170,7 +170,7 @@ type:char { TQ_INT8 c; (*str) >> c; - return PyInt_FromLong((long)c); + return PyLong_FromLong((long)c); } %% @@ -178,37 +178,29 @@ type:char type:TQByteArray %% marshal { - PyBufferProcs *pb = obj->ob_type->tp_as_buffer; - - if ( pb && pb->bf_getreadbuffer && pb->bf_getsegcount ) + Py_buffer view; + if (PyObject_GetBuffer(obj, &view, PyBUF_WRITABLE|PyBUF_SIMPLE)) { - // Get the number of buffer segments - int seg_count = (pb->bf_getsegcount)(obj, 0); - - if ( seg_count != 1 ) - // Can't handle more (or less) than 1 buffer segment - // at the moment - return false; - - // Get buffer size and data - void *data; - int size; - - if ( (size = (pb->bf_getreadbuffer)(obj, 0, &data)) < 0 ) - return false; + return false; + } - if (str) { - TQByteArray a; - a.setRawData( (const char*)data, size ); - (*str) << a; - a.resetRawData( (const char*)data, size ); - } + int size = view.len; + if (size < 0) + { + PyBuffer_Release(&view); + return false; + } - return true; + if (str) + { + TQByteArray a; + a.setRawData((const char*)view.buf, size); + (*str) << a; + a.resetRawData((const char*)view.buf, size); } - else - // obj does not implement the buffer interface - return false; + + PyBuffer_Release(&view); + return true; } %% demarshal { @@ -219,25 +211,8 @@ type:TQByteArray uint size = a.size(); char *data = a.data(); - // Create a new buffer object and copy the data. - // Don't use PyBuffer_FromMemory() and the likes since - // that wouldn't give correct allocation and deallocation. - - PyObject *buffer_obj = PyBuffer_New( size ); - - if ( !buffer_obj ) - return NULL; - - PyBufferProcs *pb = buffer_obj->ob_type->tp_as_buffer; - - void *buffer_data; - - (pb->bf_getwritebuffer)( buffer_obj, 0, &buffer_data ); - - for ( uint i = 0; i < size; i++ ) - ((char*)buffer_data)[i] = data[i]; - - return buffer_obj; + // Demarshal to a writable buffer object + return PyBytes_FromStringAndSize(data, size); } %% @@ -245,9 +220,9 @@ type:TQString %doc as str s %% marshal { - if (!PyString_Check(obj)) return false; + if (!PyBytes_Check(obj)) return false; if (str) { - TQString s( PyString_AsString(obj) ); + TQString s = TQString::fromUtf8(PyBytes_AS_STRING(obj)); (*str) << s; } return true; @@ -256,7 +231,7 @@ type:TQString { TQString s; (*str) >> s; - return PyString_FromString( s.utf8().data() ); + return PyBytes_FromString( s.utf8().data() ); } %% @@ -264,9 +239,9 @@ type:TQCString %doc as str s %% marshal { - if (!PyString_Check(obj)) return false; + if (!PyBytes_Check(obj)) return false; if (str) { - TQCString s( PyString_AsString(obj) ); + TQCString s( PyBytes_AS_STRING(obj) ); (*str) << s; } return true; @@ -275,7 +250,7 @@ type:TQCString { TQCString s; (*str) >> s; - return PyString_FromString( s.data() ); + return PyBytes_FromString( s.data() ); } %% @@ -473,13 +448,6 @@ type:TQDateTime return dt; } - if (PyInt_Check(obj)) { - *ok=true; - TQDateTime dt; - dt.setTime_t( (uint)PyInt_AsLong(obj) ); - return dt; - } - PyObject *date_tuple, *time_tuple; if (PyArg_ParseTuple(obj, (char*)"OO", &date_tuple, &time_tuple)) { TQDateTime dt; @@ -507,13 +475,13 @@ type:KURL %% from_pyobj { *ok=false; - if (!PyString_Check(obj)) return KURL(); + if (!PyBytes_Check(obj)) return KURL(); *ok=true; - return KURL( TQString(PyString_AsString(obj)) ); + return KURL( TQString::fromUtf8(PyBytes_AS_STRING(obj)) ); } %% to_pyobj { - return PyString_FromString( val.prettyURL().utf8().data() ); + return PyBytes_FromString( val.prettyURL().utf8().data() ); } %% marshal %defaultcode @@ -524,14 +492,14 @@ type:KURL type:DCOPRef %% from_pyobj { - if (PyInstance_Check(obj) && + if (PyType_Check(obj) && PyObject_HasAttrString(obj, (char*)"appname") && PyObject_HasAttrString(obj, (char*)"name")) { PyObject *appname = PyObject_GetAttrString(obj, (char*)"appname"); PyObject *name = PyObject_GetAttrString(obj, (char*)"name"); - if (PyString_Check(appname) && PyString_Check(name)) { - char *c_appname = PyString_AsString(appname); - char *c_name = PyString_AsString(name); + if (PyBytes_Check(appname) && PyBytes_Check(name)) { + char *c_appname = PyBytes_AS_STRING(appname); + char *c_name = PyBytes_AS_STRING(name); DCOPRef ref; ref.setRef(TQCString(c_appname), TQCString(c_name) ); Py_DECREF(appname); diff --git a/dcoppython/shell/pcop.cpp b/dcoppython/shell/pcop.cpp index 19557a14..01b45c7f 100644 --- a/dcoppython/shell/pcop.cpp +++ b/dcoppython/shell/pcop.cpp @@ -188,7 +188,7 @@ namespace PythonDCOP { it.current(); ++it, ++c) { PyObject *tuple = PyTuple_New(2); PyList_SetItem(result, c, tuple); - PyTuple_SetItem(tuple, 0, PyString_FromString(it.currentKey() ) ); + PyTuple_SetItem(tuple, 0, PyBytes_FromString(it.currentKey() ) ); PyTuple_SetItem(tuple, 1, it.current()->pythonMethod() ); } return result; @@ -593,7 +593,7 @@ namespace PythonDCOP { QCStringList::ConstIterator end = apps.end(); unsigned int i = 0; for (; it != end; ++it, i++ ) - PyList_SetItem( l, i, PyString_FromString( (*it).data() ) ); + PyList_SetItem( l, i, PyBytes_FromString( (*it).data() ) ); return l; } @@ -621,7 +621,7 @@ namespace PythonDCOP { int add_pid = 1; if (PyArg_ParseTuple(args, (char*)"s|i", &appid, &add_pid)) { TQCString actual_appid = Client::instance()->dcop()->registerAs(TQCString(appid), add_pid!=0); - return PyString_FromString(actual_appid.data()); + return PyBytes_FromString(actual_appid.data()); } return NULL; } @@ -632,7 +632,7 @@ namespace PythonDCOP { if (PyArg_ParseTuple(args, (char*)"O|s", &py_dcop_object, &objid)) { Py_INCREF(py_dcop_object); PCOPObject *obj = objid ? new PCOPObject(py_dcop_object, objid) : new PCOPObject(py_dcop_object); - return PyCObject_FromVoidPtr( (void*)obj, delete_dcop_object ); + return PyCapsule_New( (void*)obj, NULL, (PyCapsule_Destructor)delete_dcop_object ); } return NULL; } @@ -646,7 +646,7 @@ namespace PythonDCOP { PyObject *c_obj; PyObject *method_list; if (PyArg_ParseTuple(args, (char*)"OO", &c_obj, &method_list) && - PyCObject_Check(c_obj) && + PyCapsule_CheckExact(c_obj) && PyList_Check(method_list)) { // extract each tuple from the list, aborting if any is invalid @@ -662,7 +662,7 @@ namespace PythonDCOP { meth_list.insert(method_signature, py_method); } - PCOPObject *obj = (PCOPObject*)PyCObject_AsVoidPtr(c_obj); + PCOPObject *obj = (PCOPObject*)PyCapsule_GetPointer(c_obj, NULL); if (obj) { if (!obj->setMethodList(meth_list)) return NULL; } @@ -675,8 +675,8 @@ namespace PythonDCOP { PyObject *get_method_list(PyObject */*self*/, PyObject *args) { PyObject *c_obj; if (PyArg_ParseTuple(args, (char*)"O", &c_obj)) { - if (PyCObject_Check(c_obj)) { - PCOPObject *obj = (PCOPObject*)PyCObject_AsVoidPtr(c_obj); + if (PyCapsule_CheckExact(c_obj)) { + PCOPObject *obj = (PCOPObject*)PyCapsule_GetPointer(c_obj, NULL); return obj->methodList(); } } @@ -736,7 +736,7 @@ namespace PythonDCOP { for(QCStringList::ConstIterator it = qt_list.begin(); it!=qt_list.end(); ++it,c++) - PyList_SetItem(l, c, PyString_FromString( (*it).data() ) ); + PyList_SetItem(l, c, PyBytes_FromString( (*it).data() ) ); return l; } @@ -757,14 +757,20 @@ PyMethodDef PCOPMethods[] = { { NULL, NULL, 0, NULL } /* Sentinel */ }; +static struct PyModuleDef pcopmodule = { + PyModuleDef_HEAD_INIT, + "pcop", + NULL, + -1, + PCOPMethods +}; + extern "C" { - - void initpcop() - { - (void) Py_InitModule( (char*)"pcop", PCOPMethods ); - } - + PyMODINIT_FUNC PyInit_pcop(void) + { + return PyModule_Create(&pcopmodule); + } } diff --git a/dcoppython/test/automate_presentation.py b/dcoppython/test/automate_presentation.py index 0c75e108..a1833d2e 100755 --- a/dcoppython/test/automate_presentation.py +++ b/dcoppython/test/automate_presentation.py @@ -7,14 +7,14 @@ import pydcop app = pydcop.anyAppCalled( "kpresenter" ) -if not app: raise RuntimeError, "Couldn't find a running KPresenter" +if not app: raise RuntimeError("Couldn't find a running KPresenter") doc = app.KoApplicationIface.getDocuments()[0] view = doc.view(0) startAction = view.action( "screen_start" ) -print "Starting Presentation %s" % doc.url() +print("Starting Presentation %s" % doc.url()) startAction.activate() @@ -27,4 +27,4 @@ while startAction.enabled() == 0: act.activate() view.screenStop() -print "Presentation finished." +print("Presentation finished.") diff --git a/dcoppython/test/dcopserver/gen.py b/dcoppython/test/dcopserver/gen.py index 4d1b8ff2..f0c952e5 100644 --- a/dcoppython/test/dcopserver/gen.py +++ b/dcoppython/test/dcopserver/gen.py @@ -7,7 +7,7 @@ inc_exceptions = {'TQDate': None, 'TQTime': None, 'KURL' : 'kurl'} iface_inc_list = ['dcopobject'] iface_inc_list += [ t.lower() for t in type_list if t[0]=='Q' and t not in inc_exceptions ] -iface_inc_list += inc_exceptions.values() +iface_inc_list += list(inc_exceptions.values()) iface_inc_1 = ['class DCOPDemoIface : virtual public DCOPObject {', ' K_DCOP', @@ -39,7 +39,7 @@ files = {'tdedcoptest_iface.h': iface_inc, 'cpp_inc.h': cpp_inc } -for (fname,data) in files.items(): +for (fname,data) in list(files.items()): outf = file(fname,'w') for d in data: outf.write(d+'\n') diff --git a/dcoppython/test/dcopserver/tdedcoptest.h b/dcoppython/test/dcopserver/tdedcoptest.h index 84a4db01..a4e6531a 100644 --- a/dcoppython/test/dcopserver/tdedcoptest.h +++ b/dcoppython/test/dcopserver/tdedcoptest.h @@ -20,7 +20,7 @@ */ class KDEDcopTest : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/dcoppython/test/server.py b/dcoppython/test/server.py index 957f6d94..7118effb 100644 --- a/dcoppython/test/server.py +++ b/dcoppython/test/server.py @@ -36,7 +36,7 @@ class ParrotObject(pydcop.DCOPServerObject): appid = pydcop.registerAs('petshop') -print "Server: %s starting" % appid +print("Server: %s starting" % appid) parrot = ParrotObject() another_parrot = ParrotObject('polly') diff --git a/dcoppython/test/signal.py b/dcoppython/test/signal.py index 72aa1385..47d4038c 100644 --- a/dcoppython/test/signal.py +++ b/dcoppython/test/signal.py @@ -19,10 +19,10 @@ class MyObject(pydcop.DCOPServerObject): self.setMethods( [('void test(TQString)', self.test)]) def test(self, data): - print "New Weather for " + data + print("New Weather for " + data) appid = pydcop.registerAs('dcopSignalTest') -print "Server: %s starting" % appid +print("Server: %s starting" % appid) pytest = MyObject() diff --git a/dcoppython/test/test.py b/dcoppython/test/test.py index 5ead172a..fa04a2e0 100644 --- a/dcoppython/test/test.py +++ b/dcoppython/test/test.py @@ -4,12 +4,12 @@ import pydcop #res = pcop.dcop_call( "kspread", "default", "getDocuments", () ) res = pydcop.anyAppCalled("kspread").default.getDocuments() -print res -print res[0].appname -print res[0].name +print(res) +print(res[0].appname) +print(res[0].name) m = res[0].map() -print m.tableNames() +print(m.tableNames()) -print "done" +print("done") diff --git a/dcoppython/test/test2.py b/dcoppython/test/test2.py index 1a56f917..36456848 100644 --- a/dcoppython/test/test2.py +++ b/dcoppython/test/test2.py @@ -6,23 +6,23 @@ app = pydcop.anyAppCalled( "kspread" ); res = app.default.getDocuments() -print res -print res[0].appname -print res[0].name +print(res) +print(res[0].appname) +print(res[0].name) m = res[0].map() -print m.tableNames() +print(m.tableNames()) x = m.table('Sheet2') if x: - print x - print "====================" - print x._name - print "====================" - print x._name() - print "====================" -else: print "Could not find sheet called Sheet2" - -print "done" + print(x) + print("====================") + print(x._name) + print("====================") + print(x._name()) + print("====================") +else: print("Could not find sheet called Sheet2") + +print("done") diff --git a/dcoppython/test/test3.py b/dcoppython/test/test3.py index aa13ed8b..69072c66 100644 --- a/dcoppython/test/test3.py +++ b/dcoppython/test/test3.py @@ -9,6 +9,6 @@ table = app.default.getViews()[0] table.setSelection( ( 2, 2, 4, 6 ) ) table.setSelectionBgColor( (100, 100, 240) ) -print rect +print(rect) -print "done" +print("done") diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 00000000..5c0b20ee --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,3 @@ +KDE_LANG = en +KDE_DOCS = AUTO +SUBDIRS = $(AUTODIRS) diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am new file mode 100644 index 00000000..1f739ad7 --- /dev/null +++ b/doc/man/Makefile.am @@ -0,0 +1,21 @@ +if BUILD_dcopjava + DCOPJAVA_MAN=dcopidl2java.1 +endif + +KJSEMBED_MAN=kjscmd.1 + +if BUILD_korundum + KORUNDUM_MAN=krubyinit.1 rbtdeapi.1 rbtdesh.1 +endif + +if BUILD_qtjava + QTJAVA_MAN=juic.1 +endif + +if BUILD_qtruby + QTRUBY_MAN=qtrubyinit.1 rbqtapi.1 rbqtsh.1 rbuic.1 +endif + +tmpdir = $(mandir)/man1 +tmp_DATA = $(DCOPJAVA_MAN) $(KJSEMBED_MAN) $(KORUNDUM_MAN) $(QTJAVA_MAN) $(QTRUBY_MAN) +EXTRA_DIST=$(DCOPJAVA_MAN) $(KJSEMBED_MAN) $(KORUNDUM_MAN) $(QTJAVA_MAN) $(QTRUBY_MAN) diff --git a/doc/man/dcopidl2java.1 b/doc/man/dcopidl2java.1 new file mode 100644 index 00000000..926d7839 --- /dev/null +++ b/doc/man/dcopidl2java.1 @@ -0,0 +1,28 @@ +.TH LIBDCOP-JAVA 1 "July 31, 2002" +.SH NAME +dcopidl2java \- Convert a DCOP IDL file to Java language stubs +.SH SYNOPSIS +.B dcopidl2java +.RI " [ " --no-skel " ] [ " --no-stub " ] [ " --package " " java-package " ] " file +.SH DESCRIPTION +This manual page documents briefly the +.B dcopidl2java +command. +.PP +\fBdcopidl2java\fP is a program that generates Java stubs from a DCOP IDL file, +for use with the libdcop-java Java DCOP bindings. + +.SH OPTIONS +A summary of options is included below. +.TP +.B --no-skel +Do not generate skeleton code. +.TP +.B --no-stub +Do not generate stub implementation code. +.TP +.B --package java-package +Set the name of the Java package to use in the generated code. +.SH AUTHOR +This manual page was written by Peter Hawkins <peterh@debian.org> +for the Debian GNU/Linux system (but may be used by others). diff --git a/doc/man/juic.1 b/doc/man/juic.1 new file mode 100644 index 00000000..9120f44d --- /dev/null +++ b/doc/man/juic.1 @@ -0,0 +1,39 @@ +.TH JUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Java UI Compiler Manual" +.SH NAME +juic \- The Qt Java UI Compiler +.SH SYNOPSIS +.B juic +[options] uifile +.SH DESCRIPTION +Juic is the Qt Java UI Compiler. It generates Java\*(tm code from a +XML UI Description file. This XML UI Description file can be +generated by Qt Designer, Qt's graphical UI designer. Juic is the +Java\*(tm equivalent for the C++ uic program. + +Juic generates Java code for the Qt UI Description File passed to it, +and outputs it on standard output. +.SH OPTIONS +.TP +.B \-proc <xsltproc|xalan|saxon> +Tells juic which xslt processor to use internally. Possible values +are "xsltproc", "xalan", "saxon". The processor you specify must be +available in the PATH or juic will give an error. The default is to +use xsltproc if it's available, and use saxon otherwise. +.TP +.B \-package <the.package.for.the.class> +Tells juic to add the given package declaration to the generated java +class. +.TP +.B \-abstract <true|false> +Tells juic whether or not to define slots as abstract. +.TP +.B \-images <dir> +Tells juic where to find the images used in the given ui file. +Default is "images". +.TP +.B \-os <unix|msdos|mac> +Tells juic what newline style to use in the generated java file. Possible values are "unix", "msdos" and "mac", for UNIX, DOS and MacOS style newlines respectively. +.SH AUTHOR +Marco Ladermann +.SH SEE ALSO +uic(1) diff --git a/kjsembed/kjscmd.1 b/doc/man/kjscmd.1 index c0765aeb..c0765aeb 100644 --- a/kjsembed/kjscmd.1 +++ b/doc/man/kjscmd.1 diff --git a/doc/man/krubyinit.1 b/doc/man/krubyinit.1 new file mode 100644 index 00000000..f8a40545 --- /dev/null +++ b/doc/man/krubyinit.1 @@ -0,0 +1,25 @@ +.TH KRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "KRubyInit Manual" +.SH NAME +krubyinit \- Start Korundum Ruby Scripts Faster +.SH SYNOPSYS +.B krubyinit +[switches] [--] [programfile] [arguments] +.SH DESCRIPTION +Krubyinit is a wrapper around the ruby interpreter for executing Ruby +scripts using the Korundum library ( the Ruby TDE bindings ). It uses +the tdeinit system to start the app so that they start a little bit +faster when started in a running TDE session. + +The script takes exactly the same options as the ruby(1) program. +Therefore, its options aren't documented here, please refer to the +ruby(1) manpage. + +This script is part of Korundum, which is part of the TDE Bindings +module. +.SH OPTIONS +Krubyinit takes exactly the same options as the ruby(1) program and +they have exactly the same meaning. Please refer to its manpage. +.SH AUTHOR +Alexander Kellett +.SH SEE ALSO +ruby(1) diff --git a/doc/man/qtrubyinit.1 b/doc/man/qtrubyinit.1 new file mode 100644 index 00000000..1ab6e7f2 --- /dev/null +++ b/doc/man/qtrubyinit.1 @@ -0,0 +1,25 @@ +.TH QTRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "QtRubyInit Manual" +.SH NAME +qtrubyinit \- Start Qt Ruby Scripts Faster +.SH SYNOPSYS +.B qtrubyinit +[switches] [--] [programfile] [arguments] +.SH DESCRIPTION +Qtrubyinit is a wrapper around the ruby interpreter for executing Ruby +scripts using the QtRuby library. It uses the tdeinit system to start +the app so that they start a little bit faster when started in a +running TDE session. + +The script takes exactly the same options as the ruby(1) program. +Therefore, its options aren't documented here, please refer to the +ruby(1) manpage. + +This script is part of QtRuby, which is part of the TDE Bindings +module. +.SH OPTIONS +Qtrubyinit takes exactly the same options as the ruby(1) program and +they have exactly the same meaning. Please refer to its manpage. +.SH AUTHOR +Alexander Kellett +.SH SEE ALSO +ruby(1) diff --git a/doc/man/rbqtapi.1 b/doc/man/rbqtapi.1 new file mode 100644 index 00000000..7cafb5b8 --- /dev/null +++ b/doc/man/rbqtapi.1 @@ -0,0 +1,29 @@ +.TH RBQTAPI 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual" +.SH NAME +rbqtapi \- A QtRuby Introspection Tool +.SH SYNOPSIS +.B rbqtapi +[options] [<class>] +.SH DESCRIPTION +Rbqtapi is a QtRuby Introspection Tool, similar to javap(1). Use it +to find a list of method for a certain QtRuby class. +.SH OPTIONS +.TP +.B \-r <re> +Find all functions matching regular expression/keyword <re> +.TP +.B \-i +Perform a case insensitive search ( only meaningful in combination with -r ) +.TP +.B \-p +Display also inherited methods. +.TP +.B \-v +Print QtRuby and Qt versions. +.TP +.B \-h +Print a help message. +.SH AUTHOR +Alexander Kellett +.SH SEE ALSO +rbtdeapi(1) diff --git a/doc/man/rbqtsh.1 b/doc/man/rbqtsh.1 new file mode 100644 index 00000000..bda49d96 --- /dev/null +++ b/doc/man/rbqtsh.1 @@ -0,0 +1,16 @@ +.TH RBQTSH 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual" +.SH NAME +rbqtsh \- An Interactive QtRuby Shell +.SH SYNOPSIS +.B rbqtsh +[options] +.SH DESCRIPTION +Rbqtsh is an interactive QtRuby shell. It shows a GUI dialog box +where you can enter Ruby code using the QtRuby library. +.SH OPTIONS +This program takes no options. +.SH AUTHOR +Germain Garand +Alexander Kellett +.SH SEE ALSO +rbtdesh(1) diff --git a/doc/man/rbtdeapi.1 b/doc/man/rbtdeapi.1 new file mode 100644 index 00000000..e3d16622 --- /dev/null +++ b/doc/man/rbtdeapi.1 @@ -0,0 +1,29 @@ +.TH RBTDEAPI 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual" +.SH NAME +rbtdeapi \- A Korundum TDE Ruby Introspection Tool +.SH SYNOPSIS +.B rbtdeapi +[options] [<class>] +.SH DESCRIPTION +Rbtdeapi is a Korundum TDE Ruby Introspection Tool, similar to +javap(1). Use it to find a list of method for a certain Korundum class. +.SH OPTIONS +.TP +.B \-r <re> +Find all functions matching regular expression/keyword <re> +.TP +.B \-i +Perform a case insensitive search ( only meaningful in combination with -r ) +.TP +.B \-p +Display also inherited methods. +.TP +.B \-v +Print QtRuby and Qt versions. +.TP +.B \-h +Print a help message. +.SH AUTHOR +Alexander Kellett +.SH SEE ALSO +rbqtapi(1) diff --git a/doc/man/rbtdesh.1 b/doc/man/rbtdesh.1 new file mode 100644 index 00000000..6e792e7f --- /dev/null +++ b/doc/man/rbtdesh.1 @@ -0,0 +1,17 @@ +.TH RBTDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual" +.SH NAME +rbtdesh \- An Interactive Korundum Shell +.SH SYNOPSIS +.B rbtdesh +[options] +.SH DESCRIPTION +Rbtdesh is an interactive Korundum shell. It shows a GUI dialog box +where you can enter Ruby code using the Korundum TDE Ruby bindings +library. +.SH OPTIONS +This program takes no options. +.SH AUTHOR +Germain Garand +Alexander Kellett +.SH SEE ALSO +rbqtsh(1) diff --git a/doc/man/rbuic.1 b/doc/man/rbuic.1 new file mode 100644 index 00000000..d59caa1a --- /dev/null +++ b/doc/man/rbuic.1 @@ -0,0 +1,64 @@ +.TH RBUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Ruby UI Compiler Manual" +.SH NAME +rbuic \- The Qt Ruby UI Compiler +.SH SYNOPSIS +Generate implementation: +.B rbuic +[options] uifile +.LP +Generate subclass implementation: +.B rbuic +[options] -subimpl <classname> <uifile> +.LP +Generate image collection: +.B rbuic +[options] -embed <project> <image1> <image2> <image3> ... +.SH DESCRIPTION +Rbuic is the Qt Ruby UI Compiler. It generates Ruby code from a XML +UI Description file. This XML UI Description file can be generated by +Qt Designer, Qt's graphical UI designer. Rbuic is the Ruby equivalent +for the C++ uic program. + +When invoked to generate an implementation, rbuic generates Ruby code +for the Qt UI Description File passed to it, and outputs it on +standard output. + +When invoked to generate a subclass implementation, rbuic generates +template Ruby code for a subclass of the widget in the Qt UI +Description File passed to it, and outputs it on standard output. + +When invoked to generate an image collection, rbuic generates Ruby +code containing the image data in strings. This is useful to avoid +having to distribute image files along with your application. It is +arguably more useful for C++ ( where the image strings can be compiled +into an executable ), but still, it is available for Ruby as well. +.SH OPTIONS +.TP +.B \-o <file> +Write output to file rather than stdout. +.TP +.B \-p <indent> +Set the indent in spaces (0 to use a tab) +.TP +.B \-nofwd +Omit imports of custom widgets +.TP +.B \-kde +Use TDE widgets, require 'Korundum' extension +.TP +.B \-tr <func> +Use func(...) rather than trUtf8(...) for i18n +.TP +.B \-x +Generate extra code to test the class +.TP +.B \-version +Print the Rbuic and Qt versions +.TP +.B \-help +Display some help information. +.SH AUTHOR +Germain Garand +Phil Thompson +.SH SEE ALSO +uic(1) diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog index f1729b0d..73c69c35 100644 --- a/kalyptus/ChangeLog +++ b/kalyptus/ChangeLog @@ -119,7 +119,7 @@ 2004-05-25 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * Added the correct macro expansion for Q_OBJECT with Qt/E 2.3.x + * Added the correct macro expansion for TQ_OBJECT with Qt/E 2.3.x * kalyptus can now generate the SMOKE library for Qt Embedded 2004-05-22 Richard Dale <Richard_Dale@tipitina.demon.co.uk> diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 596f6c59..ad897365 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -27,7 +27,7 @@ use vars qw/ %rootNodes $declNodeType @includes_list %options @formats_wanted $a $libdir $libname $outputdir @libs $parse_global_space $qt_embedded $qt4 $striphpath $doPrivate $readstdin $Version $quiet $debug $debuggen $parseonly $currentfile $cSourceNode $exe %formats %flagnames @allowed_k_dcop_accesors $allowed_k_dcop_accesors_re $rootNode - @classStack $cNode $globalSpaceClassName + @classStack $cNode $globalSpaceClassName $have_tdehw_lib $lastLine $docNode @includes $cpp $defcppcmd $cppcmd $docincluded $inExtern $inNamespace %stats %definitions @inputqueue @codeqobject @qt4_codeqobject @qte_codeqobject /; @@ -131,10 +131,9 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); _STYLE_PLATINUM => '', _STYLE_SGI => '', _STYLE_WINDOWS => '', - QT_STATIC_CONST => 'static const', - Q_EXPORT => '', + TQ_EXPORT => '', Q_EXPORT_CODECS_BIG5 => '', - Q_REFCOUNT => '', + TQ_REFCOUNT => '', TQM_EXPORT_CANVAS => '', TQM_EXPORT_DNS => '', TQM_EXPORT_ICONVIEW => '', @@ -143,11 +142,11 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); TQM_EXPORT_WORKSPACE => '', TQT_NO_REMOTE => 'TQT_NO_REMOTE', QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT', - Q_WS_X11 => 'Q_WS_X11', + TQ_WS_X11 => 'TQ_WS_X11', TQ_DISABLE_COPY => 'TQ_DISABLE_COPY', - Q_WS_QWS => 'undef', - Q_WS_MAC => 'undef', - Q_OBJECT => <<'CODE', + TQ_WS_QWS => 'undef', + TQ_WS_MAC => 'undef', + TQ_OBJECT => <<'CODE', public: virtual TQMetaObject *metaObject() const; virtual const char *className() const; @@ -230,6 +229,18 @@ if ( $#includes >= 0 && !$cpp ) { die "$exe: --includedir requires --cpp\n"; } +# Check for tdehw lib headers presence +if (-e "$ENV{KDE_PREFIX}/include/tdehardwaredevices.h") +{ + $have_tdehw_lib = 1; + print "kalyptus: tdehw headers found in $ENV{KDE_PREFIX}/include\n"; +} +else +{ + $have_tdehw_lib = 0; + print "kalyptus: tdehw headers not found in $ENV{KDE_PREFIX}/include\n"; +} + # Check output formats. HTML is the default if( $#formats_wanted < 0 ) { push @formats_wanted, "java"; @@ -364,7 +375,7 @@ sub parseFiles || croak "Can't preprocess $currentfile"; } else { - open( INPUT, "tqt-replace-stream $currentfile |" ) + open( INPUT, "$currentfile" ) || croak "Can't read from $currentfile"; } @@ -456,7 +467,7 @@ sub readSourceLine =head2 readCxxLine Reads a C++ source line, skipping comments, blank lines, - preprocessor tokens and the Q_OBJECT macro + preprocessor tokens and the TQ_OBJECT macro =cut @@ -484,7 +495,7 @@ LOOP: } } - if ( $p =~ /^\s*Q_OBJECT/ ) { + if ( $p =~ /^\s*TQ_OBJECT/ ) { if ($qt_embedded) { push @inputqueue, @qte_codeqobject; } elsif ($qt4) { @@ -496,14 +507,12 @@ LOOP: } # Hack, waiting for real handling of preprocessor defines $p =~ s/QT_MODULE\(\w+\)//; - $p =~ s/QT_STATIC_CONST/static const/; $p =~ s/QT_WEAK_SYMBOL//; $p =~ s/QT_MOC_COMPAT//; $p =~ s/Q_EXPORT_CODECS_BIG5//; $p =~ s/QT_COMPAT / /; $p =~ s/TQ_DISABLE_COPY\((\w+)\)/$1(const $1 &);\n$1 &operator=(const $1 &);/; $p =~ s/TQWIDGETSIZE_MAX/32767/; # Qt/E uses this #define as an enum value - yuck! - $p =~ s/Q_SIGNALS/signals/; $p =~ s/ASYNC/void/; $p =~ s/[A-Z_]*_EXPORT_DEPRECATED//; $p =~ s/[A-Z_]*_EXPORT\s/ /; @@ -533,7 +542,7 @@ LOOP: next if ( $p =~ /^\s*$/s ); # blank lines -# || $p =~ /^\s*Q_OBJECT/ # TQObject macro +# || $p =~ /^\s*TQ_OBJECT/ # TQObject macro # ); # @@ -546,7 +555,7 @@ LOOP: || $p =~ /^\s*Q_GADGET/ || $p =~ /^\s*TQ_OVERRIDE/ # and TQ_OVERRIDE || $p =~ /^\s*TQ_SETS/ - || $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/ + || $p =~ /^\s*TQ_DUMMY_COMPARISON_OPERATOR/ || $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff || $p =~ /^\s*K_SYCOCAFACTORY/ # || $p =~ /^\s*KSVG_/ # and KSVG stuff ;) @@ -577,13 +586,13 @@ LOOP: else { # Skip platform-specific stuff, or #if 0 stuff # or #else of something we parsed (e.g. for TQKeySequence) - if ( $p =~ m/^#\s*ifdef\s*Q_WS_/ or - $p =~ m/^#\s*if\s+defined\(Q_WS_/ or + if ( $p =~ m/^#\s*ifdef\s*TQ_WS_/ or + $p =~ m/^#\s*if\s+defined\(TQ_WS_/ or ($p =~ m/^#\s*ifdef\s+_WS_QWS_/ and $qt_embedded) or ($p =~ m/^#\s*ifndef\s+TQT_NO_MIMECLIPBOARD/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(_WS_X11_/ and $qt_embedded) or - ($p =~ m/^#\s*if\s+defined\(Q_WS_X11_/ and $qt_embedded) or - ($p =~ m/^#\s*if\s+defined\(Q_WS_WIN_/ and $qt_embedded) or + ($p =~ m/^#\s*if\s+defined\(TQ_WS_X11_/ and $qt_embedded) or + ($p =~ m/^#\s*if\s+defined\(TQ_WS_WIN_/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(_WS_MAC_/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(Q_INCOMPATIBLE_3_0_ADDONS/ and $qt_embedded) or $p =~ m/^#\s*ifndef\s+TQT_NO_STL/ or @@ -591,7 +600,7 @@ LOOP: $p =~ m/^#\s*if\s+defined\(Q_CC_/ or $p =~ m/^#\s*if\s+defined\(TQT_THREAD_SUPPORT/ or $p =~ m/^#\s*else/ or - $p =~ m/^#\s*if\s+defined\(Q_FULL_TEMPLATE_INSTANTIATION/ or + $p =~ m/^#\s*if\s+defined\(TQ_FULL_TEMPLATE_INSTANTIATION/ or $p =~ m/^#\s*ifdef\s+QT_WORKSPACE_WINDOWMODE/ or $p =~ m/^#\s*ifdef\s+QT_COMPAT/ or $p =~ m/^#\s*if\s+defined\s*\(?QT_COMPAT/ or @@ -602,6 +611,7 @@ LOOP: $p =~ m/^#\s*if\s+defined\s*\(qdoc/ or $p =~ m/^#\s*ifndef\s+TQT_NO_MEMBER_TEMPLATES/ or $p =~ m/^#if\s*!defined\(Q_NO_USING_KEYWORD\)/ or + (not $have_tdehw_lib and $p =~ m/^#\s*ifdef\s+__TDE_HAVE_TDEHWLIB/) or &$match_qt_defines( $p ) or $p =~ m/^#\s*if\s+0\s+/ ) { my $if_depth = 1; @@ -864,7 +874,7 @@ sub identifyDecl (?:\s*TQ[A-Z_]*EXPORT[A-Z_]*)? (?:\s*Q[A-Z_]*EXPORT[A-Z_]*)? (?:\s*TQ_PACKED)? - (?:\s*Q_REFCOUNT)? + (?:\s*TQ_REFCOUNT)? \s+([\w_]+ # 3 name (?:<[\w_ :,]+?>)? # maybe explicit template # (eat chars between <> non-hungry) @@ -942,7 +952,10 @@ sub identifyDecl \( (.*?) \) # parameters \s*((?:const)?)\s* (?:throw\s*\(.*?\))? - \s*((?:=\s*0(?:L?))?)\s* # Pureness. is "0L" allowed? + \s*((?:=\s*(?: + 0(?:L?)| # Pureness. is "0L" allowed? + default # Default method + ))?) \s*[;{]+/xs ) { # rest my $tpn = $1; # type + name @@ -954,7 +967,7 @@ sub identifyDecl } my $const = $3 eq "" ? 0 : 1; - my $pure = $4 eq "" ? 0 : 1; + my $pure = $4 eq "" ? 0 : ($4 =~ "default" ? 0 : 1); $tpn =~ s/\s+/ /g; $tpn =~ s/operator\s+([^\w])/operator$1/g; $params =~ s/\s+/ /g; diff --git a/kalyptus/kalyptusCxxToCSharp.pm b/kalyptus/kalyptusCxxToCSharp.pm index 6c8ce4cb..d077fb59 100644 --- a/kalyptus/kalyptusCxxToCSharp.pm +++ b/kalyptus/kalyptusCxxToCSharp.pm @@ -117,7 +117,7 @@ sub cplusplusToCSharp return "IntPtr"; } elsif ( $cplusplusType =~ /^TQUuid/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^Q_REFCOUNT/ ) { + } elsif ( $cplusplusType =~ /^TQ_REFCOUNT/ ) { return "IntPtr"; } elsif ( $cplusplusType =~ /^EventRef/ ) { return "IntPtr"; @@ -223,7 +223,7 @@ sub cplusplusToPInvoke return "RawObject"; } elsif ( $cplusplusType =~ /^TQUuid/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^Q_REFCOUNT/ ) { + } elsif ( $cplusplusType =~ /^TQ_REFCOUNT/ ) { return "RawObject"; } elsif ( $cplusplusType =~ /^EventRef/ ) { return "RawObject"; diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 7d57f377..332b44de 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -536,12 +536,12 @@ EOF } /** Prepend a '2' to a signal string and remove any spaces */ - public static String SIGNAL(String signal) { + public static String TQ_SIGNAL(String signal) { return "2" + sqeezeOut(signal, ' '); } /** Prepend a '1' to a slot string and remove any spaces */ - public static String SLOT(String slot) { + public static String TQ_SLOT(String slot) { return "1" + sqeezeOut(slot, ' '); } @@ -1836,7 +1836,6 @@ sub cplusplusToJava || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_MediaList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_OfferList\s*\*/ || $cplusplusType =~ /TQMemArray<TQRect>/ - || $cplusplusType =~ /TQArray<TQRect>/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QCanvasItemList\s*\*/ ) { return "ArrayList" } elsif ( $cplusplusType =~ /uchar\s*\*/ ) { @@ -2247,8 +2246,6 @@ sub jniToReturnValue($$$) $returnCall .= "\treturn (jobject) QtSupport::arrayWithTQIconDragItemList(env, (TQValueList<TQIconDragItem>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; } elsif ( $cplusplusType =~ /TQMemArray<TQRect>\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) QtSupport::arrayWithTQRectList(env, (TQMemArray<TQRect>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; - } elsif ( $cplusplusType =~ /TQArray<TQRect>\s*([\*\&])?\s*$/ ) { - $returnCall .= "\treturn (jobject) QtSupport::arrayWithTQRectList(env, (TQArray<TQRect>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; } } elsif ( $javaType =~ /String\[\]/ ) { ; # Do nothing, string arrays are ArrayLists as return values @@ -2628,7 +2625,7 @@ sub preParseClass || ($name eq 'qt_cast') || ($name eq 'qt_property') || ($name eq 'staticMetaObject') - # Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro + # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') || $name eq 'trUtf8' @@ -2835,7 +2832,7 @@ sub writeClassDoc my @ancestor_nodes = (); Iter::Ancestors( $node, $rootnode, undef, undef, sub { my ( $ances, $name, $type, $template ) = @_; - if ( $name ne "TQMemArray" and $name ne "TQArray" and $name ne "TQSqlFieldInfoList" ) { + if ( $name ne "TQMemArray" and $name ne "TQSqlFieldInfoList" ) { push @ancestor_nodes, $ances; push @ancestors, $name; } @@ -5476,9 +5473,9 @@ sub printJavadocComment($$$$) $line =~ s/const char/String/g; $line =~ s/const (\w+)\&/$1/g; $line =~ s/bool/boolean/g; - $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; - $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; - $line =~ s/Q_OBJECT\n//g; + $line =~ s/TQ_SLOT\(\s*([^\)]*)\) ?\)/TQ_SLOT("$1)")/g; + $line =~ s/TQ_SIGNAL\(\s*([^\)]*)\) ?\)/TQ_SIGNAL("$1)")/g; + $line =~ s/TQ_OBJECT\n//g; $line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g; $line =~ s/public\s*(slots)?:\n/public /g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 59a5444d..b75b9fb2 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -331,12 +331,12 @@ EOF } /** Prepend a '2' to a signal string and remove any spaces */ - public static String SIGNAL(String signal) { + public static String TQ_SIGNAL(String signal) { return "2" + sqeezeOut(signal, ' '); } /** Prepend a '1' to a slot string and remove any spaces */ - public static String SLOT(String slot) { + public static String TQ_SLOT(String slot) { return "1" + sqeezeOut(slot, ' '); } @@ -903,7 +903,7 @@ sub preParseClass || ($name eq 'qt_property') || ($name eq 'staticMetaObject') || ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl') - # Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro + # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') || $m->{Deprecated} ) { @@ -3315,9 +3315,9 @@ sub printJavadocComment($$$$) $line =~ s/const char/String/g; $line =~ s/const (\w+)\&/$1/g; $line =~ s/bool/boolean/g; - $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; - $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; - $line =~ s/Q_OBJECT\n//g; + $line =~ s/TQ_SLOT\(\s*([^\)]*)\) ?\)/TQ_SLOT("$1)")/g; + $line =~ s/TQ_SIGNAL\(\s*([^\)]*)\) ?\)/TQ_SIGNAL("$1)")/g; + $line =~ s/TQ_OBJECT\n//g; $line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g; $line =~ s/public\s*(slots)?:\n/public /g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index 089cec92..4f4804c2 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -82,10 +82,7 @@ BEGIN 'TQ_UINT64' => '$', 'TQ_INT64' => '$', 'TQ_LLONG' => '$', - 'tquint64' => '$', - 'qint64' => '$', 'long long' => '$', - 'qulonglong' => '$', ); # Yes some of this is in kalyptusDataDict's ctypemap @@ -147,21 +144,13 @@ BEGIN 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', 'TQ_INT16' => 'short', - 'qint16' => 'short', 'TQ_INT32' => 'int', - 'qint32' => 'int', - 'qint32&' => 'int&', 'TQ_INT8' => 'char', - 'qint8' => 'char', 'TQ_LONG' => 'long', 'TQ_UINT16' => 'ushort', - 'tquint16' => 'ushort', 'TQ_UINT32' => 'uint', - 'tquint32' => 'uint', 'TQ_UINT8' => 'uchar', - 'tquint8' => 'uchar', 'TQ_ULONG' => 'long', - 'qreal' => 'double', 'pid_t' => 'int', 'size_t' => 'int', 'pid_t' => 'int', @@ -397,11 +386,11 @@ EOF public static TQApplication tqApp = null; - public static string SIGNAL(string signal) { + public static string TQ_SIGNAL(string signal) { return "2"+ signal; } - public static string SLOT(string slot) { + public static string TQ_SLOT(string slot) { return "1" + slot; } EOF @@ -952,7 +941,7 @@ sub preParseClass || ($name eq 'type') || ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl') || ($classNode->{astNodeName} eq 'TQApplication' and $name eq 'TQApplication') - # Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro + # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') @@ -3508,9 +3497,9 @@ sub printCSharpdocComment($$$$) $line =~ s/const char/string/g; $line =~ s/const (\w+)\&/$1/g; $line =~ s/bool/bool/g; - $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; - $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; - $line =~ s/Q_OBJECT\n//g; + $line =~ s/TQ_SLOT\(\s*([^\)]*)\) ?\)/TQ_SLOT("$1)")/g; + $line =~ s/TQ_SIGNAL\(\s*([^\)]*)\) ?\)/TQ_SIGNAL("$1)")/g; + $line =~ s/TQ_OBJECT\n//g; $line =~ s/public\s*(slots)?:\n/public /g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; $line =~ s/^(\s*)\*/$1/g; diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index a33f74a7..3ea44e58 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -75,10 +75,7 @@ BEGIN 'TQ_UINT64' => '$', 'TQ_INT64' => '$', 'TQ_LLONG' => '$', - 'tquint64' => '$', - 'qint64' => '$', 'long long' => '$', - 'qulonglong' => '$', ); # Yes some of this is in kalyptusDataDict's ctypemap @@ -141,21 +138,13 @@ BEGIN 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', 'TQ_INT16' => 'short', - 'qint16' => 'short', 'TQ_INT32' => 'int', - 'qint32' => 'int', - 'qint32&' => 'int&', 'TQ_INT8' => 'char', - 'qint8' => 'char', 'TQ_LONG' => 'long', 'TQ_UINT16' => 'ushort', - 'tquint16' => 'ushort', 'TQ_UINT32' => 'uint', - 'tquint32' => 'uint', 'TQ_UINT8' => 'uchar', - 'tquint8' => 'uchar', 'TQ_ULONG' => 'long', - 'qreal' => 'double', 'pid_t' => 'int', 'size_t' => 'int', 'pid_t' => 'int', @@ -637,7 +626,7 @@ sub preParseClass || ($name eq 'hack_strchr') || ($name eq 'hack_strstr') ) ) - # Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro + # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index 935395fc..6f3e7535 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -1467,7 +1467,6 @@ BEGIN 'TQActionGroup*' => 'qt_QActionGroup*', 'TQApplication*' => 'qt_QApplication*' , 'TQArabicCodec*' => 'qt_QArabicCodec*', -'TQArray*' => 'qt_QArray*', 'TQAsciiBucket*' => 'qt_QAsciiBucket*', 'TQAsciiCache*' => 'qt_QAsciiCache*', 'TQAsciiCacheIterator*' => 'qt_QAsciiCacheIterator*', @@ -1541,10 +1540,6 @@ BEGIN 'TQCleanupHandler*' => 'qt_QCleanupHandler*', 'TQClipboard*' => 'qt_QClipboard*', 'TQCloseEvent*' => 'qt_QCloseEvent*' , -'TQCollection&' => 'qt_QCollection*' , -'TQCollection*' => 'qt_QCollection*', -'TQCollection::Item&' => 'void*' , -'TQCollection::Item' => 'void*' , 'TQColor &' => 'qt_QColor*', 'TQColor&' => 'qt_QColor*', 'TQColor&fillColor::white' => 'int' , @@ -1951,7 +1946,6 @@ BEGIN 'TQPtrStack*' => 'qt_QPtrStack*', 'TQPtrVector*' => 'qt_QPtrVector*', 'TQPushButton*' => 'qt_QPushButton*', -'TQQueue*' => 'qt_QQueue*', 'TQRESULT' => 'long', 'TQRadioButton*' => 'qt_QRadioButton*', 'TQRangeControl*' => 'qt_QRangeControl*', @@ -1976,7 +1970,6 @@ BEGIN 'TQScrollBar*' => 'qt_QScrollBar*' , 'TQScrollView*' => 'qt_QScrollView*', 'TQSemaphore*' => 'qt_QSemaphore*', -'TQSemiModal*' => 'qt_QSemiModal*', 'TQSenderObject*' => 'qt_QSenderObject*', 'TQServerSocket*' => 'qt_QServerSocket*', 'TQSessionManager&' => 'qt_QSessionManager*' , @@ -2012,7 +2005,6 @@ BEGIN 'TQSocketDevice*' => 'qt_QSocketDevice*' , 'TQSocketNotifier*' => 'qt_QSocketNotifier*', 'TQSocketNotifier::Type' => 'int', -'TQSortedList*' => 'qt_QSortedList*', 'TQSound*' => 'qt_QSound*', 'TQSpacerItem*' => 'qt_QSpacerItem*' , 'TQSpinBox*' => 'qt_QSpinBox*', @@ -2296,9 +2288,6 @@ BEGIN 'TQt::RasterOp' => 'int' , 'TQt::UIEffect' => 'int' , 'TQt::WFlags' => 'int' , -'QtMultiLineEdit*' => 'qt_QtMultiLineEdit*', -'QtMultiLineEditRow*' => 'qt_QtMultiLineEditRow*', -'QtTableView*' => 'qt_QtTableView*', 'QwAbsSpriteFieldView*' => 'qt_QwAbsSpriteFieldView*' , 'QwClusterizer*' => 'qt_QwClusterizer*' , 'QwEllipse*' => 'qt_QwEllipse*', diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am index 1c8b3477..f98ad856 100644 --- a/kjsembed/Makefile.am +++ b/kjsembed/Makefile.am @@ -61,8 +61,6 @@ kjscmd_SOURCES = kjscmd.cpp kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS) kjscmd_LDADD = libkjsembed.la -man_MANS = kjscmd.1 - xdg_apps_DATA = kjscmd.desktop plugintypedir = $(kde_servicetypesdir) diff --git a/kjsembed/bindings/bindingobject.h b/kjsembed/bindings/bindingobject.h index 60cb32c2..17b51fa5 100644 --- a/kjsembed/bindings/bindingobject.h +++ b/kjsembed/bindings/bindingobject.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -37,7 +35,7 @@ namespace Bindings { */ class BindingObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: BindingObject( TQObject *parent, const char *name=0 ); diff --git a/kjsembed/bindings/brush_imp.cpp b/kjsembed/bindings/brush_imp.cpp index ab2eee3f..8daa3897 100644 --- a/kjsembed/bindings/brush_imp.cpp +++ b/kjsembed/bindings/brush_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/brush_imp.h b/kjsembed/bindings/brush_imp.h index 040c73b6..d9f4423e 100644 --- a/kjsembed/bindings/brush_imp.h +++ b/kjsembed/bindings/brush_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp index f4d68972..579ad99a 100644 --- a/kjsembed/bindings/dcop_imp.cpp +++ b/kjsembed/bindings/dcop_imp.cpp @@ -1,6 +1,4 @@ // $Id$ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/dcop_imp.h b/kjsembed/bindings/dcop_imp.h index 6a821028..c843b2f1 100644 --- a/kjsembed/bindings/dcop_imp.h +++ b/kjsembed/bindings/dcop_imp.h @@ -1,6 +1,4 @@ // $Id$ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * @@ -52,7 +50,7 @@ class JSDCOPInterfacerLoader : public JSBindingBase */ class JSDCOPInterface : public BindingObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT public: JSDCOPInterface( KJS::Interpreter *js, TQObject *parent, const char *name=0 ); diff --git a/kjsembed/bindings/iconset_imp.cpp b/kjsembed/bindings/iconset_imp.cpp index 43ec0f83..90e41ae8 100644 --- a/kjsembed/bindings/iconset_imp.cpp +++ b/kjsembed/bindings/iconset_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/iconset_imp.h b/kjsembed/bindings/iconset_imp.h index d758f0b5..9b44ab90 100644 --- a/kjsembed/bindings/iconset_imp.h +++ b/kjsembed/bindings/iconset_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/image_imp.cpp b/kjsembed/bindings/image_imp.cpp index eb428ab3..962befdd 100644 --- a/kjsembed/bindings/image_imp.cpp +++ b/kjsembed/bindings/image_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/image_imp.h b/kjsembed/bindings/image_imp.h index 39cb7031..af6ee98e 100644 --- a/kjsembed/bindings/image_imp.h +++ b/kjsembed/bindings/image_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/movie_imp.cpp b/kjsembed/bindings/movie_imp.cpp index 7f786c52..3613849b 100644 --- a/kjsembed/bindings/movie_imp.cpp +++ b/kjsembed/bindings/movie_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/movie_imp.h b/kjsembed/bindings/movie_imp.h index 5a3bfcee..59c58463 100644 --- a/kjsembed/bindings/movie_imp.h +++ b/kjsembed/bindings/movie_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * @@ -37,7 +35,7 @@ namespace Bindings { */ class Movie : public BindingObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQColor setBackgroundColor READ backgroundColor ) TQ_PROPERTY( int setSpeed READ speed ) diff --git a/kjsembed/bindings/netaccess_imp.cpp b/kjsembed/bindings/netaccess_imp.cpp index 024a8764..a5a32769 100644 --- a/kjsembed/bindings/netaccess_imp.cpp +++ b/kjsembed/bindings/netaccess_imp.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /** * netaccess_imp.cpp * diff --git a/kjsembed/bindings/netaccess_imp.h b/kjsembed/bindings/netaccess_imp.h index d22d72a0..9acd4bb0 100644 --- a/kjsembed/bindings/netaccess_imp.h +++ b/kjsembed/bindings/netaccess_imp.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /** * netaccess.h * @@ -35,7 +34,7 @@ namespace Bindings { */ class NetAccess : public BindingObject { - Q_OBJECT + TQ_OBJECT public: NetAccess( TQObject *parent, const char *name=0 ); virtual ~NetAccess(); diff --git a/kjsembed/bindings/painter_imp.cpp b/kjsembed/bindings/painter_imp.cpp index 9a8d36a9..cacadf90 100644 --- a/kjsembed/bindings/painter_imp.cpp +++ b/kjsembed/bindings/painter_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -514,8 +512,3 @@ TQColor KJSEmbed::Bindings::Painter::brush( ) const { return pr->painter()->brush().color(); } -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/bindings/painter_imp.h b/kjsembed/bindings/painter_imp.h index f831b7fd..b26f990a 100644 --- a/kjsembed/bindings/painter_imp.h +++ b/kjsembed/bindings/painter_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/pen_imp.cpp b/kjsembed/bindings/pen_imp.cpp index 63344a52..b85615b3 100644 --- a/kjsembed/bindings/pen_imp.cpp +++ b/kjsembed/bindings/pen_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -119,9 +117,3 @@ KJS::Value Pen::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List & } // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/bindings/pen_imp.h b/kjsembed/bindings/pen_imp.h index 2068a6a5..1c8e8928 100644 --- a/kjsembed/bindings/pen_imp.h +++ b/kjsembed/bindings/pen_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/pixmap_imp.cpp b/kjsembed/bindings/pixmap_imp.cpp index 5fead7ce..ad41138d 100644 --- a/kjsembed/bindings/pixmap_imp.cpp +++ b/kjsembed/bindings/pixmap_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/pixmap_imp.h b/kjsembed/bindings/pixmap_imp.h index 08baa96c..730eaf65 100644 --- a/kjsembed/bindings/pixmap_imp.h +++ b/kjsembed/bindings/pixmap_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/point_imp.cpp b/kjsembed/bindings/point_imp.cpp index fff93aad..c6988dea 100644 --- a/kjsembed/bindings/point_imp.cpp +++ b/kjsembed/bindings/point_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org> * @@ -86,7 +84,3 @@ namespace Bindings { } // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/bindings/point_imp.h b/kjsembed/bindings/point_imp.h index 950cce7d..d112a77f 100644 --- a/kjsembed/bindings/point_imp.h +++ b/kjsembed/bindings/point_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/rect_imp.cpp b/kjsembed/bindings/rect_imp.cpp index 2614197b..739a80ae 100644 --- a/kjsembed/bindings/rect_imp.cpp +++ b/kjsembed/bindings/rect_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org> * @@ -105,7 +103,3 @@ namespace Bindings { } // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/bindings/rect_imp.h b/kjsembed/bindings/rect_imp.h index 16910e4e..4c95cb92 100644 --- a/kjsembed/bindings/rect_imp.h +++ b/kjsembed/bindings/rect_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/size_imp.cpp b/kjsembed/bindings/size_imp.cpp index 1e41e60a..48ce2d7f 100644 --- a/kjsembed/bindings/size_imp.cpp +++ b/kjsembed/bindings/size_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org> * @@ -127,7 +125,3 @@ KJS::Value Size::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List } // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/bindings/size_imp.h b/kjsembed/bindings/size_imp.h index 9a1fb4eb..fc9aadc5 100644 --- a/kjsembed/bindings/size_imp.h +++ b/kjsembed/bindings/size_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/sql_imp.cpp b/kjsembed/bindings/sql_imp.cpp index 5fa9782f..6e317216 100644 --- a/kjsembed/bindings/sql_imp.cpp +++ b/kjsembed/bindings/sql_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/sql_imp.h b/kjsembed/bindings/sql_imp.h index 08555e84..3f287a13 100644 --- a/kjsembed/bindings/sql_imp.h +++ b/kjsembed/bindings/sql_imp.h @@ -35,7 +35,7 @@ namespace Bindings { */ class SqlQuery : public BindingObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int size READ size) TQ_PROPERTY( int at READ at) TQ_PROPERTY( int numRowsAffected READ numRowsAffected ) @@ -88,7 +88,7 @@ private: */ class SqlDatabase : public BindingObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString databaseName READ databaseName WRITE setDatabaseName) TQ_PROPERTY( TQString userName READ userName WRITE setUserName) TQ_PROPERTY( TQString password READ password WRITE setPassword) diff --git a/kjsembed/bindings/tdeconfig_imp.h b/kjsembed/bindings/tdeconfig_imp.h index 75bf3bfd..36ceec36 100644 --- a/kjsembed/bindings/tdeconfig_imp.h +++ b/kjsembed/bindings/tdeconfig_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * @@ -44,7 +42,7 @@ namespace Bindings { class Config : public BindingObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool forceGlobal READ forceGlobal WRITE setForceGlobal ) TQ_PROPERTY( bool dollarExpansion READ isDollarExpansion WRITE setDollarExpansion ) TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) diff --git a/kjsembed/bindwizard/binding_wizard.ui b/kjsembed/bindwizard/binding_wizard.ui index baacdca5..352b68d8 100644 --- a/kjsembed/bindwizard/binding_wizard.ui +++ b/kjsembed/bindwizard/binding_wizard.ui @@ -476,15 +476,10 @@ files of the C++ classes you want to make available to Javascript are located.</ </widget> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kled.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kled.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kjsembed/bindwizard/doxygen2imp_cpp.xsl b/kjsembed/bindwizard/doxygen2imp_cpp.xsl index 903f16b2..c16c47e8 100644 --- a/kjsembed/bindwizard/doxygen2imp_cpp.xsl +++ b/kjsembed/bindwizard/doxygen2imp_cpp.xsl @@ -551,10 +551,5 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object </xsl:for-each> } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - </xsl:template> </xsl:stylesheet> diff --git a/kjsembed/bindwizard/doxygen2imp_h.xsl b/kjsembed/bindwizard/doxygen2imp_h.xsl index d5aaa8d2..bb4c982f 100644 --- a/kjsembed/bindwizard/doxygen2imp_h.xsl +++ b/kjsembed/bindwizard/doxygen2imp_h.xsl @@ -119,10 +119,5 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_<xsl:value-of select="compoundname" />_H - -// Local Variables: -// c-basic-offset: 4 -// End: - </xsl:template> </xsl:stylesheet> diff --git a/kjsembed/builtins/qdir_imp.cpp b/kjsembed/builtins/qdir_imp.cpp index b2f50cba..376d448d 100644 --- a/kjsembed/builtins/qdir_imp.cpp +++ b/kjsembed/builtins/qdir_imp.cpp @@ -1001,9 +1001,3 @@ KJS::Value TQDirImp::isRelativePath_58( KJS::ExecState *exec, KJS::Object &obj, } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/builtins/qdir_imp.h b/kjsembed/builtins/qdir_imp.h index 55c319a5..fab17807 100644 --- a/kjsembed/builtins/qdir_imp.h +++ b/kjsembed/builtins/qdir_imp.h @@ -164,9 +164,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QDir_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/builtins/qfile_imp.cpp b/kjsembed/builtins/qfile_imp.cpp index 1ead6bbf..f12f531f 100644 --- a/kjsembed/builtins/qfile_imp.cpp +++ b/kjsembed/builtins/qfile_imp.cpp @@ -614,9 +614,3 @@ KJS::Value TQFileImp::remove_32( KJS::ExecState *exec, KJS::Object &obj, const K } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/builtins/qfile_imp.h b/kjsembed/builtins/qfile_imp.h index 69d28e9d..f4882bb8 100644 --- a/kjsembed/builtins/qfile_imp.h +++ b/kjsembed/builtins/qfile_imp.h @@ -140,9 +140,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QFile_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/builtins/resources.cpp b/kjsembed/builtins/resources.cpp index 22a6917c..bed7cd55 100644 --- a/kjsembed/builtins/resources.cpp +++ b/kjsembed/builtins/resources.cpp @@ -225,7 +225,3 @@ KJS::Value StdIconsImp::call( KJS::ExecState *exec, KJS::Object &/*obj*/, const } // namespace KJSEmbed::BuiltIns } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/resources.h b/kjsembed/builtins/resources.h index a93332b9..860ce4dd 100644 --- a/kjsembed/builtins/resources.h +++ b/kjsembed/builtins/resources.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/builtins/saxhandler.cpp b/kjsembed/builtins/saxhandler.cpp index ff0334bf..89e7fd91 100644 --- a/kjsembed/builtins/saxhandler.cpp +++ b/kjsembed/builtins/saxhandler.cpp @@ -180,7 +180,3 @@ TQString SaxHandler::errorString() } // namespace KJSEmbed::BuiltIns } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/saxhandler.h b/kjsembed/builtins/saxhandler.h index 5feeef58..e6aa56f6 100644 --- a/kjsembed/builtins/saxhandler.h +++ b/kjsembed/builtins/saxhandler.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/builtins/stdaction_imp.cpp b/kjsembed/builtins/stdaction_imp.cpp index 7950161e..74083d01 100644 --- a/kjsembed/builtins/stdaction_imp.cpp +++ b/kjsembed/builtins/stdaction_imp.cpp @@ -93,7 +93,3 @@ KJS::Value StdActionImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, cons } // namespace KJSEmbed::BuiltIns } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/stdaction_imp.h b/kjsembed/builtins/stdaction_imp.h index 9a64174b..5829814c 100644 --- a/kjsembed/builtins/stdaction_imp.h +++ b/kjsembed/builtins/stdaction_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -62,7 +60,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_STDACTION_IMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/stddialog_imp.cpp b/kjsembed/builtins/stddialog_imp.cpp index 56c9919c..85b2cfaa 100644 --- a/kjsembed/builtins/stddialog_imp.cpp +++ b/kjsembed/builtins/stddialog_imp.cpp @@ -141,7 +141,3 @@ KJS::Value StdDialogImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, cons } // namespace KJSEmbed::BuiltIns } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/stddialog_imp.h b/kjsembed/builtins/stddialog_imp.h index ea70db73..23f99405 100644 --- a/kjsembed/builtins/stddialog_imp.h +++ b/kjsembed/builtins/stddialog_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -75,7 +73,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_STDDIALOG_IMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/textstream_imp.cpp b/kjsembed/builtins/textstream_imp.cpp index d28bb46c..3d72d30b 100644 --- a/kjsembed/builtins/textstream_imp.cpp +++ b/kjsembed/builtins/textstream_imp.cpp @@ -128,7 +128,3 @@ KJS::Value TextStreamImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, con } // namespace KJSEmbed::BuiltIns } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/textstream_imp.h b/kjsembed/builtins/textstream_imp.h index c08470fc..e308ee21 100644 --- a/kjsembed/builtins/textstream_imp.h +++ b/kjsembed/builtins/textstream_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -73,7 +71,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDTEXTSTREAMIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp index 906e0691..d2311562 100644 --- a/kjsembed/customobject_imp.cpp +++ b/kjsembed/customobject_imp.cpp @@ -1437,8 +1437,3 @@ KJS::Value Bindings::CustomObjectImp::qmenuDataInsertSeparator(KJS::ExecState *e } // namespace KJSEmbed::Bindings }// namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/customobject_imp.h b/kjsembed/customobject_imp.h index 28a5a07f..9aa2e067 100644 --- a/kjsembed/customobject_imp.h +++ b/kjsembed/customobject_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2004, Richard J. Moore <rich@kde.org> * @@ -218,7 +216,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDCUSTOMOBJECTIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/docs/embedding/qtembed/posviewbase.ui b/kjsembed/docs/embedding/qtembed/posviewbase.ui index 4916d505..6c55b01e 100644 --- a/kjsembed/docs/embedding/qtembed/posviewbase.ui +++ b/kjsembed/docs/embedding/qtembed/posviewbase.ui @@ -137,9 +137,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -154,9 +151,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kjsembed/docs/embedding/qtembed/posviewimp.h b/kjsembed/docs/embedding/qtembed/posviewimp.h index 764ac813..cd629a0f 100644 --- a/kjsembed/docs/embedding/qtembed/posviewimp.h +++ b/kjsembed/docs/embedding/qtembed/posviewimp.h @@ -13,7 +13,7 @@ namespace KJSEmbed { }; class POSViewImp: public POSViewBase { - Q_OBJECT + TQ_OBJECT public: POSViewImp( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kjsembed/docs/embedding/simple-embed/embedview.ui b/kjsembed/docs/embedding/simple-embed/embedview.ui index 44985f72..58c75064 100644 --- a/kjsembed/docs/embedding/simple-embed/embedview.ui +++ b/kjsembed/docs/embedding/simple-embed/embedview.ui @@ -96,9 +96,6 @@ <property name="text"> <string>Console</string> </property> - <property name="accel"> - <string></string> - </property> <property name="stdItem" stdset="0"> <number>0</number> </property> @@ -172,12 +169,8 @@ <slot>consoleClicked()</slot> </slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kjsembed/docs/embedding/simple-embed/embedviewimp.h b/kjsembed/docs/embedding/simple-embed/embedviewimp.h index 7c678a32..d8b96572 100644 --- a/kjsembed/docs/embedding/simple-embed/embedviewimp.h +++ b/kjsembed/docs/embedding/simple-embed/embedviewimp.h @@ -13,7 +13,7 @@ namespace KJSEmbed { } class EmbedViewImp: public EmbedView { - Q_OBJECT + TQ_OBJECT public: EmbedViewImp( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui b/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui index 3af30e5e..7ffe890d 100644 --- a/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui +++ b/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui @@ -570,23 +570,13 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>tdefontrequester.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kdualcolorbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kdualcolorbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tdefontrequester.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/connect/connect.ui b/kjsembed/docs/examples/connect/connect.ui index 5c33501e..153f264b 100644 --- a/kjsembed/docs/examples/connect/connect.ui +++ b/kjsembed/docs/examples/connect/connect.ui @@ -152,9 +152,9 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>ktextbrowser.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">ktextbrowser.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/docviewer/docviewer.ui b/kjsembed/docs/examples/docviewer/docviewer.ui index b27ac94b..bcefe398 100644 --- a/kjsembed/docs/examples/docviewer/docviewer.ui +++ b/kjsembed/docs/examples/docviewer/docviewer.ui @@ -62,8 +62,8 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistbox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui b/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui index 14bf9f99..fb1e84ac 100644 --- a/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui +++ b/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui @@ -551,18 +551,9 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>tdefontrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdefontrequester.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/imagefun/bump.ui b/kjsembed/docs/examples/imagefun/bump.ui index eb342eac..fb91050b 100644 --- a/kjsembed/docs/examples/imagefun/bump.ui +++ b/kjsembed/docs/examples/imagefun/bump.ui @@ -313,15 +313,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/imunge/effectbrowser.ui b/kjsembed/docs/examples/imunge/effectbrowser.ui index 09dcac7b..95373c2c 100644 --- a/kjsembed/docs/examples/imunge/effectbrowser.ui +++ b/kjsembed/docs/examples/imunge/effectbrowser.ui @@ -145,7 +145,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/imunge/resizeparams.ui b/kjsembed/docs/examples/imunge/resizeparams.ui index a7dbfd0a..ec0cecf3 100644 --- a/kjsembed/docs/examples/imunge/resizeparams.ui +++ b/kjsembed/docs/examples/imunge/resizeparams.ui @@ -141,9 +141,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -158,9 +155,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -184,10 +178,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/madminute/configdialog.ui b/kjsembed/docs/examples/madminute/configdialog.ui index 968c9b1f..8e7e6de5 100644 --- a/kjsembed/docs/examples/madminute/configdialog.ui +++ b/kjsembed/docs/examples/madminute/configdialog.ui @@ -176,9 +176,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -193,9 +190,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -267,8 +261,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/madminute/madminute.ui b/kjsembed/docs/examples/madminute/madminute.ui index 1154312a..e9c84652 100644 --- a/kjsembed/docs/examples/madminute/madminute.ui +++ b/kjsembed/docs/examples/madminute/madminute.ui @@ -321,9 +321,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> diff --git a/kjsembed/docs/examples/qdocviewer/docviewer.ui b/kjsembed/docs/examples/qdocviewer/docviewer.ui index 94b7458b..b9bb38d7 100644 --- a/kjsembed/docs/examples/qdocviewer/docviewer.ui +++ b/kjsembed/docs/examples/qdocviewer/docviewer.ui @@ -414,9 +414,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -479,9 +476,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> </actions> <images> diff --git a/kjsembed/global.h b/kjsembed/global.h index 7ab55e96..bacbe957 100644 --- a/kjsembed/global.h +++ b/kjsembed/global.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /*************************************************************************** * Copyright (C) 2004 by Richard Moore * * rich@kde.org * diff --git a/kjsembed/jsbinding.h b/kjsembed/jsbinding.h index 74c4b140..87e42184 100644 --- a/kjsembed/jsbinding.h +++ b/kjsembed/jsbinding.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2002, Richard J. Moore <rich@kde.org> * @@ -132,7 +130,3 @@ namespace KJSEmbed { } #endif // KJSEMBEDJSBINDING_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsbindingbase.h b/kjsembed/jsbindingbase.h index cca40fc3..ab653dd2 100644 --- a/kjsembed/jsbindingbase.h +++ b/kjsembed/jsbindingbase.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/jsbindingplugin.cpp b/kjsembed/jsbindingplugin.cpp index 4edacf5e..48d52f44 100644 --- a/kjsembed/jsbindingplugin.cpp +++ b/kjsembed/jsbindingplugin.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/jsbindingplugin.h b/kjsembed/jsbindingplugin.h index fb7d6361..eec80d6d 100644 --- a/kjsembed/jsbindingplugin.h +++ b/kjsembed/jsbindingplugin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -40,7 +38,7 @@ namespace KJSEmbed { * @version $Id$ */ class KJSEMBED_EXPORT JSBindingPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: JSBindingPlugin( TQObject *parent, const char *name, const TQStringList &args ); virtual ~JSBindingPlugin(); diff --git a/kjsembed/jsbuiltin.h b/kjsembed/jsbuiltin.h index 26f82bdf..f8e35a02 100644 --- a/kjsembed/jsbuiltin.h +++ b/kjsembed/jsbuiltin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/jsbuiltin_imp.cpp b/kjsembed/jsbuiltin_imp.cpp index 4aebd73d..0b68c63a 100644 --- a/kjsembed/jsbuiltin_imp.cpp +++ b/kjsembed/jsbuiltin_imp.cpp @@ -275,7 +275,3 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ } // namespace KJSEmbed::Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsbuiltin_imp.h b/kjsembed/jsbuiltin_imp.h index 6d833457..45b260dc 100644 --- a/kjsembed/jsbuiltin_imp.h +++ b/kjsembed/jsbuiltin_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -77,7 +75,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDBUILTINIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsbuiltinproxy.h b/kjsembed/jsbuiltinproxy.h index 6eacd4ac..cdbfc4e4 100644 --- a/kjsembed/jsbuiltinproxy.h +++ b/kjsembed/jsbuiltinproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2004, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp index 57015a6d..e536fba5 100644 --- a/kjsembed/jsconsolewidget.cpp +++ b/kjsembed/jsconsolewidget.cpp @@ -94,12 +94,12 @@ void JSConsoleWidget::createView() go = new TQPushButton( i18n("&Run"), cmdBox, "run_button" ); go->setFixedSize( go->sizeHint() ); - connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), go, TQT_SLOT( animateClick() ) ); - connect( go, TQT_SIGNAL( clicked() ), TQT_SLOT( invoke() ) ); + connect( cmd, TQ_SIGNAL(returnPressed(const TQString&)), go, TQ_SLOT( animateClick() ) ); + connect( go, TQ_SIGNAL( clicked() ), TQ_SLOT( invoke() ) ); // Setup completion TDECompletion *comp = cmd->completionObject(); - connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), comp, TQT_SLOT(addItem(const TQString&)) ); + connect( cmd, TQ_SIGNAL(returnPressed(const TQString&)), comp, TQ_SLOT(addItem(const TQString&)) ); // Layout TQVBoxLayout *vert = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); @@ -192,11 +192,11 @@ bool JSConsoleWidget::run( const TQString &cmd ) proc = new KShellProcess("/bin/sh"); *proc << cmd; - connect( proc, TQT_SIGNAL( processExited(TDEProcess *) ), TQT_SLOT( childExited() ) ); - connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT( receivedStdOutput(TDEProcess *, char *, int) ) ); - connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), - this, TQT_SLOT( receivedStdError(TDEProcess *, char *, int) ) ); + connect( proc, TQ_SIGNAL( processExited(TDEProcess *) ), TQ_SLOT( childExited() ) ); + connect( proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT( receivedStdOutput(TDEProcess *, char *, int) ) ); + connect( proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), + this, TQ_SLOT( receivedStdError(TDEProcess *, char *, int) ) ); return proc->start( TDEProcess::NotifyOnExit, TDEProcess::Communication( TDEProcess::Stdout|TDEProcess::Stderr )); @@ -236,7 +236,3 @@ void JSConsoleWidget::receivedStdError( TDEProcess *, char *buffer, int buflen ) } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsconsolewidget.h b/kjsembed/jsconsolewidget.h index 71a79a3c..328fd43f 100644 --- a/kjsembed/jsconsolewidget.h +++ b/kjsembed/jsconsolewidget.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -61,7 +59,7 @@ class KJSEmbedPart; */ class KJSEMBED_EXPORT JSConsoleWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: JSConsoleWidget( KJSEmbedPart *js, TQWidget *parent=0, const char *name=0 ); @@ -147,7 +145,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSCONSOLEWIDGET_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jseventmapper.cpp b/kjsembed/jseventmapper.cpp index 000353d3..3b4f282a 100644 --- a/kjsembed/jseventmapper.cpp +++ b/kjsembed/jseventmapper.cpp @@ -93,7 +93,3 @@ TQEvent::Type JSEventMapper::findEventType( const KJS::Identifier &name ) const } } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jseventmapper.h b/kjsembed/jseventmapper.h index 3539e94a..322a4ac1 100644 --- a/kjsembed/jseventmapper.h +++ b/kjsembed/jseventmapper.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/jseventutils.h b/kjsembed/jseventutils.h index 2d2044e9..687865c6 100644 --- a/kjsembed/jseventutils.h +++ b/kjsembed/jseventutils.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp index faac7212..3443a1c4 100644 --- a/kjsembed/jsfactory.cpp +++ b/kjsembed/jsfactory.cpp @@ -1126,7 +1126,3 @@ namespace KJSEmbed { } }// namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsfactory.h b/kjsembed/jsfactory.h index 9bfe3e3d..ab0b5c8f 100644 --- a/kjsembed/jsfactory.h +++ b/kjsembed/jsfactory.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2004, Richard J. Moore <rich@kde.org> * @@ -336,7 +334,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDFACTORY_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsfactory_imp.cpp b/kjsembed/jsfactory_imp.cpp index e987d020..f58ae5f6 100644 --- a/kjsembed/jsfactory_imp.cpp +++ b/kjsembed/jsfactory_imp.cpp @@ -295,7 +295,3 @@ void JSFactoryImp::publishChildren(TQObject *obj, KJS::Object &parent) } // namespace KJSEmbed::Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsfactory_imp.h b/kjsembed/jsfactory_imp.h index ee4c59f0..977b5294 100644 --- a/kjsembed/jsfactory_imp.h +++ b/kjsembed/jsfactory_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2004, Richard J. Moore <rich@kde.org> * @@ -95,7 +93,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_JSFACTORYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsobjecteventproxy.h b/kjsembed/jsobjecteventproxy.h index e21e4cb8..c9613e79 100644 --- a/kjsembed/jsobjecteventproxy.h +++ b/kjsembed/jsobjecteventproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -39,7 +37,7 @@ class JSObjectProxy; */ class KJSEMBED_EXPORT JSObjectEventProxy : public TQObject { - Q_OBJECT + TQ_OBJECT public: JSObjectEventProxy( JSObjectProxy *parent, const char *name=0 ); diff --git a/kjsembed/jsobjectproxy.cpp b/kjsembed/jsobjectproxy.cpp index 7011e338..3b5c327d 100644 --- a/kjsembed/jsobjectproxy.cpp +++ b/kjsembed/jsobjectproxy.cpp @@ -299,8 +299,3 @@ namespace KJSEmbed { } } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsobjectproxy.h b/kjsembed/jsobjectproxy.h index 90b215fd..d2823dbb 100644 --- a/kjsembed/jsobjectproxy.h +++ b/kjsembed/jsobjectproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -196,7 +194,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSOBJECTPROXY_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsobjectproxy_imp.cpp b/kjsembed/jsobjectproxy_imp.cpp index 5d025bf3..bfceb419 100644 --- a/kjsembed/jsobjectproxy_imp.cpp +++ b/kjsembed/jsobjectproxy_imp.cpp @@ -631,8 +631,3 @@ KJS::Value JSObjectProxyImp::setAttribute( KJS::ExecState *exec, KJS::Object &, } // namespace KJSEmbed::Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsobjectproxy_imp.h b/kjsembed/jsobjectproxy_imp.h index 2c1cefb6..cc598ef3 100644 --- a/kjsembed/jsobjectproxy_imp.h +++ b/kjsembed/jsobjectproxy_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -183,7 +181,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSOBJECTPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsopaqueproxy.cpp b/kjsembed/jsopaqueproxy.cpp index 5abd9558..5d88a490 100644 --- a/kjsembed/jsopaqueproxy.cpp +++ b/kjsembed/jsopaqueproxy.cpp @@ -130,8 +130,3 @@ KJS::UString JSOpaqueProxy::toString( KJS::ExecState */*exec*/ ) const } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsopaqueproxy.h b/kjsembed/jsopaqueproxy.h index 73da0efc..fbafb139 100644 --- a/kjsembed/jsopaqueproxy.h +++ b/kjsembed/jsopaqueproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -166,7 +164,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSOPATQUEPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsopaqueproxy_imp.cpp b/kjsembed/jsopaqueproxy_imp.cpp index 6aef5494..6da44198 100644 --- a/kjsembed/jsopaqueproxy_imp.cpp +++ b/kjsembed/jsopaqueproxy_imp.cpp @@ -58,8 +58,3 @@ KJS::Value JSOpaqueProxyImp::call( KJS::ExecState *exec, KJS::Object &self, cons } // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsopaqueproxy_imp.h b/kjsembed/jsopaqueproxy_imp.h index 7d2d5157..ff661c62 100644 --- a/kjsembed/jsopaqueproxy_imp.h +++ b/kjsembed/jsopaqueproxy_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -60,7 +58,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSOPATQUEPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsproxy.cpp b/kjsembed/jsproxy.cpp index cbf3a5e3..787bb183 100644 --- a/kjsembed/jsproxy.cpp +++ b/kjsembed/jsproxy.cpp @@ -116,7 +116,3 @@ void JSProxy::addEnums( KJS::ExecState * exec, EnumTable * table, KJS::Object & } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsproxy.h b/kjsembed/jsproxy.h index db22acf6..67adedb1 100644 --- a/kjsembed/jsproxy.h +++ b/kjsembed/jsproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2004, Richard J. Moore <rich@kde.org> * @@ -178,7 +176,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsproxy_imp.cpp b/kjsembed/jsproxy_imp.cpp index 9af07152..bd8fb060 100644 --- a/kjsembed/jsproxy_imp.cpp +++ b/kjsembed/jsproxy_imp.cpp @@ -35,8 +35,3 @@ JSProxyImp::~JSProxyImp() //} // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsproxy_imp.h b/kjsembed/jsproxy_imp.h index e46391ad..bda51a89 100644 --- a/kjsembed/jsproxy_imp.h +++ b/kjsembed/jsproxy_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -47,7 +45,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jssecuritypolicy.h b/kjsembed/jssecuritypolicy.h index a14f099c..bdbb5cc6 100644 --- a/kjsembed/jssecuritypolicy.h +++ b/kjsembed/jssecuritypolicy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/jsvalueproxy.cpp b/kjsembed/jsvalueproxy.cpp index cbc75b34..8dbaddd5 100644 --- a/kjsembed/jsvalueproxy.cpp +++ b/kjsembed/jsvalueproxy.cpp @@ -90,8 +90,3 @@ bool JSValueProxy::inherits( const char * clazz ) } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsvalueproxy.h b/kjsembed/jsvalueproxy.h index 4500fe02..3a4774ce 100644 --- a/kjsembed/jsvalueproxy.h +++ b/kjsembed/jsvalueproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -61,7 +59,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSVALUEPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsvalueproxy_imp.cpp b/kjsembed/jsvalueproxy_imp.cpp index e3e30df3..ff88d9f2 100644 --- a/kjsembed/jsvalueproxy_imp.cpp +++ b/kjsembed/jsvalueproxy_imp.cpp @@ -59,8 +59,3 @@ KJS::Value JSValueProxyImp::call( KJS::ExecState *exec, KJS::Object &self, const } // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsvalueproxy_imp.h b/kjsembed/jsvalueproxy_imp.h index f0a88ab4..5096999d 100644 --- a/kjsembed/jsvalueproxy_imp.h +++ b/kjsembed/jsvalueproxy_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -60,7 +58,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSVALUEPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp index ed8718ea..d8ee0817 100644 --- a/kjsembed/kjscmd.cpp +++ b/kjsembed/kjscmd.cpp @@ -99,7 +99,7 @@ int main( int argc, char **argv ) } else { app = new TDEApplication; - app->connect( app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app->connect( app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); } // Setup the rest @@ -188,7 +188,3 @@ int main( int argc, char **argv ) return result; } - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/kjsembedpart.cpp b/kjsembed/kjsembedpart.cpp index 8d1f4d0c..007a5146 100644 --- a/kjsembed/kjsembedpart.cpp +++ b/kjsembed/kjsembedpart.cpp @@ -443,7 +443,3 @@ bool KJSEmbedPart::hasMethod( const TQString & methodName ) } }// namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/kjsembedpart.h b/kjsembed/kjsembedpart.h index 3e4b3afb..676e27c2 100644 --- a/kjsembed/kjsembedpart.h +++ b/kjsembed/kjsembedpart.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -73,7 +71,7 @@ class JSBuiltIn; */ class KJSEMBED_EXPORT KJSEmbedPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQStringList constructorNames READ constructorNames ) TQ_PROPERTY( TQCString versionString READ versionString ) TQ_PROPERTY( int versionMajor READ versionMajor ) @@ -321,8 +319,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSCONSOLEPART_H - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/kjsembedpart_imp.cpp b/kjsembed/kjsembedpart_imp.cpp index abd28782..28d4c1ab 100644 --- a/kjsembed/kjsembedpart_imp.cpp +++ b/kjsembed/kjsembedpart_imp.cpp @@ -54,7 +54,3 @@ KJS::Value KJSEmbedPartImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, c } // namespace KJSEmbed::Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/kjsembedpart_imp.h b/kjsembed/kjsembedpart_imp.h index ae743fed..f4cdc379 100644 --- a/kjsembed/kjsembedpart_imp.h +++ b/kjsembed/kjsembedpart_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -69,7 +67,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDPARTIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/ksimpleprocess.cpp b/kjsembed/ksimpleprocess.cpp index c65449ee..8777c2b9 100644 --- a/kjsembed/ksimpleprocess.cpp +++ b/kjsembed/ksimpleprocess.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004, Ian Reinhart Geiser <geiseri@kde.org> * @@ -36,10 +34,10 @@ TQString KSimpleProcess::exec( const TQString &args, bool addStdErr ) TQString KSimpleProcess::execInternal( const TQString &args, bool addStdError) { m_proc->setArguments( splitArgList( args )); - connect(m_proc, TQT_SIGNAL(processExited()), this, TQT_SLOT(slotProcessExited())); - connect(m_proc, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(slotReceivedStdout())); + connect(m_proc, TQ_SIGNAL(processExited()), this, TQ_SLOT(slotProcessExited())); + connect(m_proc, TQ_SIGNAL(readyReadStdout()), this, TQ_SLOT(slotReceivedStdout())); if( addStdError ) - connect(m_proc, TQT_SIGNAL(readyReadStderr()), this, TQT_SLOT(slotReceivedStderr())); + connect(m_proc, TQ_SIGNAL(readyReadStderr()), this, TQ_SLOT(slotReceivedStderr())); if ( !m_proc->start() ) return i18n("Could not run command '%1'.").arg( args.latin1() ); diff --git a/kjsembed/ksimpleprocess.h b/kjsembed/ksimpleprocess.h index c066490e..de11e24a 100644 --- a/kjsembed/ksimpleprocess.h +++ b/kjsembed/ksimpleprocess.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004, Ian Reinhart Geiser <geiseri@kde.org> * @@ -33,7 +31,7 @@ */ class KSimpleProcess : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp index b896481c..5f6a9e8f 100644 --- a/kjsembed/plugin/jsconsoleplugin.cpp +++ b/kjsembed/plugin/jsconsoleplugin.cpp @@ -51,7 +51,7 @@ JSConsolePlugin::JSConsolePlugin( TQObject *parent, const char *name, const TQSt menu->setDelayed( false ); menu->insert( new TDEAction( i18n("&Console"), 0, - this, TQT_SLOT( showConsole() ), + this, TQ_SLOT( showConsole() ), actionCollection(), "jsconsole_show") ); } @@ -89,11 +89,3 @@ void JSConsolePlugin::showConsole() } } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - - - diff --git a/kjsembed/plugin/jsconsoleplugin.h b/kjsembed/plugin/jsconsoleplugin.h index c8ea7aef..17e0b6a9 100644 --- a/kjsembed/plugin/jsconsoleplugin.h +++ b/kjsembed/plugin/jsconsoleplugin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -36,7 +34,7 @@ namespace KJSEmbed { */ class JSConsolePlugin : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: JSConsolePlugin( TQObject *parent, const char *name, const TQStringList & ); @@ -55,7 +53,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSCONSOLEPLUGIN_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/plugins/customobject_plugin.cpp b/kjsembed/plugins/customobject_plugin.cpp index b883ff66..d5594eb0 100644 --- a/kjsembed/plugins/customobject_plugin.cpp +++ b/kjsembed/plugins/customobject_plugin.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/plugins/customobject_plugin.h b/kjsembed/plugins/customobject_plugin.h index 5f417e69..381016af 100644 --- a/kjsembed/plugins/customobject_plugin.h +++ b/kjsembed/plugins/customobject_plugin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/plugins/customqobject_plugin.cpp b/kjsembed/plugins/customqobject_plugin.cpp index 74d39bc3..037346f6 100644 --- a/kjsembed/plugins/customqobject_plugin.cpp +++ b/kjsembed/plugins/customqobject_plugin.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/plugins/customqobject_plugin.h b/kjsembed/plugins/customqobject_plugin.h index d1e9608e..0d6f2aac 100644 --- a/kjsembed/plugins/customqobject_plugin.h +++ b/kjsembed/plugins/customqobject_plugin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -40,7 +38,7 @@ public: class MyCustomTQObjectImp : public TQObject { -Q_OBJECT +TQ_OBJECT /** Identifiers for the methods provided by this class. */ enum Mode { On, Off }; diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp index e311dfff..80acf335 100644 --- a/kjsembed/plugins/imagefx_plugin.cpp +++ b/kjsembed/plugins/imagefx_plugin.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/plugins/imagefx_plugin.h b/kjsembed/plugins/imagefx_plugin.h index b4f4c6a6..ae6c6f4f 100644 --- a/kjsembed/plugins/imagefx_plugin.h +++ b/kjsembed/plugins/imagefx_plugin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/plugins/qprocess_plugin.cpp b/kjsembed/plugins/qprocess_plugin.cpp index 3106fd8f..61d6c708 100644 --- a/kjsembed/plugins/qprocess_plugin.cpp +++ b/kjsembed/plugins/qprocess_plugin.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/plugins/qprocess_plugin.h b/kjsembed/plugins/qprocess_plugin.h index fa1825ed..5993e0f9 100644 --- a/kjsembed/plugins/qprocess_plugin.h +++ b/kjsembed/plugins/qprocess_plugin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * @@ -41,7 +39,7 @@ public: class ProcessImp : public TQProcess { -Q_OBJECT +TQ_OBJECT /** Identifiers for the methods provided by this class. */ enum Communication { Stdin = 0x01, Stdout = 0x02, Stderr = 0x04, DupStderr = 0x08 }; diff --git a/kjsembed/qjscmd.cpp b/kjsembed/qjscmd.cpp index 18da9bec..ae4fe736 100644 --- a/kjsembed/qjscmd.cpp +++ b/kjsembed/qjscmd.cpp @@ -43,7 +43,7 @@ int main( int argc, char **argv ) // Setup TQApplication TQApplication *app; app = new TQApplication( argc, argv ); - app->connect( app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app->connect( app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); // Setup Interpreter KJSEmbed::JSSecurityPolicy::setDefaultPolicy( KJSEmbed::JSSecurityPolicy::CapabilityAll ); @@ -77,7 +77,3 @@ int main( int argc, char **argv ) return result; } - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/qtbindings/qcanvas_imp.cpp b/kjsembed/qtbindings/qcanvas_imp.cpp index 22e8c40b..0a2c93d5 100644 --- a/kjsembed/qtbindings/qcanvas_imp.cpp +++ b/kjsembed/qtbindings/qcanvas_imp.cpp @@ -1109,9 +1109,3 @@ KJS::Value TQCanvasImp::setDoubleBuffering_52( KJS::ExecState *exec, KJS::Object } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvas_imp.h b/kjsembed/qtbindings/qcanvas_imp.h index 8f4e6b21..6a416066 100644 --- a/kjsembed/qtbindings/qcanvas_imp.h +++ b/kjsembed/qtbindings/qcanvas_imp.h @@ -190,9 +190,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvas_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.cpp b/kjsembed/qtbindings/qcanvasellipse_imp.cpp index 3f4d53a5..7f630f3b 100644 --- a/kjsembed/qtbindings/qcanvasellipse_imp.cpp +++ b/kjsembed/qtbindings/qcanvasellipse_imp.cpp @@ -360,9 +360,3 @@ KJS::Value TQCanvasEllipseImp::rtti_13( KJS::ExecState *exec, KJS::Object &obj, } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.h b/kjsembed/qtbindings/qcanvasellipse_imp.h index 5699f867..2ae7f361 100644 --- a/kjsembed/qtbindings/qcanvasellipse_imp.h +++ b/kjsembed/qtbindings/qcanvasellipse_imp.h @@ -112,9 +112,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasEllipse_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasitem_imp.cpp b/kjsembed/qtbindings/qcanvasitem_imp.cpp index 68c73667..36105a92 100644 --- a/kjsembed/qtbindings/qcanvasitem_imp.cpp +++ b/kjsembed/qtbindings/qcanvasitem_imp.cpp @@ -163,7 +163,7 @@ TQCanvasItem *TQCanvasItemImp::toTQCanvasItem( KJS::Object &self ) if ( !op ) return 0; /* - if ( !op->inherits(TQCANVASITEM_OBJECT_NAME_STRING) ) { + if ( !op->inherits("TQCanvasItem") ) { kdDebug() << "Typename of opaque canvas item is " << op->typeName() << endl; // Check superclasses return 0; @@ -782,9 +782,3 @@ KJS::Value TQCanvasItemImp::canvas_40( KJS::ExecState *exec, KJS::Object &obj, c } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasitem_imp.h b/kjsembed/qtbindings/qcanvasitem_imp.h index a8970762..295c8a58 100644 --- a/kjsembed/qtbindings/qcanvasitem_imp.h +++ b/kjsembed/qtbindings/qcanvasitem_imp.h @@ -166,9 +166,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasItem_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp index f92f0d33..ef890efd 100644 --- a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp +++ b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp @@ -164,9 +164,3 @@ KJS::Value TQCanvasItemListImp::drawUnique_2( KJS::ExecState *exec, KJS::Object } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.h b/kjsembed/qtbindings/qcanvasitemlist_imp.h index 7ff08639..da316a9b 100644 --- a/kjsembed/qtbindings/qcanvasitemlist_imp.h +++ b/kjsembed/qtbindings/qcanvasitemlist_imp.h @@ -92,9 +92,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasItemList_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasline_imp.cpp b/kjsembed/qtbindings/qcanvasline_imp.cpp index 907573f0..2ee55a7c 100644 --- a/kjsembed/qtbindings/qcanvasline_imp.cpp +++ b/kjsembed/qtbindings/qcanvasline_imp.cpp @@ -262,9 +262,3 @@ KJS::Value TQCanvasLineImp::moveBy_8( KJS::ExecState *exec, KJS::Object &obj, co } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasline_imp.h b/kjsembed/qtbindings/qcanvasline_imp.h index 330502c4..11111c5c 100644 --- a/kjsembed/qtbindings/qcanvasline_imp.h +++ b/kjsembed/qtbindings/qcanvasline_imp.h @@ -102,9 +102,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasLine_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp index 9fcf2718..603ad612 100644 --- a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp +++ b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp @@ -244,9 +244,3 @@ KJS::Value TQCanvasPixmapImp::setOffset_7( KJS::ExecState *exec, KJS::Object &ob } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.h b/kjsembed/qtbindings/qcanvaspixmap_imp.h index 68ec582e..3c4b544d 100644 --- a/kjsembed/qtbindings/qcanvaspixmap_imp.h +++ b/kjsembed/qtbindings/qcanvaspixmap_imp.h @@ -100,9 +100,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasPixmap_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp index 8d5a8b79..33aa5ba1 100644 --- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp +++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp @@ -332,9 +332,3 @@ KJS::Value TQCanvasPixmapArrayImp::count_12( KJS::ExecState *exec, KJS::Object & } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h index d58ba012..a4bd25f7 100644 --- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h +++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h @@ -108,9 +108,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasPixmapArray_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp index 9af85744..d355dceb 100644 --- a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp +++ b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp @@ -235,9 +235,3 @@ KJS::Value TQCanvasPolygonImp::rtti_7( KJS::ExecState *exec, KJS::Object &obj, c } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.h b/kjsembed/qtbindings/qcanvaspolygon_imp.h index 6cca713c..ed5d7666 100644 --- a/kjsembed/qtbindings/qcanvaspolygon_imp.h +++ b/kjsembed/qtbindings/qcanvaspolygon_imp.h @@ -100,9 +100,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasPolygon_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp index 4f09509d..e28590bb 100644 --- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp +++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp @@ -301,9 +301,3 @@ KJS::Value TQCanvasPolygonalItemImp::rtti_11( KJS::ExecState *exec, KJS::Object } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h index 0d9e5a11..a6fd46ec 100644 --- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h +++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h @@ -108,9 +108,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasPolygonalItem_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp index 55f1f14d..2f46b410 100644 --- a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp +++ b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp @@ -338,9 +338,3 @@ KJS::Value TQCanvasRectangleImp::rtti_12( KJS::ExecState *exec, KJS::Object &obj } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.h b/kjsembed/qtbindings/qcanvasrectangle_imp.h index ee39af19..c45fc5dd 100644 --- a/kjsembed/qtbindings/qcanvasrectangle_imp.h +++ b/kjsembed/qtbindings/qcanvasrectangle_imp.h @@ -110,9 +110,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasRectangle_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasspline_imp.cpp b/kjsembed/qtbindings/qcanvasspline_imp.cpp index 7809002c..277b3290 100644 --- a/kjsembed/qtbindings/qcanvasspline_imp.cpp +++ b/kjsembed/qtbindings/qcanvasspline_imp.cpp @@ -220,9 +220,3 @@ KJS::Value TQCanvasSplineImp::rtti_6( KJS::ExecState *exec, KJS::Object &obj, co } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasspline_imp.h b/kjsembed/qtbindings/qcanvasspline_imp.h index fbf9eac3..30fc5b51 100644 --- a/kjsembed/qtbindings/qcanvasspline_imp.h +++ b/kjsembed/qtbindings/qcanvasspline_imp.h @@ -98,9 +98,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasSpline_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvassprite_imp.cpp b/kjsembed/qtbindings/qcanvassprite_imp.cpp index 98a4a428..b084d80a 100644 --- a/kjsembed/qtbindings/qcanvassprite_imp.cpp +++ b/kjsembed/qtbindings/qcanvassprite_imp.cpp @@ -585,9 +585,3 @@ KJS::Value TQCanvasSpriteImp::draw_27( KJS::ExecState *exec, KJS::Object &obj, c } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvassprite_imp.h b/kjsembed/qtbindings/qcanvassprite_imp.h index 15eef7b6..e0c97396 100644 --- a/kjsembed/qtbindings/qcanvassprite_imp.h +++ b/kjsembed/qtbindings/qcanvassprite_imp.h @@ -140,9 +140,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasSprite_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvastext_imp.cpp b/kjsembed/qtbindings/qcanvastext_imp.cpp index d0528647..c40d7813 100644 --- a/kjsembed/qtbindings/qcanvastext_imp.cpp +++ b/kjsembed/qtbindings/qcanvastext_imp.cpp @@ -398,9 +398,3 @@ KJS::Value TQCanvasTextImp::rtti_16( KJS::ExecState *exec, KJS::Object &obj, con } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvastext_imp.h b/kjsembed/qtbindings/qcanvastext_imp.h index 2dcf157c..ce6357c5 100644 --- a/kjsembed/qtbindings/qcanvastext_imp.h +++ b/kjsembed/qtbindings/qcanvastext_imp.h @@ -118,9 +118,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasText_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasview_imp.cpp b/kjsembed/qtbindings/qcanvasview_imp.cpp index f32faef7..5713f579 100644 --- a/kjsembed/qtbindings/qcanvasview_imp.cpp +++ b/kjsembed/qtbindings/qcanvasview_imp.cpp @@ -268,9 +268,3 @@ KJS::Value TQCanvasViewImp::setWorldMatrix_8( KJS::ExecState *exec, KJS::Object } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasview_imp.h b/kjsembed/qtbindings/qcanvasview_imp.h index 2625365e..a59d0213 100644 --- a/kjsembed/qtbindings/qcanvasview_imp.h +++ b/kjsembed/qtbindings/qcanvasview_imp.h @@ -102,9 +102,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasView_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qchecklistitem_imp.cpp b/kjsembed/qtbindings/qchecklistitem_imp.cpp index 9aa28e41..01e7b48e 100644 --- a/kjsembed/qtbindings/qchecklistitem_imp.cpp +++ b/kjsembed/qtbindings/qchecklistitem_imp.cpp @@ -579,9 +579,3 @@ KJS::Value TQCheckListItemImp::rtti_23( KJS::ExecState *exec, KJS::Object &obj, } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qchecklistitem_imp.h b/kjsembed/qtbindings/qchecklistitem_imp.h index f9dca63f..04444988 100644 --- a/kjsembed/qtbindings/qchecklistitem_imp.h +++ b/kjsembed/qtbindings/qchecklistitem_imp.h @@ -131,9 +131,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCheckListItem_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcombobox_imp.cpp b/kjsembed/qtbindings/qcombobox_imp.cpp index 6ee231b8..d0e9626a 100644 --- a/kjsembed/qtbindings/qcombobox_imp.cpp +++ b/kjsembed/qtbindings/qcombobox_imp.cpp @@ -956,9 +956,3 @@ KJS::Value TQComboBoxImp::hide_48( KJS::ExecState *exec, KJS::Object &obj, const } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcombobox_imp.h b/kjsembed/qtbindings/qcombobox_imp.h index 56a43d5c..ae413f74 100644 --- a/kjsembed/qtbindings/qcombobox_imp.h +++ b/kjsembed/qtbindings/qcombobox_imp.h @@ -182,9 +182,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QComboBox_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qframe_imp.cpp b/kjsembed/qtbindings/qframe_imp.cpp index 767928a6..907a61ef 100644 --- a/kjsembed/qtbindings/qframe_imp.cpp +++ b/kjsembed/qtbindings/qframe_imp.cpp @@ -56,9 +56,3 @@ void TQFrameImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qframe_imp.h b/kjsembed/qtbindings/qframe_imp.h index a0ef9138..74bd78a5 100644 --- a/kjsembed/qtbindings/qframe_imp.h +++ b/kjsembed/qtbindings/qframe_imp.h @@ -27,9 +27,3 @@ public: } // namespace KJSEmbed #endif // KJSEMBED_QFrame_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qlistview_imp.cpp b/kjsembed/qtbindings/qlistview_imp.cpp index 2536351c..9c6d4aff 100644 --- a/kjsembed/qtbindings/qlistview_imp.cpp +++ b/kjsembed/qtbindings/qlistview_imp.cpp @@ -1321,9 +1321,3 @@ KJS::Value TQListViewImp::hideColumn_71( KJS::ExecState *exec, KJS::Object &obj, } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qlistview_imp.h b/kjsembed/qtbindings/qlistview_imp.h index 0ded4900..80f2db16 100644 --- a/kjsembed/qtbindings/qlistview_imp.h +++ b/kjsembed/qtbindings/qlistview_imp.h @@ -218,9 +218,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QListView_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qlistviewitem_imp.cpp b/kjsembed/qtbindings/qlistviewitem_imp.cpp index f1ed55c2..12a322ed 100644 --- a/kjsembed/qtbindings/qlistviewitem_imp.cpp +++ b/kjsembed/qtbindings/qlistviewitem_imp.cpp @@ -1421,9 +1421,3 @@ KJS::Value TQListViewItemImp::multiLinesEnabled_63( KJS::ExecState *exec, KJS::O } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qlistviewitem_imp.h b/kjsembed/qtbindings/qlistviewitem_imp.h index 72dfdd6e..eb2f65cf 100644 --- a/kjsembed/qtbindings/qlistviewitem_imp.h +++ b/kjsembed/qtbindings/qlistviewitem_imp.h @@ -221,9 +221,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QListViewItem_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qmenudata_imp.cpp b/kjsembed/qtbindings/qmenudata_imp.cpp index 22b16d3e..e584b1a1 100644 --- a/kjsembed/qtbindings/qmenudata_imp.cpp +++ b/kjsembed/qtbindings/qmenudata_imp.cpp @@ -1343,9 +1343,3 @@ KJS::Value TQMenuDataImp::activateItemAt_55( KJS::ExecState *exec, KJS::Object & } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qmenudata_imp.h b/kjsembed/qtbindings/qmenudata_imp.h index dfab42e8..8f7c24d6 100644 --- a/kjsembed/qtbindings/qmenudata_imp.h +++ b/kjsembed/qtbindings/qmenudata_imp.h @@ -196,9 +196,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QMenuData_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qmenuitem_imp.cpp b/kjsembed/qtbindings/qmenuitem_imp.cpp index f65fa910..60c73db3 100644 --- a/kjsembed/qtbindings/qmenuitem_imp.cpp +++ b/kjsembed/qtbindings/qmenuitem_imp.cpp @@ -422,9 +422,3 @@ KJS::Value TQMenuItemImp::setWhatsThis_22( KJS::ExecState *exec, KJS::Object &ob } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qmenuitem_imp.h b/kjsembed/qtbindings/qmenuitem_imp.h index 9739d078..57acb6d0 100644 --- a/kjsembed/qtbindings/qmenuitem_imp.h +++ b/kjsembed/qtbindings/qmenuitem_imp.h @@ -130,9 +130,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QMenuItem_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qpopupmenu_imp.cpp b/kjsembed/qtbindings/qpopupmenu_imp.cpp index 1c94776a..46714278 100644 --- a/kjsembed/qtbindings/qpopupmenu_imp.cpp +++ b/kjsembed/qtbindings/qpopupmenu_imp.cpp @@ -432,9 +432,3 @@ KJS::Value TQPopupMenuImp::itemGeometry_19( KJS::ExecState *exec, KJS::Object &o } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qpopupmenu_imp.h b/kjsembed/qtbindings/qpopupmenu_imp.h index f1d0a92f..fd9daf6a 100644 --- a/kjsembed/qtbindings/qpopupmenu_imp.h +++ b/kjsembed/qtbindings/qpopupmenu_imp.h @@ -124,9 +124,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QPopupMenu_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qt_imp.cpp b/kjsembed/qtbindings/qt_imp.cpp index 0f6bf134..d7b2ed2e 100644 --- a/kjsembed/qtbindings/qt_imp.cpp +++ b/kjsembed/qtbindings/qt_imp.cpp @@ -772,9 +772,3 @@ KJS::Value QtImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qt_imp.h b/kjsembed/qtbindings/qt_imp.h index 6bc3b489..4dfbfc3c 100644 --- a/kjsembed/qtbindings/qt_imp.h +++ b/kjsembed/qtbindings/qt_imp.h @@ -88,9 +88,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_Qt_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtstubs.h b/kjsembed/qtstubs.h index 5a467705..96c1f058 100644 --- a/kjsembed/qtstubs.h +++ b/kjsembed/qtstubs.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /*************************************************************************** * Copyright (C) 2004 by Richard Moore * * rich@kde.org * @@ -35,7 +34,7 @@ namespace KParts { class KJSEMBED_EXPORT ReadOnlyPart : public TQObject { - Q_OBJECT + TQ_OBJECT public: ReadOnlyPart( TQObject *parent, const char *name=0 ); @@ -49,7 +48,7 @@ private: class KJSEMBED_EXPORT ReadWritePart : public ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: ReadWritePart( TQObject *parent, const char *name=0 ); diff --git a/kjsembed/slotproxy.h b/kjsembed/slotproxy.h index 18f4a272..90cb57dd 100644 --- a/kjsembed/slotproxy.h +++ b/kjsembed/slotproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003-2004, Richard J. Moore <rich@kde.org> * @@ -51,7 +49,7 @@ class JSObjectProxy; */ class KJSEMBED_EXPORT JSSlotProxy : public TQObject { - Q_OBJECT + TQ_OBJECT public: JSSlotProxy( TQObject *parent, const char *name=0 ); diff --git a/kjsembed/slotutils.cpp b/kjsembed/slotutils.cpp index 0a73c43f..8f6a8f98 100644 --- a/kjsembed/slotutils.cpp +++ b/kjsembed/slotutils.cpp @@ -872,8 +872,3 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K } // namespace KJSEmbed::Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/slotutils.h b/kjsembed/slotutils.h index 3c7b3bea..2ee88652 100644 --- a/kjsembed/slotutils.h +++ b/kjsembed/slotutils.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -169,7 +167,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDSLOTUTILS_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/tdescript/javascript.h b/kjsembed/tdescript/javascript.h index 9ca87f24..e1116a73 100644 --- a/kjsembed/tdescript/javascript.h +++ b/kjsembed/tdescript/javascript.h @@ -30,7 +30,7 @@ namespace KJSEmbed { //using namespace KScriptInterface; class JavaScript : public KScriptInterface { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString appID READ appID ) public: diff --git a/kjsembed/tdescript/swaptabs.ui b/kjsembed/tdescript/swaptabs.ui index f7f5e973..d9f9a4d8 100644 --- a/kjsembed/tdescript/swaptabs.ui +++ b/kjsembed/tdescript/swaptabs.ui @@ -126,9 +126,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -143,9 +140,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kjsembed/testkjsembed.cpp b/kjsembed/testkjsembed.cpp index 9ad274b4..4b138e8e 100644 --- a/kjsembed/testkjsembed.cpp +++ b/kjsembed/testkjsembed.cpp @@ -49,13 +49,9 @@ int main( int argc, char **argv ) // Setup Window app.setMainWidget( console ); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); console->resize( 600, 450 ); console->show(); return app.exec(); } - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/tests/test.ui b/kjsembed/tests/test.ui index 477d8c2d..4c031d9b 100644 --- a/kjsembed/tests/test.ui +++ b/kjsembed/tests/test.ui @@ -105,7 +105,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kjsembed/tests/testkjsembed.cpp b/kjsembed/tests/testkjsembed.cpp index b3ff219e..7018497f 100644 --- a/kjsembed/tests/testkjsembed.cpp +++ b/kjsembed/tests/testkjsembed.cpp @@ -52,13 +52,9 @@ int main( int argc, char **argv ) // Setup Window app.setMainWidget( console ); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); console->resize( 600, 450 ); console->show(); return app.exec(); } - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/tools/doxygen2cons_cpp.xsl b/kjsembed/tools/doxygen2cons_cpp.xsl index f23e5e80..455fd3e3 100644 --- a/kjsembed/tools/doxygen2cons_cpp.xsl +++ b/kjsembed/tools/doxygen2cons_cpp.xsl @@ -90,10 +90,5 @@ KJS::Object <xsl:value-of select="$clazz" />Cons::<xsl:value-of select="$cons_na </xsl:for-each> } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - </xsl:template> </xsl:stylesheet> diff --git a/kjsembed/tools/doxygen2cons_h.xsl b/kjsembed/tools/doxygen2cons_h.xsl index 8140d52e..fa13f5e3 100644 --- a/kjsembed/tools/doxygen2cons_h.xsl +++ b/kjsembed/tools/doxygen2cons_h.xsl @@ -70,10 +70,5 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_<xsl:value-of select="compoundname" />_H - -// Local Variables: -// c-basic-offset: 4 -// End: - </xsl:template> </xsl:stylesheet> diff --git a/kjsembed/tools/doxygen2imp_cpp.xsl b/kjsembed/tools/doxygen2imp_cpp.xsl index a2be08d4..46586512 100644 --- a/kjsembed/tools/doxygen2imp_cpp.xsl +++ b/kjsembed/tools/doxygen2imp_cpp.xsl @@ -290,10 +290,5 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object </xsl:for-each> } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - </xsl:template> </xsl:stylesheet> diff --git a/kjsembed/tools/doxygen2imp_h.xsl b/kjsembed/tools/doxygen2imp_h.xsl index ce00e7a1..5b901c15 100644 --- a/kjsembed/tools/doxygen2imp_h.xsl +++ b/kjsembed/tools/doxygen2imp_h.xsl @@ -77,10 +77,5 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_<xsl:value-of select="compoundname" />_H - -// Local Variables: -// c-basic-offset: 4 -// End: - </xsl:template> </xsl:stylesheet> diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h index 6fc18ccf..5c5fb034 100644 --- a/kjsembed/tools/headers/qbrush.h +++ b/kjsembed/tools/headers/qbrush.h @@ -44,7 +44,7 @@ #endif // QT_H -class Q_EXPORT TQBrush: public Qt +class TQ_EXPORT TQBrush: public Qt { friend class TQPainter; public: @@ -84,8 +84,8 @@ private: *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & ); #endif #endif // TQBRUSH_H diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h index bbd97489..dbdd6548 100644 --- a/kjsembed/tools/headers/qcanvas.h +++ b/kjsembed/tools/headers/qcanvas.h @@ -52,7 +52,7 @@ #define TQM_EXPORT_CANVAS #define TQM_TEMPLATE_EXTERN_CANVAS #else -#define TQM_EXPORT_CANVAS Q_EXPORT +#define TQM_EXPORT_CANVAS TQ_EXPORT #define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN #endif @@ -133,16 +133,6 @@ public: virtual void setActive(bool yes); bool isActive() const { return (bool)act; } -#ifndef TQT_NO_COMPAT - bool visible() const - { return (bool)vis; } - bool selected() const - { return (bool)sel; } - bool enabled() const - { return (bool)ena; } - bool active() const - { return (bool)act; } -#endif enum RttiValues { Rtti_Item = 0, @@ -208,7 +198,7 @@ class TQCanvasData; class TQM_EXPORT_CANVAS TQCanvas : public TQObject { - Q_OBJECT + TQ_OBJECT public: TQCanvas( TQObject* parent = 0, const char* name = 0 ); TQCanvas(int w, int h); @@ -354,7 +344,7 @@ class TQCanvasViewData; class TQM_EXPORT_CANVAS TQCanvasView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: TQCanvasView(TQWidget* parent=0, const char* name=0, WFlags f=0); diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h index 7fda3222..88c42ce3 100644 --- a/kjsembed/tools/headers/qdir.h +++ b/kjsembed/tools/headers/qdir.h @@ -52,7 +52,7 @@ class TQStringList; template <class T> class TQDeepCopy; -class Q_EXPORT TQDir +class TQ_EXPORT TQDir { public: enum FilterSpec { Dirs = 0x001, diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h index 40e9767e..17fc002c 100644 --- a/kjsembed/tools/headers/qpen.h +++ b/kjsembed/tools/headers/qpen.h @@ -44,7 +44,7 @@ #endif // QT_H -class Q_EXPORT TQPen: public Qt +class TQ_EXPORT TQPen: public Qt { public: TQPen(); @@ -72,7 +72,7 @@ public: private: friend class TQPainter; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN friend class TQFontEngineWin; #endif @@ -92,8 +92,8 @@ private: TQPen stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & ); #endif #endif // TQPEN_H diff --git a/kjsembed/tools/headers/qtimer.h b/kjsembed/tools/headers/qtimer.h index 1f7115f2..b1ce519e 100644 --- a/kjsembed/tools/headers/qtimer.h +++ b/kjsembed/tools/headers/qtimer.h @@ -43,9 +43,9 @@ #endif // QT_H -class Q_EXPORT TQTimer : public TQObject +class TQ_EXPORT TQTimer : public TQObject { - Q_OBJECT + TQ_OBJECT public: TQTimer( TQObject *parent=0, const char *name=0 ); ~TQTimer(); diff --git a/kjsembed/xmlactionclient.cpp b/kjsembed/xmlactionclient.cpp index 88bfab97..43872b30 100644 --- a/kjsembed/xmlactionclient.cpp +++ b/kjsembed/xmlactionclient.cpp @@ -125,7 +125,7 @@ bool XMLActionClient::bind( TDEAction *act, const XMLActionScript &s ) // kdWarning() << "Runner:bind called, action=" << act->name() << " type=" << s.type // << " text=" << s.text << " src=" << s.src << endl; - connect( act, TQT_SIGNAL( activated() ), this, TQT_SLOT( action_activated() ) ); + connect( act, TQ_SIGNAL( activated() ), this, TQ_SLOT( action_activated() ) ); return bind( act->name(), s ); } @@ -331,7 +331,7 @@ TDEAction *XMLActionHandler::createAction( TDEActionCollection *parent ) act->setStatusText( ad.status ); act->setWhatsThis( ad.whatsthis ); - TQObject::connect( actclient, TQT_SIGNAL( destroyed() ), act, TQT_SLOT( deleteLater() ) ); + TQObject::connect( actclient, TQ_SIGNAL( destroyed() ), act, TQ_SLOT( deleteLater() ) ); return act; } diff --git a/kjsembed/xmlactionclient.h b/kjsembed/xmlactionclient.h index 6b3d1b94..4220403d 100644 --- a/kjsembed/xmlactionclient.h +++ b/kjsembed/xmlactionclient.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2002-2003, Richard J. Moore <rich@kde.org> * @@ -42,7 +40,7 @@ class XMLActionScript; */ class XMLActionClient : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am index 508f7731..47a8bb02 100644 --- a/korundum/bin/Makefile.am +++ b/korundum/bin/Makefile.am @@ -1,3 +1,5 @@ +CXXFLAGS += $(RUBY_CXXFLAGS) + INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) bin_PROGRAMS = krubyinit diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/configure.in.in index 0a987639..f32e1473 100644 --- a/korundum/rubylib/korundum/configure.in.in +++ b/korundum/configure.in.in @@ -2,6 +2,7 @@ AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby) if test -z "RUBY_EXECUTABLE"; then DO_NOT_COMPILE="$DO_NOT_COMPILE korundum" + BUILD_korundum=false else RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"` RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"` @@ -32,6 +33,37 @@ else RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}" fi + # check if Ruby requires explicit specification of C++ standard + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + SAVED_CXXFLAGS="$CXXFLAGS" + for CXX_STD_TEST in "" 11 14 17; do + CXXFLAGS="$SAVED_CXXFLAGS" + if test "x$CXX_STD_TEST" = "x"; then + AC_MSG_CHECKING([Ruby build with default C++ standard]) + RUBY_CXXFLAGS="" + else + AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST]) + RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST" + fi + CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS" + AC_TRY_COMPILE([ + #include <ruby.h> + ],[ ], + ruby_cxx_std=yes, + ruby_cxx_std=no + ) + if test "x$ruby_cxx_std" = "xyes"; then + AC_SUBST(RUBY_CXXFLAGS) + AC_MSG_RESULT(yes) + break + else + AC_MSG_RESULT(no) + fi + done + CXXFLAGS="$SAVED_CXXFLAGS" + AC_LANG_RESTORE + # Removes trailing slashes, if any, to avoid fail to install with recent libtool. RUBY_ARCHDIR=${RUBY_ARCHDIR%/} RUBY_SITEDIR=${RUBY_SITEDIR%/} @@ -46,7 +78,8 @@ else libdir $RUBY_LIBDIR, includedir $RUBY_INCLUDEDIR, librubyarg $RUBY_LIBRUBYARG, - cflags $RUBY_CFLAGS]) + cflags $RUBY_CFLAGS, + cxxflags $RUBY_CXXFLAGS]) AC_SUBST(RUBY_ARCHDIR) AC_SUBST(RUBY_SITEARCHDIR) AC_SUBST(RUBY_SITEDIR) @@ -55,5 +88,6 @@ else AC_SUBST(RUBY_INCLUDEDIR) AC_SUBST(RUBY_LIBRUBYARG) AC_SUBST(RUBY_CFLAGS) + BUILD_korundum=true fi - +AM_CONDITIONAL(BUILD_korundum, $BUILD_korundum) diff --git a/korundum/rubylib/examples/RubberDoc.rb b/korundum/rubylib/examples/RubberDoc.rb index 0c50320b..6adf0272 100755 --- a/korundum/rubylib/examples/RubberDoc.rb +++ b/korundum/rubylib/examples/RubberDoc.rb @@ -180,50 +180,50 @@ module MyGui @label = TQt::Label.new self - TQt::Object.connect @listbox, SIGNAL("clicked(TQListBoxItem*)"), - self, SLOT("clicked_result(TQListBoxItem*)") - TQt::Object.connect @viewed, SIGNAL("completed()"), - self, SLOT("tdehtml_part_init_complete()") + TQt::Object.connect @listbox, TQ_SIGNAL("clicked(TQListBoxItem*)"), + self, TQ_SLOT("clicked_result(TQListBoxItem*)") + TQt::Object.connect @viewed, TQ_SIGNAL("completed()"), + self, TQ_SLOT("tdehtml_part_init_complete()") - TQt::Object::connect @viewed, SIGNAL("setWindowCaption(const TQString&)"), + TQt::Object::connect @viewed, TQ_SIGNAL("setWindowCaption(const TQString&)"), @viewed.widget.topLevelWidget, - SLOT("setCaption(const TQString&)") + TQ_SLOT("setCaption(const TQString&)") TQt::Object::connect @viewed.browserExtension, - SIGNAL("openURLRequest(const KURL&, const KParts::URLArgs&)"), - self, SLOT("open_url(const KURL&)") + TQ_SIGNAL("openURLRequest(const KURL&, const KParts::URLArgs&)"), + self, TQ_SLOT("open_url(const KURL&)") KDE::Action.new "&Quit", "quit", KDE::Shortcut.new(), - self, SLOT("quit()"), @main.actionCollection, "file_quit" + self, TQ_SLOT("quit()"), @main.actionCollection, "file_quit" KDE::Action.new "&Index-All", KDE::Shortcut.new(), - self, SLOT("index_all()"), @main.actionCollection, "index_all" + self, TQ_SLOT("index_all()"), @main.actionCollection, "index_all" @back = \ KDE::Action.new "&Back", "back", KDE::Shortcut.new(TQt::ALT + TQt::Key_Left), - self, SLOT("go_back()"), @main.actionCollection, "back" + self, TQ_SLOT("go_back()"), @main.actionCollection, "back" @forward = \ KDE::Action.new "&Forward", "forward", KDE::Shortcut.new(TQt::ALT + TQt::Key_Right), - self, SLOT("go_forward()"), @main.actionCollection, "forward" + self, TQ_SLOT("go_forward()"), @main.actionCollection, "forward" KDE::Action.new "&Home", "gohome", KDE::Shortcut.new(TQt::Key_Home), - self, SLOT("go_home()"), @main.actionCollection, "home" + self, TQ_SLOT("go_home()"), @main.actionCollection, "home" KDE::Action.new "&Prev Match", "go-previous",KDE::Shortcut.new(TQt::CTRL + TQt::Key_P), - self, SLOT("goto_prev_match()"), @main.actionCollection, "prev_match" + self, TQ_SLOT("goto_prev_match()"), @main.actionCollection, "prev_match" KDE::Action.new "&Next Match", "go-next", KDE::Shortcut.new(TQt::CTRL + TQt::Key_N), - self, SLOT("goto_next_match()"), @main.actionCollection, "next_match" + self, TQ_SLOT("goto_next_match()"), @main.actionCollection, "next_match" KDE::Action.new "&Follow Match","go-down", KDE::Shortcut.new(TQt::Key_Return), - self, SLOT("goto_current_match_link()"), @main.actionCollection, "open_match" + self, TQ_SLOT("goto_current_match_link()"), @main.actionCollection, "open_match" KDE::Action.new "Search", "edit-find", KDE::Shortcut.new(TQt::Key_F6), - self, SLOT("focus_search()"), @main.actionCollection, "focus_search" + self, TQ_SLOT("focus_search()"), @main.actionCollection, "focus_search" KDE::Action.new "New Search", "edit-find", KDE::Shortcut.new(TQt::CTRL + TQt::Key_Slash), - self, SLOT("focus_and_clear_search()"), @main.actionCollection, "focus_and_clear_search" + self, TQ_SLOT("focus_and_clear_search()"), @main.actionCollection, "focus_and_clear_search" KDE::Action.new "&Create", "new", KDE::Shortcut.new(), - self, SLOT("project_create()"), @main.actionCollection, "project_create" + self, TQ_SLOT("project_create()"), @main.actionCollection, "project_create" KDE::Action.new "&Choose...", "select", KDE::Shortcut.new(), - self, SLOT("project_goto()"), @main.actionCollection, "project_goto" + self, TQ_SLOT("project_goto()"), @main.actionCollection, "project_goto" clearLocation = KDE::Action.new "Clear Location Bar", "locationbar_erase", KDE::Shortcut.new(), - self, SLOT("clear_location()"), @main.actionCollection, "clear_location" + self, TQ_SLOT("clear_location()"), @main.actionCollection, "clear_location" clearLocation.setWhatsThis "Clear Location bar<p>Clears the content of the location bar." @searchlabel = TQt::Label.new @main @@ -231,10 +231,10 @@ module MyGui @searchcombo = KDE::HistoryCombo.new @main focus_search - TQt::Object.connect @searchcombo, SIGNAL("returnPressed()"), - self, SLOT("goto_search()") - TQt::Object.connect @searchcombo, SIGNAL("textChanged(const TQString&)"), - self, SLOT("search(const TQString&)") + TQt::Object.connect @searchcombo, TQ_SIGNAL("returnPressed()"), + self, TQ_SLOT("goto_search()") + TQt::Object.connect @searchcombo, TQ_SIGNAL("textChanged(const TQString&)"), + self, TQ_SLOT("search(const TQString&)") KDE::WidgetAction.new @searchlabel, "Search: ", KDE::Shortcut.new(TQt::Key_F6), nil, nil, @main.actionCollection, "location_label" @searchlabel.setBuddy @searchcombo @@ -680,11 +680,11 @@ class ProjectEditDialog < TQt::Object @cb.setChecked true if enabled - TQt::Object.connect @dialog, SIGNAL("okClicked()"), - self, SLOT("slot_ok()") + TQt::Object.connect @dialog, TQ_SIGNAL("okClicked()"), + self, TQ_SLOT("slot_ok()") - TQt::Object.connect locselc, SIGNAL("clicked()"), - self, SLOT("select_file()") + TQt::Object.connect locselc, TQ_SIGNAL("clicked()"), + self, TQ_SLOT("select_file()") @title.setFocus @@ -746,17 +746,17 @@ class ProjectSelectDialog < TQt::Object button_del = TQt::PushButton.new "Delete", hbox button_edit = TQt::PushButton.new "Edit...", hbox - TQt::Object.connect button_new, SIGNAL("clicked()"), - self, SLOT("project_create_button()") + TQt::Object.connect button_new, TQ_SIGNAL("clicked()"), + self, TQ_SLOT("project_create_button()") - TQt::Object.connect button_del, SIGNAL("clicked()"), - self, SLOT("delete_selected_project()") + TQt::Object.connect button_del, TQ_SIGNAL("clicked()"), + self, TQ_SLOT("delete_selected_project()") - TQt::Object.connect button_edit, SIGNAL("clicked()"), - self, SLOT("edit_selected_project()") + TQt::Object.connect button_edit, TQ_SIGNAL("clicked()"), + self, TQ_SLOT("edit_selected_project()") - TQt::Object.connect @listbox, SIGNAL("doubleClicked(TQListBoxItem *)"), - self, SLOT("project_selected()") + TQt::Object.connect @listbox, TQ_SIGNAL("doubleClicked(TQListBoxItem *)"), + self, TQ_SLOT("project_selected()") @dialog.setMainWidget vbox end @@ -915,8 +915,8 @@ class RubberDoc < TQt::VBox gui_init_proportions @timer = TQt::Timer.new self - TQt::Object.connect @timer, SIGNAL("timeout()"), - self, SLOT("update_highlight()") + TQt::Object.connect @timer, TQ_SIGNAL("timeout()"), + self, TQ_SLOT("update_highlight()") @viewed.openURL KDE::URL.new("about:blank") @@ -934,8 +934,8 @@ class RubberDoc < TQt::VBox end def tdehtml_part_init_complete - TQt::Object.disconnect @viewed, SIGNAL("completed()"), - self, SLOT("tdehtml_part_init_complete()") if @init_connected + TQt::Object.disconnect @viewed, TQ_SIGNAL("completed()"), + self, TQ_SLOT("tdehtml_part_init_complete()") if @init_connected @pref = File.dirname first_url.url.gsub("file:","") diff --git a/korundum/rubylib/examples/dcop/dcopcall.rb b/korundum/rubylib/examples/dcop/dcopcall.rb index cba7ff09..58add5ae 100755 --- a/korundum/rubylib/examples/dcop/dcopcall.rb +++ b/korundum/rubylib/examples/dcop/dcopcall.rb @@ -6,7 +6,7 @@ include KDE class SenderWidget < PushButton def initialize(parent, name) super - connect(self, SIGNAL('clicked()'), self, SLOT('doit()')) + connect(self, TQ_SIGNAL('clicked()'), self, TQ_SLOT('doit()')) end slots 'doit()' diff --git a/korundum/rubylib/examples/dcop/dcoppredicate.rb b/korundum/rubylib/examples/dcop/dcoppredicate.rb index 82a9c8b4..c4cb2c41 100755 --- a/korundum/rubylib/examples/dcop/dcoppredicate.rb +++ b/korundum/rubylib/examples/dcop/dcoppredicate.rb @@ -6,7 +6,7 @@ include KDE class SenderWidget < PushButton def initialize(parent, name) super - connect(self, SIGNAL('clicked()'), self, SLOT('doit()')) + connect(self, TQ_SIGNAL('clicked()'), self, TQ_SLOT('doit()')) end slots 'doit()' diff --git a/korundum/rubylib/examples/dcop/dcopsend.rb b/korundum/rubylib/examples/dcop/dcopsend.rb index e8a69e00..66530797 100755 --- a/korundum/rubylib/examples/dcop/dcopsend.rb +++ b/korundum/rubylib/examples/dcop/dcopsend.rb @@ -5,7 +5,7 @@ require 'Korundum' class SenderWidget < KDE::PushButton def initialize(parent, name) super - TQt::Object::connect(self, SIGNAL('clicked()'), self, SLOT('doit()')) + TQt::Object::connect(self, TQ_SIGNAL('clicked()'), self, TQ_SLOT('doit()')) end slots 'doit()' diff --git a/korundum/rubylib/examples/dcop/dcopsignal.rb b/korundum/rubylib/examples/dcop/dcopsignal.rb index 4e83d7f4..4d61e917 100755 --- a/korundum/rubylib/examples/dcop/dcopsignal.rb +++ b/korundum/rubylib/examples/dcop/dcopsignal.rb @@ -7,7 +7,7 @@ class SenderWidget < KDE::PushButton def initialize(parent, name) super - TQt::Object::connect(self, SIGNAL('clicked()'), self, SLOT('doit()')) + TQt::Object::connect(self, TQ_SIGNAL('clicked()'), self, TQ_SLOT('doit()')) end slots 'doit()' diff --git a/korundum/rubylib/examples/kludgeror.rb b/korundum/rubylib/examples/kludgeror.rb index 156b2c53..f44d6c3c 100644 --- a/korundum/rubylib/examples/kludgeror.rb +++ b/korundum/rubylib/examples/kludgeror.rb @@ -73,8 +73,8 @@ doc = KDE::HTMLPart.new toplevel, nil, toplevel, nil, 1 # doc = KDE::HTMLPart.new toplevel, nil, toplevel, nil, 1 # KDE::HTMLPart::BrowserViewGUI ph = PartHolder.new doc -TQt::Object::connect doc.browserExtension, SIGNAL("openURLRequest(const KURL&, const KParts::URLArgs&)"), - ph, SLOT("openURL(const KURL&)") # BUG this slot must be screwing up wrt marshalling? +TQt::Object::connect doc.browserExtension, TQ_SIGNAL("openURLRequest(const KURL&, const KParts::URLArgs&)"), + ph, TQ_SLOT("openURL(const KURL&)") # BUG this slot must be screwing up wrt marshalling? ph.openURL url toplevel.setCentralWidget doc.widget @@ -103,26 +103,26 @@ begin d.documentElement.appendChild locBar end -a1 = KDE::Action.new( "Reload", "reload", KDE::Shortcut.new(TQt::Key_F5), ph, SLOT("reload()"), doc.actionCollection, "reload" ) -a2 = KDE::Action.new( "Exit", "system-log-out", KDE::Shortcut.new(0), a, SLOT("quit()"), doc.actionCollection, "exit" ) +a1 = KDE::Action.new( "Reload", "reload", KDE::Shortcut.new(TQt::Key_F5), ph, TQ_SLOT("reload()"), doc.actionCollection, "reload" ) +a2 = KDE::Action.new( "Exit", "system-log-out", KDE::Shortcut.new(0), a, TQ_SLOT("quit()"), doc.actionCollection, "exit" ) toplevel.guiFactory.addClient doc locBar = toplevel.toolBar("locationBar"); -locBar.insertButton "back", BACK_B, SIGNAL("clicked()"), - ph, SLOT("back()"), true, "Go back" -locBar.insertLined url.url, LOC_ED, SIGNAL("returnPressed(const TQString&)"), ph, SLOT("goToURL(const TQString&)"), true, "Location" -locBar.insertButton "locationbar_erase", ERASE_B, SIGNAL("clicked()"), - locBar.getLined(LOC_ED), SLOT("clear()"), true, "Erase the location bar's content", 2 +locBar.insertButton "back", BACK_B, TQ_SIGNAL("clicked()"), + ph, TQ_SLOT("back()"), true, "Go back" +locBar.insertLined url.url, LOC_ED, TQ_SIGNAL("returnPressed(const TQString&)"), ph, TQ_SLOT("goToURL(const TQString&)"), true, "Location" +locBar.insertButton "locationbar_erase", ERASE_B, TQ_SIGNAL("clicked()"), + locBar.getLined(LOC_ED), TQ_SLOT("clear()"), true, "Erase the location bar's content", 2 locBar.setItemAutoSized LOC_ED, true locBar.getLined(LOC_ED).createPopupMenu comp = locBar.getLined(LOC_ED).completionObject comp.setCompletionMode KDE::GlobalSettings::CompletionPopupAuto -TQt::Object::connect(locBar.getLined(LOC_ED), SIGNAL("returnPressed(const TQString&)"), - comp, SLOT("addItem(const TQString&)")) -TQt::Object::connect(ph, SIGNAL("setLocBarText(const TQString&)"), # BUG - once again... - locBar.getLined(LOC_ED), SLOT("setText(const TQString&)")) +TQt::Object::connect(locBar.getLined(LOC_ED), TQ_SIGNAL("returnPressed(const TQString&)"), + comp, TQ_SLOT("addItem(const TQString&)")) +TQt::Object::connect(ph, TQ_SIGNAL("setLocBarText(const TQString&)"), # BUG - once again... + locBar.getLined(LOC_ED), TQ_SLOT("setText(const TQString&)")) doc.setJScriptEnabled true doc.setJavaEnabled true @@ -131,8 +131,8 @@ doc.setURLCursor TQt::Cursor.new(TQt::PointingHandCursor) a.setTopWidget doc.widget -TQt::Object::connect doc, SIGNAL("setWindowCaption(const TQString&)"), - doc.widget.topLevelWidget, SLOT("setCaption(const TQString&)") +TQt::Object::connect doc, TQ_SIGNAL("setWindowCaption(const TQString&)"), + doc.widget.topLevelWidget, TQ_SLOT("setCaption(const TQString&)") toplevel.show a.exec diff --git a/korundum/rubylib/examples/menudemo.rb b/korundum/rubylib/examples/menudemo.rb index 0ff27ac8..5fe405d3 100644 --- a/korundum/rubylib/examples/menudemo.rb +++ b/korundum/rubylib/examples/menudemo.rb @@ -65,29 +65,29 @@ class MainWin < MainWindow def initActions() # "File" menu items - @newAction = StdAction.openNew(self, SLOT('slotNew()'), actionCollection()) - @openAction = StdAction.open(self, SLOT('slotOpen()'), actionCollection()) - @saveAction = StdAction.save(self, SLOT('slotSave()'), actionCollection()) - @saveAsAction = StdAction.saveAs(self, SLOT('slotSaveAs()'), actionCollection()) - @printAction = StdAction.print(self, SLOT('slotPrint()'), actionCollection()) - @quitAction = StdAction.quit(self, SLOT('slotQuit()'), actionCollection()) + @newAction = StdAction.openNew(self, TQ_SLOT('slotNew()'), actionCollection()) + @openAction = StdAction.open(self, TQ_SLOT('slotOpen()'), actionCollection()) + @saveAction = StdAction.save(self, TQ_SLOT('slotSave()'), actionCollection()) + @saveAsAction = StdAction.saveAs(self, TQ_SLOT('slotSaveAs()'), actionCollection()) + @printAction = StdAction.print(self, TQ_SLOT('slotPrint()'), actionCollection()) + @quitAction = StdAction.quit(self, TQ_SLOT('slotQuit()'), actionCollection()) # "Edit" menu items - @undoAction = StdAction.undo(self, SLOT('slotUndo()'), actionCollection()) - @redoAction = StdAction.redo(self, SLOT('slotRedo()'), actionCollection()) - @cutAction = StdAction.cut(self, SLOT('slotCut()'), actionCollection()) - @copyAction = StdAction.copy(self, SLOT('slotCopy()'), actionCollection()) - @pasteAction = StdAction.paste(self, SLOT('slotPaste()'), actionCollection()) - @findAction = StdAction.find(self, SLOT('slotFind()'), actionCollection()) - @findNextAction = StdAction.findNext(self, SLOT('slotFindNext()'), actionCollection()) - @replaceAction = StdAction.replace(self, SLOT('slotReplace()'), actionCollection()) - @specialAction = Action.new(i18n("Special"), Shortcut.new(), self, SLOT('slotSpecial()'), actionCollection(), "special") + @undoAction = StdAction.undo(self, TQ_SLOT('slotUndo()'), actionCollection()) + @redoAction = StdAction.redo(self, TQ_SLOT('slotRedo()'), actionCollection()) + @cutAction = StdAction.cut(self, TQ_SLOT('slotCut()'), actionCollection()) + @copyAction = StdAction.copy(self, TQ_SLOT('slotCopy()'), actionCollection()) + @pasteAction = StdAction.paste(self, TQ_SLOT('slotPaste()'), actionCollection()) + @findAction = StdAction.find(self, TQ_SLOT('slotFind()'), actionCollection()) + @findNextAction = StdAction.findNext(self, TQ_SLOT('slotFindNext()'), actionCollection()) + @replaceAction = StdAction.replace(self, TQ_SLOT('slotReplace()'), actionCollection()) + @specialAction = Action.new(i18n("Special"), Shortcut.new(), self, TQ_SLOT('slotSpecial()'), actionCollection(), "special") # Demo menu items # TDEToggleAction has an isChecked member and emits the "toggle" signal @toggle1Action = ToggleAction.new("Toggle 1") - @toggle2Action = ToggleAction.new("Toggle 2", Shortcut.new(), self, SLOT('slotToggle2()'), nil) + @toggle2Action = ToggleAction.new("Toggle 2", Shortcut.new(), self, TQ_SLOT('slotToggle2()'), nil) # A separator - create once/use everywhere @separateAction = ActionSeparator.new() @@ -103,8 +103,8 @@ class MainWin < MainWindow # Nested menus using TDEActions (also nested on toolbar) @actionMenu = ActionMenu.new("Action Menu") @actionMenu.setIconSet(iconSet) - @actionMenu.insert(StdAction.zoomIn(self, SLOT('slotZoomIn()'), actionCollection())) - @actionMenu.insert(StdAction.zoomOut(self, SLOT('slotZoomOut()'), actionCollection())) + @actionMenu.insert(StdAction.zoomIn(self, TQ_SLOT('slotZoomIn()'), actionCollection())) + @actionMenu.insert(StdAction.zoomOut(self, TQ_SLOT('slotZoomOut()'), actionCollection())) # Doesn't work in KDE 2.1.1 # radio1Action = TDERadioAction ("Radio 1") diff --git a/korundum/rubylib/examples/rbTDEHTMLPart.rb b/korundum/rubylib/examples/rbTDEHTMLPart.rb index 27eb4a70..aafc160e 100644 --- a/korundum/rubylib/examples/rbTDEHTMLPart.rb +++ b/korundum/rubylib/examples/rbTDEHTMLPart.rb @@ -67,14 +67,14 @@ class RbPartsMW < KParts::MainWindow # some of this and later stuff (like self.actionCollection () ) # comes from - quitAction = KDE::StdAction.quit(self, SLOT('close()'), actionCollection()) + quitAction = KDE::StdAction.quit(self, TQ_SLOT('close()'), actionCollection()) createStandardStatusBarAction() -# @m_toolbarAction = KDE::StdAction.showToolbar(self, SLOT('optionsShowToolbar()'), actionCollection()) - @m_statusbarAction = KDE::StdAction.showStatusbar(self, SLOT('optionsShowStatusbar()'), actionCollection()) +# @m_toolbarAction = KDE::StdAction.showToolbar(self, TQ_SLOT('optionsShowToolbar()'), actionCollection()) + @m_statusbarAction = KDE::StdAction.showStatusbar(self, TQ_SLOT('optionsShowStatusbar()'), actionCollection()) - KDE::StdAction.keyBindings(self, SLOT('optionsConfigureKeys()'), actionCollection()) - KDE::StdAction.configureToolbars(self, SLOT('optionsConfigureToolbars()'), actionCollection()) + KDE::StdAction.keyBindings(self, TQ_SLOT('optionsConfigureKeys()'), actionCollection()) + KDE::StdAction.configureToolbars(self, TQ_SLOT('optionsConfigureToolbars()'), actionCollection()) path = Dir.getwd() + '/' setGeometry(0, 0, 600, 500) diff --git a/korundum/rubylib/examples/uimodules/uidialogs.rb b/korundum/rubylib/examples/uimodules/uidialogs.rb index 8efed493..f4a9f353 100644 --- a/korundum/rubylib/examples/uimodules/uidialogs.rb +++ b/korundum/rubylib/examples/uimodules/uidialogs.rb @@ -39,9 +39,9 @@ class CustomDlg < KDE::Dialog okBtn.setGeometry(x, y, 40, 22) canBtn.setGeometry(x + 50, y, 40, 22) - connect(dlgBtn, SIGNAL("clicked()"), SLOT('dlgClicked()')) - connect(okBtn, SIGNAL("clicked()"), SLOT('okClicked()')) - connect(canBtn, SIGNAL("clicked()"), SLOT('cancelClicked()')) + connect(dlgBtn, TQ_SIGNAL("clicked()"), TQ_SLOT('dlgClicked()')) + connect(okBtn, TQ_SIGNAL("clicked()"), TQ_SLOT('okClicked()')) + connect(canBtn, TQ_SIGNAL("clicked()"), TQ_SLOT('cancelClicked()')) end def dlgClicked() @@ -93,7 +93,7 @@ class MessageDlg < KDE::Dialog grp.setGeometry(10, 10, 200, 30*n) (0...n).each { |i| TQt::RadioButton.new(buttons[i], grp) } - connect(grp, SIGNAL("clicked(int)"), SLOT('launch(int)')) + connect(grp, TQ_SIGNAL("clicked(int)"), TQ_SLOT('launch(int)')) end def launch(which) diff --git a/korundum/rubylib/examples/uimodules/uimisc.rb b/korundum/rubylib/examples/uimodules/uimisc.rb index be186409..51b85bd4 100644 --- a/korundum/rubylib/examples/uimodules/uimisc.rb +++ b/korundum/rubylib/examples/uimodules/uimisc.rb @@ -26,7 +26,7 @@ class Page3 < TQt::Object @iv = KDE::LineEdit.new(page) @iv.setGeometry(x, y + 20, 100, 20) @iv.show() - connect(@iv, SIGNAL("textChanged(const TQString&)"), SLOT('ivChanged()')) + connect(@iv, TQ_SIGNAL("textChanged(const TQString&)"), TQ_SLOT('ivChanged()')) @ivVal = KDE::IntValidator.new(page) @ivVal.setRange(20, 50) @@ -63,7 +63,7 @@ class Page3 < TQt::Object @fv = KDE::LineEdit.new(page) @fv.setGeometry(x, y + 20, 100, 20) @fv.show() - connect(@fv, SIGNAL("textChanged(const TQString&)"), SLOT('fvChanged()')) + connect(@fv, TQ_SIGNAL("textChanged(const TQString&)"), TQ_SLOT('fvChanged()')) @fvVal = KDE::DoubleValidator.new(page) @fvVal.setRange(10.0, 40.0) @@ -100,7 +100,7 @@ class Page3 < TQt::Object @dv = KDE::LineEdit.new(page) @dv.setGeometry(x, y + 20, 100, 20) @dv.show() -# connect(dv, SIGNAL("textChanged(const TQString&)"), SLOT('dvChanged()')) +# connect(dv, TQ_SIGNAL("textChanged(const TQString&)"), TQ_SLOT('dvChanged()')) @dvVal = KDE::DateValidator.new(page) # dvVal.setRange(10.0, 40.0) @@ -112,7 +112,7 @@ class Page3 < TQt::Object dvBtn = TQt::PushButton.new("Validate", page) dvBtn.setGeometry(x, y + 45, 60, 22) dvBtn.show() - connect(dvBtn, SIGNAL("clicked()"), SLOT('dvChanged()')) + connect(dvBtn, TQ_SIGNAL("clicked()"), TQ_SLOT('dvChanged()')) dvNoteLbl = TQt::Label.new("Format is locale dependent\nShort date only\nTry DD-MM-YY", page) dvNoteLbl.setGeometry(x, y + 70, 150, 60) diff --git a/korundum/rubylib/examples/uimodules/uiwidgets.rb b/korundum/rubylib/examples/uimodules/uiwidgets.rb index 71a865a5..4e0bcdb3 100644 --- a/korundum/rubylib/examples/uimodules/uiwidgets.rb +++ b/korundum/rubylib/examples/uimodules/uiwidgets.rb @@ -41,9 +41,9 @@ class Page1 < TQt::Object replaceBtn.setGeometry(x + 90, y, 60, 22) gotoBtn.setGeometry(x + 180, y, 60, 22) -# page.connect(searchBtn, SIGNAL("clicked()"), parent.edit, SLOT('search()')) -# page.connect(replaceBtn, SIGNAL("clicked()"), parent.edit, SLOT('replace()')) -# page.connect(gotoBtn, SIGNAL("clicked()"), parent.edit, SLOT('doGotoLine()')) +# page.connect(searchBtn, TQ_SIGNAL("clicked()"), parent.edit, TQ_SLOT('search()')) +# page.connect(replaceBtn, TQ_SIGNAL("clicked()"), parent.edit, TQ_SLOT('replace()')) +# page.connect(gotoBtn, TQ_SIGNAL("clicked()"), parent.edit, TQ_SLOT('doGotoLine()')) searchBtn.show() replaceBtn.show() @@ -105,7 +105,7 @@ class Page1 < TQt::Object (0...n).each { |i| TQt::RadioButton.new(buttons[i], grp) } - connect(grp, SIGNAL("clicked(int)"), SLOT('restrict(int)')) + connect(grp, TQ_SIGNAL("clicked(int)"), TQ_SLOT('restrict(int)')) grp.find(0).setChecked(true) restrict(0) @@ -469,7 +469,7 @@ class Page6 < TQt::Object toggle.setGeometry(150, 400, 60, 22) toggle.show() - connect(toggle, SIGNAL("clicked()"), SLOT('toggleClicked()')) + connect(toggle, TQ_SIGNAL("clicked()"), TQ_SLOT('toggleClicked()')) page.show() end @@ -545,7 +545,7 @@ class Page7 < TQt::Object page.show() @timer = TQt::Timer.new(page) - connect(@timer, SIGNAL('timeout()'), SLOT('add1()')) + connect(@timer, TQ_SIGNAL('timeout()'), TQ_SLOT('add1()')) @timer.start(100) add1() @@ -637,7 +637,7 @@ class CSDlg < KDE::Dialog closeBtn.setGeometry( 610, 280, 60, 22) closeBtn.show() - connect(closeBtn, SIGNAL("clicked()"), SLOT('closeClicked()')) + connect(closeBtn, TQ_SIGNAL("clicked()"), TQ_SLOT('closeClicked()')) end def closeClicked() diff --git a/korundum/rubylib/examples/uisampler.rb b/korundum/rubylib/examples/uisampler.rb index b24b59aa..bed43c44 100644 --- a/korundum/rubylib/examples/uisampler.rb +++ b/korundum/rubylib/examples/uisampler.rb @@ -160,7 +160,7 @@ class MainWin < KDE::MainWindow setCentralWidget(@mainView) initListView() - connect(@tree, SIGNAL("clicked(TQListViewItem*)"), self, SLOT('lvClicked(TQListViewItem*)')) + connect(@tree, TQ_SIGNAL("clicked(TQListViewItem*)"), self, TQ_SLOT('lvClicked(TQListViewItem*)')) @edit = nil @currentPageObj = nil diff --git a/korundum/rubylib/examples/uitdemdi.rb b/korundum/rubylib/examples/uitdemdi.rb index 3b67b9e1..fe5655c6 100644 --- a/korundum/rubylib/examples/uitdemdi.rb +++ b/korundum/rubylib/examples/uitdemdi.rb @@ -54,9 +54,9 @@ class KmdiExample < KDE::MdiMainFrm @viewIcons = ['network', 'email', 'stop', 'back', 'forward'] @toolIcons = ['view_icon', 'configure'] - openNewAction = StdAction.openNew(self, SLOT('newView()'), actionCollection()) - quitAction = StdAction.quit(self, SLOT('close()'), actionCollection()) - closeAction = StdAction.close(self, SLOT('closeActiveChild()'), actionCollection()) + openNewAction = StdAction.openNew(self, TQ_SLOT('newView()'), actionCollection()) + quitAction = StdAction.quit(self, TQ_SLOT('close()'), actionCollection()) + closeAction = StdAction.close(self, TQ_SLOT('closeActiveChild()'), actionCollection()) uifilebase = Dir.getwd + '/uitdemdi.rc' createGUI(uifilebase) @@ -82,9 +82,9 @@ class KmdiExample < KDE::MdiMainFrm makeView("View #{idx.to_s}", ico, ico) end - connect(self, SIGNAL('viewActivated(KMdiChildView*)'), self, SLOT('activatedMessage(KMdiChildView*)')) - connect(self, SIGNAL('viewActivated(KMdiChildView*)'), self, SLOT('syncFromChildView(KMdiChildView*)')) - connect(@maintool, SIGNAL('selectionChanged(TQListBoxItem*)'), self, SLOT('syncFromMainTool(TQListBoxItem*)')) + connect(self, TQ_SIGNAL('viewActivated(KMdiChildView*)'), self, TQ_SLOT('activatedMessage(KMdiChildView*)')) + connect(self, TQ_SIGNAL('viewActivated(KMdiChildView*)'), self, TQ_SLOT('syncFromChildView(KMdiChildView*)')) + connect(@maintool, TQ_SIGNAL('selectionChanged(TQListBoxItem*)'), self, TQ_SLOT('syncFromMainTool(TQListBoxItem*)')) syncFromChildView(activeWindow()) end @@ -128,7 +128,7 @@ class KmdiExample < KDE::MdiMainFrm pxm.setPixmap(getIcon(icon, Icon::NoGroup, KDE::Icon::SizeLarge)) addWindow(view) @mainToolWidget.insertItem(label) - connect(view, SIGNAL('childWindowCloseRequest(KMdiChildView*)'), self, SLOT('closeChild(KMdiChildView*)')) + connect(view, TQ_SIGNAL('childWindowCloseRequest(KMdiChildView*)'), self, TQ_SLOT('closeChild(KMdiChildView*)')) end def removeMainToolItem(view) diff --git a/korundum/rubylib/examples/xmlgui.rb b/korundum/rubylib/examples/xmlgui.rb index 84acbdde..ce5ca418 100755 --- a/korundum/rubylib/examples/xmlgui.rb +++ b/korundum/rubylib/examples/xmlgui.rb @@ -34,7 +34,7 @@ begin m = KDE::MainWindow.new @r = Receiver.new m mActionCollection = m.actionCollection - action = std_actions[:quit].create @r, SLOT("quit()"), mActionCollection + action = std_actions[:quit].create @r, TQ_SLOT("quit()"), mActionCollection m.createGUI Dir.pwd + "/xmlgui.rc" app.setMainWidget(m) m.show diff --git a/korundum/rubylib/examples/xmlmenudemo.rb b/korundum/rubylib/examples/xmlmenudemo.rb index 8d9d5c94..e619a1c6 100644 --- a/korundum/rubylib/examples/xmlmenudemo.rb +++ b/korundum/rubylib/examples/xmlmenudemo.rb @@ -81,22 +81,22 @@ class MainWin < KDE::MainWindow acts = actionCollection() # "File" menu items - newAction = KDE::StdAction.openNew(self, SLOT('slotNew()'), acts) - openAction = KDE::StdAction.open(self, SLOT('slotOpen()'), acts) - @saveAction = KDE::StdAction.save(self, SLOT('slotSave()'), acts) - @saveAsAction = KDE::StdAction.saveAs(self, SLOT('slotSaveAs()'), acts) - printAction = KDE::StdAction.print(self, SLOT('slotPrint()'), acts) - quitAction = KDE::StdAction.quit(self, SLOT('slotQuit()'), acts) + newAction = KDE::StdAction.openNew(self, TQ_SLOT('slotNew()'), acts) + openAction = KDE::StdAction.open(self, TQ_SLOT('slotOpen()'), acts) + @saveAction = KDE::StdAction.save(self, TQ_SLOT('slotSave()'), acts) + @saveAsAction = KDE::StdAction.saveAs(self, TQ_SLOT('slotSaveAs()'), acts) + printAction = KDE::StdAction.print(self, TQ_SLOT('slotPrint()'), acts) + quitAction = KDE::StdAction.quit(self, TQ_SLOT('slotQuit()'), acts) # "Edit" menu items - undoAction = KDE::StdAction.undo(self, SLOT('slotUndo()'), acts) - redoAction = KDE::StdAction.redo(self, SLOT('slotRedo()'), acts) - cutAction = KDE::StdAction.cut(self, SLOT('slotCut()'), acts) - copyAction = KDE::StdAction.copy(self, SLOT('slotCopy()'), acts) - pasteAction = KDE::StdAction.paste(self, SLOT('slotPaste()'), acts) - findAction = KDE::StdAction.find(self, SLOT('slotFind()'), acts) - findNextAction = KDE::StdAction.findNext(self, SLOT('slotFindNext()'), acts) - replaceAction = KDE::StdAction.replace(self, SLOT('slotReplace()'), acts) + undoAction = KDE::StdAction.undo(self, TQ_SLOT('slotUndo()'), acts) + redoAction = KDE::StdAction.redo(self, TQ_SLOT('slotRedo()'), acts) + cutAction = KDE::StdAction.cut(self, TQ_SLOT('slotCut()'), acts) + copyAction = KDE::StdAction.copy(self, TQ_SLOT('slotCopy()'), acts) + pasteAction = KDE::StdAction.paste(self, TQ_SLOT('slotPaste()'), acts) + findAction = KDE::StdAction.find(self, TQ_SLOT('slotFind()'), acts) + findNextAction = KDE::StdAction.findNext(self, TQ_SLOT('slotFindNext()'), acts) + replaceAction = KDE::StdAction.replace(self, TQ_SLOT('slotReplace()'), acts) # NOTE!!!! You must specify a parent and name for the action object in its constructor # Normally in a constructor like @@ -111,13 +111,13 @@ class MainWin < KDE::MainWindow # object names - the variable the object is assigned to('specialAction') # has no meaning in XNLGUI terms except through the objects 'name' member value - specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, SLOT('slotSpecial()'), acts, "specialActionName") + specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, TQ_SLOT('slotSpecial()'), acts, "specialActionName") # Demo menu items # KDE::ToggleAction has an isChecked member and emits the "toggle" signal toggle1Action = KDE::ToggleAction.new("Toggle 1", KDE::Shortcut.new(0), acts, "toggle1Action") - toggle2Action = KDE::ToggleAction.new("Toggle 2", KDE::Shortcut.new(0), self, SLOT('slotToggle2()'), acts, "toggle2Action") + toggle2Action = KDE::ToggleAction.new("Toggle 2", KDE::Shortcut.new(0), self, TQ_SLOT('slotToggle2()'), acts, "toggle2Action") # A separator - create once/use everywhere separateAction = KDE::ActionSeparator.new(acts, "separateAction") @@ -146,15 +146,15 @@ class MainWin < KDE::MainWindow # separators). Creating the KDE::StdActions alone is sufficient - you # could delete their references from the *ui.rc file and the menu # items would still be created via ui_standards.rc - actionMenu.insert(KDE::StdAction.zoomIn(self, SLOT('slotZoomIn()'), acts)) - actionMenu.insert(KDE::StdAction.zoomOut(self, SLOT('slotZoomOut()'), acts)) + actionMenu.insert(KDE::StdAction.zoomIn(self, TQ_SLOT('slotZoomIn()'), acts)) + actionMenu.insert(KDE::StdAction.zoomOut(self, TQ_SLOT('slotZoomOut()'), acts)) - radio1Action = KDE::RadioAction.new("Radio 1", KDE::Shortcut.new(0), self, SLOT('slotRadio()'), acts, "radio1") + radio1Action = KDE::RadioAction.new("Radio 1", KDE::Shortcut.new(0), self, TQ_SLOT('slotRadio()'), acts, "radio1") radio1Action.setExclusiveGroup("Radio") radio1Action.setChecked(true) - radio2Action = KDE::RadioAction.new("Radio 2", KDE::Shortcut.new(0), self, SLOT('slotRadio()'), acts, "radio2") + radio2Action = KDE::RadioAction.new("Radio 2", KDE::Shortcut.new(0), self, TQ_SLOT('slotRadio()'), acts, "radio2") radio2Action.setExclusiveGroup("Radio") - radio3Action = KDE::RadioAction.new("Radio 3", KDE::Shortcut.new(0), self, SLOT('slotRadio()'), acts, "radio3") + radio3Action = KDE::RadioAction.new("Radio 3", KDE::Shortcut.new(0), self, TQ_SLOT('slotRadio()'), acts, "radio3") radio3Action.setExclusiveGroup("Radio") end @@ -184,7 +184,7 @@ class MainWin < KDE::MainWindow # in this case only (0...fakeFiles.length).each do |i| act = KDE::Action.new(i18n(" &#{i.to_s} #{fakeFiles[i]}"), KDE::Shortcut.new(0), - self, SLOT('slotFake()'), nil, fakeFiles[i].sub(/.sip$/,'') + "open") + self, TQ_SLOT('slotFake()'), nil, fakeFiles[i].sub(/.sip$/,'') + "open") dynamicActionsList << act end diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am index 840b6ab6..74995c3d 100644 --- a/korundum/rubylib/korundum/Makefile.am +++ b/korundum/rubylib/korundum/Makefile.am @@ -1,3 +1,5 @@ +CXXFLAGS += $(RUBY_CXXFLAGS) + INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) rubylibdir = $(RUBY_ARCHDIR) diff --git a/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp b/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp index f1f44f70..760f1df5 100644 --- a/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp +++ b/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /* This file is part of KDE. diff --git a/korundum/rubylib/templates/annotated/menuapp1.rb b/korundum/rubylib/templates/annotated/menuapp1.rb index bf4ea83c..df44cee4 100644 --- a/korundum/rubylib/templates/annotated/menuapp1.rb +++ b/korundum/rubylib/templates/annotated/menuapp1.rb @@ -87,21 +87,21 @@ class MainWin < KDE::MainWindow # need to instantiate KDE::StdAccel # "File" menu items - fileMenu.insertItem(i18n("New"), self, SLOT('slotNew()'), TQt::KeySequence.new(KDE::StdAccel.openNew().keyCodeQt())) - fileMenu.insertItem(i18n("Open"), self, SLOT('slotOpen()'), TQt::KeySequence.new(KDE::StdAccel.open().keyCodeQt())) + fileMenu.insertItem(i18n("New"), self, TQ_SLOT('slotNew()'), TQt::KeySequence.new(KDE::StdAccel.openNew().keyCodeQt())) + fileMenu.insertItem(i18n("Open"), self, TQ_SLOT('slotOpen()'), TQt::KeySequence.new(KDE::StdAccel.open().keyCodeQt())) fileMenu.insertSeparator() - fileMenu.insertItem(i18n("Save"), self, SLOT('slotSave()'), TQt::KeySequence.new(KDE::StdAccel.save().keyCodeQt())) + fileMenu.insertItem(i18n("Save"), self, TQ_SLOT('slotSave()'), TQt::KeySequence.new(KDE::StdAccel.save().keyCodeQt())) # TDEStdAccel doesn't have a standard accelerator for 'Save As', # so we omit it - insertItem uses the default value - fileMenu.insertItem(i18n("SaveAs"), self, SLOT('slotSaveAs()')) + fileMenu.insertItem(i18n("SaveAs"), self, TQ_SLOT('slotSaveAs()')) # This inserts a line between groups of items in a menu fileMenu.insertSeparator() - fileMenu.insertItem(i18n("Print"), self, SLOT('slotPrint()'), TQt::KeySequence.new(KDE::StdAccel.print().keyCodeQt())) + fileMenu.insertItem(i18n("Print"), self, TQ_SLOT('slotPrint()'), TQt::KeySequence.new(KDE::StdAccel.print().keyCodeQt())) fileMenu.insertSeparator() - fileMenu.insertItem(i18n("&Quit"), self, SLOT('slotQuit()'), TQt::KeySequence.new(KDE::StdAccel.quit().keyCodeQt())) + fileMenu.insertItem(i18n("&Quit"), self, TQ_SLOT('slotQuit()'), TQt::KeySequence.new(KDE::StdAccel.quit().keyCodeQt())) # Put fileMenu (as the File menu) into the menu bar # 'menuBar' is a predefined object owned by KDE::MainWindow @@ -110,16 +110,16 @@ class MainWin < KDE::MainWindow editMenu = TQt::PopupMenu.new(self) # "Edit" menu items - editMenu.insertItem(i18n("Undo"), self, SLOT('slotUndo()'), TQt::KeySequence.new(KDE::StdAccel.undo().keyCodeQt())) - editMenu.insertItem(i18n("Redo"), self, SLOT('slotRedo()'), TQt::KeySequence.new(KDE::StdAccel.redo().keyCodeQt())) + editMenu.insertItem(i18n("Undo"), self, TQ_SLOT('slotUndo()'), TQt::KeySequence.new(KDE::StdAccel.undo().keyCodeQt())) + editMenu.insertItem(i18n("Redo"), self, TQ_SLOT('slotRedo()'), TQt::KeySequence.new(KDE::StdAccel.redo().keyCodeQt())) editMenu.insertSeparator() - editMenu.insertItem(i18n("Cut"), self, SLOT('slotCut()'), TQt::KeySequence.new(KDE::StdAccel.cut().keyCodeQt())) - editMenu.insertItem(i18n("Copy"), self, SLOT('slotCopy()'), TQt::KeySequence.new(KDE::StdAccel.copy().keyCodeQt())) - editMenu.insertItem(i18n("Paste"), self, SLOT('slotPaste()'), TQt::KeySequence.new(KDE::StdAccel.paste().keyCodeQt())) + editMenu.insertItem(i18n("Cut"), self, TQ_SLOT('slotCut()'), TQt::KeySequence.new(KDE::StdAccel.cut().keyCodeQt())) + editMenu.insertItem(i18n("Copy"), self, TQ_SLOT('slotCopy()'), TQt::KeySequence.new(KDE::StdAccel.copy().keyCodeQt())) + editMenu.insertItem(i18n("Paste"), self, TQ_SLOT('slotPaste()'), TQt::KeySequence.new(KDE::StdAccel.paste().keyCodeQt())) editMenu.insertSeparator() - editMenu.insertItem(i18n("Find"), self, SLOT('slotFind()'), TQt::KeySequence.new(KDE::StdAccel.find().keyCodeQt())) - editMenu.insertItem(i18n("Find Next"), self, SLOT('slotFindNext()'), TQt::KeySequence.new(KDE::StdAccel.findNext().keyCodeQt())) - editMenu.insertItem(i18n("Replace"), self, SLOT('slotReplace()'), TQt::KeySequence.new(KDE::StdAccel.replace().keyCodeQt())) + editMenu.insertItem(i18n("Find"), self, TQ_SLOT('slotFind()'), TQt::KeySequence.new(KDE::StdAccel.find().keyCodeQt())) + editMenu.insertItem(i18n("Find Next"), self, TQ_SLOT('slotFindNext()'), TQt::KeySequence.new(KDE::StdAccel.findNext().keyCodeQt())) + editMenu.insertItem(i18n("Replace"), self, TQ_SLOT('slotReplace()'), TQt::KeySequence.new(KDE::StdAccel.replace().keyCodeQt())) # Put editMenu (as the Edit menu) into the menu bar @@ -150,18 +150,18 @@ class MainWin < KDE::MainWindow # are easier ways to do this - see other menuapp templates for easier # methods using KDE::Action/KDE::StdAction - toolBar().insertButton(icons.loadIcon("filenew", KDE::Icon::Toolbar), TOOLBAR_NEW, SIGNAL("clicked(int)"), - self, SLOT('slotNew()'), true, "New") - toolBar().insertButton(icons.loadIcon("fileopen", KDE::Icon::Toolbar), TOOLBAR_OPEN, SIGNAL("clicked(int)"), - self, SLOT('slotOpen()'), true, "Open") - toolBar().insertButton(icons.loadIcon("filesave", KDE::Icon::Toolbar), TOOLBAR_SAVE, SIGNAL("clicked(int)"), - self, SLOT('slotSave()'), true, "Save") - toolBar().insertButton(icons.loadIcon("editcut", KDE::Icon::Toolbar), TOOLBAR_CUT, SIGNAL("clicked(int)"), - self, SLOT('slotCut()'), true, "Cut") - toolBar().insertButton(icons.loadIcon("editcopy", KDE::Icon::Toolbar), TOOLBAR_COPY, SIGNAL("clicked(int)"), - self, SLOT('slotCopy()'), true, "Copy") - toolBar().insertButton(icons.loadIcon("editpaste", KDE::Icon::Toolbar), TOOLBAR_PASTE, SIGNAL("clicked(int)"), - self, SLOT('slotPaste()'), true, "Paste") + toolBar().insertButton(icons.loadIcon("filenew", KDE::Icon::Toolbar), TOOLBAR_NEW, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotNew()'), true, "New") + toolBar().insertButton(icons.loadIcon("fileopen", KDE::Icon::Toolbar), TOOLBAR_OPEN, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotOpen()'), true, "Open") + toolBar().insertButton(icons.loadIcon("filesave", KDE::Icon::Toolbar), TOOLBAR_SAVE, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotSave()'), true, "Save") + toolBar().insertButton(icons.loadIcon("editcut", KDE::Icon::Toolbar), TOOLBAR_CUT, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotCut()'), true, "Cut") + toolBar().insertButton(icons.loadIcon("editcopy", KDE::Icon::Toolbar), TOOLBAR_COPY, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotCopy()'), true, "Copy") + toolBar().insertButton(icons.loadIcon("editpaste", KDE::Icon::Toolbar), TOOLBAR_PASTE, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotPaste()'), true, "Paste") end def initStatusBar() diff --git a/korundum/rubylib/templates/annotated/menuapp2.rb b/korundum/rubylib/templates/annotated/menuapp2.rb index f8778163..d471423e 100644 --- a/korundum/rubylib/templates/annotated/menuapp2.rb +++ b/korundum/rubylib/templates/annotated/menuapp2.rb @@ -87,22 +87,22 @@ class MainWin < KDE::MainWindow # where the code for the action is located # "File" menu items - @newAction = KDE::StdAction.openNew(self, SLOT("slotNew()"), actionCollection()) - @openAction = KDE::StdAction.open(self, SLOT("slotOpen()"), actionCollection()) - @saveAction = KDE::StdAction.save(self, SLOT("slotSave()"), actionCollection()) - @saveAsAction = KDE::StdAction.saveAs(self, SLOT("slotSaveAs()"), actionCollection()) - @printAction = KDE::StdAction.print(self, SLOT("slotPrint()"), actionCollection()) - @quitAction = KDE::StdAction.quit(self, SLOT("slotQuit()"), actionCollection()) + @newAction = KDE::StdAction.openNew(self, TQ_SLOT("slotNew()"), actionCollection()) + @openAction = KDE::StdAction.open(self, TQ_SLOT("slotOpen()"), actionCollection()) + @saveAction = KDE::StdAction.save(self, TQ_SLOT("slotSave()"), actionCollection()) + @saveAsAction = KDE::StdAction.saveAs(self, TQ_SLOT("slotSaveAs()"), actionCollection()) + @printAction = KDE::StdAction.print(self, TQ_SLOT("slotPrint()"), actionCollection()) + @quitAction = KDE::StdAction.quit(self, TQ_SLOT("slotQuit()"), actionCollection()) # "Edit" menu items - @undoAction = KDE::StdAction.undo(self, SLOT("slotUndo()"), actionCollection()) - @redoAction = KDE::StdAction.redo(self, SLOT("slotRedo()"), actionCollection()) - @cutAction = KDE::StdAction.cut(self, SLOT("slotCut()"), actionCollection()) - @copyAction = KDE::StdAction.copy(self, SLOT("slotCopy()"), actionCollection()) - @pasteAction = KDE::StdAction.paste(self, SLOT("slotPaste()"), actionCollection()) - @findAction = KDE::StdAction.find(self, SLOT("slotFind()"), actionCollection()) - @findNextAction = KDE::StdAction.findNext(self, SLOT("slotFindNext()"), actionCollection()) - @replaceAction = KDE::StdAction.replace(self, SLOT("slotReplace()"), actionCollection()) + @undoAction = KDE::StdAction.undo(self, TQ_SLOT("slotUndo()"), actionCollection()) + @redoAction = KDE::StdAction.redo(self, TQ_SLOT("slotRedo()"), actionCollection()) + @cutAction = KDE::StdAction.cut(self, TQ_SLOT("slotCut()"), actionCollection()) + @copyAction = KDE::StdAction.copy(self, TQ_SLOT("slotCopy()"), actionCollection()) + @pasteAction = KDE::StdAction.paste(self, TQ_SLOT("slotPaste()"), actionCollection()) + @findAction = KDE::StdAction.find(self, TQ_SLOT("slotFind()"), actionCollection()) + @findNextAction = KDE::StdAction.findNext(self, TQ_SLOT("slotFindNext()"), actionCollection()) + @replaceAction = KDE::StdAction.replace(self, TQ_SLOT("slotReplace()"), actionCollection()) # For actions that are not "standard", you can create your # own actions using KDE::Action. This example doesn't include @@ -114,7 +114,7 @@ class MainWin < KDE::MainWindow # This TDEAction 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") + @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, TQ_SLOT('slotSpecial()'), actionCollection(), "specialActionName") end def initMenus() diff --git a/korundum/rubylib/templates/annotated/menuapp3.rb b/korundum/rubylib/templates/annotated/menuapp3.rb index 37fbf2b4..f1b76940 100644 --- a/korundum/rubylib/templates/annotated/menuapp3.rb +++ b/korundum/rubylib/templates/annotated/menuapp3.rb @@ -96,29 +96,29 @@ class MainWin < KDE::MainWindow # in the toolBar. # "File" menu items - @newAction = KDE::StdAction.openNew(self, SLOT("slotNew()"), actionCollection()) - @openAction = KDE::StdAction.open(self, SLOT("slotOpen()"), actionCollection()) - @saveAction = KDE::StdAction.save(self, SLOT("slotSave()"), actionCollection()) - @saveAsAction = KDE::StdAction.saveAs(self, SLOT("slotSaveAs()"), actionCollection()) - @printAction = KDE::StdAction.print(self, SLOT("slotPrint()"), actionCollection()) - @quitAction = KDE::StdAction.quit(self, SLOT("slotQuit()"), actionCollection()) + @newAction = KDE::StdAction.openNew(self, TQ_SLOT("slotNew()"), actionCollection()) + @openAction = KDE::StdAction.open(self, TQ_SLOT("slotOpen()"), actionCollection()) + @saveAction = KDE::StdAction.save(self, TQ_SLOT("slotSave()"), actionCollection()) + @saveAsAction = KDE::StdAction.saveAs(self, TQ_SLOT("slotSaveAs()"), actionCollection()) + @printAction = KDE::StdAction.print(self, TQ_SLOT("slotPrint()"), actionCollection()) + @quitAction = KDE::StdAction.quit(self, TQ_SLOT("slotQuit()"), actionCollection()) # "Edit" menu items - @undoAction = KDE::StdAction.undo(self, SLOT("slotUndo()"), actionCollection()) - @redoAction = KDE::StdAction.redo(self, SLOT("slotRedo()"), actionCollection()) - @cutAction = KDE::StdAction.cut(self, SLOT("slotCut()"), actionCollection()) - @copyAction = KDE::StdAction.copy(self, SLOT("slotCopy()"), actionCollection()) - @pasteAction = KDE::StdAction.paste(self, SLOT("slotPaste()"), actionCollection()) - @findAction = KDE::StdAction.find(self, SLOT("slotFind()"), actionCollection()) - @findNextAction = KDE::StdAction.findNext(self, SLOT("slotFindNext()"), actionCollection()) - @replaceAction = KDE::StdAction.replace(self, SLOT("slotReplace()"), actionCollection()) + @undoAction = KDE::StdAction.undo(self, TQ_SLOT("slotUndo()"), actionCollection()) + @redoAction = KDE::StdAction.redo(self, TQ_SLOT("slotRedo()"), actionCollection()) + @cutAction = KDE::StdAction.cut(self, TQ_SLOT("slotCut()"), actionCollection()) + @copyAction = KDE::StdAction.copy(self, TQ_SLOT("slotCopy()"), actionCollection()) + @pasteAction = KDE::StdAction.paste(self, TQ_SLOT("slotPaste()"), actionCollection()) + @findAction = KDE::StdAction.find(self, TQ_SLOT("slotFind()"), actionCollection()) + @findNextAction = KDE::StdAction.findNext(self, TQ_SLOT("slotFindNext()"), actionCollection()) + @replaceAction = KDE::StdAction.replace(self, TQ_SLOT("slotReplace()"), actionCollection()) # For ANYTHING constructed from KDE::Action or its descendants (KDE::ActionMenu, KDE::ActionSeparator, # KDE::FontAction, etc) you MUST provide the actionCollection () parent and an object # name ("specialActionName") or the XMLGUI mechanism will not be able to locate the # action. XMLGUI finds the action via its member name value, NOT via its variable name. - @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, SLOT('slotSpecial()'), actionCollection(), "specialActionName") + @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, TQ_SLOT('slotSpecial()'), actionCollection(), "specialActionName") end def initStatusBar() diff --git a/korundum/rubylib/templates/annotated/systray1.rb b/korundum/rubylib/templates/annotated/systray1.rb index 10bdb5c8..1945fa9e 100644 --- a/korundum/rubylib/templates/annotated/systray1.rb +++ b/korundum/rubylib/templates/annotated/systray1.rb @@ -60,7 +60,7 @@ class MainWin < KDE::MainWindow # KDE::SystemTray hides or shows its parent when the system tray icon is clicked systray = KDE::SystemTray.new(self) systray.setPixmap(icons.loadIcon("process-stop", 0)) - connect(systray, SIGNAL("quitSelected()"), self, SLOT('slotQuitSelected()')) + connect(systray, TQ_SIGNAL("quitSelected()"), self, TQ_SLOT('slotQuitSelected()')) systray.show() end diff --git a/korundum/rubylib/templates/basic/menuapp1.rb b/korundum/rubylib/templates/basic/menuapp1.rb index 69902534..6037376b 100644 --- a/korundum/rubylib/templates/basic/menuapp1.rb +++ b/korundum/rubylib/templates/basic/menuapp1.rb @@ -71,31 +71,31 @@ class MainWin < KDE::MainWindow fileMenu = TQt::PopupMenu.new(self) # "File" menu items - fileMenu.insertItem(i18n("New"), self, SLOT('slotNew()'), TQt::KeySequence.new(KDE::StdAccel.openNew().keyCodeQt())) - fileMenu.insertItem(i18n("Open"), self, SLOT('slotOpen()'), TQt::KeySequence.new(KDE::StdAccel.open().keyCodeQt())) + fileMenu.insertItem(i18n("New"), self, TQ_SLOT('slotNew()'), TQt::KeySequence.new(KDE::StdAccel.openNew().keyCodeQt())) + fileMenu.insertItem(i18n("Open"), self, TQ_SLOT('slotOpen()'), TQt::KeySequence.new(KDE::StdAccel.open().keyCodeQt())) fileMenu.insertSeparator() - fileMenu.insertItem(i18n("Save"), self, SLOT('slotSave()'), TQt::KeySequence.new(KDE::StdAccel.save().keyCodeQt())) - fileMenu.insertItem(i18n("SaveAs"), self, SLOT('slotSaveAs()')) + fileMenu.insertItem(i18n("Save"), self, TQ_SLOT('slotSave()'), TQt::KeySequence.new(KDE::StdAccel.save().keyCodeQt())) + fileMenu.insertItem(i18n("SaveAs"), self, TQ_SLOT('slotSaveAs()')) fileMenu.insertSeparator() - fileMenu.insertItem(i18n("Print"), self, SLOT('slotPrint()'), TQt::KeySequence.new(KDE::StdAccel.print().keyCodeQt())) + fileMenu.insertItem(i18n("Print"), self, TQ_SLOT('slotPrint()'), TQt::KeySequence.new(KDE::StdAccel.print().keyCodeQt())) fileMenu.insertSeparator() - fileMenu.insertItem(i18n("&Quit"), self, SLOT('slotQuit()'), TQt::KeySequence.new(KDE::StdAccel.quit().keyCodeQt())) + fileMenu.insertItem(i18n("&Quit"), self, TQ_SLOT('slotQuit()'), TQt::KeySequence.new(KDE::StdAccel.quit().keyCodeQt())) menuBar().insertItem(i18n("&File"), fileMenu) editMenu = TQt::PopupMenu.new(self) # "Edit" menu items - editMenu.insertItem(i18n("Undo"), self, SLOT('slotUndo()'), TQt::KeySequence.new(KDE::StdAccel.undo().keyCodeQt())) - editMenu.insertItem(i18n("Redo"), self, SLOT('slotRedo()'), TQt::KeySequence.new(KDE::StdAccel.redo().keyCodeQt())) + editMenu.insertItem(i18n("Undo"), self, TQ_SLOT('slotUndo()'), TQt::KeySequence.new(KDE::StdAccel.undo().keyCodeQt())) + editMenu.insertItem(i18n("Redo"), self, TQ_SLOT('slotRedo()'), TQt::KeySequence.new(KDE::StdAccel.redo().keyCodeQt())) editMenu.insertSeparator() - editMenu.insertItem(i18n("Cut"), self, SLOT('slotCut()'), TQt::KeySequence.new(KDE::StdAccel.cut().keyCodeQt())) - editMenu.insertItem(i18n("Copy"), self, SLOT('slotCopy()'), TQt::KeySequence.new(KDE::StdAccel.copy().keyCodeQt())) - editMenu.insertItem(i18n("Paste"), self, SLOT('slotPaste()'), TQt::KeySequence.new(KDE::StdAccel.paste().keyCodeQt())) + editMenu.insertItem(i18n("Cut"), self, TQ_SLOT('slotCut()'), TQt::KeySequence.new(KDE::StdAccel.cut().keyCodeQt())) + editMenu.insertItem(i18n("Copy"), self, TQ_SLOT('slotCopy()'), TQt::KeySequence.new(KDE::StdAccel.copy().keyCodeQt())) + editMenu.insertItem(i18n("Paste"), self, TQ_SLOT('slotPaste()'), TQt::KeySequence.new(KDE::StdAccel.paste().keyCodeQt())) editMenu.insertSeparator() - editMenu.insertItem(i18n("Find"), self, SLOT('slotFind()'), TQt::KeySequence.new(KDE::StdAccel.find().keyCodeQt())) - editMenu.insertItem(i18n("Find Next"), self, SLOT('slotFindNext()'), TQt::KeySequence.new(KDE::StdAccel.findNext().keyCodeQt())) - editMenu.insertItem(i18n("Replace"), self, SLOT('slotReplace()'), TQt::KeySequence.new(KDE::StdAccel.replace().keyCodeQt())) + editMenu.insertItem(i18n("Find"), self, TQ_SLOT('slotFind()'), TQt::KeySequence.new(KDE::StdAccel.find().keyCodeQt())) + editMenu.insertItem(i18n("Find Next"), self, TQ_SLOT('slotFindNext()'), TQt::KeySequence.new(KDE::StdAccel.findNext().keyCodeQt())) + editMenu.insertItem(i18n("Replace"), self, TQ_SLOT('slotReplace()'), TQt::KeySequence.new(KDE::StdAccel.replace().keyCodeQt())) menuBar().insertItem(i18n("&Edit"), editMenu) @@ -106,18 +106,18 @@ class MainWin < KDE::MainWindow def initToolBar() icons = KDE::IconLoader.new() - toolBar().insertButton(icons.loadIcon("filenew", KDE::Icon::Toolbar), TOOLBAR_NEW, SIGNAL("clicked(int)"), - self, SLOT('slotNew()'), true, "New") - toolBar().insertButton(icons.loadIcon("fileopen", KDE::Icon::Toolbar), TOOLBAR_OPEN, SIGNAL("clicked(int)"), - self, SLOT('slotOpen()'), true, "Open") - toolBar().insertButton(icons.loadIcon("filesave", KDE::Icon::Toolbar), TOOLBAR_SAVE, SIGNAL("clicked(int)"), - self, SLOT('slotSave()'), true, "Save") - toolBar().insertButton(icons.loadIcon("editcut", KDE::Icon::Toolbar), TOOLBAR_CUT, SIGNAL("clicked(int)"), - self, SLOT('slotCut()'), true, "Cut") - toolBar().insertButton(icons.loadIcon("editcopy", KDE::Icon::Toolbar), TOOLBAR_COPY, SIGNAL("clicked(int)"), - self, SLOT('slotCopy()'), true, "Copy") - toolBar().insertButton(icons.loadIcon("editpaste", KDE::Icon::Toolbar), TOOLBAR_PASTE, SIGNAL("clicked(int)"), - self, SLOT('slotPaste()'), true, "Paste") + toolBar().insertButton(icons.loadIcon("filenew", KDE::Icon::Toolbar), TOOLBAR_NEW, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotNew()'), true, "New") + toolBar().insertButton(icons.loadIcon("fileopen", KDE::Icon::Toolbar), TOOLBAR_OPEN, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotOpen()'), true, "Open") + toolBar().insertButton(icons.loadIcon("filesave", KDE::Icon::Toolbar), TOOLBAR_SAVE, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotSave()'), true, "Save") + toolBar().insertButton(icons.loadIcon("editcut", KDE::Icon::Toolbar), TOOLBAR_CUT, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotCut()'), true, "Cut") + toolBar().insertButton(icons.loadIcon("editcopy", KDE::Icon::Toolbar), TOOLBAR_COPY, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotCopy()'), true, "Copy") + toolBar().insertButton(icons.loadIcon("editpaste", KDE::Icon::Toolbar), TOOLBAR_PASTE, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotPaste()'), true, "Paste") end def initStatusBar() diff --git a/korundum/rubylib/templates/basic/menuapp2.rb b/korundum/rubylib/templates/basic/menuapp2.rb index df1cadb2..67be6f84 100644 --- a/korundum/rubylib/templates/basic/menuapp2.rb +++ b/korundum/rubylib/templates/basic/menuapp2.rb @@ -63,23 +63,23 @@ class MainWin < KDE::MainWindow def initActions() # "File" menu items - @newAction = KDE::StdAction.openNew(self, SLOT("slotNew()"), actionCollection()) - @openAction = KDE::StdAction.open(self, SLOT("slotOpen()"), actionCollection()) - @saveAction = KDE::StdAction.save(self, SLOT("slotSave()"), actionCollection()) - @saveAsAction = KDE::StdAction.saveAs(self, SLOT("slotSaveAs()"), actionCollection()) - @printAction = KDE::StdAction.print(self, SLOT("slotPrint()"), actionCollection()) - @quitAction = KDE::StdAction.quit(self, SLOT("slotQuit()"), actionCollection()) + @newAction = KDE::StdAction.openNew(self, TQ_SLOT("slotNew()"), actionCollection()) + @openAction = KDE::StdAction.open(self, TQ_SLOT("slotOpen()"), actionCollection()) + @saveAction = KDE::StdAction.save(self, TQ_SLOT("slotSave()"), actionCollection()) + @saveAsAction = KDE::StdAction.saveAs(self, TQ_SLOT("slotSaveAs()"), actionCollection()) + @printAction = KDE::StdAction.print(self, TQ_SLOT("slotPrint()"), actionCollection()) + @quitAction = KDE::StdAction.quit(self, TQ_SLOT("slotQuit()"), actionCollection()) # "Edit" menu items - @undoAction = KDE::StdAction.undo(self, SLOT("slotUndo()"), actionCollection()) - @redoAction = KDE::StdAction.redo(self, SLOT("slotRedo()"), actionCollection()) - @cutAction = KDE::StdAction.cut(self, SLOT("slotCut()"), actionCollection()) - @copyAction = KDE::StdAction.copy(self, SLOT("slotCopy()"), actionCollection()) - @pasteAction = KDE::StdAction.paste(self, SLOT("slotPaste()"), actionCollection()) - @findAction = KDE::StdAction.find(self, SLOT("slotFind()"), actionCollection()) - @findNextAction = KDE::StdAction.findNext(self, SLOT("slotFindNext()"), actionCollection()) - @replaceAction = KDE::StdAction.replace(self, SLOT("slotReplace()"), actionCollection()) - @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, SLOT('slotSpecial()'), actionCollection(), "specialActionName") + @undoAction = KDE::StdAction.undo(self, TQ_SLOT("slotUndo()"), actionCollection()) + @redoAction = KDE::StdAction.redo(self, TQ_SLOT("slotRedo()"), actionCollection()) + @cutAction = KDE::StdAction.cut(self, TQ_SLOT("slotCut()"), actionCollection()) + @copyAction = KDE::StdAction.copy(self, TQ_SLOT("slotCopy()"), actionCollection()) + @pasteAction = KDE::StdAction.paste(self, TQ_SLOT("slotPaste()"), actionCollection()) + @findAction = KDE::StdAction.find(self, TQ_SLOT("slotFind()"), actionCollection()) + @findNextAction = KDE::StdAction.findNext(self, TQ_SLOT("slotFindNext()"), actionCollection()) + @replaceAction = KDE::StdAction.replace(self, TQ_SLOT("slotReplace()"), actionCollection()) + @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, TQ_SLOT('slotSpecial()'), actionCollection(), "specialActionName") end def initMenus() diff --git a/korundum/rubylib/templates/basic/menuapp3.rb b/korundum/rubylib/templates/basic/menuapp3.rb index 7751e847..86deb9c8 100644 --- a/korundum/rubylib/templates/basic/menuapp3.rb +++ b/korundum/rubylib/templates/basic/menuapp3.rb @@ -59,24 +59,24 @@ class MainWin < KDE::MainWindow def initActions() # "File" menu items - @newAction = KDE::StdAction.openNew(self, SLOT("slotNew()"), actionCollection()) - @openAction = KDE::StdAction.open(self, SLOT("slotOpen()"), actionCollection()) - @saveAction = KDE::StdAction.save(self, SLOT("slotSave()"), actionCollection()) - @saveAsAction = KDE::StdAction.saveAs(self, SLOT("slotSaveAs()"), actionCollection()) - @printAction = KDE::StdAction.print(self, SLOT("slotPrint()"), actionCollection()) - @quitAction = KDE::StdAction.quit(self, SLOT("slotQuit()"), actionCollection()) + @newAction = KDE::StdAction.openNew(self, TQ_SLOT("slotNew()"), actionCollection()) + @openAction = KDE::StdAction.open(self, TQ_SLOT("slotOpen()"), actionCollection()) + @saveAction = KDE::StdAction.save(self, TQ_SLOT("slotSave()"), actionCollection()) + @saveAsAction = KDE::StdAction.saveAs(self, TQ_SLOT("slotSaveAs()"), actionCollection()) + @printAction = KDE::StdAction.print(self, TQ_SLOT("slotPrint()"), actionCollection()) + @quitAction = KDE::StdAction.quit(self, TQ_SLOT("slotQuit()"), actionCollection()) # "Edit" menu items - @undoAction = KDE::StdAction.undo(self, SLOT("slotUndo()"), actionCollection()) - @redoAction = KDE::StdAction.redo(self, SLOT("slotRedo()"), actionCollection()) - @cutAction = KDE::StdAction.cut(self, SLOT("slotCut()"), actionCollection()) - @copyAction = KDE::StdAction.copy(self, SLOT("slotCopy()"), actionCollection()) - @pasteAction = KDE::StdAction.paste(self, SLOT("slotPaste()"), actionCollection()) - @findAction = KDE::StdAction.find(self, SLOT("slotFind()"), actionCollection()) - @findNextAction = KDE::StdAction.findNext(self, SLOT("slotFindNext()"), actionCollection()) - @replaceAction = KDE::StdAction.replace(self, SLOT("slotReplace()"), actionCollection()) - @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, SLOT('slotSpecial()'), actionCollection(), "specialActionName") + @undoAction = KDE::StdAction.undo(self, TQ_SLOT("slotUndo()"), actionCollection()) + @redoAction = KDE::StdAction.redo(self, TQ_SLOT("slotRedo()"), actionCollection()) + @cutAction = KDE::StdAction.cut(self, TQ_SLOT("slotCut()"), actionCollection()) + @copyAction = KDE::StdAction.copy(self, TQ_SLOT("slotCopy()"), actionCollection()) + @pasteAction = KDE::StdAction.paste(self, TQ_SLOT("slotPaste()"), actionCollection()) + @findAction = KDE::StdAction.find(self, TQ_SLOT("slotFind()"), actionCollection()) + @findNextAction = KDE::StdAction.findNext(self, TQ_SLOT("slotFindNext()"), actionCollection()) + @replaceAction = KDE::StdAction.replace(self, TQ_SLOT("slotReplace()"), actionCollection()) + @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, TQ_SLOT('slotSpecial()'), actionCollection(), "specialActionName") end def initStatusBar() diff --git a/korundum/rubylib/templates/basic/systray1.rb b/korundum/rubylib/templates/basic/systray1.rb index b3a91155..e760caa4 100644 --- a/korundum/rubylib/templates/basic/systray1.rb +++ b/korundum/rubylib/templates/basic/systray1.rb @@ -45,7 +45,7 @@ class MainWin < KDE::MainWindow systray = KDE::SystemTray.new(self) systray.setPixmap(icons.loadIcon("process-stop", 0)) - connect(systray, SIGNAL("quitSelected()"), self, SLOT('slotQuitSelected()')) + connect(systray, TQ_SIGNAL("quitSelected()"), self, TQ_SLOT('slotQuitSelected()')) systray.show() end diff --git a/korundum/rubylib/tutorials/p1/p1.rb b/korundum/rubylib/tutorials/p1/p1.rb index f06c6b3e..a32edb7a 100644 --- a/korundum/rubylib/tutorials/p1/p1.rb +++ b/korundum/rubylib/tutorials/p1/p1.rb @@ -5,7 +5,7 @@ require 'Qt' hello = TQt::PushButton.new( "Hello world!", nil )
hello.resize( 100, 30 )
- TQt::Object::connect( hello, SIGNAL('clicked()'), a, SLOT('quit()') )
+ TQt::Object::connect( hello, TQ_SIGNAL('clicked()'), a, TQ_SLOT('quit()') )
a.setMainWidget( hello )
hello.show()
diff --git a/korundum/rubylib/tutorials/p2/p2.rb b/korundum/rubylib/tutorials/p2/p2.rb index a9647fef..50dce77f 100644 --- a/korundum/rubylib/tutorials/p2/p2.rb +++ b/korundum/rubylib/tutorials/p2/p2.rb @@ -1,12 +1,11 @@ -require 'Korundum'
-
- about = KDE::AboutData.new("p2", "Hello World", "0.1")
- KDE::CmdLineArgs.init(ARGV, about)
- a = KDE::Application.new()
- hello = TQt::PushButton.new( a.i18n("Hello World !"), nil )
- hello.autoResize = true
-
- a.mainWidget = hello
- hello.show
-
- a.exec
\ No newline at end of file +require 'Korundum' + + about = KDE::AboutData.new("p2", "Hello World", "0.1") + KDE::CmdLineArgs.init(ARGV, about) + a = KDE::Application.new() + hello = TQt::PushButton.new( a.i18n("Hello World !"), nil ) + + a.mainWidget = hello + hello.show + + a.exec diff --git a/korundum/rubylib/tutorials/p3/p3.rb b/korundum/rubylib/tutorials/p3/p3.rb index 67360399..94940d59 100644 --- a/korundum/rubylib/tutorials/p3/p3.rb +++ b/korundum/rubylib/tutorials/p3/p3.rb @@ -8,9 +8,9 @@ class MainWindow < KDE::MainWindow setCaption("KDE Tutorial - p3")
filemenu = TQt::PopupMenu.new
- filemenu.insertItem( i18n( "&Open" ), self, SLOT('fileOpen()') )
- filemenu.insertItem( i18n( "&Save" ), self, SLOT('fileSave()') )
- filemenu.insertItem( i18n( "&Quit" ), $kapp, SLOT('quit()') )
+ filemenu.insertItem( i18n( "&Open" ), self, TQ_SLOT('fileOpen()') )
+ filemenu.insertItem( i18n( "&Save" ), self, TQ_SLOT('fileSave()') )
+ filemenu.insertItem( i18n( "&Quit" ), $kapp, TQ_SLOT('quit()') )
about =
i18n("p3 1.0\n\n" +
diff --git a/korundum/rubylib/tutorials/p4/p4.rb b/korundum/rubylib/tutorials/p4/p4.rb index 93306c86..8025a585 100644 --- a/korundum/rubylib/tutorials/p4/p4.rb +++ b/korundum/rubylib/tutorials/p4/p4.rb @@ -9,7 +9,7 @@ class MainWindow < KDE::MainWindow setCaption("KDE Tutorial - p4")
filemenu = TQt::PopupMenu.new
- filemenu.insertItem( i18n( "&Quit" ), $kapp, SLOT( 'quit()' ) )
+ filemenu.insertItem( i18n( "&Quit" ), $kapp, TQ_SLOT( 'quit()' ) )
about =
i18n("p4 1.0\n\n" +
"(C) 1999-2002 Antonio Larrosa Jimenez\n" +
@@ -34,12 +34,12 @@ class MainWindow < KDE::MainWindow @browser = KDE::HTMLPart.new( vbox )
@browser.openURL( KDE::URL.new(@location.text()) )
- connect( @location , SIGNAL( 'returnPressed()' ),
- self, SLOT( 'changeLocation()' ) )
+ connect( @location , TQ_SIGNAL( 'returnPressed()' ),
+ self, TQ_SLOT( 'changeLocation()' ) )
connect( @browser.browserExtension(),
- SIGNAL( 'openURLRequest( const KURL &, const KParts::URLArgs & )' ),
- self, SLOT( 'openURLRequest(const KURL &, const KParts::URLArgs & )' ) )
+ TQ_SIGNAL( 'openURLRequest( const KURL &, const KParts::URLArgs & )' ),
+ self, TQ_SLOT( 'openURLRequest(const KURL &, const KParts::URLArgs & )' ) )
setCentralWidget(vbox)
end
diff --git a/korundum/rubylib/tutorials/p5/p5.rb b/korundum/rubylib/tutorials/p5/p5.rb index 40fb91a5..0325aa37 100644 --- a/korundum/rubylib/tutorials/p5/p5.rb +++ b/korundum/rubylib/tutorials/p5/p5.rb @@ -10,7 +10,7 @@ class MainWindow < KDE::MainWindow setCaption("KDE Tutorial - p5")
filemenu = TQt::PopupMenu.new
- filemenu.insertItem( i18n( "&Quit" ), $kapp, SLOT( 'quit()' ) )
+ filemenu.insertItem( i18n( "&Quit" ), $kapp, TQ_SLOT( 'quit()' ) )
about =
i18n("p5 1.0\n\n" +
"(C) 1999-2002 Antonio Larrosa Jimenez\n" +
@@ -32,22 +32,22 @@ class MainWindow < KDE::MainWindow @location = TQt::LineEdit.new( vbox )
@location.setText( "http://localhost" )
- connect( @location , SIGNAL( 'returnPressed()' ),
- self, SLOT( 'changeLocation()' ) )
+ connect( @location , TQ_SIGNAL( 'returnPressed()' ),
+ self, TQ_SLOT( 'changeLocation()' ) )
split = TQt::Splitter.new( vbox )
split.setOpaqueResize()
bookmark = TQt::PushButton.new( i18n("Add to Bookmarks"), split );
- connect( bookmark, SIGNAL( 'clicked()' ), self, SLOT( 'bookLocation()' ) )
+ connect( bookmark, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'bookLocation()' ) )
@browser = KDE::HTMLPart.new( split )
@browser.openURL( KDE::URL.new(@location.text()) )
connect( @browser.browserExtension(),
- SIGNAL( 'openURLRequest( const KURL &, const KParts::URLArgs & )' ),
- self, SLOT( 'openURLRequest(const KURL &, const KParts::URLArgs & )' ) )
+ TQ_SIGNAL( 'openURLRequest( const KURL &, const KParts::URLArgs & )' ),
+ self, TQ_SLOT( 'openURLRequest(const KURL &, const KParts::URLArgs & )' ) )
setCentralWidget(vbox)
end
diff --git a/korundum/rubylib/tutorials/p7/p7.rb b/korundum/rubylib/tutorials/p7/p7.rb index d567c22a..df657186 100644 --- a/korundum/rubylib/tutorials/p7/p7.rb +++ b/korundum/rubylib/tutorials/p7/p7.rb @@ -20,8 +20,8 @@ class Browser < KDE::MainWindow filemenu = TQt::PopupMenu.new
filemenu.insertItem( i18n( "&Set default page" ),
- self, SLOT( 'fileSetDefaultPage()' ) )
- filemenu.insertItem(i18n( "&Quit" ), $kapp, SLOT( 'quit()' ))
+ self, TQ_SLOT( 'fileSetDefaultPage()' ) )
+ filemenu.insertItem(i18n( "&Quit" ), $kapp, TQ_SLOT( 'quit()' ))
about =
i18n("p7 1.0\n\n" +
"(C) 1999-2002 Antonio Larrosa Jimenez\n" +
@@ -42,13 +42,13 @@ class Browser < KDE::MainWindow icons = KDE::IconLoader.new()
toolbar.insertButton(icons.loadIcon("reload", KDE::Icon::Toolbar), TOOLBAR_ID_ADDBOOKMARK,
- SIGNAL('clicked(int)'),self,SLOT('bookLocation()'),true,
+ TQ_SIGNAL('clicked(int)'),self,TQ_SLOT('bookLocation()'),true,
i18n("Add to Bookmarks"))
toolbar.insertButton(icons.loadIcon("back", KDE::Icon::Toolbar), TOOLBAR_ID_BACK,
- SIGNAL('clicked(int)'),self,SLOT('gotoPreviousPage()'),
+ TQ_SIGNAL('clicked(int)'),self,TQ_SLOT('gotoPreviousPage()'),
false, i18n("Back to previous page"))
toolbar.insertButton(icons.loadIcon("system-log-out", KDE::Icon::Toolbar), TOOLBAR_ID_QUIT,
- SIGNAL('clicked(int)'),$kapp,SLOT('quit()'),true,
+ TQ_SIGNAL('clicked(int)'),$kapp,TQ_SLOT('quit()'),true,
i18n("Quit the application"))
addToolBar(toolbar)
@@ -60,8 +60,8 @@ class Browser < KDE::MainWindow config.setGroup("Settings")
@location.text = config.readEntry( "defaultPage", "http://localhost")
- connect( @location , SIGNAL( 'returnPressed()' ),
- self, SLOT( 'changeLocation()' ) )
+ connect( @location , TQ_SIGNAL( 'returnPressed()' ),
+ self, TQ_SLOT( 'changeLocation()' ) )
split = TQt::Splitter.new( vbox )
split.setOpaqueResize()
@@ -70,8 +70,8 @@ class Browser < KDE::MainWindow @browser.openURL( KDE::URL.new(@location.text()) )
connect( @browser.browserExtension(),
- SIGNAL( 'openURLRequest( const KURL&, const KParts::URLArgs& )' ),
- self, SLOT( 'openURLRequest(const KURL&, const KParts::URLArgs& )' ) )
+ TQ_SIGNAL( 'openURLRequest( const KURL&, const KParts::URLArgs& )' ),
+ self, TQ_SLOT( 'openURLRequest(const KURL&, const KParts::URLArgs& )' ) )
setCentralWidget(vbox)
end
diff --git a/korundum/rubylib/tutorials/p8/p8.rb b/korundum/rubylib/tutorials/p8/p8.rb index 1839e697..1f39f0e0 100644 --- a/korundum/rubylib/tutorials/p8/p8.rb +++ b/korundum/rubylib/tutorials/p8/p8.rb @@ -8,8 +8,8 @@ class BookMarkList < KDE::ListView def initialize()
super(nil, "Bookmarks")
addColumn( i18n("My Bookmarks") );
- connect( self, SIGNAL('clicked(TQListViewItem *)'),
- self, SLOT('setURLInBrowser(TQListViewItem *)'))
+ connect( self, TQ_SIGNAL('clicked(TQListViewItem *)'),
+ self, TQ_SLOT('setURLInBrowser(TQListViewItem *)'))
end
def add( s )
diff --git a/korundum/rubylib/tutorials/p9/p9.rb b/korundum/rubylib/tutorials/p9/p9.rb index e395e19c..0f54394c 100644 --- a/korundum/rubylib/tutorials/p9/p9.rb +++ b/korundum/rubylib/tutorials/p9/p9.rb @@ -13,16 +13,16 @@ class Browser < KDE::MainWindow super(nil, name)
@history = []
- KDE::StdAction.quit(self, SLOT('close()'), actionCollection())
+ KDE::StdAction.quit(self, TQ_SLOT('close()'), actionCollection())
KDE::Action.new(i18n("&Set default page"), "gohome", KDE::Shortcut.new(0), self,
- SLOT('fileSetDefaultPage()'), actionCollection(), "set_default_page")
+ TQ_SLOT('fileSetDefaultPage()'), actionCollection(), "set_default_page")
KDE::Action.new(i18n("Add to Bookmarks"), "reload", KDE::Shortcut.new(0), self,
- SLOT('bookLocation()'), actionCollection(), "add_to_bookmarks")
+ TQ_SLOT('bookLocation()'), actionCollection(), "add_to_bookmarks")
KDE::Action.new(i18n("Back to previous page"), "back", KDE::Shortcut.new(0), self,
- SLOT('gotoPreviousPage()'), actionCollection(), "back")
+ TQ_SLOT('gotoPreviousPage()'), actionCollection(), "back")
actionCollection().action("back").setEnabled(false)
@@ -36,15 +36,15 @@ class Browser < KDE::MainWindow config.setGroup("Settings")
@location.text = config.readEntry( "defaultPage", "http://localhost")
- connect( @location , SIGNAL( 'returnPressed()' ),
- self, SLOT( 'changeLocation()' ) )
+ connect( @location , TQ_SIGNAL( 'returnPressed()' ),
+ self, TQ_SLOT( 'changeLocation()' ) )
@browser = KDE::HTMLPart.new( vbox )
@browser.openURL( KDE::URL.new(@location.text()) )
connect( @browser.browserExtension(),
- SIGNAL( 'openURLRequest( const KURL&, const KParts::URLArgs& )' ),
- self, SLOT( 'openURLRequest(const KURL&, const KParts::URLArgs& )' ) )
+ TQ_SIGNAL( 'openURLRequest( const KURL&, const KParts::URLArgs& )' ),
+ self, TQ_SLOT( 'openURLRequest(const KURL&, const KParts::URLArgs& )' ) )
setCentralWidget(vbox)
end
diff --git a/qtjava/designer/juic/common/QtClasses.xml b/qtjava/designer/juic/common/QtClasses.xml index 1c02fd7c..d6e7640f 100644 --- a/qtjava/designer/juic/common/QtClasses.xml +++ b/qtjava/designer/juic/common/QtClasses.xml @@ -1119,15 +1119,6 @@ <name>TQScrollViewSignals</name> </class> <class> - <name>TQSemiModalEventHandling</name> - </class> - <class> - <name>TQSemiModal</name> - </class> - <class> - <name>TQSemiModalSignals</name> - </class> - <class> <name>TQServerSocket</name> </class> <class> diff --git a/qtjava/designer/juic/java/JavaClasses.xml b/qtjava/designer/juic/java/JavaClasses.xml index 5400f445..8a2c3c6e 100644 --- a/qtjava/designer/juic/java/JavaClasses.xml +++ b/qtjava/designer/juic/java/JavaClasses.xml @@ -1493,18 +1493,6 @@ </class> <class> <package>org.trinitydesktop.qt</package> - <name>TQSemiModalEventHandling</name> - </class> - <class> - <package>org.trinitydesktop.qt</package> - <name>TQSemiModal</name> - </class> - <class> - <package>org.trinitydesktop.qt</package> - <name>TQSemiModalSignals</name> - </class> - <class> - <package>org.trinitydesktop.qt</package> <name>TQServerSocket</name> </class> <class> diff --git a/qtjava/designer/juic/java/definitions.xsl b/qtjava/designer/juic/java/definitions.xsl index f04fbd62..94653074 100644 --- a/qtjava/designer/juic/java/definitions.xsl +++ b/qtjava/designer/juic/java/definitions.xsl @@ -631,9 +631,9 @@ </xsl:variable> <xsl:value-of select="$nlIndent8"/> <xsl:value-of select="concat('connect( ', $sender, - ', SIGNAL( "', $signal, '" ), ', + ', TQ_SIGNAL( "', $signal, '" ), ', $receiver, - ', SLOT( "', $slot, '" ));')"/> + ', TQ_SLOT( "', $slot, '" ));')"/> </xsl:template> </xsl:stylesheet> diff --git a/qtjava/designer/juic/java/methods.xsl b/qtjava/designer/juic/java/methods.xsl index b9e27e52..c8573a5e 100644 --- a/qtjava/designer/juic/java/methods.xsl +++ b/qtjava/designer/juic/java/methods.xsl @@ -156,7 +156,7 @@ <xsl:template name="putLanguageChangeSlot"> /** - * SLOT + * TQ_SLOT * languageChange sets the strings according to current language */ protected void languageChange() { diff --git a/qtjava/designer/juic/java/put.xsl b/qtjava/designer/juic/java/put.xsl index 884321dc..1bb36ddb 100644 --- a/qtjava/designer/juic/java/put.xsl +++ b/qtjava/designer/juic/java/put.xsl @@ -411,7 +411,7 @@ </xsl:if> <xsl:message>Generating slot "<xsl:value-of select="$method"/></xsl:message> /** - * SLOT <xsl:value-of select="$method"/> + * TQ_SLOT <xsl:value-of select="$method"/> */ <xsl:choose> <xsl:when test="$abstract"> @@ -419,7 +419,7 @@ </xsl:when> <xsl:otherwise> <xsl:value-of select="$method"/> { - tqWarning("Warning: SLOT \"<xsl:value-of select="$method"/>\" must be overridden"); + tqWarning("Warning: TQ_SLOT \"<xsl:value-of select="$method"/>\" must be overridden"); <xsl:if test="not($return = 'void')"> <xsl:choose> <xsl:when test="$return = 'byte' or $return = 'short' or $return = 'int' or $return = 'long'"> @@ -447,7 +447,7 @@ <xsl:template name="putSignal"> <xsl:param name="data"/> <xsl:variable name="sig" select="java:cpp-to-java-signature(.)"/> - /** SIGNAL <xsl:value-of select="."/> */ + /** TQ_SIGNAL <xsl:value-of select="."/> */ </xsl:template> <!-- diff --git a/qtjava/javalib.kdevprj b/qtjava/javalib.kdevprj index 7235b51e..a0ace93c 100644 --- a/qtjava/javalib.kdevprj +++ b/qtjava/javalib.kdevprj @@ -170,7 +170,7 @@ install_location= type=DATA [javalib/org/trinitydesktop/qt/Makefile.am] -files=javalib/org/trinitydesktop/qt/TQAccel.java,javalib/org/trinitydesktop/qt/TQAction.java,javalib/org/trinitydesktop/qt/TQActionGroup.java,javalib/org/trinitydesktop/qt/TQApplication.java,javalib/org/trinitydesktop/qt/TQAsyncIO.java,javalib/org/trinitydesktop/qt/TQAuServer.java,javalib/org/trinitydesktop/qt/TQBig5Codec.java,javalib/org/trinitydesktop/qt/TQBitmap.java,javalib/org/trinitydesktop/qt/TQBoxLayout.java,javalib/org/trinitydesktop/qt/TQBrush.java,javalib/org/trinitydesktop/qt/TQBuffer.java,javalib/org/trinitydesktop/qt/TQButton.java,javalib/org/trinitydesktop/qt/TQButtonGroup.java,javalib/org/trinitydesktop/qt/TQCanvas.java,javalib/org/trinitydesktop/qt/TQCanvasEllipse.java,javalib/org/trinitydesktop/qt/TQCanvasItem.java,javalib/org/trinitydesktop/qt/TQCanvasLine.java,javalib/org/trinitydesktop/qt/TQCanvasPixmap.java,javalib/org/trinitydesktop/qt/TQCanvasPixmapArray.java,javalib/org/trinitydesktop/qt/TQCanvasPolygon.java,javalib/org/trinitydesktop/qt/TQCanvasPolygonalItem.java,javalib/org/trinitydesktop/qt/TQCanvasRectangle.java,javalib/org/trinitydesktop/qt/TQCanvasSprite.java,javalib/org/trinitydesktop/qt/TQCanvasText.java,javalib/org/trinitydesktop/qt/TQCanvasView.java,javalib/org/trinitydesktop/qt/TQCheckListItem.java,javalib/org/trinitydesktop/qt/TQChildEvent.java,javalib/org/trinitydesktop/qt/TQClassInfo.java,javalib/org/trinitydesktop/qt/TQClipboard.java,javalib/org/trinitydesktop/qt/TQCloseEvent.java,javalib/org/trinitydesktop/qt/TQColor.java,javalib/org/trinitydesktop/qt/TQColorDialog.java,javalib/org/trinitydesktop/qt/TQColorDrag.java,javalib/org/trinitydesktop/qt/TQColorGroup.java,javalib/org/trinitydesktop/qt/TQComboBox.java,javalib/org/trinitydesktop/qt/TQCursor.java,javalib/org/trinitydesktop/qt/TQCustomEvent.java,javalib/org/trinitydesktop/qt/TQCustomMenuItem.java,javalib/org/trinitydesktop/qt/TQDataPump.java,javalib/org/trinitydesktop/qt/TQDataSink.java,javalib/org/trinitydesktop/qt/TQDataSource.java,javalib/org/trinitydesktop/qt/TQDataStream.java,javalib/org/trinitydesktop/qt/TQDial.java,javalib/org/trinitydesktop/qt/TQDialog.java,javalib/org/trinitydesktop/qt/TQDir.java,javalib/org/trinitydesktop/qt/TQDomAttr.java,javalib/org/trinitydesktop/qt/TQDomCDATASection.java,javalib/org/trinitydesktop/qt/TQDomCharacterData.java,javalib/org/trinitydesktop/qt/TQDomComment.java,javalib/org/trinitydesktop/qt/TQDomDocument.java,javalib/org/trinitydesktop/qt/TQDomDocumentFragment.java,javalib/org/trinitydesktop/qt/TQDomDocumentType.java,javalib/org/trinitydesktop/qt/TQDomElement.java,javalib/org/trinitydesktop/qt/TQDomEntity.java,javalib/org/trinitydesktop/qt/TQDomEntityReference.java,javalib/org/trinitydesktop/qt/TQDomImplementation.java,javalib/org/trinitydesktop/qt/TQDomNamedNodeMap.java,javalib/org/trinitydesktop/qt/TQDomNode.java,javalib/org/trinitydesktop/qt/TQDomNotation.java,javalib/org/trinitydesktop/qt/TQDomProcessingInstruction.java,javalib/org/trinitydesktop/qt/TQDomText.java,javalib/org/trinitydesktop/qt/TQDoubleValidator.java,javalib/org/trinitydesktop/qt/TQDragEnterEvent.java,javalib/org/trinitydesktop/qt/TQDragLeaveEvent.java,javalib/org/trinitydesktop/qt/TQDragManager.java,javalib/org/trinitydesktop/qt/TQDragMoveEvent.java,javalib/org/trinitydesktop/qt/TQDragObject.java,javalib/org/trinitydesktop/qt/TQDragResponseEvent.java,javalib/org/trinitydesktop/qt/TQDropEvent.java,javalib/org/trinitydesktop/qt/TQDropSite.java,javalib/org/trinitydesktop/qt/TQEucJpCodec.java,javalib/org/trinitydesktop/qt/TQEucKrCodec.java,javalib/org/trinitydesktop/qt/TQEvent.java,javalib/org/trinitydesktop/qt/TQFile.java,javalib/org/trinitydesktop/qt/TQFileDialog.java,javalib/org/trinitydesktop/qt/TQFileIconProvider.java,javalib/org/trinitydesktop/qt/TQFileInfo.java,javalib/org/trinitydesktop/qt/TQFilePreview.java,javalib/org/trinitydesktop/qt/TQFocusData.java,javalib/org/trinitydesktop/qt/TQFocusEvent.java,javalib/org/trinitydesktop/qt/TQFont.java,javalib/org/trinitydesktop/qt/TQFontDatabase.java,javalib/org/trinitydesktop/qt/TQFontDialog.java,javalib/org/trinitydesktop/qt/TQFontInfo.java,javalib/org/trinitydesktop/qt/TQFontMetrics.java,javalib/org/trinitydesktop/qt/TQFrame.java,javalib/org/trinitydesktop/qt/TQGL.java,javalib/org/trinitydesktop/qt/TQGLContext.java,javalib/org/trinitydesktop/qt/TQGLFormat.java,javalib/org/trinitydesktop/qt/TQGLWidget.java,javalib/org/trinitydesktop/qt/TQGbkCodec.java,javalib/org/trinitydesktop/qt/TQGrid.java,javalib/org/trinitydesktop/qt/TQGridLayout.java,javalib/org/trinitydesktop/qt/TQGroupBox.java,javalib/org/trinitydesktop/qt/TQHBox.java,javalib/org/trinitydesktop/qt/TQHBoxLayout.java,javalib/org/trinitydesktop/qt/TQHButtonGroup.java,javalib/org/trinitydesktop/qt/TQHGroupBox.java,javalib/org/trinitydesktop/qt/TQHeader.java,javalib/org/trinitydesktop/qt/TQHebrewCodec.java,javalib/org/trinitydesktop/qt/TQHideEvent.java,javalib/org/trinitydesktop/qt/TQIODevice.java,javalib/org/trinitydesktop/qt/TQIODeviceInterface.java,javalib/org/trinitydesktop/qt/TQIODeviceSource.java,javalib/org/trinitydesktop/qt/TQIconDrag.java,javalib/org/trinitydesktop/qt/TQIconDragItem.java,javalib/org/trinitydesktop/qt/TQIconSet.java,javalib/org/trinitydesktop/qt/TQIconView.java,javalib/org/trinitydesktop/qt/TQIconViewItem.java,javalib/org/trinitydesktop/qt/TQImage.java,javalib/org/trinitydesktop/qt/TQImageConsumer.java,javalib/org/trinitydesktop/qt/TQImageDecoder.java,javalib/org/trinitydesktop/qt/TQImageDrag.java,javalib/org/trinitydesktop/qt/TQImageFormat.java,javalib/org/trinitydesktop/qt/TQImageFormatType.java,javalib/org/trinitydesktop/qt/TQImageIO.java,javalib/org/trinitydesktop/qt/TQImageTextKeyLang.java,javalib/org/trinitydesktop/qt/TQInputDialog.java,javalib/org/trinitydesktop/qt/TQIntValidator.java,javalib/org/trinitydesktop/qt/TQJisCodec.java,javalib/org/trinitydesktop/qt/TQJpUnicodeConv.java,javalib/org/trinitydesktop/qt/TQKeyEvent.java,javalib/org/trinitydesktop/qt/TQLCDNumber.java,javalib/org/trinitydesktop/qt/TQLabel.java,javalib/org/trinitydesktop/qt/TQLayout.java,javalib/org/trinitydesktop/qt/TQLayoutItem.java,javalib/org/trinitydesktop/qt/TQLayoutItemInterface.java,javalib/org/trinitydesktop/qt/TQLineEdit.java,javalib/org/trinitydesktop/qt/TQListBox.java,javalib/org/trinitydesktop/qt/TQListBoxItem.java,javalib/org/trinitydesktop/qt/TQListBoxPixmap.java,javalib/org/trinitydesktop/qt/TQListBoxText.java,javalib/org/trinitydesktop/qt/TQListView.java,javalib/org/trinitydesktop/qt/TQListViewItem.java,javalib/org/trinitydesktop/qt/TQMainWindow.java,javalib/org/trinitydesktop/qt/TQMenuBar.java,javalib/org/trinitydesktop/qt/TQMenuData.java,javalib/org/trinitydesktop/qt/TQMenuDataInterface.java,javalib/org/trinitydesktop/qt/TQMessageBox.java,javalib/org/trinitydesktop/qt/TQMetaData.java,javalib/org/trinitydesktop/qt/TQMetaEnum.java,javalib/org/trinitydesktop/qt/TQMetaObject.java,javalib/org/trinitydesktop/qt/TQMetaProperty.java,javalib/org/trinitydesktop/qt/TQMimeSource.java,javalib/org/trinitydesktop/qt/TQMimeSourceFactory.java,javalib/org/trinitydesktop/qt/TQMimeSourceInterface.java,javalib/org/trinitydesktop/qt/TQMouseEvent.java,javalib/org/trinitydesktop/qt/TQMoveEvent.java,javalib/org/trinitydesktop/qt/TQMovie.java,javalib/org/trinitydesktop/qt/TQMultiLineEdit.java,javalib/org/trinitydesktop/qt/TQNetworkOperation.java,javalib/org/trinitydesktop/qt/TQObject.java,javalib/org/trinitydesktop/qt/TQPaintDevice.java,javalib/org/trinitydesktop/qt/TQPaintDeviceInterface.java,javalib/org/trinitydesktop/qt/TQPaintEvent.java,javalib/org/trinitydesktop/qt/TQPainter.java,javalib/org/trinitydesktop/qt/TQPalette.java,javalib/org/trinitydesktop/qt/TQPen.java,javalib/org/trinitydesktop/qt/TQPicture.java,javalib/org/trinitydesktop/qt/TQPixmap.java,javalib/org/trinitydesktop/qt/TQPoint.java,javalib/org/trinitydesktop/qt/TQPointArray.java,javalib/org/trinitydesktop/qt/TQPolygonScanner.java,javalib/org/trinitydesktop/qt/TQPopupMenu.java,javalib/org/trinitydesktop/qt/TQPrintDialog.java,javalib/org/trinitydesktop/qt/TQPrinter.java,javalib/org/trinitydesktop/qt/TQProgressBar.java,javalib/org/trinitydesktop/qt/TQProgressDialog.java,javalib/org/trinitydesktop/qt/TQPushButton.java,javalib/org/trinitydesktop/qt/TQRadioButton.java,javalib/org/trinitydesktop/qt/TQRangeControl.java,javalib/org/trinitydesktop/qt/TQRangeControlInterface.java,javalib/org/trinitydesktop/qt/TQRect.java,javalib/org/trinitydesktop/qt/TQRegion.java,javalib/org/trinitydesktop/qt/TQResizeEvent.java,javalib/org/trinitydesktop/qt/TQScrollBar.java,javalib/org/trinitydesktop/qt/TQScrollView.java,javalib/org/trinitydesktop/qt/TQSemiModal.java,javalib/org/trinitydesktop/qt/TQSessionManager.java,javalib/org/trinitydesktop/qt/TQShowEvent.java,javalib/org/trinitydesktop/qt/TQSignal.java,javalib/org/trinitydesktop/qt/TQSignalMapper.java,javalib/org/trinitydesktop/qt/TQSimpleRichText.java,javalib/org/trinitydesktop/qt/TQSize.java,javalib/org/trinitydesktop/qt/TQSizeGrip.java,javalib/org/trinitydesktop/qt/TQSizePolicy.java,javalib/org/trinitydesktop/qt/TQSjisCodec.java,javalib/org/trinitydesktop/qt/TQSlider.java,javalib/org/trinitydesktop/qt/TQSound.java,javalib/org/trinitydesktop/qt/TQSpacerItem.java,javalib/org/trinitydesktop/qt/TQSpinBox.java,javalib/org/trinitydesktop/qt/TQSplitter.java,javalib/org/trinitydesktop/qt/TQStatusBar.java,javalib/org/trinitydesktop/qt/TQStoredDrag.java,javalib/org/trinitydesktop/qt/TQStyle.java,javalib/org/trinitydesktop/qt/TQStyleSheet.java,javalib/org/trinitydesktop/qt/TQStyleSheetItem.java,javalib/org/trinitydesktop/qt/TQTab.java,javalib/org/trinitydesktop/qt/TQTabBar.java,javalib/org/trinitydesktop/qt/TQTabDialog.java,javalib/org/trinitydesktop/qt/TQTabWidget.java,javalib/org/trinitydesktop/qt/TQTable.java,javalib/org/trinitydesktop/qt/TQTableItem.java,javalib/org/trinitydesktop/qt/TQTableSelection.java,javalib/org/trinitydesktop/qt/TQTextBrowser.java,javalib/org/trinitydesktop/qt/TQTextCodec.java,javalib/org/trinitydesktop/qt/TQTextDecoder.java,javalib/org/trinitydesktop/qt/TQTextDrag.java,javalib/org/trinitydesktop/qt/TQTextEncoder.java,javalib/org/trinitydesktop/qt/TQTextIStream.java,javalib/org/trinitydesktop/qt/TQTextOStream.java,javalib/org/trinitydesktop/qt/TQTextStream.java,javalib/org/trinitydesktop/qt/TQTextView.java,javalib/org/trinitydesktop/qt/TQTimer.java,javalib/org/trinitydesktop/qt/TQTimerEvent.java,javalib/org/trinitydesktop/qt/TQToolBar.java,javalib/org/trinitydesktop/qt/TQToolButton.java,javalib/org/trinitydesktop/qt/TQToolTip.java,javalib/org/trinitydesktop/qt/TQToolTipGroup.java,javalib/org/trinitydesktop/qt/TQTranslator.java,javalib/org/trinitydesktop/qt/TQTranslatorMessage.java,javalib/org/trinitydesktop/qt/TQTsciiCodec.java,javalib/org/trinitydesktop/qt/TQUriDrag.java,javalib/org/trinitydesktop/qt/TQUrl.java,javalib/org/trinitydesktop/qt/TQUrlInfo.java,javalib/org/trinitydesktop/qt/TQUrlInterface.java,javalib/org/trinitydesktop/qt/TQUrlOperator.java,javalib/org/trinitydesktop/qt/TQUtf16Codec.java,javalib/org/trinitydesktop/qt/TQUtf8Codec.java,javalib/org/trinitydesktop/qt/TQVBox.java,javalib/org/trinitydesktop/qt/TQVBoxLayout.java,javalib/org/trinitydesktop/qt/TQVButtonGroup.java,javalib/org/trinitydesktop/qt/TQVGroupBox.java,javalib/org/trinitydesktop/qt/TQValidator.java,javalib/org/trinitydesktop/qt/TQVariant.java,javalib/org/trinitydesktop/qt/TQWMatrix.java,javalib/org/trinitydesktop/qt/TQWhatsThis.java,javalib/org/trinitydesktop/qt/TQWheelEvent.java,javalib/org/trinitydesktop/qt/TQWidget.java,javalib/org/trinitydesktop/qt/TQWidgetItem.java,javalib/org/trinitydesktop/qt/TQWidgetStack.java,javalib/org/trinitydesktop/qt/TQMenuItem.java,javalib/org/trinitydesktop/qt/TQPaintDeviceMetrics.java,javalib/org/trinitydesktop/qt/TQRegExp.java,javalib/org/trinitydesktop/qt/TQCanvasSpline.java,javalib/org/trinitydesktop/qt/TQCheckTableItem.java,javalib/org/trinitydesktop/qt/TQComboTableItem.java,javalib/org/trinitydesktop/qt/TQContextMenuEvent.java,javalib/org/trinitydesktop/qt/TQDataBrowser.java,javalib/org/trinitydesktop/qt/TQDataTable.java,javalib/org/trinitydesktop/qt/TQDataView.java,javalib/org/trinitydesktop/qt/TQDateEdit.java,javalib/org/trinitydesktop/qt/TQDateTimeEdit.java,javalib/org/trinitydesktop/qt/TQDesktopWidget.java,javalib/org/trinitydesktop/qt/TQDockArea.java,javalib/org/trinitydesktop/qt/TQDockWindow.java,javalib/org/trinitydesktop/qt/TQEditorFactory.java,javalib/org/trinitydesktop/qt/TQErrorMessage.java,javalib/org/trinitydesktop/qt/TQGLColormap.java,javalib/org/trinitydesktop/qt/TQGridView.java,javalib/org/trinitydesktop/qt/TQIMEvent.java,javalib/org/trinitydesktop/qt/TQLibrary.java,javalib/org/trinitydesktop/qt/TQProcess.java,javalib/org/trinitydesktop/qt/TQRegExpValidator.java,javalib/org/trinitydesktop/qt/TQSettings.java,javalib/org/trinitydesktop/qt/TQSql.java,javalib/org/trinitydesktop/qt/TQSqlCursor.java,javalib/org/trinitydesktop/qt/TQSqlDatabase.java,javalib/org/trinitydesktop/qt/TQSqlDriver.java,javalib/org/trinitydesktop/qt/TQSqlEditorFactory.java,javalib/org/trinitydesktop/qt/TQSqlError.java,javalib/org/trinitydesktop/qt/TQSqlField.java,javalib/org/trinitydesktop/qt/TQSqlForm.java,javalib/org/trinitydesktop/qt/TQSqlIndex.java,javalib/org/trinitydesktop/qt/TQSqlPropertyMap.java,javalib/org/trinitydesktop/qt/TQSqlQuery.java,javalib/org/trinitydesktop/qt/TQSqlRecord.java,javalib/org/trinitydesktop/qt/TQSqlResult.java,javalib/org/trinitydesktop/qt/TQTabletEvent.java,javalib/org/trinitydesktop/qt/TQTextEdit.java,javalib/org/trinitydesktop/qt/TQTimeEdit.java,javalib/org/trinitydesktop/qt/TQUuid.java,javalib/org/trinitydesktop/qt/TQDateTimeEditBase.java,javalib/org/trinitydesktop/qt/TQSqlQueryInterface.java,javalib/org/trinitydesktop/qt/TQAccelSignals.java,javalib/org/trinitydesktop/qt/TQActionGroupSignals.java,javalib/org/trinitydesktop/qt/TQActionSignals.java,javalib/org/trinitydesktop/qt/TQApplicationSignals.java,javalib/org/trinitydesktop/qt/TQButtonGroupSignals.java,javalib/org/trinitydesktop/qt/TQButtonSignals.java,javalib/org/trinitydesktop/qt/TQCanvasSignals.java,javalib/org/trinitydesktop/qt/TQCheckBoxSignals.java,javalib/org/trinitydesktop/qt/TQColorDragSignals.java,javalib/org/trinitydesktop/qt/TQComboBoxSignals.java,javalib/org/trinitydesktop/qt/TQDataBrowserSignals.java,javalib/org/trinitydesktop/qt/TQDataPumpSignals.java,javalib/org/trinitydesktop/qt/TQDataTableSignals.java,javalib/org/trinitydesktop/qt/TQDataViewSignals.java,javalib/org/trinitydesktop/qt/TQDateEditSignals.java,javalib/org/trinitydesktop/qt/TQDateTimeEditSignals.java,javalib/org/trinitydesktop/qt/TQDesktopWidgetSignals.java,javalib/org/trinitydesktop/qt/TQDialSignals.java,javalib/org/trinitydesktop/qt/TQDialogSignals.java,javalib/org/trinitydesktop/qt/TQDockAreaSignals.java,javalib/org/trinitydesktop/qt/TQDockWindowSignals.java,javalib/org/trinitydesktop/qt/TQDoubleValidatorSignals.java,javalib/org/trinitydesktop/qt/TQDragObjectSignals.java,javalib/org/trinitydesktop/qt/TQEditorFactorySignals.java,javalib/org/trinitydesktop/qt/TQErrorMessageSignals.java,javalib/org/trinitydesktop/qt/TQFileDialogSignals.java,javalib/org/trinitydesktop/qt/TQFileIconProviderSignals.java,javalib/org/trinitydesktop/qt/TQFrameSignals.java,javalib/org/trinitydesktop/qt/TQGLWidgetSignals.java,javalib/org/trinitydesktop/qt/TQGridLayoutSignals.java,javalib/org/trinitydesktop/qt/TQGridSignals.java,javalib/org/trinitydesktop/qt/TQGroupBoxSignals.java,javalib/org/trinitydesktop/qt/TQHBoxLayoutSignals.java,javalib/org/trinitydesktop/qt/TQHBoxSignals.java,javalib/org/trinitydesktop/qt/TQHButtonGroupSignals.java,javalib/org/trinitydesktop/qt/TQHGroupBoxSignals.java,javalib/org/trinitydesktop/qt/TQHeaderSignals.java,javalib/org/trinitydesktop/qt/TQIconDragSignals.java,javalib/org/trinitydesktop/qt/TQIconViewSignals.java,javalib/org/trinitydesktop/qt/TQImageDragSignals.java,javalib/org/trinitydesktop/qt/TQIntValidatorSignals.java,javalib/org/trinitydesktop/qt/TQInterlaceStyleSignals.java,javalib/org/trinitydesktop/qt/TQLCDNumberSignals.java,javalib/org/trinitydesktop/qt/TQLabelSignals.java,javalib/org/trinitydesktop/qt/TQLineEditSignals.java,javalib/org/trinitydesktop/qt/TQListBoxSignals.java,javalib/org/trinitydesktop/qt/TQListViewSignals.java,javalib/org/trinitydesktop/qt/TQMainWindowSignals.java,javalib/org/trinitydesktop/qt/TQMenuBarSignals.java,javalib/org/trinitydesktop/qt/TQMessageBoxSignals.java,javalib/org/trinitydesktop/qt/TQMultiLineEditSignals.java,javalib/org/trinitydesktop/qt/TQNetworkOperationSignals.java,javalib/org/trinitydesktop/qt/TQObjectSignals.java,javalib/org/trinitydesktop/qt/TQPopupMenuSignals.java,javalib/org/trinitydesktop/qt/TQPrintDialogSignals.java,javalib/org/trinitydesktop/qt/TQProcessSignals.java,javalib/org/trinitydesktop/qt/TQProgressBarSignals.java,javalib/org/trinitydesktop/qt/TQProgressDialogSignals.java,javalib/org/trinitydesktop/qt/TQPushButtonSignals.java,javalib/org/trinitydesktop/qt/TQRadioButtonSignals.java,javalib/org/trinitydesktop/qt/TQRegExpValidatorSignals.java,javalib/org/trinitydesktop/qt/TQScrollBarSignals.java,javalib/org/trinitydesktop/qt/TQScrollViewSignals.java,javalib/org/trinitydesktop/qt/TQSemiModalSignals.java,javalib/org/trinitydesktop/qt/TQSignalMapperSignals.java,javalib/org/trinitydesktop/qt/TQSignalSignals.java,javalib/org/trinitydesktop/qt/TQSizeGripSignals.java,javalib/org/trinitydesktop/qt/TQSliderSignals.java,javalib/org/trinitydesktop/qt/TQSoundSignals.java,javalib/org/trinitydesktop/qt/TQSpinBoxSignals.java,javalib/org/trinitydesktop/qt/TQSplitterSignals.java,javalib/org/trinitydesktop/qt/TQSqlDatabaseSignals.java,javalib/org/trinitydesktop/qt/TQSqlEditorFactorySignals.java,javalib/org/trinitydesktop/qt/TQSqlFormSignals.java,javalib/org/trinitydesktop/qt/TQStatusBarSignals.java,javalib/org/trinitydesktop/qt/TQStoredDragSignals.java,javalib/org/trinitydesktop/qt/TQStyleSheetSignals.java,javalib/org/trinitydesktop/qt/TQTabBarSignals.java,javalib/org/trinitydesktop/qt/TQTabDialogSignals.java,javalib/org/trinitydesktop/qt/TQTabWidgetSignals.java,javalib/org/trinitydesktop/qt/TQTableSignals.java,javalib/org/trinitydesktop/qt/TQTextBrowserSignals.java,javalib/org/trinitydesktop/qt/TQTextDragSignals.java,javalib/org/trinitydesktop/qt/TQTextEditSignals.java,javalib/org/trinitydesktop/qt/TQTextViewSignals.java,javalib/org/trinitydesktop/qt/TQTimeEditSignals.java,javalib/org/trinitydesktop/qt/TQTimerSignals.java,javalib/org/trinitydesktop/qt/TQToolBarSignals.java,javalib/org/trinitydesktop/qt/TQToolButtonSignals.java,javalib/org/trinitydesktop/qt/TQToolTipGroupSignals.java,javalib/org/trinitydesktop/qt/TQTranslatorSignals.java,javalib/org/trinitydesktop/qt/TQUriDragSignals.java,javalib/org/trinitydesktop/qt/TQUrlOperatorSignals.java,javalib/org/trinitydesktop/qt/TQVBoxLayoutSignals.java,javalib/org/trinitydesktop/qt/TQVBoxSignals.java,javalib/org/trinitydesktop/qt/TQVButtonGroupSignals.java,javalib/org/trinitydesktop/qt/TQVGroupBoxSignals.java,javalib/org/trinitydesktop/qt/TQWidgetSignals.java,javalib/org/trinitydesktop/qt/TQWidgetStackSignals.java,javalib/org/trinitydesktop/qt/TQStyleOption.java,javalib/org/trinitydesktop/qt/TQKeySequence.java,javalib/org/trinitydesktop/qt/TQSqlFieldInfo.java,javalib/org/trinitydesktop/qt/TQSqlRecordInfo.java,javalib/org/trinitydesktop/qt/TQDns.java,javalib/org/trinitydesktop/qt/TQFtp.java,javalib/org/trinitydesktop/qt/TQHostAddress.java,javalib/org/trinitydesktop/qt/TQHttp.java,javalib/org/trinitydesktop/qt/TQLocalFs.java,javalib/org/trinitydesktop/qt/TQNetworkProtocol.java,javalib/org/trinitydesktop/qt/TQObjectCleanupHandler.java,javalib/org/trinitydesktop/qt/TQServerSocket.java,javalib/org/trinitydesktop/qt/TQSocket.java,javalib/org/trinitydesktop/qt/TQSocketDevice.java,javalib/org/trinitydesktop/qt/TQSocketNotifier.java,javalib/org/trinitydesktop/qt/TQDnsSignals.java,javalib/org/trinitydesktop/qt/TQFtpSignals.java,javalib/org/trinitydesktop/qt/TQHttpSignals.java,javalib/org/trinitydesktop/qt/TQLocalFsSignals.java,javalib/org/trinitydesktop/qt/TQNetworkProtocolSignals.java,javalib/org/trinitydesktop/qt/TQObjectCleanupHandlerSignals.java,javalib/org/trinitydesktop/qt/TQSocketSignals.java,javalib/org/trinitydesktop/qt/TQSocketNotifierSignals.java,javalib/org/trinitydesktop/qt/TQGb18030Codec.java,javalib/org/trinitydesktop/qt/TQSpinWidget.java,javalib/org/trinitydesktop/qt/TQSpinWidgetSignals.java,javalib/org/trinitydesktop/qt/TQSplashScreen.java,javalib/org/trinitydesktop/qt/TQSplashScreenSignals.java,javalib/org/trinitydesktop/qt/TQToolBox.java,javalib/org/trinitydesktop/qt/TQToolBoxSignals.java,javalib/org/trinitydesktop/qt/TQHttpHeader.java,javalib/org/trinitydesktop/qt/TQHttpRequestHeader.java,javalib/org/trinitydesktop/qt/TQEventLoop.java,javalib/org/trinitydesktop/qt/TQEventLoopSignals.java,javalib/org/trinitydesktop/qt/TQHttpResponseHeader.java,javalib/org/trinitydesktop/qt/TQStyleFactory.java,javalib/org/trinitydesktop/qt/TQCheckBox.java,javalib/org/trinitydesktop/qt/TQWorkspace.java,javalib/org/trinitydesktop/qt/TQWizard.java,javalib/org/trinitydesktop/qt/TQSyntaxHighlighter.java,javalib/org/trinitydesktop/qt/TQCommonStyle.java,javalib/org/trinitydesktop/qt/TQXmlContentHandler.java,javalib/org/trinitydesktop/qt/TQXmlDeclHandler.java,javalib/org/trinitydesktop/qt/TQXmlDTDHandler.java,javalib/org/trinitydesktop/qt/TQXmlEntityResolver.java,javalib/org/trinitydesktop/qt/TQXmlErrorHandler.java,javalib/org/trinitydesktop/qt/TQXmlLexicalHandler.java,javalib/org/trinitydesktop/qt/TQXmlNamespaceSupport.java,javalib/org/trinitydesktop/qt/TQXmlSimpleReader.java,javalib/org/trinitydesktop/qt/Invocation.java,javalib/org/trinitydesktop/qt/qtjava.java,javalib/org/trinitydesktop/qt/QtSupport.java,javalib/org/trinitydesktop/qt/TQXmlDefaultHandler.java,javalib/org/trinitydesktop/qt/WeakValueMap.java,javalib/org/trinitydesktop/qt/Qt.java,javalib/org/trinitydesktop/qt/TQWizardSignals.java,javalib/org/trinitydesktop/qt/TQWorkspaceSignals.java,javalib/org/trinitydesktop/qt/TQXmlAttributes.java,javalib/org/trinitydesktop/qt/TQXmlContentHandlerInterface.java,javalib/org/trinitydesktop/qt/TQXmlDTDHandlerInterface.java,javalib/org/trinitydesktop/qt/TQXmlEntityResolverInterface.java,javalib/org/trinitydesktop/qt/TQXmlErrorHandlerInterface.java,javalib/org/trinitydesktop/qt/TQXmlInputSource.java,javalib/org/trinitydesktop/qt/TQXmlLexicalHandlerInterface.java,javalib/org/trinitydesktop/qt/TQXmlLocator.java,javalib/org/trinitydesktop/qt/TQXmlParseException.java,javalib/org/trinitydesktop/qt/TQXmlReader.java,javalib/org/trinitydesktop/qt/TQXmlDeclHandlerInterface.java +files=javalib/org/trinitydesktop/qt/TQAccel.java,javalib/org/trinitydesktop/qt/TQAction.java,javalib/org/trinitydesktop/qt/TQActionGroup.java,javalib/org/trinitydesktop/qt/TQApplication.java,javalib/org/trinitydesktop/qt/TQAsyncIO.java,javalib/org/trinitydesktop/qt/TQAuServer.java,javalib/org/trinitydesktop/qt/TQBig5Codec.java,javalib/org/trinitydesktop/qt/TQBitmap.java,javalib/org/trinitydesktop/qt/TQBoxLayout.java,javalib/org/trinitydesktop/qt/TQBrush.java,javalib/org/trinitydesktop/qt/TQBuffer.java,javalib/org/trinitydesktop/qt/TQButton.java,javalib/org/trinitydesktop/qt/TQButtonGroup.java,javalib/org/trinitydesktop/qt/TQCanvas.java,javalib/org/trinitydesktop/qt/TQCanvasEllipse.java,javalib/org/trinitydesktop/qt/TQCanvasItem.java,javalib/org/trinitydesktop/qt/TQCanvasLine.java,javalib/org/trinitydesktop/qt/TQCanvasPixmap.java,javalib/org/trinitydesktop/qt/TQCanvasPixmapArray.java,javalib/org/trinitydesktop/qt/TQCanvasPolygon.java,javalib/org/trinitydesktop/qt/TQCanvasPolygonalItem.java,javalib/org/trinitydesktop/qt/TQCanvasRectangle.java,javalib/org/trinitydesktop/qt/TQCanvasSprite.java,javalib/org/trinitydesktop/qt/TQCanvasText.java,javalib/org/trinitydesktop/qt/TQCanvasView.java,javalib/org/trinitydesktop/qt/TQCheckListItem.java,javalib/org/trinitydesktop/qt/TQChildEvent.java,javalib/org/trinitydesktop/qt/TQClassInfo.java,javalib/org/trinitydesktop/qt/TQClipboard.java,javalib/org/trinitydesktop/qt/TQCloseEvent.java,javalib/org/trinitydesktop/qt/TQColor.java,javalib/org/trinitydesktop/qt/TQColorDialog.java,javalib/org/trinitydesktop/qt/TQColorDrag.java,javalib/org/trinitydesktop/qt/TQColorGroup.java,javalib/org/trinitydesktop/qt/TQComboBox.java,javalib/org/trinitydesktop/qt/TQCursor.java,javalib/org/trinitydesktop/qt/TQCustomEvent.java,javalib/org/trinitydesktop/qt/TQCustomMenuItem.java,javalib/org/trinitydesktop/qt/TQDataPump.java,javalib/org/trinitydesktop/qt/TQDataSink.java,javalib/org/trinitydesktop/qt/TQDataSource.java,javalib/org/trinitydesktop/qt/TQDataStream.java,javalib/org/trinitydesktop/qt/TQDial.java,javalib/org/trinitydesktop/qt/TQDialog.java,javalib/org/trinitydesktop/qt/TQDir.java,javalib/org/trinitydesktop/qt/TQDomAttr.java,javalib/org/trinitydesktop/qt/TQDomCDATASection.java,javalib/org/trinitydesktop/qt/TQDomCharacterData.java,javalib/org/trinitydesktop/qt/TQDomComment.java,javalib/org/trinitydesktop/qt/TQDomDocument.java,javalib/org/trinitydesktop/qt/TQDomDocumentFragment.java,javalib/org/trinitydesktop/qt/TQDomDocumentType.java,javalib/org/trinitydesktop/qt/TQDomElement.java,javalib/org/trinitydesktop/qt/TQDomEntity.java,javalib/org/trinitydesktop/qt/TQDomEntityReference.java,javalib/org/trinitydesktop/qt/TQDomImplementation.java,javalib/org/trinitydesktop/qt/TQDomNamedNodeMap.java,javalib/org/trinitydesktop/qt/TQDomNode.java,javalib/org/trinitydesktop/qt/TQDomNotation.java,javalib/org/trinitydesktop/qt/TQDomProcessingInstruction.java,javalib/org/trinitydesktop/qt/TQDomText.java,javalib/org/trinitydesktop/qt/TQDoubleValidator.java,javalib/org/trinitydesktop/qt/TQDragEnterEvent.java,javalib/org/trinitydesktop/qt/TQDragLeaveEvent.java,javalib/org/trinitydesktop/qt/TQDragManager.java,javalib/org/trinitydesktop/qt/TQDragMoveEvent.java,javalib/org/trinitydesktop/qt/TQDragObject.java,javalib/org/trinitydesktop/qt/TQDragResponseEvent.java,javalib/org/trinitydesktop/qt/TQDropEvent.java,javalib/org/trinitydesktop/qt/TQDropSite.java,javalib/org/trinitydesktop/qt/TQEucJpCodec.java,javalib/org/trinitydesktop/qt/TQEucKrCodec.java,javalib/org/trinitydesktop/qt/TQEvent.java,javalib/org/trinitydesktop/qt/TQFile.java,javalib/org/trinitydesktop/qt/TQFileDialog.java,javalib/org/trinitydesktop/qt/TQFileIconProvider.java,javalib/org/trinitydesktop/qt/TQFileInfo.java,javalib/org/trinitydesktop/qt/TQFilePreview.java,javalib/org/trinitydesktop/qt/TQFocusData.java,javalib/org/trinitydesktop/qt/TQFocusEvent.java,javalib/org/trinitydesktop/qt/TQFont.java,javalib/org/trinitydesktop/qt/TQFontDatabase.java,javalib/org/trinitydesktop/qt/TQFontDialog.java,javalib/org/trinitydesktop/qt/TQFontInfo.java,javalib/org/trinitydesktop/qt/TQFontMetrics.java,javalib/org/trinitydesktop/qt/TQFrame.java,javalib/org/trinitydesktop/qt/TQGL.java,javalib/org/trinitydesktop/qt/TQGLContext.java,javalib/org/trinitydesktop/qt/TQGLFormat.java,javalib/org/trinitydesktop/qt/TQGLWidget.java,javalib/org/trinitydesktop/qt/TQGbkCodec.java,javalib/org/trinitydesktop/qt/TQGrid.java,javalib/org/trinitydesktop/qt/TQGridLayout.java,javalib/org/trinitydesktop/qt/TQGroupBox.java,javalib/org/trinitydesktop/qt/TQHBox.java,javalib/org/trinitydesktop/qt/TQHBoxLayout.java,javalib/org/trinitydesktop/qt/TQHButtonGroup.java,javalib/org/trinitydesktop/qt/TQHGroupBox.java,javalib/org/trinitydesktop/qt/TQHeader.java,javalib/org/trinitydesktop/qt/TQHebrewCodec.java,javalib/org/trinitydesktop/qt/TQHideEvent.java,javalib/org/trinitydesktop/qt/TQIODevice.java,javalib/org/trinitydesktop/qt/TQIODeviceInterface.java,javalib/org/trinitydesktop/qt/TQIODeviceSource.java,javalib/org/trinitydesktop/qt/TQIconDrag.java,javalib/org/trinitydesktop/qt/TQIconDragItem.java,javalib/org/trinitydesktop/qt/TQIconSet.java,javalib/org/trinitydesktop/qt/TQIconView.java,javalib/org/trinitydesktop/qt/TQIconViewItem.java,javalib/org/trinitydesktop/qt/TQImage.java,javalib/org/trinitydesktop/qt/TQImageConsumer.java,javalib/org/trinitydesktop/qt/TQImageDecoder.java,javalib/org/trinitydesktop/qt/TQImageDrag.java,javalib/org/trinitydesktop/qt/TQImageFormat.java,javalib/org/trinitydesktop/qt/TQImageFormatType.java,javalib/org/trinitydesktop/qt/TQImageIO.java,javalib/org/trinitydesktop/qt/TQImageTextKeyLang.java,javalib/org/trinitydesktop/qt/TQInputDialog.java,javalib/org/trinitydesktop/qt/TQIntValidator.java,javalib/org/trinitydesktop/qt/TQJisCodec.java,javalib/org/trinitydesktop/qt/TQJpUnicodeConv.java,javalib/org/trinitydesktop/qt/TQKeyEvent.java,javalib/org/trinitydesktop/qt/TQLCDNumber.java,javalib/org/trinitydesktop/qt/TQLabel.java,javalib/org/trinitydesktop/qt/TQLayout.java,javalib/org/trinitydesktop/qt/TQLayoutItem.java,javalib/org/trinitydesktop/qt/TQLayoutItemInterface.java,javalib/org/trinitydesktop/qt/TQLineEdit.java,javalib/org/trinitydesktop/qt/TQListBox.java,javalib/org/trinitydesktop/qt/TQListBoxItem.java,javalib/org/trinitydesktop/qt/TQListBoxPixmap.java,javalib/org/trinitydesktop/qt/TQListBoxText.java,javalib/org/trinitydesktop/qt/TQListView.java,javalib/org/trinitydesktop/qt/TQListViewItem.java,javalib/org/trinitydesktop/qt/TQMainWindow.java,javalib/org/trinitydesktop/qt/TQMenuBar.java,javalib/org/trinitydesktop/qt/TQMenuData.java,javalib/org/trinitydesktop/qt/TQMenuDataInterface.java,javalib/org/trinitydesktop/qt/TQMessageBox.java,javalib/org/trinitydesktop/qt/TQMetaData.java,javalib/org/trinitydesktop/qt/TQMetaEnum.java,javalib/org/trinitydesktop/qt/TQMetaObject.java,javalib/org/trinitydesktop/qt/TQMetaProperty.java,javalib/org/trinitydesktop/qt/TQMimeSource.java,javalib/org/trinitydesktop/qt/TQMimeSourceFactory.java,javalib/org/trinitydesktop/qt/TQMimeSourceInterface.java,javalib/org/trinitydesktop/qt/TQMouseEvent.java,javalib/org/trinitydesktop/qt/TQMoveEvent.java,javalib/org/trinitydesktop/qt/TQMovie.java,javalib/org/trinitydesktop/qt/TQMultiLineEdit.java,javalib/org/trinitydesktop/qt/TQNetworkOperation.java,javalib/org/trinitydesktop/qt/TQObject.java,javalib/org/trinitydesktop/qt/TQPaintDevice.java,javalib/org/trinitydesktop/qt/TQPaintDeviceInterface.java,javalib/org/trinitydesktop/qt/TQPaintEvent.java,javalib/org/trinitydesktop/qt/TQPainter.java,javalib/org/trinitydesktop/qt/TQPalette.java,javalib/org/trinitydesktop/qt/TQPen.java,javalib/org/trinitydesktop/qt/TQPicture.java,javalib/org/trinitydesktop/qt/TQPixmap.java,javalib/org/trinitydesktop/qt/TQPoint.java,javalib/org/trinitydesktop/qt/TQPointArray.java,javalib/org/trinitydesktop/qt/TQPolygonScanner.java,javalib/org/trinitydesktop/qt/TQPopupMenu.java,javalib/org/trinitydesktop/qt/TQPrintDialog.java,javalib/org/trinitydesktop/qt/TQPrinter.java,javalib/org/trinitydesktop/qt/TQProgressBar.java,javalib/org/trinitydesktop/qt/TQProgressDialog.java,javalib/org/trinitydesktop/qt/TQPushButton.java,javalib/org/trinitydesktop/qt/TQRadioButton.java,javalib/org/trinitydesktop/qt/TQRangeControl.java,javalib/org/trinitydesktop/qt/TQRangeControlInterface.java,javalib/org/trinitydesktop/qt/TQRect.java,javalib/org/trinitydesktop/qt/TQRegion.java,javalib/org/trinitydesktop/qt/TQResizeEvent.java,javalib/org/trinitydesktop/qt/TQScrollBar.java,javalib/org/trinitydesktop/qt/TQScrollView.java,javalib/org/trinitydesktop/qt/TQSessionManager.java,javalib/org/trinitydesktop/qt/TQShowEvent.java,javalib/org/trinitydesktop/qt/TQSignal.java,javalib/org/trinitydesktop/qt/TQSignalMapper.java,javalib/org/trinitydesktop/qt/TQSimpleRichText.java,javalib/org/trinitydesktop/qt/TQSize.java,javalib/org/trinitydesktop/qt/TQSizeGrip.java,javalib/org/trinitydesktop/qt/TQSizePolicy.java,javalib/org/trinitydesktop/qt/TQSjisCodec.java,javalib/org/trinitydesktop/qt/TQSlider.java,javalib/org/trinitydesktop/qt/TQSound.java,javalib/org/trinitydesktop/qt/TQSpacerItem.java,javalib/org/trinitydesktop/qt/TQSpinBox.java,javalib/org/trinitydesktop/qt/TQSplitter.java,javalib/org/trinitydesktop/qt/TQStatusBar.java,javalib/org/trinitydesktop/qt/TQStoredDrag.java,javalib/org/trinitydesktop/qt/TQStyle.java,javalib/org/trinitydesktop/qt/TQStyleSheet.java,javalib/org/trinitydesktop/qt/TQStyleSheetItem.java,javalib/org/trinitydesktop/qt/TQTab.java,javalib/org/trinitydesktop/qt/TQTabBar.java,javalib/org/trinitydesktop/qt/TQTabDialog.java,javalib/org/trinitydesktop/qt/TQTabWidget.java,javalib/org/trinitydesktop/qt/TQTable.java,javalib/org/trinitydesktop/qt/TQTableItem.java,javalib/org/trinitydesktop/qt/TQTableSelection.java,javalib/org/trinitydesktop/qt/TQTextBrowser.java,javalib/org/trinitydesktop/qt/TQTextCodec.java,javalib/org/trinitydesktop/qt/TQTextDecoder.java,javalib/org/trinitydesktop/qt/TQTextDrag.java,javalib/org/trinitydesktop/qt/TQTextEncoder.java,javalib/org/trinitydesktop/qt/TQTextIStream.java,javalib/org/trinitydesktop/qt/TQTextOStream.java,javalib/org/trinitydesktop/qt/TQTextStream.java,javalib/org/trinitydesktop/qt/TQTextView.java,javalib/org/trinitydesktop/qt/TQTimer.java,javalib/org/trinitydesktop/qt/TQTimerEvent.java,javalib/org/trinitydesktop/qt/TQToolBar.java,javalib/org/trinitydesktop/qt/TQToolButton.java,javalib/org/trinitydesktop/qt/TQToolTip.java,javalib/org/trinitydesktop/qt/TQToolTipGroup.java,javalib/org/trinitydesktop/qt/TQTranslator.java,javalib/org/trinitydesktop/qt/TQTranslatorMessage.java,javalib/org/trinitydesktop/qt/TQTsciiCodec.java,javalib/org/trinitydesktop/qt/TQUriDrag.java,javalib/org/trinitydesktop/qt/TQUrl.java,javalib/org/trinitydesktop/qt/TQUrlInfo.java,javalib/org/trinitydesktop/qt/TQUrlInterface.java,javalib/org/trinitydesktop/qt/TQUrlOperator.java,javalib/org/trinitydesktop/qt/TQUtf16Codec.java,javalib/org/trinitydesktop/qt/TQUtf8Codec.java,javalib/org/trinitydesktop/qt/TQVBox.java,javalib/org/trinitydesktop/qt/TQVBoxLayout.java,javalib/org/trinitydesktop/qt/TQVButtonGroup.java,javalib/org/trinitydesktop/qt/TQVGroupBox.java,javalib/org/trinitydesktop/qt/TQValidator.java,javalib/org/trinitydesktop/qt/TQVariant.java,javalib/org/trinitydesktop/qt/TQWMatrix.java,javalib/org/trinitydesktop/qt/TQWhatsThis.java,javalib/org/trinitydesktop/qt/TQWheelEvent.java,javalib/org/trinitydesktop/qt/TQWidget.java,javalib/org/trinitydesktop/qt/TQWidgetItem.java,javalib/org/trinitydesktop/qt/TQWidgetStack.java,javalib/org/trinitydesktop/qt/TQMenuItem.java,javalib/org/trinitydesktop/qt/TQPaintDeviceMetrics.java,javalib/org/trinitydesktop/qt/TQRegExp.java,javalib/org/trinitydesktop/qt/TQCanvasSpline.java,javalib/org/trinitydesktop/qt/TQCheckTableItem.java,javalib/org/trinitydesktop/qt/TQComboTableItem.java,javalib/org/trinitydesktop/qt/TQContextMenuEvent.java,javalib/org/trinitydesktop/qt/TQDataBrowser.java,javalib/org/trinitydesktop/qt/TQDataTable.java,javalib/org/trinitydesktop/qt/TQDataView.java,javalib/org/trinitydesktop/qt/TQDateEdit.java,javalib/org/trinitydesktop/qt/TQDateTimeEdit.java,javalib/org/trinitydesktop/qt/TQDesktopWidget.java,javalib/org/trinitydesktop/qt/TQDockArea.java,javalib/org/trinitydesktop/qt/TQDockWindow.java,javalib/org/trinitydesktop/qt/TQEditorFactory.java,javalib/org/trinitydesktop/qt/TQErrorMessage.java,javalib/org/trinitydesktop/qt/TQGLColormap.java,javalib/org/trinitydesktop/qt/TQGridView.java,javalib/org/trinitydesktop/qt/TQIMEvent.java,javalib/org/trinitydesktop/qt/TQLibrary.java,javalib/org/trinitydesktop/qt/TQProcess.java,javalib/org/trinitydesktop/qt/TQRegExpValidator.java,javalib/org/trinitydesktop/qt/TQSettings.java,javalib/org/trinitydesktop/qt/TQSql.java,javalib/org/trinitydesktop/qt/TQSqlCursor.java,javalib/org/trinitydesktop/qt/TQSqlDatabase.java,javalib/org/trinitydesktop/qt/TQSqlDriver.java,javalib/org/trinitydesktop/qt/TQSqlEditorFactory.java,javalib/org/trinitydesktop/qt/TQSqlError.java,javalib/org/trinitydesktop/qt/TQSqlField.java,javalib/org/trinitydesktop/qt/TQSqlForm.java,javalib/org/trinitydesktop/qt/TQSqlIndex.java,javalib/org/trinitydesktop/qt/TQSqlPropertyMap.java,javalib/org/trinitydesktop/qt/TQSqlQuery.java,javalib/org/trinitydesktop/qt/TQSqlRecord.java,javalib/org/trinitydesktop/qt/TQSqlResult.java,javalib/org/trinitydesktop/qt/TQTabletEvent.java,javalib/org/trinitydesktop/qt/TQTextEdit.java,javalib/org/trinitydesktop/qt/TQTimeEdit.java,javalib/org/trinitydesktop/qt/TQUuid.java,javalib/org/trinitydesktop/qt/TQDateTimeEditBase.java,javalib/org/trinitydesktop/qt/TQSqlQueryInterface.java,javalib/org/trinitydesktop/qt/TQAccelSignals.java,javalib/org/trinitydesktop/qt/TQActionGroupSignals.java,javalib/org/trinitydesktop/qt/TQActionSignals.java,javalib/org/trinitydesktop/qt/TQApplicationSignals.java,javalib/org/trinitydesktop/qt/TQButtonGroupSignals.java,javalib/org/trinitydesktop/qt/TQButtonSignals.java,javalib/org/trinitydesktop/qt/TQCanvasSignals.java,javalib/org/trinitydesktop/qt/TQCheckBoxSignals.java,javalib/org/trinitydesktop/qt/TQColorDragSignals.java,javalib/org/trinitydesktop/qt/TQComboBoxSignals.java,javalib/org/trinitydesktop/qt/TQDataBrowserSignals.java,javalib/org/trinitydesktop/qt/TQDataPumpSignals.java,javalib/org/trinitydesktop/qt/TQDataTableSignals.java,javalib/org/trinitydesktop/qt/TQDataViewSignals.java,javalib/org/trinitydesktop/qt/TQDateEditSignals.java,javalib/org/trinitydesktop/qt/TQDateTimeEditSignals.java,javalib/org/trinitydesktop/qt/TQDesktopWidgetSignals.java,javalib/org/trinitydesktop/qt/TQDialSignals.java,javalib/org/trinitydesktop/qt/TQDialogSignals.java,javalib/org/trinitydesktop/qt/TQDockAreaSignals.java,javalib/org/trinitydesktop/qt/TQDockWindowSignals.java,javalib/org/trinitydesktop/qt/TQDoubleValidatorSignals.java,javalib/org/trinitydesktop/qt/TQDragObjectSignals.java,javalib/org/trinitydesktop/qt/TQEditorFactorySignals.java,javalib/org/trinitydesktop/qt/TQErrorMessageSignals.java,javalib/org/trinitydesktop/qt/TQFileDialogSignals.java,javalib/org/trinitydesktop/qt/TQFileIconProviderSignals.java,javalib/org/trinitydesktop/qt/TQFrameSignals.java,javalib/org/trinitydesktop/qt/TQGLWidgetSignals.java,javalib/org/trinitydesktop/qt/TQGridLayoutSignals.java,javalib/org/trinitydesktop/qt/TQGridSignals.java,javalib/org/trinitydesktop/qt/TQGroupBoxSignals.java,javalib/org/trinitydesktop/qt/TQHBoxLayoutSignals.java,javalib/org/trinitydesktop/qt/TQHBoxSignals.java,javalib/org/trinitydesktop/qt/TQHButtonGroupSignals.java,javalib/org/trinitydesktop/qt/TQHGroupBoxSignals.java,javalib/org/trinitydesktop/qt/TQHeaderSignals.java,javalib/org/trinitydesktop/qt/TQIconDragSignals.java,javalib/org/trinitydesktop/qt/TQIconViewSignals.java,javalib/org/trinitydesktop/qt/TQImageDragSignals.java,javalib/org/trinitydesktop/qt/TQIntValidatorSignals.java,javalib/org/trinitydesktop/qt/TQInterlaceStyleSignals.java,javalib/org/trinitydesktop/qt/TQLCDNumberSignals.java,javalib/org/trinitydesktop/qt/TQLabelSignals.java,javalib/org/trinitydesktop/qt/TQLineEditSignals.java,javalib/org/trinitydesktop/qt/TQListBoxSignals.java,javalib/org/trinitydesktop/qt/TQListViewSignals.java,javalib/org/trinitydesktop/qt/TQMainWindowSignals.java,javalib/org/trinitydesktop/qt/TQMenuBarSignals.java,javalib/org/trinitydesktop/qt/TQMessageBoxSignals.java,javalib/org/trinitydesktop/qt/TQMultiLineEditSignals.java,javalib/org/trinitydesktop/qt/TQNetworkOperationSignals.java,javalib/org/trinitydesktop/qt/TQObjectSignals.java,javalib/org/trinitydesktop/qt/TQPopupMenuSignals.java,javalib/org/trinitydesktop/qt/TQPrintDialogSignals.java,javalib/org/trinitydesktop/qt/TQProcessSignals.java,javalib/org/trinitydesktop/qt/TQProgressBarSignals.java,javalib/org/trinitydesktop/qt/TQProgressDialogSignals.java,javalib/org/trinitydesktop/qt/TQPushButtonSignals.java,javalib/org/trinitydesktop/qt/TQRadioButtonSignals.java,javalib/org/trinitydesktop/qt/TQRegExpValidatorSignals.java,javalib/org/trinitydesktop/qt/TQScrollBarSignals.java,javalib/org/trinitydesktop/qt/TQScrollViewSignals.java,javalib/org/trinitydesktop/qt/TQSignalMapperSignals.java,javalib/org/trinitydesktop/qt/TQSignalSignals.java,javalib/org/trinitydesktop/qt/TQSizeGripSignals.java,javalib/org/trinitydesktop/qt/TQSliderSignals.java,javalib/org/trinitydesktop/qt/TQSoundSignals.java,javalib/org/trinitydesktop/qt/TQSpinBoxSignals.java,javalib/org/trinitydesktop/qt/TQSplitterSignals.java,javalib/org/trinitydesktop/qt/TQSqlDatabaseSignals.java,javalib/org/trinitydesktop/qt/TQSqlEditorFactorySignals.java,javalib/org/trinitydesktop/qt/TQSqlFormSignals.java,javalib/org/trinitydesktop/qt/TQStatusBarSignals.java,javalib/org/trinitydesktop/qt/TQStoredDragSignals.java,javalib/org/trinitydesktop/qt/TQStyleSheetSignals.java,javalib/org/trinitydesktop/qt/TQTabBarSignals.java,javalib/org/trinitydesktop/qt/TQTabDialogSignals.java,javalib/org/trinitydesktop/qt/TQTabWidgetSignals.java,javalib/org/trinitydesktop/qt/TQTableSignals.java,javalib/org/trinitydesktop/qt/TQTextBrowserSignals.java,javalib/org/trinitydesktop/qt/TQTextDragSignals.java,javalib/org/trinitydesktop/qt/TQTextEditSignals.java,javalib/org/trinitydesktop/qt/TQTextViewSignals.java,javalib/org/trinitydesktop/qt/TQTimeEditSignals.java,javalib/org/trinitydesktop/qt/TQTimerSignals.java,javalib/org/trinitydesktop/qt/TQToolBarSignals.java,javalib/org/trinitydesktop/qt/TQToolButtonSignals.java,javalib/org/trinitydesktop/qt/TQToolTipGroupSignals.java,javalib/org/trinitydesktop/qt/TQTranslatorSignals.java,javalib/org/trinitydesktop/qt/TQUriDragSignals.java,javalib/org/trinitydesktop/qt/TQUrlOperatorSignals.java,javalib/org/trinitydesktop/qt/TQVBoxLayoutSignals.java,javalib/org/trinitydesktop/qt/TQVBoxSignals.java,javalib/org/trinitydesktop/qt/TQVButtonGroupSignals.java,javalib/org/trinitydesktop/qt/TQVGroupBoxSignals.java,javalib/org/trinitydesktop/qt/TQWidgetSignals.java,javalib/org/trinitydesktop/qt/TQWidgetStackSignals.java,javalib/org/trinitydesktop/qt/TQStyleOption.java,javalib/org/trinitydesktop/qt/TQKeySequence.java,javalib/org/trinitydesktop/qt/TQSqlFieldInfo.java,javalib/org/trinitydesktop/qt/TQSqlRecordInfo.java,javalib/org/trinitydesktop/qt/TQDns.java,javalib/org/trinitydesktop/qt/TQFtp.java,javalib/org/trinitydesktop/qt/TQHostAddress.java,javalib/org/trinitydesktop/qt/TQHttp.java,javalib/org/trinitydesktop/qt/TQLocalFs.java,javalib/org/trinitydesktop/qt/TQNetworkProtocol.java,javalib/org/trinitydesktop/qt/TQObjectCleanupHandler.java,javalib/org/trinitydesktop/qt/TQServerSocket.java,javalib/org/trinitydesktop/qt/TQSocket.java,javalib/org/trinitydesktop/qt/TQSocketDevice.java,javalib/org/trinitydesktop/qt/TQSocketNotifier.java,javalib/org/trinitydesktop/qt/TQDnsSignals.java,javalib/org/trinitydesktop/qt/TQFtpSignals.java,javalib/org/trinitydesktop/qt/TQHttpSignals.java,javalib/org/trinitydesktop/qt/TQLocalFsSignals.java,javalib/org/trinitydesktop/qt/TQNetworkProtocolSignals.java,javalib/org/trinitydesktop/qt/TQObjectCleanupHandlerSignals.java,javalib/org/trinitydesktop/qt/TQSocketSignals.java,javalib/org/trinitydesktop/qt/TQSocketNotifierSignals.java,javalib/org/trinitydesktop/qt/TQGb18030Codec.java,javalib/org/trinitydesktop/qt/TQSpinWidget.java,javalib/org/trinitydesktop/qt/TQSpinWidgetSignals.java,javalib/org/trinitydesktop/qt/TQSplashScreen.java,javalib/org/trinitydesktop/qt/TQSplashScreenSignals.java,javalib/org/trinitydesktop/qt/TQToolBox.java,javalib/org/trinitydesktop/qt/TQToolBoxSignals.java,javalib/org/trinitydesktop/qt/TQHttpHeader.java,javalib/org/trinitydesktop/qt/TQHttpRequestHeader.java,javalib/org/trinitydesktop/qt/TQEventLoop.java,javalib/org/trinitydesktop/qt/TQEventLoopSignals.java,javalib/org/trinitydesktop/qt/TQHttpResponseHeader.java,javalib/org/trinitydesktop/qt/TQStyleFactory.java,javalib/org/trinitydesktop/qt/TQCheckBox.java,javalib/org/trinitydesktop/qt/TQWorkspace.java,javalib/org/trinitydesktop/qt/TQWizard.java,javalib/org/trinitydesktop/qt/TQSyntaxHighlighter.java,javalib/org/trinitydesktop/qt/TQCommonStyle.java,javalib/org/trinitydesktop/qt/TQXmlContentHandler.java,javalib/org/trinitydesktop/qt/TQXmlDeclHandler.java,javalib/org/trinitydesktop/qt/TQXmlDTDHandler.java,javalib/org/trinitydesktop/qt/TQXmlEntityResolver.java,javalib/org/trinitydesktop/qt/TQXmlErrorHandler.java,javalib/org/trinitydesktop/qt/TQXmlLexicalHandler.java,javalib/org/trinitydesktop/qt/TQXmlNamespaceSupport.java,javalib/org/trinitydesktop/qt/TQXmlSimpleReader.java,javalib/org/trinitydesktop/qt/Invocation.java,javalib/org/trinitydesktop/qt/qtjava.java,javalib/org/trinitydesktop/qt/QtSupport.java,javalib/org/trinitydesktop/qt/TQXmlDefaultHandler.java,javalib/org/trinitydesktop/qt/WeakValueMap.java,javalib/org/trinitydesktop/qt/Qt.java,javalib/org/trinitydesktop/qt/TQWizardSignals.java,javalib/org/trinitydesktop/qt/TQWorkspaceSignals.java,javalib/org/trinitydesktop/qt/TQXmlAttributes.java,javalib/org/trinitydesktop/qt/TQXmlContentHandlerInterface.java,javalib/org/trinitydesktop/qt/TQXmlDTDHandlerInterface.java,javalib/org/trinitydesktop/qt/TQXmlEntityResolverInterface.java,javalib/org/trinitydesktop/qt/TQXmlErrorHandlerInterface.java,javalib/org/trinitydesktop/qt/TQXmlInputSource.java,javalib/org/trinitydesktop/qt/TQXmlLexicalHandlerInterface.java,javalib/org/trinitydesktop/qt/TQXmlLocator.java,javalib/org/trinitydesktop/qt/TQXmlParseException.java,javalib/org/trinitydesktop/qt/TQXmlReader.java,javalib/org/trinitydesktop/qt/TQXmlDeclHandlerInterface.java sub_dirs= type=normal @@ -1674,12 +1674,6 @@ install=false install_location= type=DATA -[javalib/org/trinitydesktop/qt/TQSemiModal.java] -dist=true -install=false -install_location= -type=DATA - [javalib/org/trinitydesktop/qt/TQServerSocket.java] dist=true install=false @@ -2366,7 +2360,7 @@ type=DATA [javalib/org/trinitydesktop/qt/TQWidgetStackSignals.java] dist=true -files=javalib/qtjava/TQXmlDeclHandler.h,javalib/qtjava/TQXmlDefaultHandler.h,javalib/qtjava/TQXmlDTDHandler.h,javalib/qtjava/TQXmlEntityResolver.h,javalib/qtjava/TQXmlErrorHandler.h,javalib/qtjava/TQXmlInputSource.h,javalib/qtjava/TQXmlLexicalHandler.h,javalib/qtjava/TQXmlLocator.h,javalib/qtjava/TQXmlNamespaceSupport.h,javalib/qtjava/TQXmlParseException.h,javalib/qtjava/TQXmlSimpleReader.h,javalib/qtjava/CVS,javalib/qtjava/TQAccel.h,javalib/qtjava/TQAction.h,javalib/qtjava/TQActionGroup.h,javalib/qtjava/TQApplication.h,javalib/qtjava/TQAsyncIO.h,javalib/qtjava/TQAuServer.h,javalib/qtjava/TQBig5Codec.h,javalib/qtjava/TQBitmap.h,javalib/qtjava/TQBoxLayout.h,javalib/qtjava/TQBrush.h,javalib/qtjava/TQBuffer.h,javalib/qtjava/TQButton.h,javalib/qtjava/TQButtonGroup.h,javalib/qtjava/TQCanvas.h,javalib/qtjava/TQCanvasEllipse.h,javalib/qtjava/TQCanvasItem.h,javalib/qtjava/TQCanvasLine.h,javalib/qtjava/TQCanvasPixmap.h,javalib/qtjava/TQCanvasPixmapArray.h,javalib/qtjava/TQCanvasPolygon.h,javalib/qtjava/TQCanvasPolygonalItem.h,javalib/qtjava/TQCanvasRectangle.h,javalib/qtjava/TQCanvasSpline.h,javalib/qtjava/TQCanvasSprite.h,javalib/qtjava/TQCanvasText.h,javalib/qtjava/TQCanvasView.h,javalib/qtjava/TQCheckBox.h,javalib/qtjava/TQCheckListItem.h,javalib/qtjava/TQCheckTableItem.h,javalib/qtjava/TQChildEvent.h,javalib/qtjava/TQClassInfo.h,javalib/qtjava/TQClipboard.h,javalib/qtjava/TQCloseEvent.h,javalib/qtjava/TQColor.h,javalib/qtjava/TQColorDialog.h,javalib/qtjava/TQColorDrag.h,javalib/qtjava/TQColorGroup.h,javalib/qtjava/TQComboBox.h,javalib/qtjava/TQComboTableItem.h,javalib/qtjava/TQContextMenuEvent.h,javalib/qtjava/TQCursor.h,javalib/qtjava/TQCustomEvent.h,javalib/qtjava/TQCustomMenuItem.h,javalib/qtjava/TQDataBrowser.h,javalib/qtjava/TQDataPump.h,javalib/qtjava/TQDataSink.h,javalib/qtjava/TQDataSource.h,javalib/qtjava/TQDataStream.h,javalib/qtjava/TQDataTable.h,javalib/qtjava/TQDataView.h,javalib/qtjava/TQDateEdit.h,javalib/qtjava/TQDateTimeEdit.h,javalib/qtjava/TQDateTimeEditBase.h,javalib/qtjava/TQDesktopWidget.h,javalib/qtjava/TQDial.h,javalib/qtjava/TQDialog.h,javalib/qtjava/TQDir.h,javalib/qtjava/TQDockArea.h,javalib/qtjava/TQDockWindow.h,javalib/qtjava/TQDomAttr.h,javalib/qtjava/TQDomCDATASection.h,javalib/qtjava/TQDomCharacterData.h,javalib/qtjava/TQDomComment.h,javalib/qtjava/TQDomDocument.h,javalib/qtjava/TQDomDocumentFragment.h,javalib/qtjava/TQDomDocumentType.h,javalib/qtjava/TQDomElement.h,javalib/qtjava/TQDomEntity.h,javalib/qtjava/TQDomEntityReference.h,javalib/qtjava/TQDomImplementation.h,javalib/qtjava/TQDomNamedNodeMap.h,javalib/qtjava/TQDomNode.h,javalib/qtjava/TQDomNotation.h,javalib/qtjava/TQDomProcessingInstruction.h,javalib/qtjava/TQDomText.h,javalib/qtjava/TQDoubleValidator.h,javalib/qtjava/TQDragEnterEvent.h,javalib/qtjava/TQDragLeaveEvent.h,javalib/qtjava/TQDragManager.h,javalib/qtjava/TQDragMoveEvent.h,javalib/qtjava/TQDragObject.h,javalib/qtjava/TQDragResponseEvent.h,javalib/qtjava/TQDropEvent.h,javalib/qtjava/TQDropSite.h,javalib/qtjava/TQEditorFactory.h,javalib/qtjava/TQErrorMessage.h,javalib/qtjava/TQEucJpCodec.h,javalib/qtjava/TQEucKrCodec.h,javalib/qtjava/TQEvent.h,javalib/qtjava/TQFile.h,javalib/qtjava/TQFileDialog.h,javalib/qtjava/TQFileIconProvider.h,javalib/qtjava/TQFileInfo.h,javalib/qtjava/TQFilePreview.h,javalib/qtjava/TQFocusData.h,javalib/qtjava/TQFocusEvent.h,javalib/qtjava/TQFont.h,javalib/qtjava/TQFontDatabase.h,javalib/qtjava/TQFontDialog.h,javalib/qtjava/TQFontInfo.h,javalib/qtjava/TQFontMetrics.h,javalib/qtjava/TQFrame.h,javalib/qtjava/TQFtp.h,javalib/qtjava/TQGrid.h,javalib/qtjava/TQGridLayout.h,javalib/qtjava/TQGridView.h,javalib/qtjava/TQGroupBox.h,javalib/qtjava/TQHBox.h,javalib/qtjava/TQHBoxLayout.h,javalib/qtjava/TQHButtonGroup.h,javalib/qtjava/TQHeader.h,javalib/qtjava/TQHebrewCodec.h,javalib/qtjava/TQHGroupBox.h,javalib/qtjava/TQHideEvent.h,javalib/qtjava/TQHostAddress.h,javalib/qtjava/TQHttp.h,javalib/qtjava/TQIconDrag.h,javalib/qtjava/TQIconDragItem.h,javalib/qtjava/TQIconSet.h,javalib/qtjava/TQIconView.h,javalib/qtjava/TQIconViewItem.h,javalib/qtjava/TQImage.h,javalib/qtjava/TQImageConsumer.h,javalib/qtjava/TQImageDecoder.h,javalib/qtjava/TQImageDrag.h,javalib/qtjava/TQImageFormat.h,javalib/qtjava/TQImageFormatType.h,javalib/qtjava/TQImageIO.h,javalib/qtjava/TQImageTextKeyLang.h,javalib/qtjava/TQIMEvent.h,javalib/qtjava/TQInputDialog.h,javalib/qtjava/TQIntValidator.h,javalib/qtjava/TQIODevice.h,javalib/qtjava/TQIODeviceSource.h,javalib/qtjava/TQJisCodec.h,javalib/qtjava/TQJpUnicodeConv.h,javalib/qtjava/TQKeyEvent.h,javalib/qtjava/TQKeySequence.h,javalib/qtjava/TQLabel.h,javalib/qtjava/TQLayout.h,javalib/qtjava/TQLayoutItem.h,javalib/qtjava/TQLCDNumber.h,javalib/qtjava/TQLibrary.h,javalib/qtjava/TQLineEdit.h,javalib/qtjava/TQListBox.h,javalib/qtjava/TQListBoxItem.h,javalib/qtjava/TQListBoxPixmap.h,javalib/qtjava/TQListBoxText.h,javalib/qtjava/TQListView.h,javalib/qtjava/TQListViewItem.h,javalib/qtjava/TQLocalFs.h,javalib/qtjava/TQMainWindow.h,javalib/qtjava/TQMenuBar.h,javalib/qtjava/TQMenuData.h,javalib/qtjava/TQMenuItem.h,javalib/qtjava/TQMessageBox.h,javalib/qtjava/TQMetaData.h,javalib/qtjava/TQMetaEnum.h,javalib/qtjava/TQMetaObject.h,javalib/qtjava/TQMetaProperty.h,javalib/qtjava/TQMimeSource.h,javalib/qtjava/TQMimeSourceFactory.h,javalib/qtjava/TQMouseEvent.h,javalib/qtjava/TQMoveEvent.h,javalib/qtjava/TQMovie.h,javalib/qtjava/TQMultiLineEdit.h,javalib/qtjava/TQNetworkOperation.h,javalib/qtjava/TQNetworkProtocol.h,javalib/qtjava/TQObject.h,javalib/qtjava/TQObjectCleanupHandler.h,javalib/qtjava/TQPaintDevice.h,javalib/qtjava/TQPaintDeviceMetrics.h,javalib/qtjava/TQPainter.h,javalib/qtjava/TQPaintEvent.h,javalib/qtjava/TQPalette.h,javalib/qtjava/TQPen.h,javalib/qtjava/TQPicture.h,javalib/qtjava/TQPixmap.h,javalib/qtjava/TQPoint.h,javalib/qtjava/TQPointArray.h,javalib/qtjava/TQPolygonScanner.h,javalib/qtjava/TQPopupMenu.h,javalib/qtjava/TQPrintDialog.h,javalib/qtjava/TQPrinter.h,javalib/qtjava/TQProcess.h,javalib/qtjava/TQProgressBar.h,javalib/qtjava/TQProgressDialog.h,javalib/qtjava/TQPushButton.h,javalib/qtjava/TQRadioButton.h,javalib/qtjava/TQRangeControl.h,javalib/qtjava/TQRect.h,javalib/qtjava/TQRegExp.h,javalib/qtjava/TQRegExpValidator.h,javalib/qtjava/TQRegion.h,javalib/qtjava/TQResizeEvent.h,javalib/qtjava/TQScrollBar.h,javalib/qtjava/TQScrollView.h,javalib/qtjava/TQSemiModal.h,javalib/qtjava/TQServerSocket.h,javalib/qtjava/TQSessionManager.h,javalib/qtjava/TQSettings.h,javalib/qtjava/TQShowEvent.h,javalib/qtjava/TQSignal.h,javalib/qtjava/TQSignalMapper.h,javalib/qtjava/TQSimpleRichText.h,javalib/qtjava/TQSize.h,javalib/qtjava/TQSizeGrip.h,javalib/qtjava/TQSizePolicy.h,javalib/qtjava/TQSjisCodec.h,javalib/qtjava/TQSlider.h,javalib/qtjava/TQSocket.h,javalib/qtjava/TQSocketDevice.h,javalib/qtjava/TQSocketNotifier.h,javalib/qtjava/TQSound.h,javalib/qtjava/TQSpacerItem.h,javalib/qtjava/TQSpinBox.h,javalib/qtjava/TQSplitter.h,javalib/qtjava/TQSql.h,javalib/qtjava/TQSqlCursor.h,javalib/qtjava/TQSqlDatabase.h,javalib/qtjava/TQSqlDriver.h,javalib/qtjava/TQSqlEditorFactory.h,javalib/qtjava/TQSqlError.h,javalib/qtjava/TQSqlField.h,javalib/qtjava/TQSqlForm.h,javalib/qtjava/TQSqlIndex.h,javalib/qtjava/TQSqlPropertyMap.h,javalib/qtjava/TQSqlQuery.h,javalib/qtjava/TQSqlRecord.h,javalib/qtjava/TQSqlResult.h,javalib/qtjava/TQStatusBar.h,javalib/qtjava/TQStoredDrag.h,javalib/qtjava/TQStyle.h,javalib/qtjava/TQStyleFactory.h,javalib/qtjava/TQStyleSheet.h,javalib/qtjava/TQStyleSheetItem.h,javalib/qtjava/Qt.h,javalib/qtjava/TQTab.h,javalib/qtjava/TQTabBar.h,javalib/qtjava/TQTabDialog.h,javalib/qtjava/TQTable.h,javalib/qtjava/TQTableItem.h,javalib/qtjava/TQTableSelection.h,javalib/qtjava/TQTabletEvent.h,javalib/qtjava/TQTabWidget.h,javalib/qtjava/TQTextBrowser.h,javalib/qtjava/TQTextCodec.h,javalib/qtjava/TQTextDecoder.h,javalib/qtjava/TQTextDrag.h,javalib/qtjava/TQTextEdit.h,javalib/qtjava/TQTextEncoder.h,javalib/qtjava/TQTextIStream.h,javalib/qtjava/TQTextOStream.h,javalib/qtjava/TQTextStream.h,javalib/qtjava/TQTextView.h,javalib/qtjava/TQTimeEdit.h,javalib/qtjava/TQTimer.h,javalib/qtjava/TQTimerEvent.h,javalib/qtjava/qtjava.h,javalib/qtjava/TQToolBar.h,javalib/qtjava/TQToolButton.h,javalib/qtjava/TQToolTip.h,javalib/qtjava/TQToolTipGroup.h,javalib/qtjava/TQTranslator.h,javalib/qtjava/TQTranslatorMessage.h,javalib/qtjava/TQTsciiCodec.h,javalib/qtjava/QtSupport.h,javalib/qtjava/TQUriDrag.h,javalib/qtjava/TQUrl.h,javalib/qtjava/TQUrlInfo.h,javalib/qtjava/TQUrlOperator.h,javalib/qtjava/TQUtf16Codec.h,javalib/qtjava/TQUtf8Codec.h,javalib/qtjava/TQUuid.h,javalib/qtjava/TQValidator.h,javalib/qtjava/TQVariant.h,javalib/qtjava/TQVBox.h,javalib/qtjava/TQVBoxLayout.h,javalib/qtjava/TQVButtonGroup.h,javalib/qtjava/TQVGroupBox.h,javalib/qtjava/TQWhatsThis.h,javalib/qtjava/TQWheelEvent.h,javalib/qtjava/TQWidget.h,javalib/qtjava/TQWidgetItem.h,javalib/qtjava/TQWidgetStack.h,javalib/qtjava/TQWizard.h,javalib/qtjava/TQWMatrix.h,javalib/qtjava/TQWorkspace.h,javalib/qtjava/TQXmlAttributes.h,javalib/qtjava/TQXmlContentHandler.h,javalib/qtjava/TQXmlReader.h +files=javalib/qtjava/TQXmlDeclHandler.h,javalib/qtjava/TQXmlDefaultHandler.h,javalib/qtjava/TQXmlDTDHandler.h,javalib/qtjava/TQXmlEntityResolver.h,javalib/qtjava/TQXmlErrorHandler.h,javalib/qtjava/TQXmlInputSource.h,javalib/qtjava/TQXmlLexicalHandler.h,javalib/qtjava/TQXmlLocator.h,javalib/qtjava/TQXmlNamespaceSupport.h,javalib/qtjava/TQXmlParseException.h,javalib/qtjava/TQXmlSimpleReader.h,javalib/qtjava/CVS,javalib/qtjava/TQAccel.h,javalib/qtjava/TQAction.h,javalib/qtjava/TQActionGroup.h,javalib/qtjava/TQApplication.h,javalib/qtjava/TQAsyncIO.h,javalib/qtjava/TQAuServer.h,javalib/qtjava/TQBig5Codec.h,javalib/qtjava/TQBitmap.h,javalib/qtjava/TQBoxLayout.h,javalib/qtjava/TQBrush.h,javalib/qtjava/TQBuffer.h,javalib/qtjava/TQButton.h,javalib/qtjava/TQButtonGroup.h,javalib/qtjava/TQCanvas.h,javalib/qtjava/TQCanvasEllipse.h,javalib/qtjava/TQCanvasItem.h,javalib/qtjava/TQCanvasLine.h,javalib/qtjava/TQCanvasPixmap.h,javalib/qtjava/TQCanvasPixmapArray.h,javalib/qtjava/TQCanvasPolygon.h,javalib/qtjava/TQCanvasPolygonalItem.h,javalib/qtjava/TQCanvasRectangle.h,javalib/qtjava/TQCanvasSpline.h,javalib/qtjava/TQCanvasSprite.h,javalib/qtjava/TQCanvasText.h,javalib/qtjava/TQCanvasView.h,javalib/qtjava/TQCheckBox.h,javalib/qtjava/TQCheckListItem.h,javalib/qtjava/TQCheckTableItem.h,javalib/qtjava/TQChildEvent.h,javalib/qtjava/TQClassInfo.h,javalib/qtjava/TQClipboard.h,javalib/qtjava/TQCloseEvent.h,javalib/qtjava/TQColor.h,javalib/qtjava/TQColorDialog.h,javalib/qtjava/TQColorDrag.h,javalib/qtjava/TQColorGroup.h,javalib/qtjava/TQComboBox.h,javalib/qtjava/TQComboTableItem.h,javalib/qtjava/TQContextMenuEvent.h,javalib/qtjava/TQCursor.h,javalib/qtjava/TQCustomEvent.h,javalib/qtjava/TQCustomMenuItem.h,javalib/qtjava/TQDataBrowser.h,javalib/qtjava/TQDataPump.h,javalib/qtjava/TQDataSink.h,javalib/qtjava/TQDataSource.h,javalib/qtjava/TQDataStream.h,javalib/qtjava/TQDataTable.h,javalib/qtjava/TQDataView.h,javalib/qtjava/TQDateEdit.h,javalib/qtjava/TQDateTimeEdit.h,javalib/qtjava/TQDateTimeEditBase.h,javalib/qtjava/TQDesktopWidget.h,javalib/qtjava/TQDial.h,javalib/qtjava/TQDialog.h,javalib/qtjava/TQDir.h,javalib/qtjava/TQDockArea.h,javalib/qtjava/TQDockWindow.h,javalib/qtjava/TQDomAttr.h,javalib/qtjava/TQDomCDATASection.h,javalib/qtjava/TQDomCharacterData.h,javalib/qtjava/TQDomComment.h,javalib/qtjava/TQDomDocument.h,javalib/qtjava/TQDomDocumentFragment.h,javalib/qtjava/TQDomDocumentType.h,javalib/qtjava/TQDomElement.h,javalib/qtjava/TQDomEntity.h,javalib/qtjava/TQDomEntityReference.h,javalib/qtjava/TQDomImplementation.h,javalib/qtjava/TQDomNamedNodeMap.h,javalib/qtjava/TQDomNode.h,javalib/qtjava/TQDomNotation.h,javalib/qtjava/TQDomProcessingInstruction.h,javalib/qtjava/TQDomText.h,javalib/qtjava/TQDoubleValidator.h,javalib/qtjava/TQDragEnterEvent.h,javalib/qtjava/TQDragLeaveEvent.h,javalib/qtjava/TQDragManager.h,javalib/qtjava/TQDragMoveEvent.h,javalib/qtjava/TQDragObject.h,javalib/qtjava/TQDragResponseEvent.h,javalib/qtjava/TQDropEvent.h,javalib/qtjava/TQDropSite.h,javalib/qtjava/TQEditorFactory.h,javalib/qtjava/TQErrorMessage.h,javalib/qtjava/TQEucJpCodec.h,javalib/qtjava/TQEucKrCodec.h,javalib/qtjava/TQEvent.h,javalib/qtjava/TQFile.h,javalib/qtjava/TQFileDialog.h,javalib/qtjava/TQFileIconProvider.h,javalib/qtjava/TQFileInfo.h,javalib/qtjava/TQFilePreview.h,javalib/qtjava/TQFocusData.h,javalib/qtjava/TQFocusEvent.h,javalib/qtjava/TQFont.h,javalib/qtjava/TQFontDatabase.h,javalib/qtjava/TQFontDialog.h,javalib/qtjava/TQFontInfo.h,javalib/qtjava/TQFontMetrics.h,javalib/qtjava/TQFrame.h,javalib/qtjava/TQFtp.h,javalib/qtjava/TQGrid.h,javalib/qtjava/TQGridLayout.h,javalib/qtjava/TQGridView.h,javalib/qtjava/TQGroupBox.h,javalib/qtjava/TQHBox.h,javalib/qtjava/TQHBoxLayout.h,javalib/qtjava/TQHButtonGroup.h,javalib/qtjava/TQHeader.h,javalib/qtjava/TQHebrewCodec.h,javalib/qtjava/TQHGroupBox.h,javalib/qtjava/TQHideEvent.h,javalib/qtjava/TQHostAddress.h,javalib/qtjava/TQHttp.h,javalib/qtjava/TQIconDrag.h,javalib/qtjava/TQIconDragItem.h,javalib/qtjava/TQIconSet.h,javalib/qtjava/TQIconView.h,javalib/qtjava/TQIconViewItem.h,javalib/qtjava/TQImage.h,javalib/qtjava/TQImageConsumer.h,javalib/qtjava/TQImageDecoder.h,javalib/qtjava/TQImageDrag.h,javalib/qtjava/TQImageFormat.h,javalib/qtjava/TQImageFormatType.h,javalib/qtjava/TQImageIO.h,javalib/qtjava/TQImageTextKeyLang.h,javalib/qtjava/TQIMEvent.h,javalib/qtjava/TQInputDialog.h,javalib/qtjava/TQIntValidator.h,javalib/qtjava/TQIODevice.h,javalib/qtjava/TQIODeviceSource.h,javalib/qtjava/TQJisCodec.h,javalib/qtjava/TQJpUnicodeConv.h,javalib/qtjava/TQKeyEvent.h,javalib/qtjava/TQKeySequence.h,javalib/qtjava/TQLabel.h,javalib/qtjava/TQLayout.h,javalib/qtjava/TQLayoutItem.h,javalib/qtjava/TQLCDNumber.h,javalib/qtjava/TQLibrary.h,javalib/qtjava/TQLineEdit.h,javalib/qtjava/TQListBox.h,javalib/qtjava/TQListBoxItem.h,javalib/qtjava/TQListBoxPixmap.h,javalib/qtjava/TQListBoxText.h,javalib/qtjava/TQListView.h,javalib/qtjava/TQListViewItem.h,javalib/qtjava/TQLocalFs.h,javalib/qtjava/TQMainWindow.h,javalib/qtjava/TQMenuBar.h,javalib/qtjava/TQMenuData.h,javalib/qtjava/TQMenuItem.h,javalib/qtjava/TQMessageBox.h,javalib/qtjava/TQMetaData.h,javalib/qtjava/TQMetaEnum.h,javalib/qtjava/TQMetaObject.h,javalib/qtjava/TQMetaProperty.h,javalib/qtjava/TQMimeSource.h,javalib/qtjava/TQMimeSourceFactory.h,javalib/qtjava/TQMouseEvent.h,javalib/qtjava/TQMoveEvent.h,javalib/qtjava/TQMovie.h,javalib/qtjava/TQMultiLineEdit.h,javalib/qtjava/TQNetworkOperation.h,javalib/qtjava/TQNetworkProtocol.h,javalib/qtjava/TQObject.h,javalib/qtjava/TQObjectCleanupHandler.h,javalib/qtjava/TQPaintDevice.h,javalib/qtjava/TQPaintDeviceMetrics.h,javalib/qtjava/TQPainter.h,javalib/qtjava/TQPaintEvent.h,javalib/qtjava/TQPalette.h,javalib/qtjava/TQPen.h,javalib/qtjava/TQPicture.h,javalib/qtjava/TQPixmap.h,javalib/qtjava/TQPoint.h,javalib/qtjava/TQPointArray.h,javalib/qtjava/TQPolygonScanner.h,javalib/qtjava/TQPopupMenu.h,javalib/qtjava/TQPrintDialog.h,javalib/qtjava/TQPrinter.h,javalib/qtjava/TQProcess.h,javalib/qtjava/TQProgressBar.h,javalib/qtjava/TQProgressDialog.h,javalib/qtjava/TQPushButton.h,javalib/qtjava/TQRadioButton.h,javalib/qtjava/TQRangeControl.h,javalib/qtjava/TQRect.h,javalib/qtjava/TQRegExp.h,javalib/qtjava/TQRegExpValidator.h,javalib/qtjava/TQRegion.h,javalib/qtjava/TQResizeEvent.h,javalib/qtjava/TQScrollBar.h,javalib/qtjava/TQScrollView.h,javalib/qtjava/TQServerSocket.h,javalib/qtjava/TQSessionManager.h,javalib/qtjava/TQSettings.h,javalib/qtjava/TQShowEvent.h,javalib/qtjava/TQSignal.h,javalib/qtjava/TQSignalMapper.h,javalib/qtjava/TQSimpleRichText.h,javalib/qtjava/TQSize.h,javalib/qtjava/TQSizeGrip.h,javalib/qtjava/TQSizePolicy.h,javalib/qtjava/TQSjisCodec.h,javalib/qtjava/TQSlider.h,javalib/qtjava/TQSocket.h,javalib/qtjava/TQSocketDevice.h,javalib/qtjava/TQSocketNotifier.h,javalib/qtjava/TQSound.h,javalib/qtjava/TQSpacerItem.h,javalib/qtjava/TQSpinBox.h,javalib/qtjava/TQSplitter.h,javalib/qtjava/TQSql.h,javalib/qtjava/TQSqlCursor.h,javalib/qtjava/TQSqlDatabase.h,javalib/qtjava/TQSqlDriver.h,javalib/qtjava/TQSqlEditorFactory.h,javalib/qtjava/TQSqlError.h,javalib/qtjava/TQSqlField.h,javalib/qtjava/TQSqlForm.h,javalib/qtjava/TQSqlIndex.h,javalib/qtjava/TQSqlPropertyMap.h,javalib/qtjava/TQSqlQuery.h,javalib/qtjava/TQSqlRecord.h,javalib/qtjava/TQSqlResult.h,javalib/qtjava/TQStatusBar.h,javalib/qtjava/TQStoredDrag.h,javalib/qtjava/TQStyle.h,javalib/qtjava/TQStyleFactory.h,javalib/qtjava/TQStyleSheet.h,javalib/qtjava/TQStyleSheetItem.h,javalib/qtjava/Qt.h,javalib/qtjava/TQTab.h,javalib/qtjava/TQTabBar.h,javalib/qtjava/TQTabDialog.h,javalib/qtjava/TQTable.h,javalib/qtjava/TQTableItem.h,javalib/qtjava/TQTableSelection.h,javalib/qtjava/TQTabletEvent.h,javalib/qtjava/TQTabWidget.h,javalib/qtjava/TQTextBrowser.h,javalib/qtjava/TQTextCodec.h,javalib/qtjava/TQTextDecoder.h,javalib/qtjava/TQTextDrag.h,javalib/qtjava/TQTextEdit.h,javalib/qtjava/TQTextEncoder.h,javalib/qtjava/TQTextIStream.h,javalib/qtjava/TQTextOStream.h,javalib/qtjava/TQTextStream.h,javalib/qtjava/TQTextView.h,javalib/qtjava/TQTimeEdit.h,javalib/qtjava/TQTimer.h,javalib/qtjava/TQTimerEvent.h,javalib/qtjava/qtjava.h,javalib/qtjava/TQToolBar.h,javalib/qtjava/TQToolButton.h,javalib/qtjava/TQToolTip.h,javalib/qtjava/TQToolTipGroup.h,javalib/qtjava/TQTranslator.h,javalib/qtjava/TQTranslatorMessage.h,javalib/qtjava/TQTsciiCodec.h,javalib/qtjava/QtSupport.h,javalib/qtjava/TQUriDrag.h,javalib/qtjava/TQUrl.h,javalib/qtjava/TQUrlInfo.h,javalib/qtjava/TQUrlOperator.h,javalib/qtjava/TQUtf16Codec.h,javalib/qtjava/TQUtf8Codec.h,javalib/qtjava/TQUuid.h,javalib/qtjava/TQValidator.h,javalib/qtjava/TQVariant.h,javalib/qtjava/TQVBox.h,javalib/qtjava/TQVBoxLayout.h,javalib/qtjava/TQVButtonGroup.h,javalib/qtjava/TQVGroupBox.h,javalib/qtjava/TQWhatsThis.h,javalib/qtjava/TQWheelEvent.h,javalib/qtjava/TQWidget.h,javalib/qtjava/TQWidgetItem.h,javalib/qtjava/TQWidgetStack.h,javalib/qtjava/TQWizard.h,javalib/qtjava/TQWMatrix.h,javalib/qtjava/TQWorkspace.h,javalib/qtjava/TQXmlAttributes.h,javalib/qtjava/TQXmlContentHandler.h,javalib/qtjava/TQXmlReader.h install=false install_location= sub_dirs= @@ -2553,7 +2547,7 @@ install_location= type=HEADER [javalib/qtjava/Makefile.am] -files=javalib/qtjava/JavaSlot.h,javalib/qtjava/TQAccel.cpp,javalib/qtjava/TQAccel.h,javalib/qtjava/TQAction.cpp,javalib/qtjava/TQAction.h,javalib/qtjava/TQActionGroup.cpp,javalib/qtjava/TQActionGroup.h,javalib/qtjava/TQApplication.cpp,javalib/qtjava/TQApplication.h,javalib/qtjava/TQAsyncIO.cpp,javalib/qtjava/TQAsyncIO.h,javalib/qtjava/TQAuServer.cpp,javalib/qtjava/TQAuServer.h,javalib/qtjava/TQBig5Codec.cpp,javalib/qtjava/TQBig5Codec.h,javalib/qtjava/TQBitmap.cpp,javalib/qtjava/TQBitmap.h,javalib/qtjava/TQBoxLayout.cpp,javalib/qtjava/TQBoxLayout.h,javalib/qtjava/TQBrush.cpp,javalib/qtjava/TQBrush.h,javalib/qtjava/TQBuffer.cpp,javalib/qtjava/TQBuffer.h,javalib/qtjava/TQButton.cpp,javalib/qtjava/TQButton.h,javalib/qtjava/TQButtonGroup.cpp,javalib/qtjava/TQButtonGroup.h,javalib/qtjava/TQCanvas.cpp,javalib/qtjava/TQCanvas.h,javalib/qtjava/TQCanvasEllipse.cpp,javalib/qtjava/TQCanvasEllipse.h,javalib/qtjava/TQCanvasItem.cpp,javalib/qtjava/TQCanvasItem.h,javalib/qtjava/TQCanvasLine.cpp,javalib/qtjava/TQCanvasLine.h,javalib/qtjava/TQCanvasPixmap.cpp,javalib/qtjava/TQCanvasPixmap.h,javalib/qtjava/TQCanvasPixmapArray.cpp,javalib/qtjava/TQCanvasPixmapArray.h,javalib/qtjava/TQCanvasPolygon.cpp,javalib/qtjava/TQCanvasPolygon.h,javalib/qtjava/TQCanvasPolygonalItem.cpp,javalib/qtjava/TQCanvasPolygonalItem.h,javalib/qtjava/TQCanvasRectangle.cpp,javalib/qtjava/TQCanvasRectangle.h,javalib/qtjava/TQCanvasSpline.cpp,javalib/qtjava/TQCanvasSpline.h,javalib/qtjava/TQCanvasSprite.cpp,javalib/qtjava/TQCanvasSprite.h,javalib/qtjava/TQCanvasText.cpp,javalib/qtjava/TQCanvasText.h,javalib/qtjava/TQCanvasView.cpp,javalib/qtjava/TQCanvasView.h,javalib/qtjava/TQCheckBox.cpp,javalib/qtjava/TQCheckBox.h,javalib/qtjava/TQCheckListItem.cpp,javalib/qtjava/TQCheckListItem.h,javalib/qtjava/TQCheckTableItem.cpp,javalib/qtjava/TQCheckTableItem.h,javalib/qtjava/TQChildEvent.cpp,javalib/qtjava/TQChildEvent.h,javalib/qtjava/TQClassInfo.cpp,javalib/qtjava/TQClassInfo.h,javalib/qtjava/TQClipboard.cpp,javalib/qtjava/TQClipboard.h,javalib/qtjava/TQCloseEvent.cpp,javalib/qtjava/TQCloseEvent.h,javalib/qtjava/TQColor.cpp,javalib/qtjava/TQColor.h,javalib/qtjava/TQColorDialog.cpp,javalib/qtjava/TQColorDialog.h,javalib/qtjava/TQColorDrag.cpp,javalib/qtjava/TQColorDrag.h,javalib/qtjava/TQColorGroup.cpp,javalib/qtjava/TQColorGroup.h,javalib/qtjava/TQComboBox.cpp,javalib/qtjava/TQComboBox.h,javalib/qtjava/TQComboTableItem.cpp,javalib/qtjava/TQComboTableItem.h,javalib/qtjava/TQContextMenuEvent.cpp,javalib/qtjava/TQContextMenuEvent.h,javalib/qtjava/TQCursor.cpp,javalib/qtjava/TQCursor.h,javalib/qtjava/TQCustomEvent.cpp,javalib/qtjava/TQCustomEvent.h,javalib/qtjava/TQCustomMenuItem.cpp,javalib/qtjava/TQCustomMenuItem.h,javalib/qtjava/TQDataBrowser.cpp,javalib/qtjava/TQDataBrowser.h,javalib/qtjava/TQDataPump.cpp,javalib/qtjava/TQDataPump.h,javalib/qtjava/TQDataSink.cpp,javalib/qtjava/TQDataSink.h,javalib/qtjava/TQDataSource.cpp,javalib/qtjava/TQDataSource.h,javalib/qtjava/TQDataStream.cpp,javalib/qtjava/TQDataStream.h,javalib/qtjava/TQDataTable.cpp,javalib/qtjava/TQDataTable.h,javalib/qtjava/TQDataView.cpp,javalib/qtjava/TQDataView.h,javalib/qtjava/TQDateEdit.cpp,javalib/qtjava/TQDateEdit.h,javalib/qtjava/TQDateTimeEdit.cpp,javalib/qtjava/TQDateTimeEdit.h,javalib/qtjava/TQDateTimeEditBase.cpp,javalib/qtjava/TQDateTimeEditBase.h,javalib/qtjava/TQDesktopWidget.cpp,javalib/qtjava/TQDesktopWidget.h,javalib/qtjava/TQDial.cpp,javalib/qtjava/TQDial.h,javalib/qtjava/TQDialog.cpp,javalib/qtjava/TQDialog.h,javalib/qtjava/TQDir.cpp,javalib/qtjava/TQDir.h,javalib/qtjava/TQDockArea.cpp,javalib/qtjava/TQDockArea.h,javalib/qtjava/TQDockWindow.cpp,javalib/qtjava/TQDockWindow.h,javalib/qtjava/TQDomAttr.cpp,javalib/qtjava/TQDomAttr.h,javalib/qtjava/TQDomCDATASection.cpp,javalib/qtjava/TQDomCDATASection.h,javalib/qtjava/TQDomCharacterData.cpp,javalib/qtjava/TQDomCharacterData.h,javalib/qtjava/TQDomComment.cpp,javalib/qtjava/TQDomComment.h,javalib/qtjava/TQDomDocument.cpp,javalib/qtjava/TQDomDocument.h,javalib/qtjava/TQDomDocumentFragment.cpp,javalib/qtjava/TQDomDocumentFragment.h,javalib/qtjava/TQDomDocumentType.cpp,javalib/qtjava/TQDomDocumentType.h,javalib/qtjava/TQDomElement.cpp,javalib/qtjava/TQDomElement.h,javalib/qtjava/TQDomEntity.cpp,javalib/qtjava/TQDomEntity.h,javalib/qtjava/TQDomEntityReference.cpp,javalib/qtjava/TQDomEntityReference.h,javalib/qtjava/TQDomImplementation.cpp,javalib/qtjava/TQDomImplementation.h,javalib/qtjava/TQDomNamedNodeMap.cpp,javalib/qtjava/TQDomNamedNodeMap.h,javalib/qtjava/TQDomNode.cpp,javalib/qtjava/TQDomNode.h,javalib/qtjava/TQDomNotation.cpp,javalib/qtjava/TQDomNotation.h,javalib/qtjava/TQDomProcessingInstruction.cpp,javalib/qtjava/TQDomProcessingInstruction.h,javalib/qtjava/TQDomText.cpp,javalib/qtjava/TQDomText.h,javalib/qtjava/TQDoubleValidator.cpp,javalib/qtjava/TQDoubleValidator.h,javalib/qtjava/TQDragEnterEvent.cpp,javalib/qtjava/TQDragEnterEvent.h,javalib/qtjava/TQDragLeaveEvent.cpp,javalib/qtjava/TQDragLeaveEvent.h,javalib/qtjava/TQDragManager.cpp,javalib/qtjava/TQDragManager.h,javalib/qtjava/TQDragMoveEvent.cpp,javalib/qtjava/TQDragMoveEvent.h,javalib/qtjava/TQDragObject.cpp,javalib/qtjava/TQDragObject.h,javalib/qtjava/TQDragResponseEvent.cpp,javalib/qtjava/TQDragResponseEvent.h,javalib/qtjava/TQDropEvent.cpp,javalib/qtjava/TQDropEvent.h,javalib/qtjava/TQDropSite.cpp,javalib/qtjava/TQDropSite.h,javalib/qtjava/TQEditorFactory.cpp,javalib/qtjava/TQEditorFactory.h,javalib/qtjava/TQErrorMessage.cpp,javalib/qtjava/TQErrorMessage.h,javalib/qtjava/TQEucJpCodec.cpp,javalib/qtjava/TQEucJpCodec.h,javalib/qtjava/TQEucKrCodec.cpp,javalib/qtjava/TQEucKrCodec.h,javalib/qtjava/TQEvent.cpp,javalib/qtjava/TQEvent.h,javalib/qtjava/TQFile.cpp,javalib/qtjava/TQFile.h,javalib/qtjava/TQFileDialog.cpp,javalib/qtjava/TQFileDialog.h,javalib/qtjava/TQFileIconProvider.cpp,javalib/qtjava/TQFileIconProvider.h,javalib/qtjava/TQFileInfo.cpp,javalib/qtjava/TQFileInfo.h,javalib/qtjava/TQFilePreview.cpp,javalib/qtjava/TQFilePreview.h,javalib/qtjava/TQFocusData.cpp,javalib/qtjava/TQFocusData.h,javalib/qtjava/TQFocusEvent.cpp,javalib/qtjava/TQFocusEvent.h,javalib/qtjava/TQFont.cpp,javalib/qtjava/TQFont.h,javalib/qtjava/TQFontDatabase.cpp,javalib/qtjava/TQFontDatabase.h,javalib/qtjava/TQFontDialog.cpp,javalib/qtjava/TQFontDialog.h,javalib/qtjava/TQFontInfo.cpp,javalib/qtjava/TQFontInfo.h,javalib/qtjava/TQFontMetrics.cpp,javalib/qtjava/TQFontMetrics.h,javalib/qtjava/TQFrame.cpp,javalib/qtjava/TQFrame.h,javalib/qtjava/TQFtp.cpp,javalib/qtjava/TQFtp.h,javalib/qtjava/TQGrid.cpp,javalib/qtjava/TQGrid.h,javalib/qtjava/TQGridLayout.cpp,javalib/qtjava/TQGridLayout.h,javalib/qtjava/TQGridView.cpp,javalib/qtjava/TQGridView.h,javalib/qtjava/TQGroupBox.cpp,javalib/qtjava/TQGroupBox.h,javalib/qtjava/TQHBox.cpp,javalib/qtjava/TQHBox.h,javalib/qtjava/TQHBoxLayout.cpp,javalib/qtjava/TQHBoxLayout.h,javalib/qtjava/TQHButtonGroup.cpp,javalib/qtjava/TQHButtonGroup.h,javalib/qtjava/TQHeader.cpp,javalib/qtjava/TQHeader.h,javalib/qtjava/TQHebrewCodec.cpp,javalib/qtjava/TQHebrewCodec.h,javalib/qtjava/TQHGroupBox.cpp,javalib/qtjava/TQHGroupBox.h,javalib/qtjava/TQHideEvent.cpp,javalib/qtjava/TQHideEvent.h,javalib/qtjava/TQHostAddress.cpp,javalib/qtjava/TQHostAddress.h,javalib/qtjava/TQHttp.cpp,javalib/qtjava/TQHttp.h,javalib/qtjava/TQIconDrag.cpp,javalib/qtjava/TQIconDrag.h,javalib/qtjava/TQIconDragItem.cpp,javalib/qtjava/TQIconDragItem.h,javalib/qtjava/TQIconSet.cpp,javalib/qtjava/TQIconSet.h,javalib/qtjava/TQIconView.cpp,javalib/qtjava/TQIconView.h,javalib/qtjava/TQIconViewItem.cpp,javalib/qtjava/TQIconViewItem.h,javalib/qtjava/TQImage.cpp,javalib/qtjava/TQImage.h,javalib/qtjava/TQImageConsumer.cpp,javalib/qtjava/TQImageConsumer.h,javalib/qtjava/TQImageDecoder.cpp,javalib/qtjava/TQImageDecoder.h,javalib/qtjava/TQImageDrag.cpp,javalib/qtjava/TQImageDrag.h,javalib/qtjava/TQImageFormat.cpp,javalib/qtjava/TQImageFormat.h,javalib/qtjava/TQImageFormatType.cpp,javalib/qtjava/TQImageFormatType.h,javalib/qtjava/TQImageIO.cpp,javalib/qtjava/TQImageIO.h,javalib/qtjava/TQImageTextKeyLang.cpp,javalib/qtjava/TQImageTextKeyLang.h,javalib/qtjava/TQIMEvent.cpp,javalib/qtjava/TQIMEvent.h,javalib/qtjava/TQInputDialog.cpp,javalib/qtjava/TQInputDialog.h,javalib/qtjava/TQIntValidator.cpp,javalib/qtjava/TQIntValidator.h,javalib/qtjava/TQIODevice.cpp,javalib/qtjava/TQIODevice.h,javalib/qtjava/TQIODeviceSource.cpp,javalib/qtjava/TQIODeviceSource.h,javalib/qtjava/TQJisCodec.cpp,javalib/qtjava/TQJisCodec.h,javalib/qtjava/TQJpUnicodeConv.cpp,javalib/qtjava/TQJpUnicodeConv.h,javalib/qtjava/TQKeyEvent.cpp,javalib/qtjava/TQKeyEvent.h,javalib/qtjava/TQKeySequence.cpp,javalib/qtjava/TQKeySequence.h,javalib/qtjava/TQLabel.cpp,javalib/qtjava/TQLabel.h,javalib/qtjava/TQLayout.cpp,javalib/qtjava/TQLayout.h,javalib/qtjava/TQLayoutItem.cpp,javalib/qtjava/TQLayoutItem.h,javalib/qtjava/TQLCDNumber.cpp,javalib/qtjava/TQLCDNumber.h,javalib/qtjava/TQLibrary.cpp,javalib/qtjava/TQLibrary.h,javalib/qtjava/TQLineEdit.cpp,javalib/qtjava/TQLineEdit.h,javalib/qtjava/TQListBox.cpp,javalib/qtjava/TQListBox.h,javalib/qtjava/TQListBoxItem.cpp,javalib/qtjava/TQListBoxItem.h,javalib/qtjava/TQListBoxPixmap.cpp,javalib/qtjava/TQListBoxPixmap.h,javalib/qtjava/TQListBoxText.cpp,javalib/qtjava/TQListBoxText.h,javalib/qtjava/TQListView.cpp,javalib/qtjava/TQListView.h,javalib/qtjava/TQListViewItem.cpp,javalib/qtjava/TQListViewItem.h,javalib/qtjava/TQLocalFs.cpp,javalib/qtjava/TQLocalFs.h,javalib/qtjava/TQMainWindow.cpp,javalib/qtjava/TQMainWindow.h,javalib/qtjava/TQMenuBar.cpp,javalib/qtjava/TQMenuBar.h,javalib/qtjava/TQMenuData.cpp,javalib/qtjava/TQMenuData.h,javalib/qtjava/TQMenuItem.cpp,javalib/qtjava/TQMenuItem.h,javalib/qtjava/TQMessageBox.cpp,javalib/qtjava/TQMessageBox.h,javalib/qtjava/TQMetaData.cpp,javalib/qtjava/TQMetaData.h,javalib/qtjava/TQMetaEnum.cpp,javalib/qtjava/TQMetaEnum.h,javalib/qtjava/TQMetaObject.cpp,javalib/qtjava/TQMetaObject.h,javalib/qtjava/TQMetaProperty.cpp,javalib/qtjava/TQMetaProperty.h,javalib/qtjava/TQMimeSource.cpp,javalib/qtjava/TQMimeSource.h,javalib/qtjava/TQMimeSourceFactory.cpp,javalib/qtjava/TQMimeSourceFactory.h,javalib/qtjava/TQMouseEvent.cpp,javalib/qtjava/TQMouseEvent.h,javalib/qtjava/TQMoveEvent.cpp,javalib/qtjava/TQMoveEvent.h,javalib/qtjava/TQMovie.cpp,javalib/qtjava/TQMovie.h,javalib/qtjava/TQMultiLineEdit.cpp,javalib/qtjava/TQMultiLineEdit.h,javalib/qtjava/TQNetworkOperation.cpp,javalib/qtjava/TQNetworkOperation.h,javalib/qtjava/TQNetworkProtocol.cpp,javalib/qtjava/TQNetworkProtocol.h,javalib/qtjava/TQObject.cpp,javalib/qtjava/TQObject.h,javalib/qtjava/TQObjectCleanupHandler.cpp,javalib/qtjava/TQObjectCleanupHandler.h,javalib/qtjava/TQPaintDevice.cpp,javalib/qtjava/TQPaintDevice.h,javalib/qtjava/TQPaintDeviceMetrics.cpp,javalib/qtjava/TQPaintDeviceMetrics.h,javalib/qtjava/TQPainter.cpp,javalib/qtjava/TQPainter.h,javalib/qtjava/TQPaintEvent.cpp,javalib/qtjava/TQPaintEvent.h,javalib/qtjava/TQPalette.cpp,javalib/qtjava/TQPalette.h,javalib/qtjava/TQPen.cpp,javalib/qtjava/TQPen.h,javalib/qtjava/TQPicture.cpp,javalib/qtjava/TQPicture.h,javalib/qtjava/TQPixmap.cpp,javalib/qtjava/TQPixmap.h,javalib/qtjava/TQPoint.cpp,javalib/qtjava/TQPoint.h,javalib/qtjava/TQPointArray.cpp,javalib/qtjava/TQPointArray.h,javalib/qtjava/TQPolygonScanner.cpp,javalib/qtjava/TQPolygonScanner.h,javalib/qtjava/TQPopupMenu.cpp,javalib/qtjava/TQPopupMenu.h,javalib/qtjava/TQPrintDialog.cpp,javalib/qtjava/TQPrintDialog.h,javalib/qtjava/TQPrinter.cpp,javalib/qtjava/TQPrinter.h,javalib/qtjava/TQProcess.cpp,javalib/qtjava/TQProcess.h,javalib/qtjava/TQProgressBar.cpp,javalib/qtjava/TQProgressBar.h,javalib/qtjava/TQProgressDialog.cpp,javalib/qtjava/TQProgressDialog.h,javalib/qtjava/TQPushButton.cpp,javalib/qtjava/TQPushButton.h,javalib/qtjava/TQRadioButton.cpp,javalib/qtjava/TQRadioButton.h,javalib/qtjava/TQRangeControl.cpp,javalib/qtjava/TQRangeControl.h,javalib/qtjava/TQRect.cpp,javalib/qtjava/TQRect.h,javalib/qtjava/TQRegExp.cpp,javalib/qtjava/TQRegExp.h,javalib/qtjava/TQRegExpValidator.cpp,javalib/qtjava/TQRegExpValidator.h,javalib/qtjava/TQRegion.cpp,javalib/qtjava/TQRegion.h,javalib/qtjava/TQResizeEvent.cpp,javalib/qtjava/TQResizeEvent.h,javalib/qtjava/TQScrollBar.cpp,javalib/qtjava/TQScrollBar.h,javalib/qtjava/TQScrollView.cpp,javalib/qtjava/TQScrollView.h,javalib/qtjava/TQSemiModal.cpp,javalib/qtjava/TQSemiModal.h,javalib/qtjava/TQServerSocket.cpp,javalib/qtjava/TQServerSocket.h,javalib/qtjava/TQSessionManager.cpp,javalib/qtjava/TQSessionManager.h,javalib/qtjava/TQSettings.cpp,javalib/qtjava/TQSettings.h,javalib/qtjava/TQShowEvent.cpp,javalib/qtjava/TQShowEvent.h,javalib/qtjava/TQSignal.cpp,javalib/qtjava/TQSignal.h,javalib/qtjava/TQSignalMapper.cpp,javalib/qtjava/TQSignalMapper.h,javalib/qtjava/TQSimpleRichText.cpp,javalib/qtjava/TQSimpleRichText.h,javalib/qtjava/TQSize.cpp,javalib/qtjava/TQSize.h,javalib/qtjava/TQSizeGrip.cpp,javalib/qtjava/TQSizeGrip.h,javalib/qtjava/TQSizePolicy.cpp,javalib/qtjava/TQSizePolicy.h,javalib/qtjava/TQSjisCodec.cpp,javalib/qtjava/TQSjisCodec.h,javalib/qtjava/TQSlider.cpp,javalib/qtjava/TQSlider.h,javalib/qtjava/TQSocket.cpp,javalib/qtjava/TQSocket.h,javalib/qtjava/TQSocketDevice.cpp,javalib/qtjava/TQSocketDevice.h,javalib/qtjava/TQSocketNotifier.cpp,javalib/qtjava/TQSocketNotifier.h,javalib/qtjava/TQSound.cpp,javalib/qtjava/TQSound.h,javalib/qtjava/TQSpacerItem.cpp,javalib/qtjava/TQSpacerItem.h,javalib/qtjava/TQSpinBox.cpp,javalib/qtjava/TQSpinBox.h,javalib/qtjava/TQSplitter.cpp,javalib/qtjava/TQSplitter.h,javalib/qtjava/TQSql.cpp,javalib/qtjava/TQSql.h,javalib/qtjava/TQSqlCursor.cpp,javalib/qtjava/TQSqlCursor.h,javalib/qtjava/TQSqlDatabase.cpp,javalib/qtjava/TQSqlDatabase.h,javalib/qtjava/TQSqlDriver.cpp,javalib/qtjava/TQSqlDriver.h,javalib/qtjava/TQSqlEditorFactory.cpp,javalib/qtjava/TQSqlEditorFactory.h,javalib/qtjava/TQSqlError.cpp,javalib/qtjava/TQSqlError.h,javalib/qtjava/TQSqlField.cpp,javalib/qtjava/TQSqlField.h,javalib/qtjava/TQSqlForm.cpp,javalib/qtjava/TQSqlForm.h,javalib/qtjava/TQSqlIndex.cpp,javalib/qtjava/TQSqlIndex.h,javalib/qtjava/TQSqlPropertyMap.cpp,javalib/qtjava/TQSqlPropertyMap.h,javalib/qtjava/TQSqlQuery.cpp,javalib/qtjava/TQSqlQuery.h,javalib/qtjava/TQSqlRecord.cpp,javalib/qtjava/TQSqlRecord.h,javalib/qtjava/TQSqlResult.cpp,javalib/qtjava/TQSqlResult.h,javalib/qtjava/TQStatusBar.cpp,javalib/qtjava/TQStatusBar.h,javalib/qtjava/TQStoredDrag.cpp,javalib/qtjava/TQStoredDrag.h,javalib/qtjava/TQStyle.cpp,javalib/qtjava/TQStyle.h,javalib/qtjava/TQStyleFactory.cpp,javalib/qtjava/TQStyleFactory.h,javalib/qtjava/TQStyleSheet.cpp,javalib/qtjava/TQStyleSheet.h,javalib/qtjava/TQStyleSheetItem.cpp,javalib/qtjava/TQStyleSheetItem.h,javalib/qtjava/Qt.cpp,javalib/qtjava/Qt.h,javalib/qtjava/TQTab.cpp,javalib/qtjava/TQTab.h,javalib/qtjava/TQTabBar.cpp,javalib/qtjava/TQTabBar.h,javalib/qtjava/TQTabDialog.cpp,javalib/qtjava/TQTabDialog.h,javalib/qtjava/TQTable.cpp,javalib/qtjava/TQTable.h,javalib/qtjava/TQTableItem.cpp,javalib/qtjava/TQTableItem.h,javalib/qtjava/TQTableSelection.cpp,javalib/qtjava/TQTableSelection.h,javalib/qtjava/TQTabletEvent.cpp,javalib/qtjava/TQTabletEvent.h,javalib/qtjava/TQTabWidget.cpp,javalib/qtjava/TQTabWidget.h,javalib/qtjava/TQTextBrowser.cpp,javalib/qtjava/TQTextBrowser.h,javalib/qtjava/TQTextCodec.cpp,javalib/qtjava/TQTextCodec.h,javalib/qtjava/TQTextDecoder.cpp,javalib/qtjava/TQTextDecoder.h,javalib/qtjava/TQTextDrag.cpp,javalib/qtjava/TQTextDrag.h,javalib/qtjava/TQTextEdit.cpp,javalib/qtjava/TQTextEdit.h,javalib/qtjava/TQTextEncoder.cpp,javalib/qtjava/TQTextEncoder.h,javalib/qtjava/TQTextIStream.cpp,javalib/qtjava/TQTextIStream.h,javalib/qtjava/TQTextOStream.cpp,javalib/qtjava/TQTextOStream.h,javalib/qtjava/TQTextStream.cpp,javalib/qtjava/TQTextStream.h,javalib/qtjava/TQTextView.cpp,javalib/qtjava/TQTextView.h,javalib/qtjava/TQTimeEdit.cpp,javalib/qtjava/TQTimeEdit.h,javalib/qtjava/TQTimer.cpp,javalib/qtjava/TQTimer.h,javalib/qtjava/TQTimerEvent.cpp,javalib/qtjava/TQTimerEvent.h,javalib/qtjava/qtjava.cpp,javalib/qtjava/qtjava.h,javalib/qtjava/TQToolBar.cpp,javalib/qtjava/TQToolBar.h,javalib/qtjava/TQToolButton.cpp,javalib/qtjava/TQToolButton.h,javalib/qtjava/TQToolTip.cpp,javalib/qtjava/TQToolTip.h,javalib/qtjava/TQToolTipGroup.cpp,javalib/qtjava/TQToolTipGroup.h,javalib/qtjava/TQTranslator.cpp,javalib/qtjava/TQTranslator.h,javalib/qtjava/TQTranslatorMessage.cpp,javalib/qtjava/TQTranslatorMessage.h,javalib/qtjava/TQTsciiCodec.cpp,javalib/qtjava/TQTsciiCodec.h,javalib/qtjava/QtSupport.cpp,javalib/qtjava/TQUriDrag.cpp,javalib/qtjava/TQUriDrag.h,javalib/qtjava/TQUrl.cpp,javalib/qtjava/TQUrl.h,javalib/qtjava/TQUrlInfo.cpp,javalib/qtjava/TQUrlInfo.h,javalib/qtjava/TQUrlOperator.cpp,javalib/qtjava/TQUrlOperator.h,javalib/qtjava/TQUtf16Codec.cpp,javalib/qtjava/TQUtf16Codec.h,javalib/qtjava/TQUtf8Codec.cpp,javalib/qtjava/TQUtf8Codec.h,javalib/qtjava/TQUuid.cpp,javalib/qtjava/TQUuid.h,javalib/qtjava/TQValidator.cpp,javalib/qtjava/TQValidator.h,javalib/qtjava/TQVariant.cpp,javalib/qtjava/TQVariant.h,javalib/qtjava/TQVBox.cpp,javalib/qtjava/TQVBox.h,javalib/qtjava/TQVBoxLayout.cpp,javalib/qtjava/TQVBoxLayout.h,javalib/qtjava/TQVButtonGroup.cpp,javalib/qtjava/TQVButtonGroup.h,javalib/qtjava/TQVGroupBox.cpp,javalib/qtjava/TQVGroupBox.h,javalib/qtjava/TQWhatsThis.cpp,javalib/qtjava/TQWhatsThis.h,javalib/qtjava/TQWheelEvent.cpp,javalib/qtjava/TQWheelEvent.h,javalib/qtjava/TQWidget.cpp,javalib/qtjava/TQWidget.h,javalib/qtjava/TQWidgetItem.cpp,javalib/qtjava/TQWidgetItem.h,javalib/qtjava/TQWidgetStack.cpp,javalib/qtjava/TQWidgetStack.h,javalib/qtjava/TQWizard.cpp,javalib/qtjava/TQWizard.h,javalib/qtjava/TQWMatrix.cpp,javalib/qtjava/TQWMatrix.h,javalib/qtjava/TQWorkspace.cpp,javalib/qtjava/TQWorkspace.h,javalib/qtjava/TQXmlAttributes.cpp,javalib/qtjava/TQXmlAttributes.h,javalib/qtjava/TQXmlContentHandler.cpp,javalib/qtjava/TQXmlContentHandler.h,javalib/qtjava/TQXmlDeclHandler.cpp,javalib/qtjava/TQXmlDeclHandler.h,javalib/qtjava/TQXmlDefaultHandler.cpp,javalib/qtjava/TQXmlDefaultHandler.h,javalib/qtjava/TQXmlDTDHandler.cpp,javalib/qtjava/TQXmlDTDHandler.h,javalib/qtjava/TQXmlEntityResolver.cpp,javalib/qtjava/TQXmlEntityResolver.h,javalib/qtjava/TQXmlErrorHandler.cpp,javalib/qtjava/TQXmlErrorHandler.h,javalib/qtjava/TQXmlInputSource.cpp,javalib/qtjava/TQXmlInputSource.h,javalib/qtjava/TQXmlLexicalHandler.cpp,javalib/qtjava/TQXmlLexicalHandler.h,javalib/qtjava/TQXmlLocator.cpp,javalib/qtjava/TQXmlLocator.h,javalib/qtjava/TQXmlNamespaceSupport.cpp,javalib/qtjava/TQXmlNamespaceSupport.h,javalib/qtjava/TQXmlParseException.cpp,javalib/qtjava/TQXmlParseException.h,javalib/qtjava/TQXmlReader.cpp,javalib/qtjava/TQXmlReader.h,javalib/qtjava/TQXmlSimpleReader.cpp,javalib/qtjava/TQXmlSimpleReader.h,javalib/qtjava/TQGb18030Codec.cpp,javalib/qtjava/TQGb18030Codec.h,javalib/qtjava/TQEventLoop.cpp,javalib/qtjava/TQHttpHeader.cpp,javalib/qtjava/TQHttpRequestHeader.cpp,javalib/qtjava/TQHttpResponseHeader.cpp,javalib/qtjava/TQSpinWidget.cpp,javalib/qtjava/TQSplashScreen.cpp,javalib/qtjava/TQToolBox.cpp,javalib/qtjava/TQEventLoop.h,javalib/qtjava/TQHttpHeader.h,javalib/qtjava/TQHttpRequestHeader.h,javalib/qtjava/TQSpinWidget.h,javalib/qtjava/TQSplashScreen.h,javalib/qtjava/TQToolBox.h,javalib/qtjava/TQHttpResponseHeader.h,javalib/qtjava/QtSupport.h,javalib/qtjava/TQSyntaxHighlighter.cpp,javalib/qtjava/TQSyntaxHighlighter.h,javalib/qtjava/JavaSlot.cpp +files=javalib/qtjava/JavaSlot.h,javalib/qtjava/TQAccel.cpp,javalib/qtjava/TQAccel.h,javalib/qtjava/TQAction.cpp,javalib/qtjava/TQAction.h,javalib/qtjava/TQActionGroup.cpp,javalib/qtjava/TQActionGroup.h,javalib/qtjava/TQApplication.cpp,javalib/qtjava/TQApplication.h,javalib/qtjava/TQAsyncIO.cpp,javalib/qtjava/TQAsyncIO.h,javalib/qtjava/TQAuServer.cpp,javalib/qtjava/TQAuServer.h,javalib/qtjava/TQBig5Codec.cpp,javalib/qtjava/TQBig5Codec.h,javalib/qtjava/TQBitmap.cpp,javalib/qtjava/TQBitmap.h,javalib/qtjava/TQBoxLayout.cpp,javalib/qtjava/TQBoxLayout.h,javalib/qtjava/TQBrush.cpp,javalib/qtjava/TQBrush.h,javalib/qtjava/TQBuffer.cpp,javalib/qtjava/TQBuffer.h,javalib/qtjava/TQButton.cpp,javalib/qtjava/TQButton.h,javalib/qtjava/TQButtonGroup.cpp,javalib/qtjava/TQButtonGroup.h,javalib/qtjava/TQCanvas.cpp,javalib/qtjava/TQCanvas.h,javalib/qtjava/TQCanvasEllipse.cpp,javalib/qtjava/TQCanvasEllipse.h,javalib/qtjava/TQCanvasItem.cpp,javalib/qtjava/TQCanvasItem.h,javalib/qtjava/TQCanvasLine.cpp,javalib/qtjava/TQCanvasLine.h,javalib/qtjava/TQCanvasPixmap.cpp,javalib/qtjava/TQCanvasPixmap.h,javalib/qtjava/TQCanvasPixmapArray.cpp,javalib/qtjava/TQCanvasPixmapArray.h,javalib/qtjava/TQCanvasPolygon.cpp,javalib/qtjava/TQCanvasPolygon.h,javalib/qtjava/TQCanvasPolygonalItem.cpp,javalib/qtjava/TQCanvasPolygonalItem.h,javalib/qtjava/TQCanvasRectangle.cpp,javalib/qtjava/TQCanvasRectangle.h,javalib/qtjava/TQCanvasSpline.cpp,javalib/qtjava/TQCanvasSpline.h,javalib/qtjava/TQCanvasSprite.cpp,javalib/qtjava/TQCanvasSprite.h,javalib/qtjava/TQCanvasText.cpp,javalib/qtjava/TQCanvasText.h,javalib/qtjava/TQCanvasView.cpp,javalib/qtjava/TQCanvasView.h,javalib/qtjava/TQCheckBox.cpp,javalib/qtjava/TQCheckBox.h,javalib/qtjava/TQCheckListItem.cpp,javalib/qtjava/TQCheckListItem.h,javalib/qtjava/TQCheckTableItem.cpp,javalib/qtjava/TQCheckTableItem.h,javalib/qtjava/TQChildEvent.cpp,javalib/qtjava/TQChildEvent.h,javalib/qtjava/TQClassInfo.cpp,javalib/qtjava/TQClassInfo.h,javalib/qtjava/TQClipboard.cpp,javalib/qtjava/TQClipboard.h,javalib/qtjava/TQCloseEvent.cpp,javalib/qtjava/TQCloseEvent.h,javalib/qtjava/TQColor.cpp,javalib/qtjava/TQColor.h,javalib/qtjava/TQColorDialog.cpp,javalib/qtjava/TQColorDialog.h,javalib/qtjava/TQColorDrag.cpp,javalib/qtjava/TQColorDrag.h,javalib/qtjava/TQColorGroup.cpp,javalib/qtjava/TQColorGroup.h,javalib/qtjava/TQComboBox.cpp,javalib/qtjava/TQComboBox.h,javalib/qtjava/TQComboTableItem.cpp,javalib/qtjava/TQComboTableItem.h,javalib/qtjava/TQContextMenuEvent.cpp,javalib/qtjava/TQContextMenuEvent.h,javalib/qtjava/TQCursor.cpp,javalib/qtjava/TQCursor.h,javalib/qtjava/TQCustomEvent.cpp,javalib/qtjava/TQCustomEvent.h,javalib/qtjava/TQCustomMenuItem.cpp,javalib/qtjava/TQCustomMenuItem.h,javalib/qtjava/TQDataBrowser.cpp,javalib/qtjava/TQDataBrowser.h,javalib/qtjava/TQDataPump.cpp,javalib/qtjava/TQDataPump.h,javalib/qtjava/TQDataSink.cpp,javalib/qtjava/TQDataSink.h,javalib/qtjava/TQDataSource.cpp,javalib/qtjava/TQDataSource.h,javalib/qtjava/TQDataStream.cpp,javalib/qtjava/TQDataStream.h,javalib/qtjava/TQDataTable.cpp,javalib/qtjava/TQDataTable.h,javalib/qtjava/TQDataView.cpp,javalib/qtjava/TQDataView.h,javalib/qtjava/TQDateEdit.cpp,javalib/qtjava/TQDateEdit.h,javalib/qtjava/TQDateTimeEdit.cpp,javalib/qtjava/TQDateTimeEdit.h,javalib/qtjava/TQDateTimeEditBase.cpp,javalib/qtjava/TQDateTimeEditBase.h,javalib/qtjava/TQDesktopWidget.cpp,javalib/qtjava/TQDesktopWidget.h,javalib/qtjava/TQDial.cpp,javalib/qtjava/TQDial.h,javalib/qtjava/TQDialog.cpp,javalib/qtjava/TQDialog.h,javalib/qtjava/TQDir.cpp,javalib/qtjava/TQDir.h,javalib/qtjava/TQDockArea.cpp,javalib/qtjava/TQDockArea.h,javalib/qtjava/TQDockWindow.cpp,javalib/qtjava/TQDockWindow.h,javalib/qtjava/TQDomAttr.cpp,javalib/qtjava/TQDomAttr.h,javalib/qtjava/TQDomCDATASection.cpp,javalib/qtjava/TQDomCDATASection.h,javalib/qtjava/TQDomCharacterData.cpp,javalib/qtjava/TQDomCharacterData.h,javalib/qtjava/TQDomComment.cpp,javalib/qtjava/TQDomComment.h,javalib/qtjava/TQDomDocument.cpp,javalib/qtjava/TQDomDocument.h,javalib/qtjava/TQDomDocumentFragment.cpp,javalib/qtjava/TQDomDocumentFragment.h,javalib/qtjava/TQDomDocumentType.cpp,javalib/qtjava/TQDomDocumentType.h,javalib/qtjava/TQDomElement.cpp,javalib/qtjava/TQDomElement.h,javalib/qtjava/TQDomEntity.cpp,javalib/qtjava/TQDomEntity.h,javalib/qtjava/TQDomEntityReference.cpp,javalib/qtjava/TQDomEntityReference.h,javalib/qtjava/TQDomImplementation.cpp,javalib/qtjava/TQDomImplementation.h,javalib/qtjava/TQDomNamedNodeMap.cpp,javalib/qtjava/TQDomNamedNodeMap.h,javalib/qtjava/TQDomNode.cpp,javalib/qtjava/TQDomNode.h,javalib/qtjava/TQDomNotation.cpp,javalib/qtjava/TQDomNotation.h,javalib/qtjava/TQDomProcessingInstruction.cpp,javalib/qtjava/TQDomProcessingInstruction.h,javalib/qtjava/TQDomText.cpp,javalib/qtjava/TQDomText.h,javalib/qtjava/TQDoubleValidator.cpp,javalib/qtjava/TQDoubleValidator.h,javalib/qtjava/TQDragEnterEvent.cpp,javalib/qtjava/TQDragEnterEvent.h,javalib/qtjava/TQDragLeaveEvent.cpp,javalib/qtjava/TQDragLeaveEvent.h,javalib/qtjava/TQDragManager.cpp,javalib/qtjava/TQDragManager.h,javalib/qtjava/TQDragMoveEvent.cpp,javalib/qtjava/TQDragMoveEvent.h,javalib/qtjava/TQDragObject.cpp,javalib/qtjava/TQDragObject.h,javalib/qtjava/TQDragResponseEvent.cpp,javalib/qtjava/TQDragResponseEvent.h,javalib/qtjava/TQDropEvent.cpp,javalib/qtjava/TQDropEvent.h,javalib/qtjava/TQDropSite.cpp,javalib/qtjava/TQDropSite.h,javalib/qtjava/TQEditorFactory.cpp,javalib/qtjava/TQEditorFactory.h,javalib/qtjava/TQErrorMessage.cpp,javalib/qtjava/TQErrorMessage.h,javalib/qtjava/TQEucJpCodec.cpp,javalib/qtjava/TQEucJpCodec.h,javalib/qtjava/TQEucKrCodec.cpp,javalib/qtjava/TQEucKrCodec.h,javalib/qtjava/TQEvent.cpp,javalib/qtjava/TQEvent.h,javalib/qtjava/TQFile.cpp,javalib/qtjava/TQFile.h,javalib/qtjava/TQFileDialog.cpp,javalib/qtjava/TQFileDialog.h,javalib/qtjava/TQFileIconProvider.cpp,javalib/qtjava/TQFileIconProvider.h,javalib/qtjava/TQFileInfo.cpp,javalib/qtjava/TQFileInfo.h,javalib/qtjava/TQFilePreview.cpp,javalib/qtjava/TQFilePreview.h,javalib/qtjava/TQFocusData.cpp,javalib/qtjava/TQFocusData.h,javalib/qtjava/TQFocusEvent.cpp,javalib/qtjava/TQFocusEvent.h,javalib/qtjava/TQFont.cpp,javalib/qtjava/TQFont.h,javalib/qtjava/TQFontDatabase.cpp,javalib/qtjava/TQFontDatabase.h,javalib/qtjava/TQFontDialog.cpp,javalib/qtjava/TQFontDialog.h,javalib/qtjava/TQFontInfo.cpp,javalib/qtjava/TQFontInfo.h,javalib/qtjava/TQFontMetrics.cpp,javalib/qtjava/TQFontMetrics.h,javalib/qtjava/TQFrame.cpp,javalib/qtjava/TQFrame.h,javalib/qtjava/TQFtp.cpp,javalib/qtjava/TQFtp.h,javalib/qtjava/TQGrid.cpp,javalib/qtjava/TQGrid.h,javalib/qtjava/TQGridLayout.cpp,javalib/qtjava/TQGridLayout.h,javalib/qtjava/TQGridView.cpp,javalib/qtjava/TQGridView.h,javalib/qtjava/TQGroupBox.cpp,javalib/qtjava/TQGroupBox.h,javalib/qtjava/TQHBox.cpp,javalib/qtjava/TQHBox.h,javalib/qtjava/TQHBoxLayout.cpp,javalib/qtjava/TQHBoxLayout.h,javalib/qtjava/TQHButtonGroup.cpp,javalib/qtjava/TQHButtonGroup.h,javalib/qtjava/TQHeader.cpp,javalib/qtjava/TQHeader.h,javalib/qtjava/TQHebrewCodec.cpp,javalib/qtjava/TQHebrewCodec.h,javalib/qtjava/TQHGroupBox.cpp,javalib/qtjava/TQHGroupBox.h,javalib/qtjava/TQHideEvent.cpp,javalib/qtjava/TQHideEvent.h,javalib/qtjava/TQHostAddress.cpp,javalib/qtjava/TQHostAddress.h,javalib/qtjava/TQHttp.cpp,javalib/qtjava/TQHttp.h,javalib/qtjava/TQIconDrag.cpp,javalib/qtjava/TQIconDrag.h,javalib/qtjava/TQIconDragItem.cpp,javalib/qtjava/TQIconDragItem.h,javalib/qtjava/TQIconSet.cpp,javalib/qtjava/TQIconSet.h,javalib/qtjava/TQIconView.cpp,javalib/qtjava/TQIconView.h,javalib/qtjava/TQIconViewItem.cpp,javalib/qtjava/TQIconViewItem.h,javalib/qtjava/TQImage.cpp,javalib/qtjava/TQImage.h,javalib/qtjava/TQImageConsumer.cpp,javalib/qtjava/TQImageConsumer.h,javalib/qtjava/TQImageDecoder.cpp,javalib/qtjava/TQImageDecoder.h,javalib/qtjava/TQImageDrag.cpp,javalib/qtjava/TQImageDrag.h,javalib/qtjava/TQImageFormat.cpp,javalib/qtjava/TQImageFormat.h,javalib/qtjava/TQImageFormatType.cpp,javalib/qtjava/TQImageFormatType.h,javalib/qtjava/TQImageIO.cpp,javalib/qtjava/TQImageIO.h,javalib/qtjava/TQImageTextKeyLang.cpp,javalib/qtjava/TQImageTextKeyLang.h,javalib/qtjava/TQIMEvent.cpp,javalib/qtjava/TQIMEvent.h,javalib/qtjava/TQInputDialog.cpp,javalib/qtjava/TQInputDialog.h,javalib/qtjava/TQIntValidator.cpp,javalib/qtjava/TQIntValidator.h,javalib/qtjava/TQIODevice.cpp,javalib/qtjava/TQIODevice.h,javalib/qtjava/TQIODeviceSource.cpp,javalib/qtjava/TQIODeviceSource.h,javalib/qtjava/TQJisCodec.cpp,javalib/qtjava/TQJisCodec.h,javalib/qtjava/TQJpUnicodeConv.cpp,javalib/qtjava/TQJpUnicodeConv.h,javalib/qtjava/TQKeyEvent.cpp,javalib/qtjava/TQKeyEvent.h,javalib/qtjava/TQKeySequence.cpp,javalib/qtjava/TQKeySequence.h,javalib/qtjava/TQLabel.cpp,javalib/qtjava/TQLabel.h,javalib/qtjava/TQLayout.cpp,javalib/qtjava/TQLayout.h,javalib/qtjava/TQLayoutItem.cpp,javalib/qtjava/TQLayoutItem.h,javalib/qtjava/TQLCDNumber.cpp,javalib/qtjava/TQLCDNumber.h,javalib/qtjava/TQLibrary.cpp,javalib/qtjava/TQLibrary.h,javalib/qtjava/TQLineEdit.cpp,javalib/qtjava/TQLineEdit.h,javalib/qtjava/TQListBox.cpp,javalib/qtjava/TQListBox.h,javalib/qtjava/TQListBoxItem.cpp,javalib/qtjava/TQListBoxItem.h,javalib/qtjava/TQListBoxPixmap.cpp,javalib/qtjava/TQListBoxPixmap.h,javalib/qtjava/TQListBoxText.cpp,javalib/qtjava/TQListBoxText.h,javalib/qtjava/TQListView.cpp,javalib/qtjava/TQListView.h,javalib/qtjava/TQListViewItem.cpp,javalib/qtjava/TQListViewItem.h,javalib/qtjava/TQLocalFs.cpp,javalib/qtjava/TQLocalFs.h,javalib/qtjava/TQMainWindow.cpp,javalib/qtjava/TQMainWindow.h,javalib/qtjava/TQMenuBar.cpp,javalib/qtjava/TQMenuBar.h,javalib/qtjava/TQMenuData.cpp,javalib/qtjava/TQMenuData.h,javalib/qtjava/TQMenuItem.cpp,javalib/qtjava/TQMenuItem.h,javalib/qtjava/TQMessageBox.cpp,javalib/qtjava/TQMessageBox.h,javalib/qtjava/TQMetaData.cpp,javalib/qtjava/TQMetaData.h,javalib/qtjava/TQMetaEnum.cpp,javalib/qtjava/TQMetaEnum.h,javalib/qtjava/TQMetaObject.cpp,javalib/qtjava/TQMetaObject.h,javalib/qtjava/TQMetaProperty.cpp,javalib/qtjava/TQMetaProperty.h,javalib/qtjava/TQMimeSource.cpp,javalib/qtjava/TQMimeSource.h,javalib/qtjava/TQMimeSourceFactory.cpp,javalib/qtjava/TQMimeSourceFactory.h,javalib/qtjava/TQMouseEvent.cpp,javalib/qtjava/TQMouseEvent.h,javalib/qtjava/TQMoveEvent.cpp,javalib/qtjava/TQMoveEvent.h,javalib/qtjava/TQMovie.cpp,javalib/qtjava/TQMovie.h,javalib/qtjava/TQMultiLineEdit.cpp,javalib/qtjava/TQMultiLineEdit.h,javalib/qtjava/TQNetworkOperation.cpp,javalib/qtjava/TQNetworkOperation.h,javalib/qtjava/TQNetworkProtocol.cpp,javalib/qtjava/TQNetworkProtocol.h,javalib/qtjava/TQObject.cpp,javalib/qtjava/TQObject.h,javalib/qtjava/TQObjectCleanupHandler.cpp,javalib/qtjava/TQObjectCleanupHandler.h,javalib/qtjava/TQPaintDevice.cpp,javalib/qtjava/TQPaintDevice.h,javalib/qtjava/TQPaintDeviceMetrics.cpp,javalib/qtjava/TQPaintDeviceMetrics.h,javalib/qtjava/TQPainter.cpp,javalib/qtjava/TQPainter.h,javalib/qtjava/TQPaintEvent.cpp,javalib/qtjava/TQPaintEvent.h,javalib/qtjava/TQPalette.cpp,javalib/qtjava/TQPalette.h,javalib/qtjava/TQPen.cpp,javalib/qtjava/TQPen.h,javalib/qtjava/TQPicture.cpp,javalib/qtjava/TQPicture.h,javalib/qtjava/TQPixmap.cpp,javalib/qtjava/TQPixmap.h,javalib/qtjava/TQPoint.cpp,javalib/qtjava/TQPoint.h,javalib/qtjava/TQPointArray.cpp,javalib/qtjava/TQPointArray.h,javalib/qtjava/TQPolygonScanner.cpp,javalib/qtjava/TQPolygonScanner.h,javalib/qtjava/TQPopupMenu.cpp,javalib/qtjava/TQPopupMenu.h,javalib/qtjava/TQPrintDialog.cpp,javalib/qtjava/TQPrintDialog.h,javalib/qtjava/TQPrinter.cpp,javalib/qtjava/TQPrinter.h,javalib/qtjava/TQProcess.cpp,javalib/qtjava/TQProcess.h,javalib/qtjava/TQProgressBar.cpp,javalib/qtjava/TQProgressBar.h,javalib/qtjava/TQProgressDialog.cpp,javalib/qtjava/TQProgressDialog.h,javalib/qtjava/TQPushButton.cpp,javalib/qtjava/TQPushButton.h,javalib/qtjava/TQRadioButton.cpp,javalib/qtjava/TQRadioButton.h,javalib/qtjava/TQRangeControl.cpp,javalib/qtjava/TQRangeControl.h,javalib/qtjava/TQRect.cpp,javalib/qtjava/TQRect.h,javalib/qtjava/TQRegExp.cpp,javalib/qtjava/TQRegExp.h,javalib/qtjava/TQRegExpValidator.cpp,javalib/qtjava/TQRegExpValidator.h,javalib/qtjava/TQRegion.cpp,javalib/qtjava/TQRegion.h,javalib/qtjava/TQResizeEvent.cpp,javalib/qtjava/TQResizeEvent.h,javalib/qtjava/TQScrollBar.cpp,javalib/qtjava/TQScrollBar.h,javalib/qtjava/TQScrollView.cpp,javalib/qtjava/TQScrollView.h,javalib/qtjava/TQServerSocket.cpp,javalib/qtjava/TQServerSocket.h,javalib/qtjava/TQSessionManager.cpp,javalib/qtjava/TQSessionManager.h,javalib/qtjava/TQSettings.cpp,javalib/qtjava/TQSettings.h,javalib/qtjava/TQShowEvent.cpp,javalib/qtjava/TQShowEvent.h,javalib/qtjava/TQSignal.cpp,javalib/qtjava/TQSignal.h,javalib/qtjava/TQSignalMapper.cpp,javalib/qtjava/TQSignalMapper.h,javalib/qtjava/TQSimpleRichText.cpp,javalib/qtjava/TQSimpleRichText.h,javalib/qtjava/TQSize.cpp,javalib/qtjava/TQSize.h,javalib/qtjava/TQSizeGrip.cpp,javalib/qtjava/TQSizeGrip.h,javalib/qtjava/TQSizePolicy.cpp,javalib/qtjava/TQSizePolicy.h,javalib/qtjava/TQSjisCodec.cpp,javalib/qtjava/TQSjisCodec.h,javalib/qtjava/TQSlider.cpp,javalib/qtjava/TQSlider.h,javalib/qtjava/TQSocket.cpp,javalib/qtjava/TQSocket.h,javalib/qtjava/TQSocketDevice.cpp,javalib/qtjava/TQSocketDevice.h,javalib/qtjava/TQSocketNotifier.cpp,javalib/qtjava/TQSocketNotifier.h,javalib/qtjava/TQSound.cpp,javalib/qtjava/TQSound.h,javalib/qtjava/TQSpacerItem.cpp,javalib/qtjava/TQSpacerItem.h,javalib/qtjava/TQSpinBox.cpp,javalib/qtjava/TQSpinBox.h,javalib/qtjava/TQSplitter.cpp,javalib/qtjava/TQSplitter.h,javalib/qtjava/TQSql.cpp,javalib/qtjava/TQSql.h,javalib/qtjava/TQSqlCursor.cpp,javalib/qtjava/TQSqlCursor.h,javalib/qtjava/TQSqlDatabase.cpp,javalib/qtjava/TQSqlDatabase.h,javalib/qtjava/TQSqlDriver.cpp,javalib/qtjava/TQSqlDriver.h,javalib/qtjava/TQSqlEditorFactory.cpp,javalib/qtjava/TQSqlEditorFactory.h,javalib/qtjava/TQSqlError.cpp,javalib/qtjava/TQSqlError.h,javalib/qtjava/TQSqlField.cpp,javalib/qtjava/TQSqlField.h,javalib/qtjava/TQSqlForm.cpp,javalib/qtjava/TQSqlForm.h,javalib/qtjava/TQSqlIndex.cpp,javalib/qtjava/TQSqlIndex.h,javalib/qtjava/TQSqlPropertyMap.cpp,javalib/qtjava/TQSqlPropertyMap.h,javalib/qtjava/TQSqlQuery.cpp,javalib/qtjava/TQSqlQuery.h,javalib/qtjava/TQSqlRecord.cpp,javalib/qtjava/TQSqlRecord.h,javalib/qtjava/TQSqlResult.cpp,javalib/qtjava/TQSqlResult.h,javalib/qtjava/TQStatusBar.cpp,javalib/qtjava/TQStatusBar.h,javalib/qtjava/TQStoredDrag.cpp,javalib/qtjava/TQStoredDrag.h,javalib/qtjava/TQStyle.cpp,javalib/qtjava/TQStyle.h,javalib/qtjava/TQStyleFactory.cpp,javalib/qtjava/TQStyleFactory.h,javalib/qtjava/TQStyleSheet.cpp,javalib/qtjava/TQStyleSheet.h,javalib/qtjava/TQStyleSheetItem.cpp,javalib/qtjava/TQStyleSheetItem.h,javalib/qtjava/Qt.cpp,javalib/qtjava/Qt.h,javalib/qtjava/TQTab.cpp,javalib/qtjava/TQTab.h,javalib/qtjava/TQTabBar.cpp,javalib/qtjava/TQTabBar.h,javalib/qtjava/TQTabDialog.cpp,javalib/qtjava/TQTabDialog.h,javalib/qtjava/TQTable.cpp,javalib/qtjava/TQTable.h,javalib/qtjava/TQTableItem.cpp,javalib/qtjava/TQTableItem.h,javalib/qtjava/TQTableSelection.cpp,javalib/qtjava/TQTableSelection.h,javalib/qtjava/TQTabletEvent.cpp,javalib/qtjava/TQTabletEvent.h,javalib/qtjava/TQTabWidget.cpp,javalib/qtjava/TQTabWidget.h,javalib/qtjava/TQTextBrowser.cpp,javalib/qtjava/TQTextBrowser.h,javalib/qtjava/TQTextCodec.cpp,javalib/qtjava/TQTextCodec.h,javalib/qtjava/TQTextDecoder.cpp,javalib/qtjava/TQTextDecoder.h,javalib/qtjava/TQTextDrag.cpp,javalib/qtjava/TQTextDrag.h,javalib/qtjava/TQTextEdit.cpp,javalib/qtjava/TQTextEdit.h,javalib/qtjava/TQTextEncoder.cpp,javalib/qtjava/TQTextEncoder.h,javalib/qtjava/TQTextIStream.cpp,javalib/qtjava/TQTextIStream.h,javalib/qtjava/TQTextOStream.cpp,javalib/qtjava/TQTextOStream.h,javalib/qtjava/TQTextStream.cpp,javalib/qtjava/TQTextStream.h,javalib/qtjava/TQTextView.cpp,javalib/qtjava/TQTextView.h,javalib/qtjava/TQTimeEdit.cpp,javalib/qtjava/TQTimeEdit.h,javalib/qtjava/TQTimer.cpp,javalib/qtjava/TQTimer.h,javalib/qtjava/TQTimerEvent.cpp,javalib/qtjava/TQTimerEvent.h,javalib/qtjava/qtjava.cpp,javalib/qtjava/qtjava.h,javalib/qtjava/TQToolBar.cpp,javalib/qtjava/TQToolBar.h,javalib/qtjava/TQToolButton.cpp,javalib/qtjava/TQToolButton.h,javalib/qtjava/TQToolTip.cpp,javalib/qtjava/TQToolTip.h,javalib/qtjava/TQToolTipGroup.cpp,javalib/qtjava/TQToolTipGroup.h,javalib/qtjava/TQTranslator.cpp,javalib/qtjava/TQTranslator.h,javalib/qtjava/TQTranslatorMessage.cpp,javalib/qtjava/TQTranslatorMessage.h,javalib/qtjava/TQTsciiCodec.cpp,javalib/qtjava/TQTsciiCodec.h,javalib/qtjava/QtSupport.cpp,javalib/qtjava/TQUriDrag.cpp,javalib/qtjava/TQUriDrag.h,javalib/qtjava/TQUrl.cpp,javalib/qtjava/TQUrl.h,javalib/qtjava/TQUrlInfo.cpp,javalib/qtjava/TQUrlInfo.h,javalib/qtjava/TQUrlOperator.cpp,javalib/qtjava/TQUrlOperator.h,javalib/qtjava/TQUtf16Codec.cpp,javalib/qtjava/TQUtf16Codec.h,javalib/qtjava/TQUtf8Codec.cpp,javalib/qtjava/TQUtf8Codec.h,javalib/qtjava/TQUuid.cpp,javalib/qtjava/TQUuid.h,javalib/qtjava/TQValidator.cpp,javalib/qtjava/TQValidator.h,javalib/qtjava/TQVariant.cpp,javalib/qtjava/TQVariant.h,javalib/qtjava/TQVBox.cpp,javalib/qtjava/TQVBox.h,javalib/qtjava/TQVBoxLayout.cpp,javalib/qtjava/TQVBoxLayout.h,javalib/qtjava/TQVButtonGroup.cpp,javalib/qtjava/TQVButtonGroup.h,javalib/qtjava/TQVGroupBox.cpp,javalib/qtjava/TQVGroupBox.h,javalib/qtjava/TQWhatsThis.cpp,javalib/qtjava/TQWhatsThis.h,javalib/qtjava/TQWheelEvent.cpp,javalib/qtjava/TQWheelEvent.h,javalib/qtjava/TQWidget.cpp,javalib/qtjava/TQWidget.h,javalib/qtjava/TQWidgetItem.cpp,javalib/qtjava/TQWidgetItem.h,javalib/qtjava/TQWidgetStack.cpp,javalib/qtjava/TQWidgetStack.h,javalib/qtjava/TQWizard.cpp,javalib/qtjava/TQWizard.h,javalib/qtjava/TQWMatrix.cpp,javalib/qtjava/TQWMatrix.h,javalib/qtjava/TQWorkspace.cpp,javalib/qtjava/TQWorkspace.h,javalib/qtjava/TQXmlAttributes.cpp,javalib/qtjava/TQXmlAttributes.h,javalib/qtjava/TQXmlContentHandler.cpp,javalib/qtjava/TQXmlContentHandler.h,javalib/qtjava/TQXmlDeclHandler.cpp,javalib/qtjava/TQXmlDeclHandler.h,javalib/qtjava/TQXmlDefaultHandler.cpp,javalib/qtjava/TQXmlDefaultHandler.h,javalib/qtjava/TQXmlDTDHandler.cpp,javalib/qtjava/TQXmlDTDHandler.h,javalib/qtjava/TQXmlEntityResolver.cpp,javalib/qtjava/TQXmlEntityResolver.h,javalib/qtjava/TQXmlErrorHandler.cpp,javalib/qtjava/TQXmlErrorHandler.h,javalib/qtjava/TQXmlInputSource.cpp,javalib/qtjava/TQXmlInputSource.h,javalib/qtjava/TQXmlLexicalHandler.cpp,javalib/qtjava/TQXmlLexicalHandler.h,javalib/qtjava/TQXmlLocator.cpp,javalib/qtjava/TQXmlLocator.h,javalib/qtjava/TQXmlNamespaceSupport.cpp,javalib/qtjava/TQXmlNamespaceSupport.h,javalib/qtjava/TQXmlParseException.cpp,javalib/qtjava/TQXmlParseException.h,javalib/qtjava/TQXmlReader.cpp,javalib/qtjava/TQXmlReader.h,javalib/qtjava/TQXmlSimpleReader.cpp,javalib/qtjava/TQXmlSimpleReader.h,javalib/qtjava/TQGb18030Codec.cpp,javalib/qtjava/TQGb18030Codec.h,javalib/qtjava/TQEventLoop.cpp,javalib/qtjava/TQHttpHeader.cpp,javalib/qtjava/TQHttpRequestHeader.cpp,javalib/qtjava/TQHttpResponseHeader.cpp,javalib/qtjava/TQSpinWidget.cpp,javalib/qtjava/TQSplashScreen.cpp,javalib/qtjava/TQToolBox.cpp,javalib/qtjava/TQEventLoop.h,javalib/qtjava/TQHttpHeader.h,javalib/qtjava/TQHttpRequestHeader.h,javalib/qtjava/TQSpinWidget.h,javalib/qtjava/TQSplashScreen.h,javalib/qtjava/TQToolBox.h,javalib/qtjava/TQHttpResponseHeader.h,javalib/qtjava/QtSupport.h,javalib/qtjava/TQSyntaxHighlighter.cpp,javalib/qtjava/TQSyntaxHighlighter.h,javalib/qtjava/JavaSlot.cpp sharedlib_LDFLAGS= sharedlib_rootname= sub_dirs= @@ -5103,18 +5097,6 @@ install=false install_location= type=HEADER -[javalib/qtjava/TQSemiModal.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[javalib/qtjava/TQSemiModal.h] -dist=true -install=false -install_location= -type=HEADER - [javalib/qtjava/TQServerSocket.cpp] dist=true install=false diff --git a/qtjava/javalib/Makefile.am b/qtjava/javalib/Makefile.am index 7a36d3d7..e960a11c 100644 --- a/qtjava/javalib/Makefile.am +++ b/qtjava/javalib/Makefile.am @@ -4,7 +4,7 @@ noinst_PROGRAMS = javalib ## INCLUDES were found outside tdevelop specific part javalib_SOURCES = main.cpp -SOURCES = qtjava/JavaSlot.cpp qtjava/TQSyntaxHighlighter.cpp qtjava/TQToolBox.cpp qtjava/TQSplashScreen.cpp qtjava/TQSpinWidget.cpp qtjava/TQHttpResponseHeader.cpp qtjava/TQHttpRequestHeader.cpp qtjava/TQHttpHeader.cpp qtjava/TQEventLoop.cpp qtjava/TQGb18030Codec.cpp qtjava/TQXmlSimpleReader.cpp qtjava/TQXmlReader.cpp qtjava/TQXmlParseException.cpp qtjava/TQXmlNamespaceSupport.cpp qtjava/TQXmlLocator.cpp qtjava/TQXmlLexicalHandler.cpp qtjava/TQXmlInputSource.cpp qtjava/TQXmlErrorHandler.cpp qtjava/TQXmlEntityResolver.cpp qtjava/TQXmlDTDHandler.cpp qtjava/TQXmlDefaultHandler.cpp qtjava/TQXmlDeclHandler.cpp qtjava/TQXmlContentHandler.cpp qtjava/TQXmlAttributes.cpp qtjava/TQWorkspace.cpp qtjava/TQWMatrix.cpp qtjava/TQWizard.cpp qtjava/TQWidgetStack.cpp qtjava/TQWidgetItem.cpp qtjava/TQWidget.cpp qtjava/TQWheelEvent.cpp qtjava/TQWhatsThis.cpp qtjava/TQVGroupBox.cpp qtjava/TQVButtonGroup.cpp qtjava/TQVBoxLayout.cpp qtjava/TQVBox.cpp qtjava/TQVariant.cpp qtjava/TQValidator.cpp qtjava/TQUuid.cpp qtjava/TQUtf8Codec.cpp qtjava/TQUtf16Codec.cpp qtjava/TQUrlOperator.cpp qtjava/TQUrlInfo.cpp qtjava/TQUrl.cpp qtjava/TQUriDrag.cpp qtjava/QtSupport.cpp qtjava/TQTsciiCodec.cpp qtjava/TQTranslatorMessage.cpp qtjava/TQTranslator.cpp qtjava/TQToolTipGroup.cpp qtjava/TQToolTip.cpp qtjava/TQToolButton.cpp qtjava/TQToolBar.cpp qtjava/qtjava.cpp qtjava/TQTimerEvent.cpp qtjava/TQTimer.cpp qtjava/TQTimeEdit.cpp qtjava/TQTextView.cpp qtjava/TQTextStream.cpp qtjava/TQTextOStream.cpp qtjava/TQTextIStream.cpp qtjava/TQTextEncoder.cpp qtjava/TQTextEdit.cpp qtjava/TQTextDrag.cpp qtjava/TQTextDecoder.cpp qtjava/TQTextCodec.cpp qtjava/TQTextBrowser.cpp qtjava/TQTabWidget.cpp qtjava/TQTabletEvent.cpp qtjava/TQTableSelection.cpp qtjava/TQTableItem.cpp qtjava/TQTable.cpp qtjava/TQTabDialog.cpp qtjava/TQTabBar.cpp qtjava/TQTab.cpp qtjava/Qt.cpp qtjava/TQStyleSheetItem.cpp qtjava/TQStyleSheet.cpp qtjava/TQStyleFactory.cpp qtjava/TQStyle.cpp qtjava/TQStoredDrag.cpp qtjava/TQStatusBar.cpp qtjava/TQSqlResult.cpp qtjava/TQSqlRecord.cpp qtjava/TQSqlQuery.cpp qtjava/TQSqlPropertyMap.cpp qtjava/TQSqlIndex.cpp qtjava/TQSqlForm.cpp qtjava/TQSqlField.cpp qtjava/TQSqlError.cpp qtjava/TQSqlEditorFactory.cpp qtjava/TQSqlDriver.cpp qtjava/TQSqlDatabase.cpp qtjava/TQSqlCursor.cpp qtjava/TQSql.cpp qtjava/TQSplitter.cpp qtjava/TQSpinBox.cpp qtjava/TQSpacerItem.cpp qtjava/TQSound.cpp qtjava/TQSocketNotifier.cpp qtjava/TQSocketDevice.cpp qtjava/TQSocket.cpp qtjava/TQSlider.cpp qtjava/TQSjisCodec.cpp qtjava/TQSizePolicy.cpp qtjava/TQSizeGrip.cpp qtjava/TQSize.cpp qtjava/TQSimpleRichText.cpp qtjava/TQSignalMapper.cpp qtjava/TQSignal.cpp qtjava/TQShowEvent.cpp qtjava/TQSettings.cpp qtjava/TQSessionManager.cpp qtjava/TQServerSocket.cpp qtjava/TQSemiModal.cpp qtjava/TQScrollView.cpp qtjava/TQScrollBar.cpp qtjava/TQResizeEvent.cpp qtjava/TQRegion.cpp qtjava/TQRegExpValidator.cpp qtjava/TQRegExp.cpp qtjava/TQRect.cpp qtjava/TQRangeControl.cpp qtjava/TQRadioButton.cpp qtjava/TQPushButton.cpp qtjava/TQProgressDialog.cpp qtjava/TQProgressBar.cpp qtjava/TQProcess.cpp qtjava/TQPrinter.cpp qtjava/TQPrintDialog.cpp qtjava/TQPopupMenu.cpp qtjava/TQPolygonScanner.cpp qtjava/TQPointArray.cpp qtjava/TQPoint.cpp qtjava/TQPixmap.cpp qtjava/TQPicture.cpp qtjava/TQPen.cpp qtjava/TQPalette.cpp qtjava/TQPaintEvent.cpp qtjava/TQPainter.cpp qtjava/TQPaintDeviceMetrics.cpp qtjava/TQPaintDevice.cpp qtjava/TQObjectCleanupHandler.cpp qtjava/TQObject.cpp qtjava/TQNetworkProtocol.cpp qtjava/TQNetworkOperation.cpp qtjava/TQMultiLineEdit.cpp qtjava/TQMovie.cpp qtjava/TQMoveEvent.cpp qtjava/TQMouseEvent.cpp qtjava/TQMimeSourceFactory.cpp qtjava/TQMimeSource.cpp qtjava/TQMetaProperty.cpp qtjava/TQMetaObject.cpp qtjava/TQMetaEnum.cpp qtjava/TQMetaData.cpp qtjava/TQMessageBox.cpp qtjava/TQMenuItem.cpp qtjava/TQMenuData.cpp qtjava/TQMenuBar.cpp qtjava/TQMainWindow.cpp qtjava/TQLocalFs.cpp qtjava/TQListViewItem.cpp qtjava/TQListView.cpp qtjava/TQListBoxText.cpp qtjava/TQListBoxPixmap.cpp qtjava/TQListBoxItem.cpp qtjava/TQListBox.cpp qtjava/TQLineEdit.cpp qtjava/TQLibrary.cpp qtjava/TQLCDNumber.cpp qtjava/TQLayoutItem.cpp qtjava/TQLayout.cpp qtjava/TQLabel.cpp qtjava/TQKeySequence.cpp qtjava/TQKeyEvent.cpp qtjava/TQJpUnicodeConv.cpp qtjava/TQJisCodec.cpp qtjava/TQIODeviceSource.cpp qtjava/TQIODevice.cpp qtjava/TQIntValidator.cpp qtjava/TQInputDialog.cpp qtjava/TQIMEvent.cpp qtjava/TQImageTextKeyLang.cpp qtjava/TQImageIO.cpp qtjava/TQImageFormatType.cpp qtjava/TQImageFormat.cpp qtjava/TQImageDrag.cpp qtjava/TQImageDecoder.cpp qtjava/TQImageConsumer.cpp qtjava/TQImage.cpp qtjava/TQIconViewItem.cpp qtjava/TQIconView.cpp qtjava/TQIconSet.cpp qtjava/TQIconDragItem.cpp qtjava/TQIconDrag.cpp qtjava/TQHttp.cpp qtjava/TQHostAddress.cpp qtjava/TQHideEvent.cpp qtjava/TQHGroupBox.cpp qtjava/TQHebrewCodec.cpp qtjava/TQHeader.cpp qtjava/TQHButtonGroup.cpp qtjava/TQHBoxLayout.cpp qtjava/TQHBox.cpp qtjava/TQGroupBox.cpp qtjava/TQGridView.cpp qtjava/TQGridLayout.cpp qtjava/TQGrid.cpp qtjava/TQFtp.cpp qtjava/TQFrame.cpp qtjava/TQFontMetrics.cpp qtjava/TQFontInfo.cpp qtjava/TQFontDialog.cpp qtjava/TQFontDatabase.cpp qtjava/TQFont.cpp qtjava/TQFocusEvent.cpp qtjava/TQFocusData.cpp qtjava/TQFilePreview.cpp qtjava/TQFileInfo.cpp qtjava/TQFileIconProvider.cpp qtjava/TQFileDialog.cpp qtjava/TQFile.cpp qtjava/TQEvent.cpp qtjava/TQEucKrCodec.cpp qtjava/TQEucJpCodec.cpp qtjava/TQErrorMessage.cpp qtjava/TQEditorFactory.cpp qtjava/TQDropSite.cpp qtjava/TQDropEvent.cpp qtjava/TQDragResponseEvent.cpp qtjava/TQDragObject.cpp qtjava/TQDragMoveEvent.cpp qtjava/TQDragManager.cpp qtjava/TQDragLeaveEvent.cpp qtjava/TQDragEnterEvent.cpp qtjava/TQDoubleValidator.cpp qtjava/TQDomText.cpp qtjava/TQDomProcessingInstruction.cpp qtjava/TQDomNotation.cpp qtjava/TQDomNode.cpp qtjava/TQDomNamedNodeMap.cpp qtjava/TQDomImplementation.cpp qtjava/TQDomEntityReference.cpp qtjava/TQDomEntity.cpp qtjava/TQDomElement.cpp qtjava/TQDomDocumentType.cpp qtjava/TQDomDocumentFragment.cpp qtjava/TQDomDocument.cpp qtjava/TQDomComment.cpp qtjava/TQDomCharacterData.cpp qtjava/TQDomCDATASection.cpp qtjava/TQDomAttr.cpp qtjava/TQDockWindow.cpp qtjava/TQDockArea.cpp qtjava/TQDir.cpp qtjava/TQDialog.cpp qtjava/TQDial.cpp qtjava/TQDesktopWidget.cpp qtjava/TQDateTimeEditBase.cpp qtjava/TQDateTimeEdit.cpp qtjava/TQDateEdit.cpp qtjava/TQDataView.cpp qtjava/TQDataTable.cpp qtjava/TQDataStream.cpp qtjava/TQDataSource.cpp qtjava/TQDataSink.cpp qtjava/TQDataPump.cpp qtjava/TQDataBrowser.cpp qtjava/TQCustomMenuItem.cpp qtjava/TQCustomEvent.cpp qtjava/TQCursor.cpp qtjava/TQContextMenuEvent.cpp qtjava/TQComboTableItem.cpp qtjava/TQComboBox.cpp qtjava/TQColorGroup.cpp qtjava/TQColorDrag.cpp qtjava/TQColorDialog.cpp qtjava/TQColor.cpp qtjava/TQCloseEvent.cpp qtjava/TQClipboard.cpp qtjava/TQClassInfo.cpp qtjava/TQChildEvent.cpp qtjava/TQCheckTableItem.cpp qtjava/TQCheckListItem.cpp qtjava/TQCheckBox.cpp qtjava/TQCanvasView.cpp qtjava/TQCanvasText.cpp qtjava/TQCanvasSprite.cpp qtjava/TQCanvasSpline.cpp qtjava/TQCanvasRectangle.cpp qtjava/TQCanvasPolygonalItem.cpp qtjava/TQCanvasPolygon.cpp qtjava/TQCanvasPixmapArray.cpp qtjava/TQCanvasPixmap.cpp qtjava/TQCanvasLine.cpp qtjava/TQCanvasItem.cpp qtjava/TQCanvasEllipse.cpp qtjava/TQCanvas.cpp qtjava/TQButtonGroup.cpp qtjava/TQButton.cpp qtjava/TQBuffer.cpp qtjava/TQBrush.cpp qtjava/TQBoxLayout.cpp qtjava/TQBitmap.cpp qtjava/TQBig5Codec.cpp qtjava/TQAuServer.cpp qtjava/TQAsyncIO.cpp qtjava/TQApplication.cpp qtjava/TQActionGroup.cpp qtjava/TQAction.cpp qtjava/TQAccel.cpp main.cpp +SOURCES = qtjava/JavaSlot.cpp qtjava/TQSyntaxHighlighter.cpp qtjava/TQToolBox.cpp qtjava/TQSplashScreen.cpp qtjava/TQSpinWidget.cpp qtjava/TQHttpResponseHeader.cpp qtjava/TQHttpRequestHeader.cpp qtjava/TQHttpHeader.cpp qtjava/TQEventLoop.cpp qtjava/TQGb18030Codec.cpp qtjava/TQXmlSimpleReader.cpp qtjava/TQXmlReader.cpp qtjava/TQXmlParseException.cpp qtjava/TQXmlNamespaceSupport.cpp qtjava/TQXmlLocator.cpp qtjava/TQXmlLexicalHandler.cpp qtjava/TQXmlInputSource.cpp qtjava/TQXmlErrorHandler.cpp qtjava/TQXmlEntityResolver.cpp qtjava/TQXmlDTDHandler.cpp qtjava/TQXmlDefaultHandler.cpp qtjava/TQXmlDeclHandler.cpp qtjava/TQXmlContentHandler.cpp qtjava/TQXmlAttributes.cpp qtjava/TQWorkspace.cpp qtjava/TQWMatrix.cpp qtjava/TQWizard.cpp qtjava/TQWidgetStack.cpp qtjava/TQWidgetItem.cpp qtjava/TQWidget.cpp qtjava/TQWheelEvent.cpp qtjava/TQWhatsThis.cpp qtjava/TQVGroupBox.cpp qtjava/TQVButtonGroup.cpp qtjava/TQVBoxLayout.cpp qtjava/TQVBox.cpp qtjava/TQVariant.cpp qtjava/TQValidator.cpp qtjava/TQUuid.cpp qtjava/TQUtf8Codec.cpp qtjava/TQUtf16Codec.cpp qtjava/TQUrlOperator.cpp qtjava/TQUrlInfo.cpp qtjava/TQUrl.cpp qtjava/TQUriDrag.cpp qtjava/QtSupport.cpp qtjava/TQTsciiCodec.cpp qtjava/TQTranslatorMessage.cpp qtjava/TQTranslator.cpp qtjava/TQToolTipGroup.cpp qtjava/TQToolTip.cpp qtjava/TQToolButton.cpp qtjava/TQToolBar.cpp qtjava/qtjava.cpp qtjava/TQTimerEvent.cpp qtjava/TQTimer.cpp qtjava/TQTimeEdit.cpp qtjava/TQTextView.cpp qtjava/TQTextStream.cpp qtjava/TQTextOStream.cpp qtjava/TQTextIStream.cpp qtjava/TQTextEncoder.cpp qtjava/TQTextEdit.cpp qtjava/TQTextDrag.cpp qtjava/TQTextDecoder.cpp qtjava/TQTextCodec.cpp qtjava/TQTextBrowser.cpp qtjava/TQTabWidget.cpp qtjava/TQTabletEvent.cpp qtjava/TQTableSelection.cpp qtjava/TQTableItem.cpp qtjava/TQTable.cpp qtjava/TQTabDialog.cpp qtjava/TQTabBar.cpp qtjava/TQTab.cpp qtjava/Qt.cpp qtjava/TQStyleSheetItem.cpp qtjava/TQStyleSheet.cpp qtjava/TQStyleFactory.cpp qtjava/TQStyle.cpp qtjava/TQStoredDrag.cpp qtjava/TQStatusBar.cpp qtjava/TQSqlResult.cpp qtjava/TQSqlRecord.cpp qtjava/TQSqlQuery.cpp qtjava/TQSqlPropertyMap.cpp qtjava/TQSqlIndex.cpp qtjava/TQSqlForm.cpp qtjava/TQSqlField.cpp qtjava/TQSqlError.cpp qtjava/TQSqlEditorFactory.cpp qtjava/TQSqlDriver.cpp qtjava/TQSqlDatabase.cpp qtjava/TQSqlCursor.cpp qtjava/TQSql.cpp qtjava/TQSplitter.cpp qtjava/TQSpinBox.cpp qtjava/TQSpacerItem.cpp qtjava/TQSound.cpp qtjava/TQSocketNotifier.cpp qtjava/TQSocketDevice.cpp qtjava/TQSocket.cpp qtjava/TQSlider.cpp qtjava/TQSjisCodec.cpp qtjava/TQSizePolicy.cpp qtjava/TQSizeGrip.cpp qtjava/TQSize.cpp qtjava/TQSimpleRichText.cpp qtjava/TQSignalMapper.cpp qtjava/TQSignal.cpp qtjava/TQShowEvent.cpp qtjava/TQSettings.cpp qtjava/TQSessionManager.cpp qtjava/TQServerSocket.cpp qtjava/TQScrollView.cpp qtjava/TQScrollBar.cpp qtjava/TQResizeEvent.cpp qtjava/TQRegion.cpp qtjava/TQRegExpValidator.cpp qtjava/TQRegExp.cpp qtjava/TQRect.cpp qtjava/TQRangeControl.cpp qtjava/TQRadioButton.cpp qtjava/TQPushButton.cpp qtjava/TQProgressDialog.cpp qtjava/TQProgressBar.cpp qtjava/TQProcess.cpp qtjava/TQPrinter.cpp qtjava/TQPrintDialog.cpp qtjava/TQPopupMenu.cpp qtjava/TQPolygonScanner.cpp qtjava/TQPointArray.cpp qtjava/TQPoint.cpp qtjava/TQPixmap.cpp qtjava/TQPicture.cpp qtjava/TQPen.cpp qtjava/TQPalette.cpp qtjava/TQPaintEvent.cpp qtjava/TQPainter.cpp qtjava/TQPaintDeviceMetrics.cpp qtjava/TQPaintDevice.cpp qtjava/TQObjectCleanupHandler.cpp qtjava/TQObject.cpp qtjava/TQNetworkProtocol.cpp qtjava/TQNetworkOperation.cpp qtjava/TQMultiLineEdit.cpp qtjava/TQMovie.cpp qtjava/TQMoveEvent.cpp qtjava/TQMouseEvent.cpp qtjava/TQMimeSourceFactory.cpp qtjava/TQMimeSource.cpp qtjava/TQMetaProperty.cpp qtjava/TQMetaObject.cpp qtjava/TQMetaEnum.cpp qtjava/TQMetaData.cpp qtjava/TQMessageBox.cpp qtjava/TQMenuItem.cpp qtjava/TQMenuData.cpp qtjava/TQMenuBar.cpp qtjava/TQMainWindow.cpp qtjava/TQLocalFs.cpp qtjava/TQListViewItem.cpp qtjava/TQListView.cpp qtjava/TQListBoxText.cpp qtjava/TQListBoxPixmap.cpp qtjava/TQListBoxItem.cpp qtjava/TQListBox.cpp qtjava/TQLineEdit.cpp qtjava/TQLibrary.cpp qtjava/TQLCDNumber.cpp qtjava/TQLayoutItem.cpp qtjava/TQLayout.cpp qtjava/TQLabel.cpp qtjava/TQKeySequence.cpp qtjava/TQKeyEvent.cpp qtjava/TQJpUnicodeConv.cpp qtjava/TQJisCodec.cpp qtjava/TQIODeviceSource.cpp qtjava/TQIODevice.cpp qtjava/TQIntValidator.cpp qtjava/TQInputDialog.cpp qtjava/TQIMEvent.cpp qtjava/TQImageTextKeyLang.cpp qtjava/TQImageIO.cpp qtjava/TQImageFormatType.cpp qtjava/TQImageFormat.cpp qtjava/TQImageDrag.cpp qtjava/TQImageDecoder.cpp qtjava/TQImageConsumer.cpp qtjava/TQImage.cpp qtjava/TQIconViewItem.cpp qtjava/TQIconView.cpp qtjava/TQIconSet.cpp qtjava/TQIconDragItem.cpp qtjava/TQIconDrag.cpp qtjava/TQHttp.cpp qtjava/TQHostAddress.cpp qtjava/TQHideEvent.cpp qtjava/TQHGroupBox.cpp qtjava/TQHebrewCodec.cpp qtjava/TQHeader.cpp qtjava/TQHButtonGroup.cpp qtjava/TQHBoxLayout.cpp qtjava/TQHBox.cpp qtjava/TQGroupBox.cpp qtjava/TQGridView.cpp qtjava/TQGridLayout.cpp qtjava/TQGrid.cpp qtjava/TQFtp.cpp qtjava/TQFrame.cpp qtjava/TQFontMetrics.cpp qtjava/TQFontInfo.cpp qtjava/TQFontDialog.cpp qtjava/TQFontDatabase.cpp qtjava/TQFont.cpp qtjava/TQFocusEvent.cpp qtjava/TQFocusData.cpp qtjava/TQFilePreview.cpp qtjava/TQFileInfo.cpp qtjava/TQFileIconProvider.cpp qtjava/TQFileDialog.cpp qtjava/TQFile.cpp qtjava/TQEvent.cpp qtjava/TQEucKrCodec.cpp qtjava/TQEucJpCodec.cpp qtjava/TQErrorMessage.cpp qtjava/TQEditorFactory.cpp qtjava/TQDropSite.cpp qtjava/TQDropEvent.cpp qtjava/TQDragResponseEvent.cpp qtjava/TQDragObject.cpp qtjava/TQDragMoveEvent.cpp qtjava/TQDragManager.cpp qtjava/TQDragLeaveEvent.cpp qtjava/TQDragEnterEvent.cpp qtjava/TQDoubleValidator.cpp qtjava/TQDomText.cpp qtjava/TQDomProcessingInstruction.cpp qtjava/TQDomNotation.cpp qtjava/TQDomNode.cpp qtjava/TQDomNamedNodeMap.cpp qtjava/TQDomImplementation.cpp qtjava/TQDomEntityReference.cpp qtjava/TQDomEntity.cpp qtjava/TQDomElement.cpp qtjava/TQDomDocumentType.cpp qtjava/TQDomDocumentFragment.cpp qtjava/TQDomDocument.cpp qtjava/TQDomComment.cpp qtjava/TQDomCharacterData.cpp qtjava/TQDomCDATASection.cpp qtjava/TQDomAttr.cpp qtjava/TQDockWindow.cpp qtjava/TQDockArea.cpp qtjava/TQDir.cpp qtjava/TQDialog.cpp qtjava/TQDial.cpp qtjava/TQDesktopWidget.cpp qtjava/TQDateTimeEditBase.cpp qtjava/TQDateTimeEdit.cpp qtjava/TQDateEdit.cpp qtjava/TQDataView.cpp qtjava/TQDataTable.cpp qtjava/TQDataStream.cpp qtjava/TQDataSource.cpp qtjava/TQDataSink.cpp qtjava/TQDataPump.cpp qtjava/TQDataBrowser.cpp qtjava/TQCustomMenuItem.cpp qtjava/TQCustomEvent.cpp qtjava/TQCursor.cpp qtjava/TQContextMenuEvent.cpp qtjava/TQComboTableItem.cpp qtjava/TQComboBox.cpp qtjava/TQColorGroup.cpp qtjava/TQColorDrag.cpp qtjava/TQColorDialog.cpp qtjava/TQColor.cpp qtjava/TQCloseEvent.cpp qtjava/TQClipboard.cpp qtjava/TQClassInfo.cpp qtjava/TQChildEvent.cpp qtjava/TQCheckTableItem.cpp qtjava/TQCheckListItem.cpp qtjava/TQCheckBox.cpp qtjava/TQCanvasView.cpp qtjava/TQCanvasText.cpp qtjava/TQCanvasSprite.cpp qtjava/TQCanvasSpline.cpp qtjava/TQCanvasRectangle.cpp qtjava/TQCanvasPolygonalItem.cpp qtjava/TQCanvasPolygon.cpp qtjava/TQCanvasPixmapArray.cpp qtjava/TQCanvasPixmap.cpp qtjava/TQCanvasLine.cpp qtjava/TQCanvasItem.cpp qtjava/TQCanvasEllipse.cpp qtjava/TQCanvas.cpp qtjava/TQButtonGroup.cpp qtjava/TQButton.cpp qtjava/TQBuffer.cpp qtjava/TQBrush.cpp qtjava/TQBoxLayout.cpp qtjava/TQBitmap.cpp qtjava/TQBig5Codec.cpp qtjava/TQAuServer.cpp qtjava/TQAsyncIO.cpp qtjava/TQApplication.cpp qtjava/TQActionGroup.cpp qtjava/TQAction.cpp qtjava/TQAccel.cpp main.cpp INTERFACES = TRANSLATIONS = KDE_OPTIONS = qtonly diff --git a/qtjava/javalib/examples/aclock/AnalogClock.java b/qtjava/javalib/examples/aclock/AnalogClock.java index 8982ea34..99dd902a 100644 --- a/qtjava/javalib/examples/aclock/AnalogClock.java +++ b/qtjava/javalib/examples/aclock/AnalogClock.java @@ -30,7 +30,7 @@ public AnalogClock( TQWidget parent, String name ) super( parent, name ); time = new Date(); // get current time TQTimer internalTimer = new TQTimer( this ); // create internal timer - connect( internalTimer, SIGNAL("timeout()"), SLOT("timeout()") ); + connect( internalTimer, TQ_SIGNAL("timeout()"), TQ_SLOT("timeout()") ); internalTimer.start( 5000 ); // emit signal every 5 seconds } diff --git a/qtjava/javalib/examples/addressbook/ABCentralWidget.java b/qtjava/javalib/examples/addressbook/ABCentralWidget.java index d299f2f9..f579302a 100644 --- a/qtjava/javalib/examples/addressbook/ABCentralWidget.java +++ b/qtjava/javalib/examples/addressbook/ABCentralWidget.java @@ -106,7 +106,7 @@ public void setupTabWidget() add = new TQPushButton( "A&dd", input ); add.resize( add.sizeHint() ); grid1.addWidget( add, 0, 4 ); - connect( add, SIGNAL( "clicked()" ), this, SLOT( "addEntry()" ) ); + connect( add, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "addEntry()" ) ); iFirstName = new TQLineEdit( input ); iFirstName.resize( iFirstName.sizeHint() ); @@ -131,7 +131,7 @@ public void setupTabWidget() change = new TQPushButton( "&Change", input ); change.resize( change.sizeHint() ); grid1.addWidget( change, 1, 4 ); - connect( change, SIGNAL( "clicked()" ), this, SLOT( "changeEntry()" ) ); + connect( change, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "changeEntry()" ) ); tabWidget.addTab( input, "&Add/Change Entry" ); @@ -143,22 +143,22 @@ public void setupTabWidget() cFirstName = new TQCheckBox( "First &Name", search ); cFirstName.resize( cFirstName.sizeHint() ); grid2.addWidget( cFirstName, 0, 0 ); - connect( cFirstName, SIGNAL( "clicked()" ), this, SLOT( "toggleFirstName()" ) ); + connect( cFirstName, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "toggleFirstName()" ) ); cLastName = new TQCheckBox( "&Last Name", search ); cLastName.resize( cLastName.sizeHint() ); grid2.addWidget( cLastName, 0, 1 ); - connect( cLastName, SIGNAL( "clicked()" ), this, SLOT( "toggleLastName()" ) ); + connect( cLastName, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "toggleLastName()" ) ); cAddress = new TQCheckBox( "Add&ress", search ); cAddress.resize( cAddress.sizeHint() ); grid2.addWidget( cAddress, 0, 2 ); - connect( cAddress, SIGNAL( "clicked()" ), this, SLOT( "toggleAddress()" ) ); + connect( cAddress, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "toggleAddress()" ) ); cEMail = new TQCheckBox( "&E-Mail", search ); cEMail.resize( cEMail.sizeHint() ); grid2.addWidget( cEMail, 0, 3 ); - connect( cEMail, SIGNAL( "clicked()" ), this, SLOT( "toggleEMail()" ) ); + connect( cEMail, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "toggleEMail()" ) ); sFirstName = new TQLineEdit( search ); sFirstName.resize( sFirstName.sizeHint() ); @@ -179,7 +179,7 @@ public void setupTabWidget() find = new TQPushButton( "F&ind", search ); find.resize( find.sizeHint() ); grid2.addWidget( find, 1, 4 ); - connect( find, SIGNAL( "clicked()" ), this, SLOT( "findEntries()" ) ); + connect( find, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "findEntries()" ) ); cFirstName.setChecked( true ); sFirstName.setEnabled( true ); @@ -202,7 +202,7 @@ public void setupListView() listView.setSelectionMode( TQListView.Extended ); - connect( listView, SIGNAL( "clicked( TQListViewItem )" ), this, SLOT( "itemSelected( TQListViewItem )" ) ); + connect( listView, TQ_SIGNAL( "clicked( TQListViewItem )" ), this, TQ_SLOT( "itemSelected( TQListViewItem )" ) ); mainGrid.addWidget( listView, 1, 0 ); listView.setAllColumnsShowFocus( true ); diff --git a/qtjava/javalib/examples/addressbook/ABMainWindow.java b/qtjava/javalib/examples/addressbook/ABMainWindow.java index 2574dbff..c3ebb401 100644 --- a/qtjava/javalib/examples/addressbook/ABMainWindow.java +++ b/qtjava/javalib/examples/addressbook/ABMainWindow.java @@ -30,16 +30,16 @@ public void setupMenuBar() TQPopupMenu file = new TQPopupMenu( this ); menuBar().insertItem( "&File", file ); - file.insertItem( "New", this, SLOT( "fileNew()" ), new TQKeySequence(CTRL + Key_N) ); - file.insertItem( new TQIconSet(new TQPixmap( "fileopen.xpm" )), "Open", this, SLOT( "fileOpen()" ), new TQKeySequence(CTRL + Key_O) ); + file.insertItem( "New", this, TQ_SLOT( "fileNew()" ), new TQKeySequence(CTRL + Key_N) ); + file.insertItem( new TQIconSet(new TQPixmap( "fileopen.xpm" )), "Open", this, TQ_SLOT( "fileOpen()" ), new TQKeySequence(CTRL + Key_O) ); file.insertSeparator(); - file.insertItem( new TQIconSet(new TQPixmap( "filesave.xpm" )), "Save", this, SLOT( "fileSave()" ), new TQKeySequence(CTRL + Key_S) ); - file.insertItem( "Save As...", this, SLOT( "fileSaveAs()" ) ); + file.insertItem( new TQIconSet(new TQPixmap( "filesave.xpm" )), "Save", this, TQ_SLOT( "fileSave()" ), new TQKeySequence(CTRL + Key_S) ); + file.insertItem( "Save As...", this, TQ_SLOT( "fileSaveAs()" ) ); file.insertSeparator(); - file.insertItem( new TQIconSet(new TQPixmap( "fileprint.xpm" )), "Print...", this, SLOT( "filePrint()" ), new TQKeySequence(CTRL + Key_P) ); + file.insertItem( new TQIconSet(new TQPixmap( "fileprint.xpm" )), "Print...", this, TQ_SLOT( "filePrint()" ), new TQKeySequence(CTRL + Key_P) ); file.insertSeparator(); - file.insertItem( "Close", this, SLOT( "closeWindow()" ), new TQKeySequence(CTRL + Key_W) ); - file.insertItem( "Quit", tqApp(), SLOT( "quit()" ), new TQKeySequence(CTRL + Key_Q) ); + file.insertItem( "Close", this, TQ_SLOT( "closeWindow()" ), new TQKeySequence(CTRL + Key_W) ); + file.insertItem( "Quit", tqApp(), TQ_SLOT( "quit()" ), new TQKeySequence(CTRL + Key_Q) ); } public void setupFileTools() diff --git a/qtjava/javalib/examples/addressbook/Main.java b/qtjava/javalib/examples/addressbook/Main.java index 696ec40d..d393a4fe 100644 --- a/qtjava/javalib/examples/addressbook/Main.java +++ b/qtjava/javalib/examples/addressbook/Main.java @@ -20,7 +20,7 @@ public static void main( String[] args ) a.setMainWidget( mw ); mw.show(); - a.connect( a, Qt.SIGNAL( "lastWindowClosed()" ), a, Qt.SLOT( "quit()" ) ); + a.connect( a, Qt.TQ_SIGNAL( "lastWindowClosed()" ), a, Qt.TQ_SLOT( "quit()" ) ); int result = a.exec(); return; } diff --git a/qtjava/javalib/examples/application/ApplicationWindow.java b/qtjava/javalib/examples/application/ApplicationWindow.java index 2c68a673..b6091fd3 100644 --- a/qtjava/javalib/examples/application/ApplicationWindow.java +++ b/qtjava/javalib/examples/application/ApplicationWindow.java @@ -102,30 +102,30 @@ public class ApplicationWindow extends TQMainWindow { fileQuitAction; fileNewAction = new TQAction("New", "&New", new TQKeySequence(CTRL+Key_N), this, "new", false); - connect(fileNewAction, SIGNAL("activated()"), this, SLOT("newDoc()")); + connect(fileNewAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("newDoc()")); fileOpenAction = new TQAction("Open File", new TQIconSet(new TQPixmap(fileopen)), "&Open", new TQKeySequence(CTRL+Key_O), this, "open", false); - connect(fileOpenAction, SIGNAL("activated()"), this, SLOT("load()")); + connect(fileOpenAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("load()")); TQMimeSourceFactory.defaultFactory().setPixmap("fileopen", new TQPixmap(fileopen)); fileOpenAction.setWhatsThis(fileOpenText); fileSaveAction = new TQAction("Save File", new TQIconSet(new TQPixmap(filesave)), "&Save", new TQKeySequence(CTRL+Key_S), this, "save", false); - connect(fileSaveAction, SIGNAL("activated()"), this, SLOT("save()")); + connect(fileSaveAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("save()")); fileSaveAction.setWhatsThis(fileSaveText); fileSaveAsAction = new TQAction("Save File As", "Save &as", new TQKeySequence(), this, "save as", false); - connect(fileSaveAsAction, SIGNAL("activated()"), this, SLOT("saveAs()")); + connect(fileSaveAsAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("saveAs()")); fileSaveAsAction.setWhatsThis(fileSaveText); filePrintAction = new TQAction("Print File", new TQIconSet(new TQPixmap(fileprint)), "&Print", new TQKeySequence(CTRL+Key_P), this, "print", false); - connect(filePrintAction, SIGNAL("activated()"), this, SLOT("print()")); + connect(filePrintAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("print()")); filePrintAction.setWhatsThis(filePrintText); fileCloseAction = new TQAction("Close", "&Close", new TQKeySequence(CTRL+Key_W), this, "close", false); - connect(fileCloseAction, SIGNAL("activated()"), this, SLOT("close()")); + connect(fileCloseAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("close()")); fileQuitAction = new TQAction("Quit", "&Quit", new TQKeySequence(CTRL+Key_Q), this, "quit", false); - connect(fileQuitAction, SIGNAL("activated()"), tqApp(), SLOT("closeAllWindows()")); + connect(fileQuitAction, TQ_SIGNAL("activated()"), tqApp(), TQ_SLOT("closeAllWindows()")); // populate a tool bar with some actions @@ -158,10 +158,10 @@ public class ApplicationWindow extends TQMainWindow { TQPopupMenu help = new TQPopupMenu(this, "help"); menuBar().insertSeparator(); menuBar().insertItem("&Help", help); - help.insertItem("&About", this, SLOT("about()"), new TQKeySequence(Key_F1), -1, -1); - help.insertItem("About &Qt", this, SLOT("aboutTQt()")); + help.insertItem("&About", this, TQ_SLOT("about()"), new TQKeySequence(Key_F1), -1, -1); + help.insertItem("About &Qt", this, TQ_SLOT("aboutTQt()")); help.insertSeparator(); - help.insertItem("What's &This", this, SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1), -1, -1); + help.insertItem("What's &This", this, TQ_SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1), -1, -1); // create and define the central widget diff --git a/qtjava/javalib/examples/application/Main.java b/qtjava/javalib/examples/application/Main.java index 34988cb8..607c6d33 100644 --- a/qtjava/javalib/examples/application/Main.java +++ b/qtjava/javalib/examples/application/Main.java @@ -6,7 +6,7 @@ public class Main extends TQObject { ApplicationWindow mw = new ApplicationWindow(); mw.setCaption("Document 1"); mw.show(); - a.connect(a, SIGNAL("lastWindowClosed()"), a, SLOT("quit()")); + a.connect(a, TQ_SIGNAL("lastWindowClosed()"), a, TQ_SLOT("quit()")); a.exec(); return; } diff --git a/qtjava/javalib/examples/buttongroups/ButtonsGroups.java b/qtjava/javalib/examples/buttongroups/ButtonsGroups.java index 89b1bcb9..466ccd29 100644 --- a/qtjava/javalib/examples/buttongroups/ButtonsGroups.java +++ b/qtjava/javalib/examples/buttongroups/ButtonsGroups.java @@ -80,8 +80,8 @@ public ButtonsGroups( TQWidget parent, String name ) // insert a checkbox... state = new TQCheckBox( "E&nable Radiobuttons", bgrp3 ); state.setChecked( true ); - // ...and connect its SIGNAL clicked() with the SLOT slotChangeGrp3State() - connect( state, SIGNAL(" clicked()"), this, SLOT(" slotChangeGrp3State()") ); + // ...and connect its signal clicked() with the slot slotChangeGrp3State() + connect( state, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" slotChangeGrp3State()") ); // ------------ fourth group @@ -103,7 +103,7 @@ public ButtonsGroups( TQWidget parent, String name ) } /* - SLOT slotChangeGrp3State() + TQ_SLOT slotChangeGrp3State() * enables/disables the radiobuttons of the third buttongroup */ diff --git a/qtjava/javalib/examples/checklists/CheckLists.java b/qtjava/javalib/examples/checklists/CheckLists.java index d274c1c7..a28d17dd 100644 --- a/qtjava/javalib/examples/checklists/CheckLists.java +++ b/qtjava/javalib/examples/checklists/CheckLists.java @@ -73,8 +73,8 @@ CheckLists( TQWidget parent, String name ) TQPushButton copy1 = new TQPushButton( " -> ", this ); tmp.addWidget( copy1 ); copy1.setMaximumWidth( copy1.sizeHint().width() ); - // connect the SIGNAL clicked() of the pushbutton with the SLOT copy1to2() - connect( copy1, SIGNAL(" clicked()"), this, SLOT(" copy1to2()") ); + // connect the signal clicked() of the pushbutton with the slot copy1to2() + connect( copy1, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" copy1to2()") ); // another widget for layouting TQVBoxLayout vbox2 = new TQVBoxLayout( lay ); @@ -97,8 +97,8 @@ CheckLists( TQWidget parent, String name ) TQPushButton copy2 = new TQPushButton( " -> ", this ); lay.addWidget( copy2 ); copy2.setMaximumWidth( copy2.sizeHint().width() ); - // ...and connect its clicked() SIGNAL to the copy2to3() SLOT - connect( copy2, SIGNAL(" clicked()"), this, SLOT(" copy2to3()") ); + // ...and connect its clicked() signal to the copy2to3() slot + connect( copy2, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" copy2to3()") ); tmp = new TQVBoxLayout( lay ); tmp.setMargin( 5 ); @@ -109,7 +109,7 @@ CheckLists( TQWidget parent, String name ) } /* - SLOT copy1to2() + TQ_SLOT copy1to2() * Copies all checked ListViewItems from the first ListView to the second one, and inserts them as Radio-ListViewItem. @@ -143,7 +143,7 @@ public void copy1to2() } /* - SLOT copy2to3() + TQ_SLOT copy2to3() * Copies the checked item of the second ListView into the Label at the right. diff --git a/qtjava/javalib/examples/demo/sql/BookForm.java b/qtjava/javalib/examples/demo/sql/BookForm.java index 667207c9..96f39b3c 100644 --- a/qtjava/javalib/examples/demo/sql/BookForm.java +++ b/qtjava/javalib/examples/demo/sql/BookForm.java @@ -83,10 +83,10 @@ BookForm( TQWidget parent, String name, int fl ) // signals and slots connections - connect( editButton, SIGNAL( "clicked()" ), this, SLOT( "editClicked()" ) ); - connect( AuthorDataTable, SIGNAL( "primeInsert(TQSqlRecord)" ), this, SLOT( "primeInsertAuthor(TQSqlRecord)" ) ); - connect( AuthorDataTable, SIGNAL( "currentChanged(TQSqlRecord)" ), this, SLOT( "newCurrentAuthor(TQSqlRecord)" ) ); - connect( connectButton, SIGNAL( "clicked()" ), this, SLOT( "connectClicked()" ) ); + connect( editButton, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "editClicked()" ) ); + connect( AuthorDataTable, TQ_SIGNAL( "primeInsert(TQSqlRecord)" ), this, TQ_SLOT( "primeInsertAuthor(TQSqlRecord)" ) ); + connect( AuthorDataTable, TQ_SIGNAL( "currentChanged(TQSqlRecord)" ), this, TQ_SLOT( "newCurrentAuthor(TQSqlRecord)" ) ); + connect( connectButton, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "connectClicked()" ) ); // tab order setTabOrder( connectButton, editButton ); diff --git a/qtjava/javalib/examples/demo/sql/ConnectDialog.java b/qtjava/javalib/examples/demo/sql/ConnectDialog.java index ec0f1cc4..1cfc0f01 100644 --- a/qtjava/javalib/examples/demo/sql/ConnectDialog.java +++ b/qtjava/javalib/examples/demo/sql/ConnectDialog.java @@ -108,8 +108,8 @@ ConnectDialog( TQWidget parent, String name, boolean modal, int fl ) // signals and slots connections - connect( PushButton1, SIGNAL( "clicked()" ), this, SLOT( "accept()" ) ); - connect( PushButton2, SIGNAL( "clicked()" ), this, SLOT( "reject()" ) ); + connect( PushButton1, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "accept()" ) ); + connect( PushButton2, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "reject()" ) ); // tab order setTabOrder( comboDriver, editDatabase ); diff --git a/qtjava/javalib/examples/demo/sql/EditBookForm.java b/qtjava/javalib/examples/demo/sql/EditBookForm.java index 19a3df05..5f39c44d 100644 --- a/qtjava/javalib/examples/demo/sql/EditBookForm.java +++ b/qtjava/javalib/examples/demo/sql/EditBookForm.java @@ -157,23 +157,23 @@ EditBookForm( TQWidget parent, String name, boolean modal, int fl ) // signals and slots connections - connect( PushButtonFirst, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "first()" ) ); - connect( BookDataBrowser, SIGNAL( "firstRecordAvailable( boolean )" ), PushButtonFirst, SLOT( "setEnabled(boolean)" ) ); - connect( PushButtonPrev, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "prev()" ) ); - connect( BookDataBrowser, SIGNAL( "prevRecordAvailable( boolean )" ), PushButtonPrev, SLOT( "setEnabled(boolean)" ) ); - connect( PushButtonNext, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "next()" ) ); - connect( BookDataBrowser, SIGNAL( "nextRecordAvailable( boolean )" ), PushButtonNext, SLOT( "setEnabled(boolean)" ) ); - connect( PushButtonLast, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "last()" ) ); - connect( BookDataBrowser, SIGNAL( "lastRecordAvailable( boolean )" ), PushButtonLast, SLOT( "setEnabled(boolean)" ) ); - connect( PushButtonInsert, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "insert()" ) ); - connect( PushButtonUpdate, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "update()" ) ); - connect( PushButtonDelete, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "del()" ) ); - connect( PushButtonClose, SIGNAL( "clicked()" ), this, SLOT( "accept()" ) ); - connect( BookDataBrowser, SIGNAL( "primeUpdate(TQSqlRecord)" ), this, SLOT( "primeUpdateBook(TQSqlRecord)" ) ); - connect( BookDataBrowser, SIGNAL( "beforeUpdate(TQSqlRecord)" ), this, SLOT( "beforeUpdateBook(TQSqlRecord)" ) ); - connect( BookDataBrowser, SIGNAL( "beforeInsert(TQSqlRecord)" ), this, SLOT( "beforeUpdateBook(TQSqlRecord)" ) ); - connect( BookDataBrowser, SIGNAL( "primeInsert(TQSqlRecord)" ), this, SLOT( "primeInsertBook(TQSqlRecord)" ) ); - connect( BookDataBrowser, SIGNAL( "primeInsert(TQSqlRecord)" ), this, SLOT( "primeInsertBook(TQSqlRecord)" ) ); + connect( PushButtonFirst, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "first()" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "firstRecordAvailable( boolean )" ), PushButtonFirst, TQ_SLOT( "setEnabled(boolean)" ) ); + connect( PushButtonPrev, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "prev()" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "prevRecordAvailable( boolean )" ), PushButtonPrev, TQ_SLOT( "setEnabled(boolean)" ) ); + connect( PushButtonNext, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "next()" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "nextRecordAvailable( boolean )" ), PushButtonNext, TQ_SLOT( "setEnabled(boolean)" ) ); + connect( PushButtonLast, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "last()" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "lastRecordAvailable( boolean )" ), PushButtonLast, TQ_SLOT( "setEnabled(boolean)" ) ); + connect( PushButtonInsert, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "insert()" ) ); + connect( PushButtonUpdate, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "update()" ) ); + connect( PushButtonDelete, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "del()" ) ); + connect( PushButtonClose, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "accept()" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "primeUpdate(TQSqlRecord)" ), this, TQ_SLOT( "primeUpdateBook(TQSqlRecord)" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "beforeUpdate(TQSqlRecord)" ), this, TQ_SLOT( "beforeUpdateBook(TQSqlRecord)" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "beforeInsert(TQSqlRecord)" ), this, TQ_SLOT( "beforeUpdateBook(TQSqlRecord)" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "primeInsert(TQSqlRecord)" ), this, TQ_SLOT( "primeInsertBook(TQSqlRecord)" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "primeInsert(TQSqlRecord)" ), this, TQ_SLOT( "primeInsertBook(TQSqlRecord)" ) ); // tab order setTabOrder( TQLineEditTitle, TQLineEditPrice ); diff --git a/qtjava/javalib/examples/demo/widgets/WidgetsBase.java b/qtjava/javalib/examples/demo/widgets/WidgetsBase.java index e64ccf7f..6622d265 100644 --- a/qtjava/javalib/examples/demo/widgets/WidgetsBase.java +++ b/qtjava/javalib/examples/demo/widgets/WidgetsBase.java @@ -6036,19 +6036,19 @@ WidgetsBase( TQWidget parent, String name, int fl ) // signals and slots connections - connect( slider, SIGNAL( "valueChanged(int)" ), lcdDisplay, SLOT( "display(int)" ) ); - connect( slider, SIGNAL( "valueChanged(int)" ), progressBar, SLOT( "setProgress(int)" ) ); - connect( dateEdit, SIGNAL( "valueChanged(Calendar)" ), this, SLOT( "updateDateTimeString()" ) ); - connect( slider, SIGNAL( "valueChanged(int)" ), spinBox, SLOT( "setValue(int)" ) ); - connect( spinBox, SIGNAL( "valueChanged(int)" ), slider, SLOT( "setValue(int)" ) ); - connect( spinBox, SIGNAL( "valueChanged(int)" ), progressBar, SLOT( "setProgress(int)" ) ); - connect( spinBox, SIGNAL( "valueChanged(int)" ), lcdDisplay, SLOT( "display(int)" ) ); - connect( buttonColorBox, SIGNAL( "activated(String)" ), this, SLOT( "setColor(String)" ) ); - connect( lineEdit, SIGNAL( "textChanged(String)" ), this, SLOT( "updateColorTest(String)" ) ); - connect( lineEdit, SIGNAL( "returnPressed()" ), this, SLOT( "setColor()" ) ); - connect( timeEdit, SIGNAL( "valueChanged(Date)" ), this, SLOT( "updateDateTimeString()" ) ); - connect( timeEdit, SIGNAL( "valueChanged(Date)" ), this, SLOT( "updateClock()" ) ); - connect( pushButton, SIGNAL( "clicked()" ), this, SLOT( "resetColors()" ) ); + connect( slider, TQ_SIGNAL( "valueChanged(int)" ), lcdDisplay, TQ_SLOT( "display(int)" ) ); + connect( slider, TQ_SIGNAL( "valueChanged(int)" ), progressBar, TQ_SLOT( "setProgress(int)" ) ); + connect( dateEdit, TQ_SIGNAL( "valueChanged(Calendar)" ), this, TQ_SLOT( "updateDateTimeString()" ) ); + connect( slider, TQ_SIGNAL( "valueChanged(int)" ), spinBox, TQ_SLOT( "setValue(int)" ) ); + connect( spinBox, TQ_SIGNAL( "valueChanged(int)" ), slider, TQ_SLOT( "setValue(int)" ) ); + connect( spinBox, TQ_SIGNAL( "valueChanged(int)" ), progressBar, TQ_SLOT( "setProgress(int)" ) ); + connect( spinBox, TQ_SIGNAL( "valueChanged(int)" ), lcdDisplay, TQ_SLOT( "display(int)" ) ); + connect( buttonColorBox, TQ_SIGNAL( "activated(String)" ), this, TQ_SLOT( "setColor(String)" ) ); + connect( lineEdit, TQ_SIGNAL( "textChanged(String)" ), this, TQ_SLOT( "updateColorTest(String)" ) ); + connect( lineEdit, TQ_SIGNAL( "returnPressed()" ), this, TQ_SLOT( "setColor()" ) ); + connect( timeEdit, TQ_SIGNAL( "valueChanged(Date)" ), this, TQ_SLOT( "updateDateTimeString()" ) ); + connect( timeEdit, TQ_SIGNAL( "valueChanged(Date)" ), this, TQ_SLOT( "updateClock()" ) ); + connect( pushButton, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "resetColors()" ) ); init(); } diff --git a/qtjava/javalib/examples/dragdrop/DropSite.java b/qtjava/javalib/examples/dragdrop/DropSite.java index 3b85dd93..9209dd51 100644 --- a/qtjava/javalib/examples/dragdrop/DropSite.java +++ b/qtjava/javalib/examples/dragdrop/DropSite.java @@ -147,7 +147,7 @@ DragMoviePlayer( TQDragObject p ) // TQObject(p), dobj = p; movie = new TQMovie("trolltech.gif" ); - movie.connectUpdate(this,SLOT("updatePixmap(TQRect)")); + movie.connectUpdate(this,TQ_SLOT("updatePixmap(TQRect)")); } void updatePixmap( TQRect rect ) diff --git a/qtjava/javalib/examples/dragdrop/Main.java b/qtjava/javalib/examples/dragdrop/Main.java index ed6c5309..3bf475df 100644 --- a/qtjava/javalib/examples/dragdrop/Main.java +++ b/qtjava/javalib/examples/dragdrop/Main.java @@ -48,8 +48,8 @@ static DropSite addStuff( TQWidget parent, boolean image, boolean secret ) tll.activate(); parent.resize( parent.sizeHint() ); - TQObject.connect( d, Qt.SIGNAL("message(String)"), - format, Qt.SLOT("setText(String)") ); + TQObject.connect( d, Qt.TQ_SIGNAL("message(String)"), + format, Qt.TQ_SLOT("setText(String)") ); return d; } @@ -75,7 +75,7 @@ public static void main( String[] args ) mw3.setCaption( "Qt Example - Drag and Drop" ); mw3.show(); - TQObject.connect(Qt.qApp(),Qt.SIGNAL("lastWindowClosed()"),Qt.qApp(),Qt.SLOT("quit()")); + TQObject.connect(Qt.qApp(),Qt.TQ_SIGNAL("lastWindowClosed()"),Qt.qApp(),Qt.TQ_SLOT("quit()")); a.exec(); return; } diff --git a/qtjava/javalib/examples/forever/Forever.java b/qtjava/javalib/examples/forever/Forever.java index b7a10677..051a39dd 100644 --- a/qtjava/javalib/examples/forever/Forever.java +++ b/qtjava/javalib/examples/forever/Forever.java @@ -49,8 +49,8 @@ Forever( TQWidget parent, String name ) rectangles = 0; startTimer( 0 ); // run continuous timer TQTimer counter = new TQTimer( this ); - connect( counter, SIGNAL("timeout()"), - this, SLOT("updateCaption()") ); + connect( counter, TQ_SIGNAL("timeout()"), + this, TQ_SLOT("updateCaption()") ); counter.start( 1000 ); } diff --git a/qtjava/javalib/examples/hello/Hello.java b/qtjava/javalib/examples/hello/Hello.java index 5247d495..fec25073 100644 --- a/qtjava/javalib/examples/hello/Hello.java +++ b/qtjava/javalib/examples/hello/Hello.java @@ -28,7 +28,7 @@ Hello( String text, TQWidget parent, String name ) super(parent,name); t = text; TQTimer timer = new TQTimer(this); - connect( timer, SIGNAL("timeout()"), SLOT("animate()") ); + connect( timer, TQ_SIGNAL("timeout()"), TQ_SLOT("animate()") ); timer.start( 40 ); resize( 260, 130 ); diff --git a/qtjava/javalib/examples/hello/Main.java b/qtjava/javalib/examples/hello/Main.java index c5ebc24c..3e053584 100644 --- a/qtjava/javalib/examples/hello/Main.java +++ b/qtjava/javalib/examples/hello/Main.java @@ -29,7 +29,7 @@ public static void main( String[] args ) s = "Hello, World"; Hello h = new Hello( s ); h.setCaption( "Qt says hello" ); - TQObject.connect( h, Qt.SIGNAL("clicked()"), a, Qt.SLOT("quit()") ); + TQObject.connect( h, Qt.TQ_SIGNAL("clicked()"), a, Qt.TQ_SLOT("quit()") ); h.setFont( new TQFont("times",32,TQFont.Bold) ); // default font h.setBackgroundColor( Qt.white() ); // default bg color a.setMainWidget( h ); diff --git a/qtjava/javalib/examples/helpviewer/HelpWindow.java b/qtjava/javalib/examples/helpviewer/HelpWindow.java index c5e4ff7a..006a4722 100644 --- a/qtjava/javalib/examples/helpviewer/HelpWindow.java +++ b/qtjava/javalib/examples/helpviewer/HelpWindow.java @@ -42,26 +42,26 @@ HelpWindow( String home_, String _path, browser.mimeSourceFactory().setFilePath( new String[] { _path } ); browser.setFrameStyle( TQFrame.Panel | TQFrame.Sunken ); - connect( browser, SIGNAL(" textChanged()"), - this, SLOT(" textChanged()") ); + connect( browser, TQ_SIGNAL(" textChanged()"), + this, TQ_SLOT(" textChanged()") ); setCentralWidget( browser ); if ( !home_.equals("") ) browser.setSource( home_ ); - connect( browser, SIGNAL(" highlighted( String)"), - statusBar(), SLOT(" message( String)") ); + connect( browser, TQ_SIGNAL(" highlighted( String)"), + statusBar(), TQ_SLOT(" message( String)") ); resize( 640,700 ); TQPopupMenu file = new TQPopupMenu( this ); - file.insertItem( tr("&New Window"), this, SLOT(" newWindow()"), new TQKeySequence(CTRL+Key_N) ); - file.insertItem( tr("&Open File"), this, SLOT(" openFile()"), new TQKeySequence(CTRL+Key_O) ); - file.insertItem( tr("&Print"), this, SLOT(" print()"), new TQKeySequence(CTRL+Key_P) ); + file.insertItem( tr("&New Window"), this, TQ_SLOT(" newWindow()"), new TQKeySequence(CTRL+Key_N) ); + file.insertItem( tr("&Open File"), this, TQ_SLOT(" openFile()"), new TQKeySequence(CTRL+Key_O) ); + file.insertItem( tr("&Print"), this, TQ_SLOT(" print()"), new TQKeySequence(CTRL+Key_P) ); file.insertSeparator(); - file.insertItem( tr("&Close"), this, SLOT(" close()"), new TQKeySequence(CTRL+Key_Q) ); - file.insertItem( tr("E&xit"), tqApp(), SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_X) ); + file.insertItem( tr("&Close"), this, TQ_SLOT(" close()"), new TQKeySequence(CTRL+Key_Q) ); + file.insertItem( tr("E&xit"), tqApp(), TQ_SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_X) ); // The same three icons are used twice each. TQIconSet icon_back = new TQIconSet( new TQPixmap("back.xpm") ); @@ -70,16 +70,16 @@ HelpWindow( String home_, String _path, TQPopupMenu go = new TQPopupMenu( this ); backwardId = go.insertItem( icon_back, - tr("&Backward"), browser, SLOT(" backward()"), + tr("&Backward"), browser, TQ_SLOT(" backward()"), new TQKeySequence(CTRL+Key_Left) ); forwardId = go.insertItem( icon_forward, - tr("&Forward"), browser, SLOT(" forward()"), + tr("&Forward"), browser, TQ_SLOT(" forward()"), new TQKeySequence(CTRL+Key_Right) ); - go.insertItem( icon_home, tr("&Home"), browser, SLOT(" home()") ); + go.insertItem( icon_home, tr("&Home"), browser, TQ_SLOT(" home()") ); TQPopupMenu help = new TQPopupMenu( this ); - help.insertItem( tr("&About ..."), this, SLOT(" about()") ); - help.insertItem( tr("About &Qt ..."), this, SLOT(" aboutTQt()") ); + help.insertItem( tr("&About ..."), this, TQ_SLOT(" about()") ); + help.insertItem( tr("About &Qt ..."), this, TQ_SLOT(" aboutTQt()") ); hist = new TQPopupMenu( this ); Iterator it = history.iterator(); @@ -87,11 +87,11 @@ HelpWindow( String home_, String _path, String item = (String) it.next(); mHistory.put(new Integer(hist.insertItem( item )), item); } - connect( hist, SIGNAL(" activated( int )"), - this, SLOT(" histChosen( int )") ); + connect( hist, TQ_SIGNAL(" activated( int )"), + this, TQ_SLOT(" histChosen( int )") ); bookm = new TQPopupMenu( this ); - bookm.insertItem( tr( "Add Bookmark" ), this, SLOT(" addBookmark()") ); + bookm.insertItem( tr( "Add Bookmark" ), this, TQ_SLOT(" addBookmark()") ); bookm.insertSeparator(); Iterator it2 = bookmarks.iterator(); @@ -99,8 +99,8 @@ HelpWindow( String home_, String _path, String item = (String) it2.next(); mBookmarks.put(new Integer(bookm.insertItem( item )), item); } - connect( bookm, SIGNAL(" activated( int )"), - this, SLOT(" bookmChosen( int )") ); + connect( bookm, TQ_SIGNAL(" activated( int )"), + this, TQ_SLOT(" bookmChosen( int )") ); menuBar().insertItem( tr("&File"), file ); menuBar().insertItem( tr("&Go"), go ); @@ -111,29 +111,29 @@ HelpWindow( String home_, String _path, menuBar().setItemEnabled( forwardId, false); menuBar().setItemEnabled( backwardId, false); - connect( browser, SIGNAL(" backwardAvailable( boolean )"), - this, SLOT(" setBackwardAvailable( boolean )") ); - connect( browser, SIGNAL(" forwardAvailable( boolean )"), - this, SLOT(" setForwardAvailable( boolean )") ); + connect( browser, TQ_SIGNAL(" backwardAvailable( boolean )"), + this, TQ_SLOT(" setBackwardAvailable( boolean )") ); + connect( browser, TQ_SIGNAL(" forwardAvailable( boolean )"), + this, TQ_SLOT(" setForwardAvailable( boolean )") ); TQToolBar toolbar = new TQToolBar( this ); addToolBar( toolbar, "Toolbar"); TQToolButton button; - button = new TQToolButton( icon_back, tr("Backward"), "", browser, SLOT("backward()"), toolbar ); - connect( browser, SIGNAL(" backwardAvailable(boolean)"), button, SLOT(" setEnabled(boolean)") ); + button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQ_SLOT("backward()"), toolbar ); + connect( browser, TQ_SIGNAL(" backwardAvailable(boolean)"), button, TQ_SLOT(" setEnabled(boolean)") ); button.setEnabled( false ); - button = new TQToolButton( icon_forward, tr("Forward"), "", browser, SLOT("forward()"), toolbar ); - connect( browser, SIGNAL(" forwardAvailable(boolean)"), button, SLOT(" setEnabled(boolean)") ); + button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQ_SLOT("forward()"), toolbar ); + connect( browser, TQ_SIGNAL(" forwardAvailable(boolean)"), button, TQ_SLOT(" setEnabled(boolean)") ); button.setEnabled( false ); - button = new TQToolButton( icon_home, tr("Home"), "", browser, SLOT("home()"), toolbar ); + button = new TQToolButton( icon_home, tr("Home"), "", browser, TQ_SLOT("home()"), toolbar ); toolbar.addSeparator(); pathCombo = new TQComboBox( true, toolbar ); - connect( pathCombo, SIGNAL(" activated( String )"), - this, SLOT(" pathSelected( String )") ); + connect( pathCombo, TQ_SIGNAL(" activated( String )"), + this, TQ_SLOT(" pathSelected( String )") ); toolbar.setStretchableWidget( pathCombo ); setRightJustification( true ); setDockEnabled( DockLeft, false ); diff --git a/qtjava/javalib/examples/helpviewer/Main.java b/qtjava/javalib/examples/helpviewer/Main.java index 492ca36d..e6dc203d 100644 --- a/qtjava/javalib/examples/helpviewer/Main.java +++ b/qtjava/javalib/examples/helpviewer/Main.java @@ -32,10 +32,10 @@ public static void main( String[] args ) else help.showMaximized(); - TQObject.connect( a, Qt.SIGNAL("aboutToQuit()"), - help, Qt.SLOT("cleanUp()") ); - TQObject.connect( a, Qt.SIGNAL("lastWindowClosed()"), - a, Qt.SLOT("quit()") ); + TQObject.connect( a, Qt.TQ_SIGNAL("aboutToQuit()"), + help, Qt.TQ_SLOT("cleanUp()") ); + TQObject.connect( a, Qt.TQ_SIGNAL("lastWindowClosed()"), + a, Qt.TQ_SLOT("quit()") ); a.exec(); return; diff --git a/qtjava/javalib/examples/iconview/ListenDND.java b/qtjava/javalib/examples/iconview/ListenDND.java index d6dfbc9f..a7c8b00e 100644 --- a/qtjava/javalib/examples/iconview/ListenDND.java +++ b/qtjava/javalib/examples/iconview/ListenDND.java @@ -49,9 +49,9 @@ public static void main( String[] args ) qiconview.setCaption( "Qt Example - Iconview" ); ListenDND listen_dnd = new ListenDND( qiconview ); - TQObject.connect( qiconview, SIGNAL(" dropped( TQDropEvent , ArrayList )"), - listen_dnd, SLOT(" dropped( TQDropEvent )") ); - TQObject.connect( qiconview, SIGNAL(" moved()"), listen_dnd, SLOT(" moved()") ); + TQObject.connect( qiconview, TQ_SIGNAL(" dropped( TQDropEvent , ArrayList )"), + listen_dnd, TQ_SLOT(" dropped( TQDropEvent )") ); + TQObject.connect( qiconview, TQ_SIGNAL(" moved()"), listen_dnd, TQ_SLOT(" moved()") ); a.setMainWidget( qiconview ); qiconview.show(); diff --git a/qtjava/javalib/examples/layout/ExampleWidget.java b/qtjava/javalib/examples/layout/ExampleWidget.java index 566a7825..c66e238d 100644 --- a/qtjava/javalib/examples/layout/ExampleWidget.java +++ b/qtjava/javalib/examples/layout/ExampleWidget.java @@ -30,7 +30,7 @@ ExampleWidget( TQWidget parent, String name ) menubar.setSeparator( TQMenuBar.InWindowsStyle ); TQPopupMenu popup; popup = new TQPopupMenu( this ); - popup.insertItem( "&Quit", tqApp(), SLOT("quit()") ); + popup.insertItem( "&Quit", tqApp(), TQ_SLOT("quit()") ); menubar.insertItem( "&File", popup ); // ...and tell the layout about it. diff --git a/qtjava/javalib/examples/lineedits/LineEdits.java b/qtjava/javalib/examples/lineedits/LineEdits.java index f0f00bf1..072e851a 100644 --- a/qtjava/javalib/examples/lineedits/LineEdits.java +++ b/qtjava/javalib/examples/lineedits/LineEdits.java @@ -48,9 +48,9 @@ LineEdits( TQWidget parent, String name ) combo1.insertItem( "Normal", -1 ); combo1.insertItem( "Password", -1 ); combo1.insertItem( "No Echo", -1 ); - // ...and connect the activated() SIGNAL with the slotEchoChanged() SLOT to be able + // ...and connect the activated() signal with the slotEchoChanged() slot to be able // to react when an item is selected - connect( combo1, SIGNAL(" activated( int )"), this, SLOT(" slotEchoChanged( int )") ); + connect( combo1, TQ_SIGNAL(" activated( int )"), this, TQ_SLOT(" slotEchoChanged( int )") ); // insert the first LineEdit lined1 = new TQLineEdit( this ); @@ -70,8 +70,8 @@ LineEdits( TQWidget parent, String name ) combo2.insertItem( "No Validator", -1 ); combo2.insertItem( "Integer Validator", -1 ); combo2.insertItem( "Double Validator", -1 ); - // ...and again the activated() SIGNAL gets connected with a SLOT - connect( combo2, SIGNAL(" activated( int )"), this, SLOT(" slotValidatorChanged( int )") ); + // ...and again the activated() signal gets connected with a slot + connect( combo2, TQ_SIGNAL(" activated( int )"), this, TQ_SLOT(" slotValidatorChanged( int )") ); // and the second LineEdit lined2 = new TQLineEdit( this ); @@ -91,8 +91,8 @@ LineEdits( TQWidget parent, String name ) combo3.insertItem( "Left", -1 ); combo3.insertItem( "Centered", -1 ); combo3.insertItem( "Right", -1 ); - // ...and again the activated() SIGNAL gets connected with a SLOT - connect( combo3, SIGNAL(" activated( int )"), this, SLOT(" slotAlignmentChanged( int )") ); + // ...and again the activated() signal gets connected with a slot + connect( combo3, TQ_SIGNAL(" activated( int )"), this, TQ_SLOT(" slotAlignmentChanged( int )") ); // and the third lineedit lined3 = new TQLineEdit( this ); @@ -110,8 +110,8 @@ LineEdits( TQWidget parent, String name ) combo4 = new TQComboBox( false, row4 ); combo4.insertItem( "False", -1 ); combo4.insertItem( "True", -1 ); - // ...and again the activated() SIGNAL gets connected with a SLOT - connect( combo4, SIGNAL(" activated( int )"), this, SLOT(" slotReadOnlyChanged( int )") ); + // ...and again the activated() signal gets connected with a slot + connect( combo4, TQ_SIGNAL(" activated( int )"), this, TQ_SLOT(" slotReadOnlyChanged( int )") ); // and the last lineedit lined4 = new TQLineEdit( this ); @@ -122,7 +122,7 @@ LineEdits( TQWidget parent, String name ) } /* - SLOT slotEchoChanged( int i ) + TQ_SLOT slotEchoChanged( int i ) * i contains the number of the item which the user has been chosen in the first Combobox. According to this value, we set the Echo-Mode for the @@ -147,7 +147,7 @@ void slotEchoChanged( int i ) } /* - SLOT slotValidatorChanged( int i ) + TQ_SLOT slotValidatorChanged( int i ) * i contains the number of the item which the user has been chosen in the second Combobox. According to this value, we set a validator for the @@ -177,7 +177,7 @@ void slotValidatorChanged( int i ) /* - SLOT slotAlignmentChanged( int i ) + TQ_SLOT slotAlignmentChanged( int i ) * i contains the number of the item which the user has been chosen in the third Combobox. According to this value, we set an alignment @@ -203,7 +203,7 @@ void slotAlignmentChanged( int i ) /* - SLOT slotReadOnlyChanged( int i ) + TQ_SLOT slotReadOnlyChanged( int i ) * i contains the number of the item which the user has been chosen in the fourth Combobox. According to this value, we toggle read-only. diff --git a/qtjava/javalib/examples/listbox/ListBoxDemo.java b/qtjava/javalib/examples/listbox/ListBoxDemo.java index 11ce7037..ea496b68 100644 --- a/qtjava/javalib/examples/listbox/ListBoxDemo.java +++ b/qtjava/javalib/examples/listbox/ListBoxDemo.java @@ -45,7 +45,7 @@ ListBoxDemo() bg.insert( b ); v.addWidget( b ); b.setChecked( true ); - connect( b, SIGNAL("clicked()"), this, SLOT("setNumCols()") ); + connect( b, TQ_SIGNAL("clicked()"), this, TQ_SLOT("setNumCols()") ); TQHBoxLayout h = new TQHBoxLayout(); v.addLayout( h ); h.addSpacing( 30 ); @@ -61,7 +61,7 @@ ListBoxDemo() this ); bg.insert( b ); v.addWidget( b ); - connect( b, SIGNAL("clicked()"), this, SLOT("setColsByWidth()") ); + connect( b, TQ_SIGNAL("clicked()"), this, TQ_SLOT("setColsByWidth()") ); v.addSpacing( 12 ); @@ -70,7 +70,7 @@ ListBoxDemo() this ); bg.insert( b ); v.addWidget( b ); - connect( b, SIGNAL("clicked()"), this, SLOT("setNumRows()") ); + connect( b, TQ_SIGNAL("clicked()"), this, TQ_SLOT("setNumRows()") ); h = new TQHBoxLayout(); v.addLayout( h ); h.addSpacing( 30 ); @@ -87,30 +87,30 @@ ListBoxDemo() this ); bg.insert( b ); v.addWidget( b ); - connect( b, SIGNAL("clicked()"), this, SLOT("setRowsByHeight()") ); + connect( b, TQ_SIGNAL("clicked()"), this, TQ_SLOT("setRowsByHeight()") ); v.addSpacing( 12 ); TQCheckBox cb = new TQCheckBox( "Variable-height rows", this ); cb.setChecked( true ); - connect( cb, SIGNAL("toggled(boolean)"), this, SLOT("setVariableHeight(boolean)") ); + connect( cb, TQ_SIGNAL("toggled(boolean)"), this, TQ_SLOT("setVariableHeight(boolean)") ); v.addWidget( cb ); v.addSpacing( 6 ); cb = new TQCheckBox( "Variable-width columns", this ); - connect( cb, SIGNAL("toggled(boolean)"), this, SLOT("setVariableWidth(boolean)") ); + connect( cb, TQ_SIGNAL("toggled(boolean)"), this, TQ_SLOT("setVariableWidth(boolean)") ); v.addWidget( cb ); cb = new TQCheckBox( "Extended-Selection", this ); - connect( cb, SIGNAL("toggled(boolean)"), this, SLOT("setMultiSelection(boolean)") ); + connect( cb, TQ_SIGNAL("toggled(boolean)"), this, TQ_SLOT("setMultiSelection(boolean)") ); v.addWidget( cb ); TQPushButton pb = new TQPushButton( "Sort ascending", this ); - connect( pb, SIGNAL(" clicked()"), this, SLOT(" sortAscending()") ); + connect( pb, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" sortAscending()") ); v.addWidget( pb ); pb = new TQPushButton( "Sort descending", this ); - connect( pb, SIGNAL(" clicked()"), this, SLOT(" sortDescending()") ); + connect( pb, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" sortDescending()") ); v.addWidget( pb ); v.addStretch( 100 ); @@ -124,8 +124,8 @@ ListBoxDemo() rows.setRange( 1, 256 ); rows.setValue( 256 ); - connect( columns, SIGNAL("valueChanged(int)"), this, SLOT("setNumCols()") ); - connect( rows, SIGNAL("valueChanged(int)"), this, SLOT("setNumRows()") ); + connect( columns, TQ_SIGNAL("valueChanged(int)"), this, TQ_SLOT("setNumCols()") ); + connect( rows, TQ_SIGNAL("valueChanged(int)"), this, TQ_SLOT("setNumRows()") ); } diff --git a/qtjava/javalib/examples/mdi/ApplicationWindow.java b/qtjava/javalib/examples/mdi/ApplicationWindow.java index fd0079be..d6e5ce25 100644 --- a/qtjava/javalib/examples/mdi/ApplicationWindow.java +++ b/qtjava/javalib/examples/mdi/ApplicationWindow.java @@ -118,12 +118,12 @@ ApplicationWindow() openIcon = new TQPixmap( fileopen ); TQToolButton fileOpen = new TQToolButton( new TQIconSet(openIcon), "Open File", "", - this, SLOT("load()"), fileTools, "open file" ); + this, TQ_SLOT("load()"), fileTools, "open file" ); saveIcon = new TQPixmap( filesave ); TQToolButton fileSave = new TQToolButton( new TQIconSet(saveIcon), "Save File", "", - this, SLOT("save()"), fileTools, "save file" ); + this, TQ_SLOT("save()"), fileTools, "save file" ); printer = new TQPrinter(); TQPixmap printIcon; @@ -131,7 +131,7 @@ ApplicationWindow() printIcon = new TQPixmap( fileprint ); TQToolButton filePrint = new TQToolButton( new TQIconSet(printIcon), "Print File", "", - this, SLOT("print()"), fileTools, "print file" ); + this, TQ_SLOT("print()"), fileTools, "print file" ); TQWhatsThis.add( filePrint, filePrintText ); TQWhatsThis.whatsThisButton( fileTools ); @@ -142,39 +142,39 @@ ApplicationWindow() TQPopupMenu file = new TQPopupMenu( this ); menuBar().insertItem( "&File", file ); - file.insertItem( "&New", this, SLOT("newDoc()"), new TQKeySequence(CTRL+Key_N) ); + file.insertItem( "&New", this, TQ_SLOT("newDoc()"), new TQKeySequence(CTRL+Key_N) ); id = file.insertItem( new TQIconSet(openIcon), "&Open...", - this, SLOT("load()"), new TQKeySequence(CTRL+Key_O) ); + this, TQ_SLOT("load()"), new TQKeySequence(CTRL+Key_O) ); file.setWhatsThis( id, fileOpenText ); id = file.insertItem( new TQIconSet(saveIcon), "&Save", - this, SLOT("save()"), new TQKeySequence(CTRL+Key_S) ); + this, TQ_SLOT("save()"), new TQKeySequence(CTRL+Key_S) ); file.setWhatsThis( id, fileSaveText ); - id = file.insertItem( "Save &As...", this, SLOT("saveAs()") ); + id = file.insertItem( "Save &As...", this, TQ_SLOT("saveAs()") ); file.setWhatsThis( id, fileSaveText ); file.insertSeparator(); id = file.insertItem( new TQIconSet(printIcon), "&Print...", - this, SLOT("print()"), new TQKeySequence(CTRL+Key_P) ); + this, TQ_SLOT("print()"), new TQKeySequence(CTRL+Key_P) ); file.setWhatsThis( id, filePrintText ); file.insertSeparator(); - file.insertItem( "&Close", this, SLOT("closeWindow()"), new TQKeySequence(CTRL+Key_W) ); - file.insertItem( "&Quit", tqApp(), SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_Q) ); + file.insertItem( "&Close", this, TQ_SLOT("closeWindow()"), new TQKeySequence(CTRL+Key_W) ); + file.insertItem( "&Quit", tqApp(), TQ_SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_Q) ); windowsMenu = new TQPopupMenu( this ); windowsMenu.setCheckable( true ); - connect( windowsMenu, SIGNAL(" aboutToShow()"), - this, SLOT(" windowsMenuAboutToShow()") ); + connect( windowsMenu, TQ_SIGNAL(" aboutToShow()"), + this, TQ_SLOT(" windowsMenuAboutToShow()") ); menuBar().insertItem( "&Windows", windowsMenu ); menuBar().insertSeparator(); TQPopupMenu help = new TQPopupMenu( this ); menuBar().insertItem( "&Help", help ); - help.insertItem( "&About", this, SLOT("about()"), new TQKeySequence(Key_F1)); - help.insertItem( "About &Qt", this, SLOT("aboutTQt()")); + help.insertItem( "&About", this, TQ_SLOT("about()"), new TQKeySequence(Key_F1)); + help.insertItem( "About &Qt", this, TQ_SLOT("aboutTQt()")); help.insertSeparator(); - help.insertItem( "What's &This", this, SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1)); + help.insertItem( "What's &This", this, TQ_SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1)); TQVBox vb = new TQVBox( this ); vb.setFrameStyle( TQFrame.StyledPanel | TQFrame.Sunken ); @@ -189,7 +189,7 @@ ApplicationWindow() MDIWindow newDoc() { MDIWindow w = new MDIWindow( ws, null, WDestructiveClose ); - connect( w, SIGNAL("message(String,int)"), statusBar(), SLOT("message(String,int)") ); + connect( w, TQ_SIGNAL("message(String,int)"), statusBar(), TQ_SLOT("message(String,int)") ); w.setCaption("unnamed document"); w.setIcon( new TQPixmap("document.xpm") ); // show the very first window in maximized mode @@ -260,8 +260,8 @@ void aboutTQt() void windowsMenuAboutToShow() { windowsMenu.clear(); - int cascadeId = windowsMenu.insertItem("&Cascade", ws, SLOT("cascade()") ); - int tileId = windowsMenu.insertItem("&Tile", ws, SLOT("tile()") ); + int cascadeId = windowsMenu.insertItem("&Cascade", ws, TQ_SLOT("cascade()") ); + int tileId = windowsMenu.insertItem("&Tile", ws, TQ_SLOT("tile()") ); windows = ws.windowList(); if ( windows.size() == 0 ) { windowsMenu.setItemEnabled( cascadeId, false ); @@ -270,7 +270,7 @@ void windowsMenuAboutToShow() windowsMenu.insertSeparator(); for ( int i = 0; i < windows.size(); ++i ) { int id = windowsMenu.insertItem(((TQWidget) windows.get(i)).caption(), - this, SLOT(" windowsMenuActivated( int )") ); + this, TQ_SLOT(" windowsMenuActivated( int )") ); windowsMenu.setItemParameter( id, i ); windowsMenu.setItemChecked( id, ws.activeWindow() == windows.get(i) ); } diff --git a/qtjava/javalib/examples/mdi/Main.java b/qtjava/javalib/examples/mdi/Main.java index daec64d7..e75f1d3c 100644 --- a/qtjava/javalib/examples/mdi/Main.java +++ b/qtjava/javalib/examples/mdi/Main.java @@ -17,7 +17,7 @@ public static void main(String[] args) { ApplicationWindow mw = new ApplicationWindow(); mw.setCaption( "Qt Example - Multiple Documents Interface (MDI)" ); mw.show(); - a.connect( a, Qt.SIGNAL("lastWindowClosed()"), a, Qt.SLOT("quit()") ); + a.connect( a, Qt.TQ_SIGNAL("lastWindowClosed()"), a, Qt.TQ_SLOT("quit()") ); int res = a.exec(); return; } diff --git a/qtjava/javalib/examples/menu/MenuExample.java b/qtjava/javalib/examples/menu/MenuExample.java index dd619d09..10fe5c5c 100644 --- a/qtjava/javalib/examples/menu/MenuExample.java +++ b/qtjava/javalib/examples/menu/MenuExample.java @@ -135,32 +135,32 @@ MenuExample( TQWidget parent, String name ) TQPopupMenu print = new TQPopupMenu( this ); print.insertTearOffHandle(); - print.insertItem( "&Print to printer", this, SLOT("printer()") ); - print.insertItem( "Print to &file", this, SLOT("file()") ); - print.insertItem( "Print to fa&x", this, SLOT("fax()") ); + print.insertItem( "&Print to printer", this, TQ_SLOT("printer()") ); + print.insertItem( "Print to &file", this, TQ_SLOT("file()") ); + print.insertItem( "Print to fa&x", this, TQ_SLOT("fax()") ); print.insertSeparator(); - print.insertItem( "Printer &Setup", this, SLOT("printerSetup()") ); + print.insertItem( "Printer &Setup", this, TQ_SLOT("printerSetup()") ); TQPopupMenu file = new TQPopupMenu( this ); - file.insertItem( new TQIconSet(p1), "&Open", this, SLOT("open()"), new TQKeySequence(CTRL+Key_O) ); - file.insertItem( new TQIconSet(p2), "&New", this, SLOT("news()"), new TQKeySequence(CTRL+Key_N) ); - file.insertItem( new TQIconSet(p3), "&Save", this, SLOT("save()"), new TQKeySequence(CTRL+Key_S) ); - file.insertItem( "&Close", this, SLOT("closeDoc()"), new TQKeySequence(CTRL+Key_W) ); + file.insertItem( new TQIconSet(p1), "&Open", this, TQ_SLOT("open()"), new TQKeySequence(CTRL+Key_O) ); + file.insertItem( new TQIconSet(p2), "&New", this, TQ_SLOT("news()"), new TQKeySequence(CTRL+Key_N) ); + file.insertItem( new TQIconSet(p3), "&Save", this, TQ_SLOT("save()"), new TQKeySequence(CTRL+Key_S) ); + file.insertItem( "&Close", this, TQ_SLOT("closeDoc()"), new TQKeySequence(CTRL+Key_W) ); file.insertSeparator(); file.insertItem( "&Print", print, CTRL+Key_P ); file.insertSeparator(); - file.insertItem( "E&xit", tqApp(), SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) ); + file.insertItem( "E&xit", tqApp(), TQ_SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) ); TQPopupMenu edit = new TQPopupMenu( this ); - int undoID = edit.insertItem( "&Undo", this, SLOT("undo()") ); - int redoID = edit.insertItem( "&Redo", this, SLOT("redo()") ); + int undoID = edit.insertItem( "&Undo", this, TQ_SLOT("undo()") ); + int redoID = edit.insertItem( "&Redo", this, TQ_SLOT("redo()") ); edit.setItemEnabled( undoID, false ); edit.setItemEnabled( redoID, false ); TQPopupMenu options = new TQPopupMenu( this ); options.insertTearOffHandle(); options.setCaption("Options"); - options.insertItem( "&Normal Font", this, SLOT("normal()") ); + options.insertItem( "&Normal Font", this, TQ_SLOT("normal()") ); options.insertSeparator(); options.polish(); // adjust system settings @@ -168,12 +168,12 @@ MenuExample( TQWidget parent, String name ) f.setBold( true ); // boldID = options.insertItem( new MyMenuItem( "&Bold", f ) ); options.setAccel( new TQKeySequence(CTRL+Key_B), boldID ); - options.connectItem( boldID, this, SLOT("bold()") ); + options.connectItem( boldID, this, TQ_SLOT("bold()") ); f = font(); f.setUnderline( true ); // underlineID = options.insertItem( new MyMenuItem( "&Underline", f ) ); options.setAccel( new TQKeySequence(CTRL+Key_U), underlineID ); - options.connectItem( underlineID, this, SLOT("underline()") ); + options.connectItem( underlineID, this, TQ_SLOT("underline()") ); isBold = false; isUnderline = false; @@ -181,8 +181,8 @@ MenuExample( TQWidget parent, String name ) TQPopupMenu help = new TQPopupMenu( this ); - help.insertItem( "&About", this, SLOT("about()"), new TQKeySequence(CTRL+Key_H) ); - help.insertItem( "About &Qt", this, SLOT("aboutTQt()") ); + help.insertItem( "&About", this, TQ_SLOT("about()"), new TQKeySequence(CTRL+Key_H) ); + help.insertItem( "About &Qt", this, TQ_SLOT("aboutTQt()") ); menu = new TQMenuBar( this ); menu.insertItem( "&File", file ); @@ -198,8 +198,8 @@ MenuExample( TQWidget parent, String name ) label.setLineWidth( 1 ); label.setAlignment( AlignCenter ); - connect( this, SIGNAL("explain(String)"), - label, SLOT("setText(String)") ); + connect( this, TQ_SIGNAL("explain(String)"), + label, TQ_SLOT("setText(String)") ); setMinimumSize( 100, 80 ); } diff --git a/qtjava/javalib/examples/popup/Frame.java b/qtjava/javalib/examples/popup/Frame.java index f7608e03..6fbaa7d9 100644 --- a/qtjava/javalib/examples/popup/Frame.java +++ b/qtjava/javalib/examples/popup/Frame.java @@ -32,9 +32,9 @@ Frame(TQWidget parent, String name) { super(parent, name); button1 = new TQPushButton("Simple Popup", this); - connect ( button1, SIGNAL(" clicked()"), SLOT(" button1Clicked()") ); + connect ( button1, TQ_SIGNAL(" clicked()"), TQ_SLOT(" button1Clicked()") ); button2 = new TQPushButton("Fancy Popup", this); - connect ( button2, SIGNAL(" pressed()"), SLOT(" button2Pressed()") ); + connect ( button2, TQ_SIGNAL(" pressed()"), TQ_SLOT(" button2Pressed()") ); TQBoxLayout l = new TQHBoxLayout( this ); button1.setMaximumSize(button1.sizeHint()); @@ -54,11 +54,11 @@ Frame(TQWidget parent, String name) popup1.setFrameStyle( WinPanel|Raised ); popup1.resize(150,100); TQLineEdit tmpE = new TQLineEdit( popup1 ); - connect( tmpE, SIGNAL(" returnPressed()"), popup1, SLOT(" hide()") ); + connect( tmpE, TQ_SIGNAL(" returnPressed()"), popup1, TQ_SLOT(" hide()") ); tmpE.setGeometry(10,10, 130, 30); tmpE.setFocus(); TQPushButton tmpB = new TQPushButton("Click me!", popup1); - connect( tmpB, SIGNAL(" clicked()"), popup1, SLOT(" close()") ); + connect( tmpB, TQ_SIGNAL(" clicked()"), popup1, TQ_SLOT(" close()") ); tmpB.setGeometry(10, 50, 130, 30); // the fancier version uses its own class. It will be shown when @@ -73,7 +73,7 @@ Frame(TQWidget parent, String name) // tmpE = new TQLineEdit( popup2 ); // tmpE.setFocus(); -// connect( tmpE, SIGNAL(" returnPressed()"), popup2, SLOT(" close()") ); +// connect( tmpE, TQ_SIGNAL(" returnPressed()"), popup2, TQ_SLOT(" close()") ); // tmpE.setGeometry(10, 10, 130, 30); } diff --git a/qtjava/javalib/examples/progressbar/ProgressBar.java b/qtjava/javalib/examples/progressbar/ProgressBar.java index 88b547eb..0d05040d 100644 --- a/qtjava/javalib/examples/progressbar/ProgressBar.java +++ b/qtjava/javalib/examples/progressbar/ProgressBar.java @@ -67,11 +67,11 @@ ProgressBar( TQWidget parent, String name ) toplayout.addMultiCellWidget( progress, 1, 1, 0, 1 ); // connect the clicked() SIGNALs of the pushbuttons to SLOTs - connect( start, SIGNAL(" clicked()"), this, SLOT(" slotStart()") ); - connect( reset, SIGNAL(" clicked()"), this, SLOT(" slotReset()") ); + connect( start, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" slotStart()") ); + connect( reset, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" slotReset()") ); - // connect the timeout() SIGNAL of the progress-timer to a SLOT - connect( timer, SIGNAL(" timeout()"), this, SLOT(" slotTimeout()") ); + // connect the timeout() TQ_SIGNAL of the progress-timer to a TQ_SLOT + connect( timer, TQ_SIGNAL(" timeout()"), this, TQ_SLOT(" slotTimeout()") ); // Let's start with normal speed... normal.setChecked( true ); @@ -83,9 +83,9 @@ ProgressBar( TQWidget parent, String name ) } /* - SLOT slotStart + TQ_SLOT slotStart * - This SLOT is called if the user clicks start/pause/continue + This slot is called if the user clicks start/pause/continue button */ @@ -123,9 +123,9 @@ void slotStart() } /* - SLOT slotReset + TQ_SLOT slotReset * - This SLOT is called when the user clicks the reset button + This slot is called when the user clicks the reset button */ void slotReset() @@ -148,9 +148,9 @@ void slotReset() } /* - SLOT slotTimeout + TQ_SLOT slotTimeout * - This SLOT is called each ms when the timer is + This slot is called each ms when the timer is active (== progress is running) */ diff --git a/qtjava/javalib/examples/qfd/FontDisplayer.java b/qtjava/javalib/examples/qfd/FontDisplayer.java index 17dfe6a4..3895726f 100644 --- a/qtjava/javalib/examples/qfd/FontDisplayer.java +++ b/qtjava/javalib/examples/qfd/FontDisplayer.java @@ -157,10 +157,10 @@ FontDisplayer( TQWidget parent, String name ) controls.addSeparator(); TQPushButton fontbutton = new TQPushButton(tr("Font..."), controls); - connect(row,SIGNAL("valueChanged(int)"),table,SLOT("setRow(int)")); - connect(fontbutton, SIGNAL("clicked()"), table, SLOT("chooseFont()")); - connect(table,SIGNAL("fontInformation(String)"), - statusBar(),SLOT("message(String)")); + connect(row,TQ_SIGNAL("valueChanged(int)"),table,TQ_SLOT("setRow(int)")); + connect(fontbutton, TQ_SIGNAL("clicked()"), table, TQ_SLOT("chooseFont()")); + connect(table,TQ_SIGNAL("fontInformation(String)"), + statusBar(),TQ_SLOT("message(String)")); table.setRow(0); setCentralWidget(table); } diff --git a/qtjava/javalib/examples/qmag/MagWidget.java b/qtjava/javalib/examples/qmag/MagWidget.java index f701835b..ade43cef 100644 --- a/qtjava/javalib/examples/qmag/MagWidget.java +++ b/qtjava/javalib/examples/qmag/MagWidget.java @@ -57,11 +57,11 @@ MagWidget( TQWidget parent, String name ) zoom = new TQComboBox( false, this ); zoom.insertStrList( zoomfactors, 9 ); - connect( zoom, SIGNAL("activated(int)"), SLOT("setZoom(int)") ); + connect( zoom, TQ_SIGNAL("activated(int)"), TQ_SLOT("setZoom(int)") ); refresh = new TQComboBox( false, this ); refresh.insertStrList( refreshrates, 9 ); - connect( refresh, SIGNAL("activated(int)"), SLOT("setRefresh(int)") ); + connect( refresh, TQ_SIGNAL("activated(int)"), TQ_SLOT("setRefresh(int)") ); for( n=0; n<9; n++) { int w2 = zoom.fontMetrics().width( zoomfactors[n] ); @@ -78,20 +78,20 @@ MagWidget( TQWidget parent, String name ) refresh.setGeometry( x, 2, w+30, 20 ); saveButton = new TQPushButton( this ); - connect( saveButton, SIGNAL("clicked()"), this, SLOT("save()") ); + connect( saveButton, TQ_SIGNAL("clicked()"), this, TQ_SLOT("save()") ); saveButton.setText( "Save" ); saveButton.setGeometry( x+w+30+2, 2, 10+saveButton.fontMetrics().width("Save"), 20 ); multiSaveButton = new TQPushButton( this ); multiSaveButton.setToggleButton(true); - connect( multiSaveButton, SIGNAL("clicked()"), this, SLOT("multiSave()") ); + connect( multiSaveButton, TQ_SIGNAL("clicked()"), this, TQ_SLOT("multiSave()") ); multiSaveButton.setText( "MultiSave" ); multiSaveButton.setGeometry( saveButton.geometry().right() + 2, 2, 10+multiSaveButton.fontMetrics().width("MultiSave"), 20 ); quitButton = new TQPushButton( this ); - connect( quitButton, SIGNAL("clicked()"), tqApp(), SLOT("quit()") ); + connect( quitButton, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()") ); quitButton.setText( "Quit" ); quitButton.setGeometry( multiSaveButton.geometry().right() + 2, 2, 10+quitButton.fontMetrics().width("Quit"), 20 ); diff --git a/qtjava/javalib/examples/qwerty/Editor.java b/qtjava/javalib/examples/qwerty/Editor.java index 5175b7da..36934685 100644 --- a/qtjava/javalib/examples/qwerty/Editor.java +++ b/qtjava/javalib/examples/qwerty/Editor.java @@ -46,35 +46,35 @@ Editor( TQWidget parent , String name ) TQPopupMenu file = new TQPopupMenu(this); m.insertItem( "&File", file ); - file.insertItem( "&New", this, SLOT("newDoc()"), new TQKeySequence(ALT+Key_N) ); - file.insertItem( "&Open...", this, SLOT("load()"), new TQKeySequence(ALT+Key_O) ); - file.insertItem( "&Save...", this, SLOT("save()"), new TQKeySequence(ALT+Key_S) ); + file.insertItem( "&New", this, TQ_SLOT("newDoc()"), new TQKeySequence(ALT+Key_N) ); + file.insertItem( "&Open...", this, TQ_SLOT("load()"), new TQKeySequence(ALT+Key_O) ); + file.insertItem( "&Save...", this, TQ_SLOT("save()"), new TQKeySequence(ALT+Key_S) ); file.insertSeparator(); open_as = new TQPopupMenu(file); file.insertItem( "Open &As", open_as ); save_as = new TQPopupMenu(file); file.insertItem( "Sa&ve As", save_as ); - file.insertItem( "Add &Encoding", this, SLOT("addEncoding()") ); + file.insertItem( "Add &Encoding", this, TQ_SLOT("addEncoding()") ); file.insertSeparator(); - file.insertItem( "&Print...", this, SLOT("print()"), new TQKeySequence(ALT+Key_P) ); + file.insertItem( "&Print...", this, TQ_SLOT("print()"), new TQKeySequence(ALT+Key_P) ); file.insertSeparator(); - file.insertItem( "&Close", this, SLOT("close()"),new TQKeySequence(ALT+Key_W) ); - file.insertItem( "&Quit", tqApp(), SLOT("closeAllWindows()"), new TQKeySequence(ALT+Key_Q) ); + file.insertItem( "&Close", this, TQ_SLOT("close()"),new TQKeySequence(ALT+Key_W) ); + file.insertItem( "&Quit", tqApp(), TQ_SLOT("closeAllWindows()"), new TQKeySequence(ALT+Key_Q) ); - connect( save_as, SIGNAL("activated(int)"), this, SLOT("saveAsEncoding(int)") ); - connect( open_as, SIGNAL("activated(int)"), this, SLOT("openAsEncoding(int)") ); + connect( save_as, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("saveAsEncoding(int)") ); + connect( open_as, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("openAsEncoding(int)") ); rebuildCodecList(); TQPopupMenu edit = new TQPopupMenu(m); m.insertItem( "&Edit", edit ); - edit.insertItem( "To &Uppercase", this, SLOT("toUpper()"), new TQKeySequence(ALT+Key_U) ); - edit.insertItem( "To &Lowercase", this, SLOT("toLower()"), new TQKeySequence(ALT+Key_L) ); + edit.insertItem( "To &Uppercase", this, TQ_SLOT("toUpper()"), new TQKeySequence(ALT+Key_U) ); + edit.insertItem( "To &Lowercase", this, TQ_SLOT("toLower()"), new TQKeySequence(ALT+Key_L) ); edit.insertSeparator(); - edit.insertItem( "&Select Font" , this, SLOT("getFont()"), new TQKeySequence(ALT+Key_F) ); + edit.insertItem( "&Select Font" , this, TQ_SLOT("getFont()"), new TQKeySequence(ALT+Key_F) ); changed = false; e = new TQMultiLineEdit( this, "editor" ); - connect( e, SIGNAL(" textChanged()"), this, SLOT(" textChanged()") ); + connect( e, TQ_SIGNAL(" textChanged()"), this, TQ_SLOT(" textChanged()") ); // We use Unifont - if you have it installed you'll see all // Unicode character glyphs. diff --git a/qtjava/javalib/examples/qwerty/Main.java b/qtjava/javalib/examples/qwerty/Main.java index a2001e15..a59b3a73 100644 --- a/qtjava/javalib/examples/qwerty/Main.java +++ b/qtjava/javalib/examples/qwerty/Main.java @@ -32,7 +32,7 @@ public static void main(String[] args) e.show(); } } - a.connect(a, Qt.SIGNAL("lastWindowClosed()"), a, Qt.SLOT("quit()") ); + a.connect(a, Qt.TQ_SIGNAL("lastWindowClosed()"), a, Qt.TQ_SLOT("quit()") ); a.exec(); return; } diff --git a/qtjava/javalib/examples/rangecontrols/RangeControls.java b/qtjava/javalib/examples/rangecontrols/RangeControls.java index ea0c9b16..ded6bdc0 100644 --- a/qtjava/javalib/examples/rangecontrols/RangeControls.java +++ b/qtjava/javalib/examples/rangecontrols/RangeControls.java @@ -61,7 +61,7 @@ RangeControls( TQWidget parent, String name ) TQLCDNumber lcd2 = new TQLCDNumber( 2, cell3 ); lcd2.display( 33 ); lcd2.setSegmentStyle( TQLCDNumber.Filled ); - connect( hslider, SIGNAL(" valueChanged( int )"), lcd2, SLOT(" display( int )") ); + connect( hslider, TQ_SIGNAL(" valueChanged( int )"), lcd2, TQ_SLOT(" display( int )") ); TQHBox cell4 = new TQHBox( row2 ); cell4.setFrameStyle( TQFrame.WinPanel | TQFrame.Sunken ); @@ -69,6 +69,6 @@ RangeControls( TQWidget parent, String name ) TQSlider vslider = new TQSlider( 0, 64, 1, 8, Qt.Vertical, cell4 ); TQLCDNumber lcd3 = new TQLCDNumber( 3, cell4 ); lcd3.display( 8 ); - connect( vslider, SIGNAL(" valueChanged( int )"), lcd3, SLOT(" display( int )") ); + connect( vslider, TQ_SIGNAL(" valueChanged( int )"), lcd3, TQ_SLOT(" display( int )") ); } } diff --git a/qtjava/javalib/examples/richtext/MyRichText.java b/qtjava/javalib/examples/richtext/MyRichText.java index f06dde68..7e1fd25b 100644 --- a/qtjava/javalib/examples/richtext/MyRichText.java +++ b/qtjava/javalib/examples/richtext/MyRichText.java @@ -108,9 +108,9 @@ MyRichText( TQWidget parent, String name ) bPrev.setEnabled( false ); - connect( bClose, SIGNAL(" clicked()"), tqApp(), SLOT(" quit()") ); - connect( bPrev, SIGNAL(" clicked()"), this, SLOT(" prev()") ); - connect( bNext, SIGNAL(" clicked()"), this, SLOT(" next()") ); + connect( bClose, TQ_SIGNAL(" clicked()"), tqApp(), TQ_SLOT(" quit()") ); + connect( bPrev, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" prev()") ); + connect( bNext, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" next()") ); num = 0; } diff --git a/qtjava/javalib/examples/rot13/Rot13.java b/qtjava/javalib/examples/rot13/Rot13.java index bfb55edb..472e13eb 100644 --- a/qtjava/javalib/examples/rot13/Rot13.java +++ b/qtjava/javalib/examples/rot13/Rot13.java @@ -24,12 +24,12 @@ Rot13() { left = new TQMultiLineEdit( this, "left" ); right = new TQMultiLineEdit( this, "right" ); - connect( left, SIGNAL("textChanged()"), this, SLOT("changeRight()") ); - connect( right, SIGNAL("textChanged()"), this, SLOT("changeLeft()") ); + connect( left, TQ_SIGNAL("textChanged()"), this, TQ_SLOT("changeRight()") ); + connect( right, TQ_SIGNAL("textChanged()"), this, TQ_SLOT("changeLeft()") ); TQPushButton quit = new TQPushButton( "&Quit", this ); quit.setFocusPolicy( NoFocus ); - connect( quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()") ); + connect( quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()") ); TQGridLayout l = new TQGridLayout( this, 2, 2, 5 ); l.addWidget( left, 0, 0 ); diff --git a/qtjava/javalib/examples/scribble/Scribble.java b/qtjava/javalib/examples/scribble/Scribble.java index 1fedd0e2..cb0abf65 100644 --- a/qtjava/javalib/examples/scribble/Scribble.java +++ b/qtjava/javalib/examples/scribble/Scribble.java @@ -153,24 +153,24 @@ Scribble( TQWidget parent, String name ) TQToolBar tools = new TQToolBar( this ); - bSave = new TQToolButton( new TQIconSet(), "Save", "Save as PNG image", this, SLOT(" slotSave()"), tools ); + bSave = new TQToolButton( new TQIconSet(), "Save", "Save as PNG image", this, TQ_SLOT(" slotSave()"), tools ); bSave.setText( "Save as..." ); tools.addSeparator(); - bPColor = new TQToolButton( new TQIconSet(), "Choose Pen Color", "Choose Pen Color", this, SLOT(" slotColor()"), tools ); + bPColor = new TQToolButton( new TQIconSet(), "Choose Pen Color", "Choose Pen Color", this, TQ_SLOT(" slotColor()"), tools ); bPColor.setText( "Choose Pen Color..." ); tools.addSeparator(); bPWidth = new TQSpinBox( 1, 20, 1, tools ); TQToolTip.add( bPWidth, "Choose Pen Width" ); - connect( bPWidth, SIGNAL(" valueChanged( int )"), this, SLOT(" slotWidth( int )") ); + connect( bPWidth, TQ_SIGNAL(" valueChanged( int )"), this, TQ_SLOT(" slotWidth( int )") ); bPWidth.setValue( 3 ); tools.addSeparator(); - bClear = new TQToolButton( new TQIconSet(), "Clear Screen", "Clear Screen", this, SLOT(" slotClear()"), tools ); + bClear = new TQToolButton( new TQIconSet(), "Clear Screen", "Clear Screen", this, TQ_SLOT(" slotClear()"), tools ); bClear.setText( "Clear Screen" ); } diff --git a/qtjava/javalib/examples/showimg/ImageTextEditor.java b/qtjava/javalib/examples/showimg/ImageTextEditor.java index bb4ba0ce..4b6531d0 100644 --- a/qtjava/javalib/examples/showimg/ImageTextEditor.java +++ b/qtjava/javalib/examples/showimg/ImageTextEditor.java @@ -54,23 +54,23 @@ ImageTextEditor( TQImage i, TQWidget parent, String name, int f ) TQPushButton cancel = new TQPushButton("Cancel",hbox); TQPushButton ok = new TQPushButton("OK",hbox); - connect(add,SIGNAL("clicked()"), - this,SLOT("addText()")); + connect(add,TQ_SIGNAL("clicked()"), + this,TQ_SLOT("addText()")); - connect(remove,SIGNAL("clicked()"), - this,SLOT("removeText()")); + connect(remove,TQ_SIGNAL("clicked()"), + this,TQ_SLOT("removeText()")); - connect(ok,SIGNAL("clicked()"), - this,SLOT("accept()")); + connect(ok,TQ_SIGNAL("clicked()"), + this,TQ_SLOT("accept()")); - connect(cancel,SIGNAL("clicked()"), - this,SLOT("reject()")); + connect(cancel,TQ_SIGNAL("clicked()"), + this,TQ_SLOT("reject()")); - connect(languages,SIGNAL("activated(int)"), - this,SLOT("updateText()")); + connect(languages,TQ_SIGNAL("activated(int)"), + this,TQ_SLOT("updateText()")); - connect(keys,SIGNAL("activated(int)"), - this,SLOT("updateText()")); + connect(keys,TQ_SIGNAL("activated(int)"), + this,TQ_SLOT("updateText()")); imageChanged(); } diff --git a/qtjava/javalib/examples/showimg/ImageViewer.java b/qtjava/javalib/examples/showimg/ImageViewer.java index 86f8af26..974a189a 100644 --- a/qtjava/javalib/examples/showimg/ImageViewer.java +++ b/qtjava/javalib/examples/showimg/ImageViewer.java @@ -73,32 +73,32 @@ ImageViewer( TQWidget parent, String name, int wFlags ) saveimage.insertItem( f ); savepixmap.insertItem( f ); } - connect( saveimage, SIGNAL("activated(int)"), this, SLOT("saveImage(int)") ); - connect( savepixmap, SIGNAL("activated(int)"), this, SLOT("savePixmap(int)") ); + connect( saveimage, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("saveImage(int)") ); + connect( savepixmap, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("savePixmap(int)") ); file = new TQPopupMenu( menubar ); menubar.insertItem( "&File", file ); - file.insertItem( "&New window", this, SLOT("newWindow()"), new TQKeySequence(CTRL+Key_N) ); - file.insertItem( "&Open...", this, SLOT("openFile()"), new TQKeySequence(CTRL+Key_O) ); + file.insertItem( "&New window", this, TQ_SLOT("newWindow()"), new TQKeySequence(CTRL+Key_N) ); + file.insertItem( "&Open...", this, TQ_SLOT("openFile()"), new TQKeySequence(CTRL+Key_O) ); si = file.insertItem( "Save image", saveimage ); sp = file.insertItem( "Save pixmap", savepixmap ); file.insertSeparator(); - file.insertItem( "E&xit", tqApp(), SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) ); + file.insertItem( "E&xit", tqApp(), TQ_SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) ); edit = new TQPopupMenu( menubar ); menubar.insertItem( "&Edit", edit ); - edit.insertItem("&Copy", this, SLOT("copy()"), new TQKeySequence(CTRL+Key_C)); - edit.insertItem("&Paste", this, SLOT("paste()"), new TQKeySequence(CTRL+Key_V)); + edit.insertItem("&Copy", this, TQ_SLOT("copy()"), new TQKeySequence(CTRL+Key_C)); + edit.insertItem("&Paste", this, TQ_SLOT("paste()"), new TQKeySequence(CTRL+Key_V)); edit.insertSeparator(); - edit.insertItem("&Horizontal flip", this, SLOT("hFlip()"), new TQKeySequence(ALT+Key_H)); - edit.insertItem("&Vertical flip", this, SLOT("vFlip()"), new TQKeySequence(ALT+Key_V)); - edit.insertItem("&Rotate 180", this, SLOT("rot180()"), new TQKeySequence(ALT+Key_R)); + edit.insertItem("&Horizontal flip", this, TQ_SLOT("hFlip()"), new TQKeySequence(ALT+Key_H)); + edit.insertItem("&Vertical flip", this, TQ_SLOT("vFlip()"), new TQKeySequence(ALT+Key_V)); + edit.insertItem("&Rotate 180", this, TQ_SLOT("rot180()"), new TQKeySequence(ALT+Key_R)); edit.insertSeparator(); - edit.insertItem("&Text...", this, SLOT("editText()")); + edit.insertItem("&Text...", this, TQ_SLOT("editText()")); edit.insertSeparator(); - t1 = edit.insertItem( "Convert to &1 bit", this, SLOT("to1Bit()") ); - t8 = edit.insertItem( "Convert to &8 bit", this, SLOT("to8Bit()") ); - t32 = edit.insertItem( "Convert to &32 bit", this, SLOT("to32Bit()") ); + t1 = edit.insertItem( "Convert to &1 bit", this, TQ_SLOT("to1Bit()") ); + t8 = edit.insertItem( "Convert to &8 bit", this, TQ_SLOT("to8Bit()") ); + t32 = edit.insertItem( "Convert to &32 bit", this, TQ_SLOT("to32Bit()") ); options = new TQPopupMenu( menubar ); menubar.insertItem( "&Options", options ); @@ -128,9 +128,9 @@ ImageViewer( TQWidget parent, String name, int wFlags ) TQPopupMenu help = new TQPopupMenu( menubar ); menubar.insertItem( "&Help", help ); - help.insertItem( "Help!", this, SLOT("giveHelp()"), new TQKeySequence(CTRL+Key_H) ); + help.insertItem( "Help!", this, TQ_SLOT("giveHelp()"), new TQKeySequence(CTRL+Key_H) ); - connect( options, SIGNAL("activated(int)"), this, SLOT("doOption(int)") ); + connect( options, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("doOption(int)") ); status = new TQLabel(this); status.setFrameStyle( TQFrame.WinPanel | TQFrame.Sunken ); diff --git a/qtjava/javalib/examples/showimg/Main.java b/qtjava/javalib/examples/showimg/Main.java index 952e65eb..66d44493 100644 --- a/qtjava/javalib/examples/showimg/Main.java +++ b/qtjava/javalib/examples/showimg/Main.java @@ -47,7 +47,7 @@ public static void main(String[] args) } } - TQObject.connect(Qt.qApp(), Qt.SIGNAL("lastWindowClosed()"), Qt.qApp(), Qt.SLOT("quit()")); + TQObject.connect(Qt.qApp(), Qt.TQ_SIGNAL("lastWindowClosed()"), Qt.qApp(), Qt.TQ_SLOT("quit()")); a.exec(); return; diff --git a/qtjava/javalib/examples/sound/SoundPlayer.java b/qtjava/javalib/examples/sound/SoundPlayer.java index 3cc76d76..73d54b71 100644 --- a/qtjava/javalib/examples/sound/SoundPlayer.java +++ b/qtjava/javalib/examples/sound/SoundPlayer.java @@ -49,15 +49,15 @@ SoundPlayer() } TQPopupMenu file = new TQPopupMenu(this); - file.insertItem("Play &1", this, SLOT("doPlay1()"), new TQKeySequence(CTRL+Key_1)); - file.insertItem("Play &2", this, SLOT("doPlay2()"), new TQKeySequence(CTRL+Key_2)); - file.insertItem("Play from bucket &3", this, SLOT("doPlay3()"), new TQKeySequence(CTRL+Key_3)); - file.insertItem("Play from bucket &4", this, SLOT("doPlay4()"), new TQKeySequence(CTRL+Key_4)); + file.insertItem("Play &1", this, TQ_SLOT("doPlay1()"), new TQKeySequence(CTRL+Key_1)); + file.insertItem("Play &2", this, TQ_SLOT("doPlay2()"), new TQKeySequence(CTRL+Key_2)); + file.insertItem("Play from bucket &3", this, TQ_SLOT("doPlay3()"), new TQKeySequence(CTRL+Key_3)); + file.insertItem("Play from bucket &4", this, TQ_SLOT("doPlay4()"), new TQKeySequence(CTRL+Key_4)); file.insertSeparator(); - file.insertItem("Play 3 and 4 together", this, SLOT("doPlay34()")); - file.insertItem("Play all together", this, SLOT("doPlay1234()")); + file.insertItem("Play 3 and 4 together", this, TQ_SLOT("doPlay34()")); + file.insertItem("Play all together", this, TQ_SLOT("doPlay1234()")); file.insertSeparator(); - file.insertItem("E&xit", tqApp(), SLOT("quit()")); + file.insertItem("E&xit", tqApp(), TQ_SLOT("quit()")); menuBar().insertItem("&File", file); } diff --git a/qtjava/javalib/examples/tabdialog/TabDialog.java b/qtjava/javalib/examples/tabdialog/TabDialog.java index 448b97b7..7ce50053 100644 --- a/qtjava/javalib/examples/tabdialog/TabDialog.java +++ b/qtjava/javalib/examples/tabdialog/TabDialog.java @@ -27,7 +27,7 @@ TabDialog( TQWidget parent, String name, String _filename ) setupTab2(); setupTab3(); - connect( this, SIGNAL(" applyButtonPressed()"), tqApp(), SLOT(" quit()") ); + connect( this, TQ_SIGNAL(" applyButtonPressed()"), tqApp(), TQ_SLOT(" quit()") ); } void setupTab1() diff --git a/qtjava/javalib/examples/textedit/Main.java b/qtjava/javalib/examples/textedit/Main.java index 701c702b..e56f83dd 100644 --- a/qtjava/javalib/examples/textedit/Main.java +++ b/qtjava/javalib/examples/textedit/Main.java @@ -19,7 +19,7 @@ public static void main(String[] args) mw.setCaption( "Richtext Editor" ); mw.resize( 640, 800 ); mw.show(); - a.connect( a, Qt.SIGNAL(" lastWindowClosed()"), a, Qt.SLOT(" quit()") ); + a.connect( a, Qt.TQ_SIGNAL(" lastWindowClosed()"), a, Qt.TQ_SLOT(" quit()") ); a.exec(); return; } diff --git a/qtjava/javalib/examples/textedit/TextEdit.java b/qtjava/javalib/examples/textedit/TextEdit.java index 657981cb..25437140 100644 --- a/qtjava/javalib/examples/textedit/TextEdit.java +++ b/qtjava/javalib/examples/textedit/TextEdit.java @@ -44,8 +44,8 @@ TextEdit( TQWidget parent, String name ) setupTextActions(); tabWidget = new TQTabWidget( this ); - connect( tabWidget, SIGNAL(" currentChanged( TQWidget )"), - this, SLOT(" editorChanged( TQWidget )") ); + connect( tabWidget, TQ_SIGNAL(" currentChanged( TQWidget )"), + this, TQ_SLOT(" editorChanged( TQWidget )") ); setCentralWidget( tabWidget ); if ( tqApp().args().length == 0 ) { @@ -65,31 +65,31 @@ void setupFileActions() TQAction a; a = new TQAction( tr( "New" ), new TQIconSet(new TQPixmap( "filenew.xpm" )), tr( "&New..." ), new TQKeySequence(CTRL + Key_N), this, "fileNew" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" fileNew()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileNew()") ); a.addTo( tb ); a.addTo( menu ); a = new TQAction( tr( "Open" ), new TQIconSet(new TQPixmap( "fileopen.xpm" )), tr( "&Open..." ), new TQKeySequence(CTRL + Key_O), this, "fileOpen" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" fileOpen()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileOpen()") ); a.addTo( tb ); a.addTo( menu ); menu.insertSeparator(); a = new TQAction( tr( "Save" ), new TQIconSet(new TQPixmap( "filesave.xpm" )), tr( "&Save..." ), new TQKeySequence(CTRL + Key_S), this, "fileSave" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" fileSave()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileSave()") ); a.addTo( tb ); a.addTo( menu ); a = new TQAction( tr( "Save As" ), new TQIconSet(new TQPixmap()), tr( "Save &As..." ), new TQKeySequence(0), this, "fileSaveAs" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" fileSaveAs()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileSaveAs()") ); a.addTo( menu ); menu.insertSeparator(); a = new TQAction( tr( "Print" ), new TQIconSet(new TQPixmap( "fileprint.xpm" )), tr( "&Print..." ), new TQKeySequence(CTRL + Key_P), this, "filePrint" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" filePrint()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" filePrint()") ); a.addTo( tb ); a.addTo( menu ); a = new TQAction( tr( "Close" ), new TQIconSet(new TQPixmap()), tr( "&Close" ), new TQKeySequence(0), this, "fileClose" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" fileClose()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileClose()") ); a.addTo( menu ); a = new TQAction( tr( "Exit" ), new TQIconSet(new TQPixmap()), tr( "E&xit" ), new TQKeySequence(0), this, "fileExit" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" fileExit()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileExit()") ); a.addTo( menu ); } @@ -102,24 +102,24 @@ void setupEditActions() TQAction a; a = new TQAction( tr( "Undo" ), new TQIconSet(new TQPixmap( "editundo.xpm" )), tr( "&Undo" ), new TQKeySequence(CTRL + Key_Z), this, "editUndo" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" editUndo()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editUndo()") ); a.addTo( tb ); a.addTo( menu ); a = new TQAction( tr( "Redo" ), new TQIconSet(new TQPixmap( "editredo.xpm" )), tr( "&Redo" ), new TQKeySequence(CTRL + Key_Y), this, "editRedo" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" editRedo()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editRedo()") ); a.addTo( tb ); a.addTo( menu ); menu.insertSeparator(); a = new TQAction( tr( "Copy" ), new TQIconSet(new TQPixmap( "editcopy.xpm" )), tr( "&Copy" ), new TQKeySequence(CTRL + Key_C), this, "editCopy" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" editCopy()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editCopy()") ); a.addTo( tb ); a.addTo( menu ); a = new TQAction( tr( "Cut" ), new TQIconSet(new TQPixmap( "editcut.xpm" )), tr( "Cu&t" ), new TQKeySequence(CTRL + Key_X), this, "editCut" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" editCut()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editCut()") ); a.addTo( tb ); a.addTo( menu ); a = new TQAction( tr( "Paste" ), new TQIconSet(new TQPixmap( "editpaste.xpm" )), tr( "&Paste" ), new TQKeySequence(CTRL + Key_V), this, "editPaste" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" editPaste()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editPaste()") ); a.addTo( tb ); a.addTo( menu ); } @@ -139,36 +139,36 @@ void setupTextActions() comboStyle.insertItem( "Ordered List (Decimal)" ); comboStyle.insertItem( "Ordered List (Alpha lower)" ); comboStyle.insertItem( "Ordered List (Alpha upper)" ); - connect( comboStyle, SIGNAL(" activated( int )"), - this, SLOT(" textStyle( int )") ); + connect( comboStyle, TQ_SIGNAL(" activated( int )"), + this, TQ_SLOT(" textStyle( int )") ); comboFont = new TQComboBox( true, tb ); TQFontDatabase db = new TQFontDatabase(); comboFont.insertStringList( (String[]) db.families().toArray(new String[0]) ); - connect( comboFont, SIGNAL(" activated( String )"), - this, SLOT(" textFamily( String )") ); + connect( comboFont, TQ_SIGNAL(" activated( String )"), + this, TQ_SLOT(" textFamily( String )") ); comboFont.lineEdit().setText( TQApplication.font().family() ); comboSize = new TQComboBox( true, tb ); int[] sizes = db.standardSizes(); for (int i = 0; i < sizes.length; i++ ) comboSize.insertItem( Integer.toString(sizes[i]) ); - connect( comboSize, SIGNAL(" activated( String )"), - this, SLOT(" textSize( String )") ); + connect( comboSize, TQ_SIGNAL(" activated( String )"), + this, TQ_SLOT(" textSize( String )") ); comboSize.lineEdit().setText( Integer.toString( TQApplication.font().pointSize() ) ); actionTextBold = new TQAction( tr( "Bold" ), new TQIconSet(new TQPixmap( "textbold.xpm" )), tr( "&Bold" ), new TQKeySequence(CTRL + Key_B), this, "textBold" ); - connect( actionTextBold, SIGNAL(" activated()"), this, SLOT(" textBold()") ); + connect( actionTextBold, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" textBold()") ); actionTextBold.addTo( tb ); actionTextBold.addTo( menu ); actionTextBold.setToggleAction( true ); actionTextItalic = new TQAction( tr( "Italic" ), new TQIconSet(new TQPixmap( "textitalic.xpm" )), tr( "&Italic" ), new TQKeySequence(CTRL + Key_I), this, "textItalic" ); - connect( actionTextItalic, SIGNAL(" activated()"), this, SLOT(" textItalic()") ); + connect( actionTextItalic, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" textItalic()") ); actionTextItalic.addTo( tb ); actionTextItalic.addTo( menu ); actionTextItalic.setToggleAction( true ); actionTextUnderline = new TQAction( tr( "Underline" ), new TQIconSet(new TQPixmap( "textunder.xpm" )), tr( "&Underline" ), new TQKeySequence(CTRL + Key_U), this, "textUnderline" ); - connect( actionTextUnderline, SIGNAL(" activated()"), this, SLOT(" textUnderline()") ); + connect( actionTextUnderline, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" textUnderline()") ); actionTextUnderline.addTo( tb ); actionTextUnderline.addTo( menu ); actionTextUnderline.setToggleAction( true ); @@ -176,7 +176,7 @@ void setupTextActions() TQActionGroup grp = new TQActionGroup( this ); grp.setExclusive( true ); - connect( grp, SIGNAL(" selected( TQAction )"), this, SLOT(" textAlign( TQAction )") ); + connect( grp, TQ_SIGNAL(" selected( TQAction )"), this, TQ_SLOT(" textAlign( TQAction )") ); actionAlignLeft = new TQAction( tr( "Left" ), new TQIconSet(new TQPixmap( "textleft.xpm" )), tr( "&Left" ), new TQKeySequence(CTRL + Key_L), grp, "textLeft" ); actionAlignLeft.addTo( tb ); @@ -200,7 +200,7 @@ void setupTextActions() TQPixmap pix = new TQPixmap( 16, 16 ); pix.fill( black() ); actionTextColor = new TQAction( tr( "Color" ), new TQIconSet(pix), tr( "&Color..." ), new TQKeySequence(0), this, "textColor" ); - connect( actionTextColor, SIGNAL(" activated()"), this, SLOT(" textColor()") ); + connect( actionTextColor, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" textColor()") ); actionTextColor.addTo( tb ); actionTextColor.addTo( menu ); } @@ -232,12 +232,12 @@ TQTextEdit currentEditor() void doConnections( TQTextEdit e ) { - connect( e, SIGNAL(" currentFontChanged( TQFont )"), - this, SLOT(" fontChanged( TQFont )") ); - connect( e, SIGNAL(" currentColorChanged( TQColor )"), - this, SLOT(" colorChanged( TQColor )") ); - connect( e, SIGNAL(" currentAlignmentChanged( int )"), - this, SLOT(" alignmentChanged( int )") ); + connect( e, TQ_SIGNAL(" currentFontChanged( TQFont )"), + this, TQ_SLOT(" fontChanged( TQFont )") ); + connect( e, TQ_SIGNAL(" currentColorChanged( TQColor )"), + this, TQ_SLOT(" colorChanged( TQColor )") ); + connect( e, TQ_SIGNAL(" currentAlignmentChanged( int )"), + this, TQ_SLOT(" alignmentChanged( int )") ); } void fileNew() diff --git a/qtjava/javalib/examples/textedit/example.html b/qtjava/javalib/examples/textedit/example.html index 8815f9d8..3b803cba 100644 --- a/qtjava/javalib/examples/textedit/example.html +++ b/qtjava/javalib/examples/textedit/example.html @@ -17,9 +17,9 @@ Inherits <a href="tqframe.html">TQFrame</a>. <p><a href="qlabel-members.html">List of all member functions.</a> <h2>Public Members</h2> <ul> -<li><div class="fn"><a href="#39107d"><b>TQLabel</b></a> ( QWidget * parent, const char * name=0, WFlags f=0 ) </div> -<li><div class="fn"><a href="#2bafbb"><b>TQLabel</b></a> ( const QString & text, TQWidget * parent, const char * name=0, WFlags f=0 ) </div> -<li><div class="fn"><a href="#5514c7"><b>TQLabel</b></a> ( QWidget * buddy, const QString &, TQWidget * parent, const char * name=0, WFlags f=0 ) </div> +<li><div class="fn"><a href="#39107d"><b>TQLabel</b></a> ( TQWidget * parent, const char * name=0, WFlags f=0 ) </div> +<li><div class="fn"><a href="#2bafbb"><b>TQLabel</b></a> ( const TQString & text, TQWidget * parent, const char * name=0, WFlags f=0 ) </div> +<li><div class="fn"><a href="#5514c7"><b>TQLabel</b></a> ( TQWidget * buddy, const TQString &, TQWidget * parent, const char * name=0, WFlags f=0 ) </div> <li><div class="fn"><a href="#9958af"><b>~TQLabel</b></a> () </div> <li><div class="fn">TQString <a href="#72cf09"><b>text</b></a> () const</div> <li><div class="fn">TQPixmap* <a href="#101ecb"><b>pixmap</b></a> () const</div> @@ -34,12 +34,12 @@ Inherits <a href="tqframe.html">TQFrame</a>. <li><div class="fn">virtual void setAutoResize ( bool ) <em>(obsolete)</em></div> <li><div class="fn">bool <a href="#7e1f73"><b>hasScaledContents</b></a> () const</div> <li><div class="fn">void <a href="#e9e3cf"><b>setScaledContents</b></a> ( bool ) </div> -<li><div class="fn">virtual void <a href="#191701"><b>setBuddy</b></a> ( QWidget * ) </div> +<li><div class="fn">virtual void <a href="#191701"><b>setBuddy</b></a> ( TQWidget * ) </div> <li><div class="fn">TQWidget* <a href="#123954"><b>buddy</b></a> () const</div> </ul> <h2>Public Slots</h2> <ul> -<li><div class="fn">virtual void <a href="#dffb43"><b>setText</b></a> ( const QString & ) </div> +<li><div class="fn">virtual void <a href="#dffb43"><b>setText</b></a> ( const TQString & ) </div> <li><div class="fn">virtual void <a href="#f3f301"><b>setPixmap</b></a> ( const QPixmap & ) </div> <li><div class="fn">virtual void <a href="#60de9f"><b>setMovie</b></a> ( const QMovie & ) </div> <li><div class="fn">virtual void <a href="#301e3c"><b>setNum</b></a> ( int ) </div> diff --git a/qtjava/javalib/examples/widgets/WidgetView.java b/qtjava/javalib/examples/widgets/WidgetView.java index e1ae373f..8ef42f9b 100644 --- a/qtjava/javalib/examples/widgets/WidgetView.java +++ b/qtjava/javalib/examples/widgets/WidgetView.java @@ -219,7 +219,7 @@ WidgetView( TQWidget parent, String name ) // put something in it TQPixmap openIcon = new TQPixmap( fileopen ); TQToolButton toolb = new TQToolButton( new TQIconSet(openIcon), "toolbutton 1", - "", this, SLOT("open()"), + "", this, TQ_SLOT("open()"), tools, "open file" ); TQWhatsThis.add( toolb, "This is a <b>TQToolButton</b>. It lives in a " + "TQToolBar. This particular button doesn't do anything " @@ -227,13 +227,13 @@ WidgetView( TQWidget parent, String name ) TQPixmap saveIcon = new TQPixmap( filesave ); toolb = new TQToolButton( new TQIconSet(saveIcon), "toolbutton 2", "", - this, SLOT("dummy()"), + this, TQ_SLOT("dummy()"), tools, "save file" ); TQWhatsThis.add( toolb, "This is also a <b>TQToolButton</b>." ); TQPixmap printIcon = new TQPixmap( fileprint ); toolb = new TQToolButton( new TQIconSet(printIcon), "toolbutton 3", "", - this, SLOT("dummy()"), + this, TQ_SLOT("dummy()"), tools, "print file" ); TQWhatsThis.add( toolb, "This is the third <b>TQToolButton</b>."); @@ -265,10 +265,10 @@ WidgetView( TQWidget parent, String name ) int id; id = popup.insertItem( "&New" ); popup.setItemEnabled( id, false ); - id = popup.insertItem( new TQIconSet(openIcon), "&Open", this, SLOT(" open()") ); + id = popup.insertItem( new TQIconSet(openIcon), "&Open", this, TQ_SLOT(" open()") ); popup.insertSeparator(); - popup.insertItem( "&Quit", tqApp(), SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) ); + popup.insertItem( "&Quit", tqApp(), TQ_SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) ); textStylePopup = popup = new TQPopupMenu( this ); @@ -294,8 +294,8 @@ WidgetView( TQWidget parent, String name ) f = font(); f.setStrikeOut( true ); id = popup.insertItem( new MyMenuItem( "&Strike", f ) ); - connect( textStylePopup, SIGNAL("activated(int)"), - this, SLOT("popupSelected(int)") ); + connect( textStylePopup, TQ_SIGNAL("activated(int)"), + this, TQ_SLOT("popupSelected(int)") ); */ // Create an analog and a digital clock aclock = new AnalogClock( central ); @@ -317,7 +317,7 @@ WidgetView( TQWidget parent, String name ) TQPushButton pb; pb = new TQPushButton( "&Push button 1", central, "button1" ); grid.addWidget( pb, 0, 0, AlignVCenter ); - connect( pb, SIGNAL("clicked()"), SLOT("button1Clicked()") ); + connect( pb, TQ_SIGNAL("clicked()"), TQ_SLOT("button1Clicked()") ); TQToolTip.add( pb, "push button 1" ); TQWhatsThis.add( pb, "This is a <b>TQPushButton</b>.<br>" + "Click it and watch...<br>" @@ -336,8 +336,8 @@ WidgetView( TQWidget parent, String name ) // Create a label containing a TQMovie movie = new TQMovie( MOVIEFILENAME ); movielabel = new TQLabel( central, "label0" ); - movie.connectStatus(this, SLOT("movieStatus(int)")); - movie.connectUpdate(this, SLOT("movieUpdate(TQRect)")); + movie.connectStatus(this, TQ_SLOT("movieStatus(int)")); + movie.connectUpdate(this, TQ_SLOT("movieUpdate(TQRect)")); movielabel.setFrameStyle( TQFrame.Box | TQFrame.Plain ); movielabel.setMovie( movie ); movielabel.setFixedSize( 128+movielabel.frameWidth()*2, @@ -367,7 +367,7 @@ WidgetView( TQWidget parent, String name ) cb[2].setText( "&Execute" ); vbox.addWidget( cb[2] ); - connect( bg, SIGNAL("clicked(int)"), SLOT("checkBoxClicked(int)") ); + connect( bg, TQ_SIGNAL("clicked(int)"), TQ_SLOT("checkBoxClicked(int)") ); TQToolTip.add( cb[0], "check box 1" ); TQToolTip.add( cb[1], "check box 2" ); @@ -397,7 +397,7 @@ WidgetView( TQWidget parent, String name ) rb.setText( "&Short Wave" ); vbox.addWidget(rb); - connect( bg, SIGNAL("clicked(int)"), SLOT("radioButtonClicked(int)") ); + connect( bg, TQ_SIGNAL("clicked(int)"), TQ_SLOT("radioButtonClicked(int)") ); TQToolTip.add( rb, "radio button 3" ); // Create a list box @@ -410,7 +410,7 @@ WidgetView( TQWidget parent, String name ) lb.insertItem( str ); } grid.addMultiCellWidget( lb, 2, 4, 0, 0 ); - connect( lb, SIGNAL("selected(int)"), SLOT("listBoxItemSelected(int)") ); + connect( lb, TQ_SIGNAL("selected(int)"), TQ_SLOT("listBoxItemSelected(int)") ); TQToolTip.add( lb, "list box" ); // new MyWhatsThis( lb ); @@ -425,7 +425,7 @@ WidgetView( TQWidget parent, String name ) sb.setFocusPolicy( TQWidget.TabFocus ); vbox.addWidget( sb ); - connect( sb, SIGNAL("valueChanged(int)"), SLOT("sliderValueChanged(int)") ); + connect( sb, TQ_SIGNAL("valueChanged(int)"), TQ_SLOT("sliderValueChanged(int)") ); TQToolTip.add( sb, "slider" ); TQWhatsThis.add( sb, "This is a <b>TQSlider</b>. " + "The tick marks are optional." @@ -438,8 +438,8 @@ WidgetView( TQWidget parent, String name ) combo.insertItem( "blue" ); combo.insertItem( "red" ); vbox.addWidget( combo ); - connect( combo, SIGNAL("activated(int)"), - this, SLOT("comboBoxItemActivated(int)") ); + connect( combo, TQ_SIGNAL("activated(int)"), + this, TQ_SLOT("comboBoxItemActivated(int)") ); TQToolTip.add( combo, "read-only combo box" ); // Create an editable combo box @@ -450,8 +450,8 @@ WidgetView( TQWidget parent, String name ) edCombo.insertItem( "Alterable" ); edCombo.insertItem( "Inconstant" ); vbox.addWidget( edCombo ); - connect( edCombo, SIGNAL("activated(String)"), - this, SLOT("edComboBoxItemActivated(String)") ); + connect( edCombo, TQ_SIGNAL("activated(String)"), + this, TQ_SLOT("edComboBoxItemActivated(String)") ); TQToolTip.add( edCombo, "editable combo box" ); edCombo.setAutoCompletion( true ); @@ -463,8 +463,8 @@ WidgetView( TQWidget parent, String name ) TQSpinBox spin = new TQSpinBox( 0, 10, 1, central, "spin" ); spin.setSuffix(" mm"); spin.setSpecialValueText( "Auto" ); - connect( spin, SIGNAL(" valueChanged(String)"), - SLOT(" spinBoxValueChanged(String)") ); + connect( spin, TQ_SIGNAL(" valueChanged(String)"), + TQ_SLOT(" spinBoxValueChanged(String)") ); TQToolTip.add( spin, "spin box" ); TQWhatsThis.add( spin, "This is a <b>TQSpinBox</b>. " + "You can chose values in a given range " @@ -514,8 +514,8 @@ WidgetView( TQWidget parent, String name ) grid.addMultiCellWidget( le, 4, 4, 1, 2 ); - connect( le, SIGNAL("textChanged(String)"), - SLOT("lineEditTextChanged(String)") ); + connect( le, TQ_SIGNAL("textChanged(String)"), + TQ_SLOT("lineEditTextChanged(String)") ); TQToolTip.add( le, "single line editor" ); TQWhatsThis.add( le, "This is a <b>TQLineEdit</b>, you can enter a " + "single line of text in it. " @@ -536,14 +536,14 @@ WidgetView( TQWidget parent, String name ) split.setOpaqueResize( true ); topLayout.addWidget( split, 1 ); TQListView lv = new MyListView( split ); - connect(lv, SIGNAL("selectionChanged()"), - this, SLOT(" selectionChanged()") ); - connect(lv, SIGNAL("selectionChanged(TQListViewItem)"), - this, SLOT(" selectionChanged(TQListViewItem)") ); - connect(lv, SIGNAL("clicked(TQListViewItem)"), - this, SLOT(" clicked(TQListViewItem)") ); - connect(lv, SIGNAL("mySelectionChanged(TQListViewItem)"), - this, SLOT(" mySelectionChanged(TQListViewItem)") ); + connect(lv, TQ_SIGNAL("selectionChanged()"), + this, TQ_SLOT(" selectionChanged()") ); + connect(lv, TQ_SIGNAL("selectionChanged(TQListViewItem)"), + this, TQ_SLOT(" selectionChanged(TQListViewItem)") ); + connect(lv, TQ_SIGNAL("clicked(TQListViewItem)"), + this, TQ_SLOT(" clicked(TQListViewItem)") ); + connect(lv, TQ_SIGNAL("mySelectionChanged(TQListViewItem)"), + this, TQ_SLOT(" mySelectionChanged(TQListViewItem)") ); lv.addColumn( "One" ); lv.addColumn( "Two" ); lv.setAllColumnsShowFocus( true ); @@ -603,7 +603,7 @@ WidgetView( TQWidget parent, String name ) TQAccel a = new TQAccel( this ); a.connectItem( a.insertItem( new TQKeySequence(Key_F9) ), - this, SLOT(" showProperties()") ); + this, TQ_SLOT(" showProperties()") ); prog = new TQProgressBar( statusBar(), "progress" ); prog.setTotalSteps( 100 ); diff --git a/qtjava/javalib/examples/wizard/Wizard.java b/qtjava/javalib/examples/wizard/Wizard.java index 6c3a42d7..5268202f 100644 --- a/qtjava/javalib/examples/wizard/Wizard.java +++ b/qtjava/javalib/examples/wizard/Wizard.java @@ -30,8 +30,8 @@ Wizard( TQWidget parent, String name ) setupPage1(); setupPage2(); setupPage3(); - connect(this, SIGNAL("selected(String)"), this, SLOT("doShowPage(String)")); - connect(finishButton(), SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(this, TQ_SIGNAL("selected(String)"), this, TQ_SLOT("doShowPage(String)")); + connect(finishButton(), TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); key.setFocus(); } @@ -59,8 +59,8 @@ void setupPage1() key.setMaxLength( 4 ); key.setValidator( new TQIntValidator( 1000, 9999, key ) ); - connect( key, SIGNAL(" textChanged( String )"), - this, SLOT(" keyChanged( String )") ); + connect( key, TQ_SIGNAL(" textChanged( String )"), + this, TQ_SLOT(" keyChanged( String )") ); addPage( page1, "Personal Key" ); @@ -115,12 +115,12 @@ void setupPage2() phone = new TQLineEdit( row4 ); email = new TQLineEdit( row5 ); - connect( firstName, SIGNAL(" textChanged( String )"), - this, SLOT(" dataChanged( String )") ); - connect( lastName, SIGNAL(" textChanged( String )"), - this, SLOT(" dataChanged( String )") ); - connect( email, SIGNAL(" textChanged( String )"), - this, SLOT(" dataChanged( String )") ); + connect( firstName, TQ_SIGNAL(" textChanged( String )"), + this, TQ_SLOT(" dataChanged( String )") ); + connect( lastName, TQ_SIGNAL(" textChanged( String )"), + this, TQ_SLOT(" dataChanged( String )") ); + connect( email, TQ_SIGNAL(" textChanged( String )"), + this, TQ_SLOT(" dataChanged( String )") ); addPage( page2, "Personal Data" ); diff --git a/qtjava/javalib/org/trinitydesktop/qt/Makefile.am b/qtjava/javalib/org/trinitydesktop/qt/Makefile.am index c9eed501..14c54155 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/Makefile.am +++ b/qtjava/javalib/org/trinitydesktop/qt/Makefile.am @@ -1,7 +1,7 @@ ####### tdevelop will overwrite this part!!! (begin)########## -EXTRA_DIST = QtUtils.java TQAccel.java TQAction.java TQActionGroup.java TQApplication.java TQAsyncIO.java TQAuServer.java TQBig5Codec.java TQBitmap.java TQBoxLayout.java TQBrush.java TQBuffer.java TQButton.java TQButtonGroup.java TQCanvas.java TQCanvasEllipse.java TQCanvasItem.java TQCanvasLine.java TQCanvasPixmap.java TQCanvasPixmapArray.java TQCanvasPolygon.java TQCanvasPolygonalItem.java TQCanvasRectangle.java TQCanvasSprite.java TQCanvasText.java TQCanvasView.java TQCheckListItem.java TQChildEvent.java TQClassInfo.java TQClipboard.java TQCloseEvent.java TQColor.java TQColorDialog.java TQColorDrag.java TQColorGroup.java TQComboBox.java TQCursor.java TQCustomEvent.java TQCustomMenuItem.java TQDataPump.java TQDataSink.java TQDataSource.java TQDataStream.java TQDial.java TQDialog.java TQDir.java TQDomAttr.java TQDomCDATASection.java TQDomCharacterData.java TQDomComment.java TQDomDocument.java TQDomDocumentFragment.java TQDomDocumentType.java TQDomElement.java TQDomEntity.java TQDomEntityReference.java TQDomImplementation.java TQDomNamedNodeMap.java TQDomNode.java TQDomNotation.java TQDomProcessingInstruction.java TQDomText.java TQDoubleValidator.java TQDragEnterEvent.java TQDragLeaveEvent.java TQDragManager.java TQDragMoveEvent.java TQDragObject.java TQDragResponseEvent.java TQDropEvent.java TQDropSite.java TQEucJpCodec.java TQEucKrCodec.java TQEvent.java TQFile.java TQFileDialog.java TQFileIconProvider.java TQFileInfo.java TQFilePreview.java TQFocusData.java TQFocusEvent.java TQFont.java TQFontDatabase.java TQFontDialog.java TQFontInfo.java TQFontMetrics.java TQFrame.java TQGL.java TQGLContext.java TQGLFormat.java TQGLWidget.java TQGbkCodec.java TQGrid.java TQGridLayout.java TQGroupBox.java TQHBox.java TQHBoxLayout.java TQHButtonGroup.java TQHGroupBox.java TQHeader.java TQHebrewCodec.java TQHideEvent.java TQIODevice.java TQIODeviceInterface.java TQIODeviceSource.java TQIconDrag.java TQIconDragItem.java TQIconSet.java TQIconView.java TQIconViewItem.java TQImage.java TQImageConsumer.java TQImageDecoder.java TQImageDrag.java TQImageFormat.java TQImageFormatType.java TQImageIO.java TQImageTextKeyLang.java TQInputDialog.java TQIntValidator.java TQJisCodec.java TQJpUnicodeConv.java TQKeyEvent.java TQLCDNumber.java TQLabel.java TQLayout.java TQLayoutItem.java TQLayoutItemInterface.java TQLineEdit.java TQListBox.java TQListBoxItem.java TQListBoxPixmap.java TQListBoxText.java TQListView.java TQListViewItem.java TQMainWindow.java TQMenuBar.java TQMenuData.java TQMenuDataInterface.java TQMessageBox.java TQMetaData.java TQMetaEnum.java TQMetaObject.java TQMetaProperty.java TQMimeSource.java TQMimeSourceFactory.java TQMimeSourceInterface.java TQMouseEvent.java TQMoveEvent.java TQMovie.java TQMultiLineEdit.java TQNetworkOperation.java TQObject.java TQPaintDevice.java TQPaintDeviceInterface.java TQPaintEvent.java TQPainter.java TQPalette.java TQPen.java TQPicture.java TQPixmap.java TQPoint.java TQPointArray.java TQPolygonScanner.java TQPopupMenu.java TQPrintDialog.java TQPrinter.java TQProgressBar.java TQProgressDialog.java TQPushButton.java TQRadioButton.java TQRangeControl.java TQRangeControlInterface.java TQRect.java TQRegion.java TQResizeEvent.java TQScrollBar.java TQScrollView.java TQSemiModal.java TQSessionManager.java TQShowEvent.java TQSignal.java TQSignalMapper.java TQSimpleRichText.java TQSize.java TQSizeGrip.java TQSizePolicy.java TQSjisCodec.java TQSlider.java TQSound.java TQSpacerItem.java TQSpinBox.java TQSplitter.java TQStatusBar.java TQStoredDrag.java TQStyle.java TQStyleSheet.java TQStyleSheetItem.java TQTab.java TQTabBar.java TQTabDialog.java TQTabWidget.java TQTable.java TQTableItem.java TQTableSelection.java TQTextBrowser.java TQTextCodec.java TQTextDecoder.java TQTextDrag.java TQTextEncoder.java TQTextIStream.java TQTextOStream.java TQTextStream.java TQTextView.java TQTimer.java TQTimerEvent.java TQToolBar.java TQToolButton.java TQToolTip.java TQToolTipGroup.java TQTranslator.java TQTranslatorMessage.java TQTsciiCodec.java TQUriDrag.java TQUrl.java TQUrlInfo.java TQUrlInterface.java TQUrlOperator.java TQUtf16Codec.java TQUtf8Codec.java TQVBox.java TQVBoxLayout.java TQVButtonGroup.java TQVGroupBox.java TQValidator.java TQVariant.java TQWMatrix.java TQWhatsThis.java TQWheelEvent.java TQWidget.java TQWidgetItem.java TQWidgetStack.java TQMenuItem.java TQPaintDeviceMetrics.java TQRegExp.java TQCanvasSpline.java TQCheckTableItem.java TQComboTableItem.java TQContextMenuEvent.java TQDataBrowser.java TQDataTable.java TQDataView.java TQDateEdit.java TQDateTimeEdit.java TQDesktopWidget.java TQDockArea.java TQDockWindow.java TQEditorFactory.java TQErrorMessage.java TQGLColormap.java TQGridView.java TQIMEvent.java TQLibrary.java TQProcess.java TQRegExpValidator.java TQSettings.java TQSql.java TQSqlCursor.java TQSqlDatabase.java TQSqlDriver.java TQSqlEditorFactory.java TQSqlError.java TQSqlField.java TQSqlForm.java TQSqlIndex.java TQSqlPropertyMap.java TQSqlQuery.java TQSqlRecord.java TQSqlResult.java TQTabletEvent.java TQTextEdit.java TQTimeEdit.java TQUuid.java TQDateTimeEditBase.java TQSqlQueryInterface.java TQAccelSignals.java TQActionGroupSignals.java TQActionSignals.java TQApplicationSignals.java TQButtonGroupSignals.java TQButtonSignals.java TQCanvasSignals.java TQComboBoxSignals.java TQDataBrowserSignals.java TQDataTableSignals.java TQDateEditSignals.java TQDateTimeEditSignals.java TQDesktopWidgetSignals.java TQDialSignals.java TQDockWindowSignals.java TQFileDialogSignals.java TQGroupBoxSignals.java TQHeaderSignals.java TQIconViewSignals.java TQLCDNumberSignals.java TQLineEditSignals.java TQListBoxSignals.java TQListViewSignals.java TQMainWindowSignals.java TQMenuBarSignals.java TQObjectSignals.java TQPopupMenuSignals.java TQProcessSignals.java TQProgressDialogSignals.java TQScrollBarSignals.java TQScrollViewSignals.java TQSignalMapperSignals.java TQSignalSignals.java TQSliderSignals.java TQSpinBoxSignals.java TQStatusBarSignals.java TQTabBarSignals.java TQTabDialogSignals.java TQTabWidgetSignals.java TQTableSignals.java TQTextBrowserSignals.java TQTextEditSignals.java TQTimeEditSignals.java TQTimerSignals.java TQToolTipGroupSignals.java TQUrlOperatorSignals.java TQWidgetStackSignals.java TQStyleOption.java TQKeySequence.java TQSqlFieldInfo.java TQSqlRecordInfo.java TQFtp.java TQHostAddress.java TQHttp.java TQLocalFs.java TQNetworkProtocol.java TQObjectCleanupHandler.java TQServerSocket.java TQSocket.java TQSocketDevice.java TQSocketNotifier.java TQFtpSignals.java TQHttpSignals.java TQNetworkProtocolSignals.java TQSocketSignals.java TQSocketNotifierSignals.java TQGb18030Codec.java TQSpinWidget.java TQSpinWidgetSignals.java TQSplashScreen.java TQSplashScreenSignals.java TQToolBox.java TQToolBoxSignals.java TQHttpHeader.java TQHttpRequestHeader.java TQEventLoop.java TQEventLoopSignals.java TQHttpResponseHeader.java TQStyleFactory.java TQCheckBox.java TQWorkspace.java TQWizard.java TQSyntaxHighlighter.java TQXmlContentHandler.java TQXmlDeclHandler.java TQXmlDTDHandler.java TQXmlEntityResolver.java TQXmlErrorHandler.java TQXmlLexicalHandler.java TQXmlNamespaceSupport.java TQXmlSimpleReader.java Invocation.java qtjava.java QtSupport.java TQXmlDefaultHandler.java WeakValueMap.java Qt.java TQWizardSignals.java TQWorkspaceSignals.java TQXmlAttributes.java TQXmlContentHandlerInterface.java TQXmlDTDHandlerInterface.java TQXmlEntityResolverInterface.java TQXmlErrorHandlerInterface.java TQXmlInputSource.java TQXmlLexicalHandlerInterface.java TQXmlLocator.java TQXmlParseException.java TQXmlReader.java TQXmlDeclHandlerInterface.java +EXTRA_DIST = QtUtils.java TQAccel.java TQAction.java TQActionGroup.java TQApplication.java TQAsyncIO.java TQAuServer.java TQBig5Codec.java TQBitmap.java TQBoxLayout.java TQBrush.java TQBuffer.java TQButton.java TQButtonGroup.java TQCanvas.java TQCanvasEllipse.java TQCanvasItem.java TQCanvasLine.java TQCanvasPixmap.java TQCanvasPixmapArray.java TQCanvasPolygon.java TQCanvasPolygonalItem.java TQCanvasRectangle.java TQCanvasSprite.java TQCanvasText.java TQCanvasView.java TQCheckListItem.java TQChildEvent.java TQClassInfo.java TQClipboard.java TQCloseEvent.java TQColor.java TQColorDialog.java TQColorDrag.java TQColorGroup.java TQComboBox.java TQCursor.java TQCustomEvent.java TQCustomMenuItem.java TQDataPump.java TQDataSink.java TQDataSource.java TQDataStream.java TQDial.java TQDialog.java TQDir.java TQDomAttr.java TQDomCDATASection.java TQDomCharacterData.java TQDomComment.java TQDomDocument.java TQDomDocumentFragment.java TQDomDocumentType.java TQDomElement.java TQDomEntity.java TQDomEntityReference.java TQDomImplementation.java TQDomNamedNodeMap.java TQDomNode.java TQDomNotation.java TQDomProcessingInstruction.java TQDomText.java TQDoubleValidator.java TQDragEnterEvent.java TQDragLeaveEvent.java TQDragManager.java TQDragMoveEvent.java TQDragObject.java TQDragResponseEvent.java TQDropEvent.java TQDropSite.java TQEucJpCodec.java TQEucKrCodec.java TQEvent.java TQFile.java TQFileDialog.java TQFileIconProvider.java TQFileInfo.java TQFilePreview.java TQFocusData.java TQFocusEvent.java TQFont.java TQFontDatabase.java TQFontDialog.java TQFontInfo.java TQFontMetrics.java TQFrame.java TQGL.java TQGLContext.java TQGLFormat.java TQGLWidget.java TQGbkCodec.java TQGrid.java TQGridLayout.java TQGroupBox.java TQHBox.java TQHBoxLayout.java TQHButtonGroup.java TQHGroupBox.java TQHeader.java TQHebrewCodec.java TQHideEvent.java TQIODevice.java TQIODeviceInterface.java TQIODeviceSource.java TQIconDrag.java TQIconDragItem.java TQIconSet.java TQIconView.java TQIconViewItem.java TQImage.java TQImageConsumer.java TQImageDecoder.java TQImageDrag.java TQImageFormat.java TQImageFormatType.java TQImageIO.java TQImageTextKeyLang.java TQInputDialog.java TQIntValidator.java TQJisCodec.java TQJpUnicodeConv.java TQKeyEvent.java TQLCDNumber.java TQLabel.java TQLayout.java TQLayoutItem.java TQLayoutItemInterface.java TQLineEdit.java TQListBox.java TQListBoxItem.java TQListBoxPixmap.java TQListBoxText.java TQListView.java TQListViewItem.java TQMainWindow.java TQMenuBar.java TQMenuData.java TQMenuDataInterface.java TQMessageBox.java TQMetaData.java TQMetaEnum.java TQMetaObject.java TQMetaProperty.java TQMimeSource.java TQMimeSourceFactory.java TQMimeSourceInterface.java TQMouseEvent.java TQMoveEvent.java TQMovie.java TQMultiLineEdit.java TQNetworkOperation.java TQObject.java TQPaintDevice.java TQPaintDeviceInterface.java TQPaintEvent.java TQPainter.java TQPalette.java TQPen.java TQPicture.java TQPixmap.java TQPoint.java TQPointArray.java TQPolygonScanner.java TQPopupMenu.java TQPrintDialog.java TQPrinter.java TQProgressBar.java TQProgressDialog.java TQPushButton.java TQRadioButton.java TQRangeControl.java TQRangeControlInterface.java TQRect.java TQRegion.java TQResizeEvent.java TQScrollBar.java TQScrollView.java TQSessionManager.java TQShowEvent.java TQSignal.java TQSignalMapper.java TQSimpleRichText.java TQSize.java TQSizeGrip.java TQSizePolicy.java TQSjisCodec.java TQSlider.java TQSound.java TQSpacerItem.java TQSpinBox.java TQSplitter.java TQStatusBar.java TQStoredDrag.java TQStyle.java TQStyleSheet.java TQStyleSheetItem.java TQTab.java TQTabBar.java TQTabDialog.java TQTabWidget.java TQTable.java TQTableItem.java TQTableSelection.java TQTextBrowser.java TQTextCodec.java TQTextDecoder.java TQTextDrag.java TQTextEncoder.java TQTextIStream.java TQTextOStream.java TQTextStream.java TQTextView.java TQTimer.java TQTimerEvent.java TQToolBar.java TQToolButton.java TQToolTip.java TQToolTipGroup.java TQTranslator.java TQTranslatorMessage.java TQTsciiCodec.java TQUriDrag.java TQUrl.java TQUrlInfo.java TQUrlInterface.java TQUrlOperator.java TQUtf16Codec.java TQUtf8Codec.java TQVBox.java TQVBoxLayout.java TQVButtonGroup.java TQVGroupBox.java TQValidator.java TQVariant.java TQWMatrix.java TQWhatsThis.java TQWheelEvent.java TQWidget.java TQWidgetItem.java TQWidgetStack.java TQMenuItem.java TQPaintDeviceMetrics.java TQRegExp.java TQCanvasSpline.java TQCheckTableItem.java TQComboTableItem.java TQContextMenuEvent.java TQDataBrowser.java TQDataTable.java TQDataView.java TQDateEdit.java TQDateTimeEdit.java TQDesktopWidget.java TQDockArea.java TQDockWindow.java TQEditorFactory.java TQErrorMessage.java TQGLColormap.java TQGridView.java TQIMEvent.java TQLibrary.java TQProcess.java TQRegExpValidator.java TQSettings.java TQSql.java TQSqlCursor.java TQSqlDatabase.java TQSqlDriver.java TQSqlEditorFactory.java TQSqlError.java TQSqlField.java TQSqlForm.java TQSqlIndex.java TQSqlPropertyMap.java TQSqlQuery.java TQSqlRecord.java TQSqlResult.java TQTabletEvent.java TQTextEdit.java TQTimeEdit.java TQUuid.java TQDateTimeEditBase.java TQSqlQueryInterface.java TQAccelSignals.java TQActionGroupSignals.java TQActionSignals.java TQApplicationSignals.java TQButtonGroupSignals.java TQButtonSignals.java TQCanvasSignals.java TQComboBoxSignals.java TQDataBrowserSignals.java TQDataTableSignals.java TQDateEditSignals.java TQDateTimeEditSignals.java TQDesktopWidgetSignals.java TQDialSignals.java TQDockWindowSignals.java TQFileDialogSignals.java TQGroupBoxSignals.java TQHeaderSignals.java TQIconViewSignals.java TQLCDNumberSignals.java TQLineEditSignals.java TQListBoxSignals.java TQListViewSignals.java TQMainWindowSignals.java TQMenuBarSignals.java TQObjectSignals.java TQPopupMenuSignals.java TQProcessSignals.java TQProgressDialogSignals.java TQScrollBarSignals.java TQScrollViewSignals.java TQSignalMapperSignals.java TQSignalSignals.java TQSliderSignals.java TQSpinBoxSignals.java TQStatusBarSignals.java TQTabBarSignals.java TQTabDialogSignals.java TQTabWidgetSignals.java TQTableSignals.java TQTextBrowserSignals.java TQTextEditSignals.java TQTimeEditSignals.java TQTimerSignals.java TQToolTipGroupSignals.java TQUrlOperatorSignals.java TQWidgetStackSignals.java TQStyleOption.java TQKeySequence.java TQSqlFieldInfo.java TQSqlRecordInfo.java TQFtp.java TQHostAddress.java TQHttp.java TQLocalFs.java TQNetworkProtocol.java TQObjectCleanupHandler.java TQServerSocket.java TQSocket.java TQSocketDevice.java TQSocketNotifier.java TQFtpSignals.java TQHttpSignals.java TQNetworkProtocolSignals.java TQSocketSignals.java TQSocketNotifierSignals.java TQGb18030Codec.java TQSpinWidget.java TQSpinWidgetSignals.java TQSplashScreen.java TQSplashScreenSignals.java TQToolBox.java TQToolBoxSignals.java TQHttpHeader.java TQHttpRequestHeader.java TQEventLoop.java TQEventLoopSignals.java TQHttpResponseHeader.java TQStyleFactory.java TQCheckBox.java TQWorkspace.java TQWizard.java TQSyntaxHighlighter.java TQXmlContentHandler.java TQXmlDeclHandler.java TQXmlDTDHandler.java TQXmlEntityResolver.java TQXmlErrorHandler.java TQXmlLexicalHandler.java TQXmlNamespaceSupport.java TQXmlSimpleReader.java Invocation.java qtjava.java QtSupport.java TQXmlDefaultHandler.java WeakValueMap.java Qt.java TQWizardSignals.java TQWorkspaceSignals.java TQXmlAttributes.java TQXmlContentHandlerInterface.java TQXmlDTDHandlerInterface.java TQXmlEntityResolverInterface.java TQXmlErrorHandlerInterface.java TQXmlInputSource.java TQXmlLexicalHandlerInterface.java TQXmlLocator.java TQXmlParseException.java TQXmlReader.java TQXmlDeclHandlerInterface.java ####### tdevelop will overwrite this part!!! (end)############ diff --git a/qtjava/javalib/org/trinitydesktop/qt/Qt.java b/qtjava/javalib/org/trinitydesktop/qt/Qt.java index 6b9311b6..2532d136 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/Qt.java +++ b/qtjava/javalib/org/trinitydesktop/qt/Qt.java @@ -1115,12 +1115,12 @@ public class Qt implements QtSupport { } /** Prepend a '2' to a signal string and remove any spaces */ - public static String SIGNAL(String signal) { + public static String TQ_SIGNAL(String signal) { return "2" + sqeezeOut(signal, ' '); } /** Prepend a '1' to a slot string and remove any spaces */ - public static String SLOT(String slot) { + public static String TQ_SLOT(String slot) { return "1" + sqeezeOut(slot, ' '); } diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQButton.java b/qtjava/javalib/org/trinitydesktop/qt/TQButton.java index 831d8747..2b8efdb9 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/TQButton.java +++ b/qtjava/javalib/org/trinitydesktop/qt/TQButton.java @@ -50,8 +50,6 @@ public class TQButton extends TQWidget { public native boolean isDown(); public native boolean isOn(); public native int state(); - public native boolean autoResize(); - public native void setAutoResize(boolean arg1); public native boolean autoRepeat(); public native void setAutoRepeat(boolean arg1); public native boolean isExclusiveToggle(); diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQLineEdit.java b/qtjava/javalib/org/trinitydesktop/qt/TQLineEdit.java index 854fd58e..8564208d 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/TQLineEdit.java +++ b/qtjava/javalib/org/trinitydesktop/qt/TQLineEdit.java @@ -56,10 +56,6 @@ public class TQLineEdit extends TQFrame { public native int cursorPosition(); public native boolean validateAndSet(String arg1, int arg2, int arg3, int arg4); public native int alignment(); - public native void cursorLeft(boolean mark, int steps); - public native void cursorLeft(boolean mark); - public native void cursorRight(boolean mark, int steps); - public native void cursorRight(boolean mark); public native void cursorForward(boolean mark, int steps); public native void cursorForward(boolean mark); public native void cursorBackward(boolean mark, int steps); @@ -79,8 +75,6 @@ public class TQLineEdit extends TQFrame { public native int selectionStart(); public native boolean isUndoAvailable(); public native boolean isRedoAvailable(); - public native boolean hasMarkedText(); - public native String markedText(); public native boolean dragEnabled(); public native String inputMask(); public native void setInputMask(String inputMask); @@ -131,7 +125,6 @@ public class TQLineEdit extends TQFrame { protected native void contextMenuEvent(TQContextMenuEvent arg1); protected native TQPopupMenu createPopupMenu(); protected native void windowActivationChange(boolean arg1); - protected native void repaintArea(int arg1, int arg2); /** Deletes the wrapped C++ instance */ protected native void finalize() throws InternalError; /** Delete the wrapped C++ instance ahead of finalize() */ diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQPalette.java b/qtjava/javalib/org/trinitydesktop/qt/TQPalette.java index cce475ed..c92cb8b2 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/TQPalette.java +++ b/qtjava/javalib/org/trinitydesktop/qt/TQPalette.java @@ -12,7 +12,6 @@ public class TQPalette implements QtSupport { public static final int Active = 1; public static final int Inactive = 2; public static final int NColorGroups = 3; - public static final int Normal = Active; public TQPalette() { newTQPalette(); @@ -44,11 +43,9 @@ public class TQPalette implements QtSupport { public native TQColorGroup active(); public native TQColorGroup disabled(); public native TQColorGroup inactive(); - public native TQColorGroup normal(); public native void setActive(TQColorGroup arg1); public native void setDisabled(TQColorGroup arg1); public native void setInactive(TQColorGroup arg1); - public native void setNormal(TQColorGroup cg); public native boolean op_equals(TQPalette p); public native boolean op_not_equals(TQPalette p); public native boolean isCopyOf(TQPalette arg1); diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQSemiModal.java b/qtjava/javalib/org/trinitydesktop/qt/TQSemiModal.java deleted file mode 100644 index 672fd9f8..00000000 --- a/qtjava/javalib/org/trinitydesktop/qt/TQSemiModal.java +++ /dev/null @@ -1,43 +0,0 @@ -//Auto-generated by kalyptus. DO NOT EDIT. -package org.trinitydesktop.qt; - -import org.trinitydesktop.qt.Qt; - -public class TQSemiModal extends TQDialog { - protected TQSemiModal(Class dummy){super((Class) null);} - public native TQMetaObject metaObject(); - public native String className(); - public TQSemiModal(TQWidget parent, String name, boolean modal, int f) { - super((Class) null); - newTQSemiModal(parent,name,modal,f); - } - private native void newTQSemiModal(TQWidget parent, String name, boolean modal, int f); - public TQSemiModal(TQWidget parent, String name, boolean modal) { - super((Class) null); - newTQSemiModal(parent,name,modal); - } - private native void newTQSemiModal(TQWidget parent, String name, boolean modal); - public TQSemiModal(TQWidget parent, String name) { - super((Class) null); - newTQSemiModal(parent,name); - } - private native void newTQSemiModal(TQWidget parent, String name); - public TQSemiModal(TQWidget parent) { - super((Class) null); - newTQSemiModal(parent); - } - private native void newTQSemiModal(TQWidget parent); - public TQSemiModal() { - super((Class) null); - newTQSemiModal(); - } - private native void newTQSemiModal(); - public static native String tr(String arg1, String arg2); - public static native String tr(String arg1); - /** Deletes the wrapped C++ instance */ - protected native void finalize() throws InternalError; - /** Delete the wrapped C++ instance ahead of finalize() */ - public native void dispose(); - /** Has the wrapped C++ instance been deleted? */ - public native boolean isDisposed(); -} diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQSignal.java b/qtjava/javalib/org/trinitydesktop/qt/TQSignal.java index ebc96889..b41c23ff 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/TQSignal.java +++ b/qtjava/javalib/org/trinitydesktop/qt/TQSignal.java @@ -66,10 +66,6 @@ public class TQSignal extends TQObject { public native boolean disconnect(TQObject receiver, String member); public native boolean disconnect(TQObject receiver); public native void activate(); - public native boolean isBlocked(); - public native void block(boolean b); - public native void setParameter(int value); - public native int parameter(); public native void setValue(TQVariant value); public native TQVariant value(); public static native String tr(String arg1, String arg2); diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQToolButton.java b/qtjava/javalib/org/trinitydesktop/qt/TQToolButton.java index 1db010c1..24d86bd0 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/TQToolButton.java +++ b/qtjava/javalib/org/trinitydesktop/qt/TQToolButton.java @@ -44,12 +44,6 @@ public class TQToolButton extends TQButton { private native void newTQToolButton(int type, TQWidget parent); public native TQSize sizeHint(); public native TQSize minimumSizeHint(); - public native void setOnIconSet(TQIconSet arg1); - public native void setOffIconSet(TQIconSet arg1); - public native void setIconSet(TQIconSet arg1, boolean on); - public native TQIconSet onIconSet(); - public native TQIconSet offIconSet(); - public native TQIconSet iconSet(boolean on); public native void setIconSet(TQIconSet arg1); public native TQIconSet iconSet(); public native boolean usesBigPixmap(); diff --git a/qtjava/javalib/qtjava/JavaSlot.h b/qtjava/javalib/qtjava/JavaSlot.h index a1d69069..6b51a449 100644 --- a/qtjava/javalib/qtjava/JavaSlot.h +++ b/qtjava/javalib/qtjava/JavaSlot.h @@ -45,7 +45,7 @@ class TQMetaObject; class JavaSlot: public TQObject { - Q_OBJECT + TQ_OBJECT public: JavaSlot(JNIEnv * env, jobject receiver, jstring slot); ~JavaSlot(); @@ -190,7 +190,7 @@ public: class JavaSignal: public TQObject { - Q_OBJECT + TQ_OBJECT public: JavaSignal(); ~JavaSignal(); diff --git a/qtjava/javalib/qtjava/Makefile.am b/qtjava/javalib/qtjava/Makefile.am index 83239a9e..a42cd0eb 100644 --- a/qtjava/javalib/qtjava/Makefile.am +++ b/qtjava/javalib/qtjava/Makefile.am @@ -9,11 +9,11 @@ jnilocdir = $(libdir)/jni AM_LDFLAGS = -libtqtjava_la_SOURCES = TQSyntaxHighlighter.cpp TQToolBox.cpp TQSplashScreen.cpp TQSpinWidget.cpp TQHttpResponseHeader.cpp TQHttpRequestHeader.cpp TQHttpHeader.cpp TQEventLoop.cpp TQGLWidget.cpp TQGLFormat.cpp TQGLContext.cpp TQGL.cpp TQGb18030Codec.cpp TQXmlSimpleReader.cpp TQXmlReader.cpp TQXmlParseException.cpp TQXmlNamespaceSupport.cpp TQXmlLocator.cpp TQXmlLexicalHandler.cpp TQXmlInputSource.cpp TQXmlErrorHandler.cpp TQXmlEntityResolver.cpp TQXmlDTDHandler.cpp TQXmlDefaultHandler.cpp TQXmlDeclHandler.cpp TQXmlContentHandler.cpp TQXmlAttributes.cpp TQWorkspace.cpp TQWMatrix.cpp TQWizard.cpp TQWidgetStack.cpp TQWidgetItem.cpp TQWidget.cpp TQWheelEvent.cpp TQWhatsThis.cpp TQVGroupBox.cpp TQVButtonGroup.cpp TQVBoxLayout.cpp TQVBox.cpp TQVariant.cpp TQValidator.cpp TQUuid.cpp TQUtf8Codec.cpp TQUtf16Codec.cpp TQUrlOperator.cpp TQUrlInfo.cpp TQUrl.cpp TQUriDrag.cpp TQTsciiCodec.cpp TQTranslatorMessage.cpp TQTranslator.cpp TQToolTipGroup.cpp TQToolTip.cpp TQToolButton.cpp TQToolBar.cpp qtjava.cpp TQTimerEvent.cpp TQTimer.cpp TQTimeEdit.cpp TQTextView.cpp TQTextStream.cpp TQTextOStream.cpp TQTextIStream.cpp TQTextEncoder.cpp TQTextEdit.cpp TQTextDrag.cpp TQTextDecoder.cpp TQTextCodec.cpp TQTextBrowser.cpp TQTabWidget.cpp TQTabletEvent.cpp TQTableSelection.cpp TQTableItem.cpp TQTable.cpp TQTabDialog.cpp TQTabBar.cpp TQTab.cpp Qt.cpp TQStyleOption.cpp TQStyleSheetItem.cpp TQStyleSheet.cpp TQStyleFactory.cpp TQStyle.cpp TQStoredDrag.cpp TQStatusBar.cpp TQSqlResult.cpp TQSqlRecord.cpp TQSqlQuery.cpp TQSqlPropertyMap.cpp TQSqlIndex.cpp TQSqlForm.cpp TQSqlFieldInfo.cpp TQSqlField.cpp TQSqlError.cpp TQSqlEditorFactory.cpp TQSqlDriver.cpp TQSqlDatabase.cpp TQSqlCursor.cpp TQSql.cpp TQSplitter.cpp TQSpinBox.cpp TQSpacerItem.cpp TQSound.cpp TQSocketNotifier.cpp TQSocketDevice.cpp TQSocket.cpp TQSlider.cpp TQSjisCodec.cpp TQSizePolicy.cpp TQSizeGrip.cpp TQSize.cpp TQSimpleRichText.cpp TQSignalMapper.cpp TQSignal.cpp TQShowEvent.cpp TQSettings.cpp TQSessionManager.cpp TQServerSocket.cpp TQSemiModal.cpp TQScrollView.cpp TQScrollBar.cpp TQResizeEvent.cpp TQRegion.cpp TQRegExpValidator.cpp TQRegExp.cpp TQRect.cpp TQRangeControl.cpp TQRadioButton.cpp TQPushButton.cpp TQProgressDialog.cpp TQProgressBar.cpp TQProcess.cpp TQPrinter.cpp TQPrintDialog.cpp TQPopupMenu.cpp TQPolygonScanner.cpp TQPointArray.cpp TQPoint.cpp TQPixmap.cpp TQPicture.cpp TQPen.cpp TQPalette.cpp TQPaintEvent.cpp TQPainter.cpp TQPaintDeviceMetrics.cpp TQPaintDevice.cpp TQObjectCleanupHandler.cpp TQObject.cpp TQNetworkProtocol.cpp TQNetworkOperation.cpp TQMultiLineEdit.cpp TQMovie.cpp TQMoveEvent.cpp TQMouseEvent.cpp TQMimeSourceFactory.cpp TQMimeSource.cpp TQMetaProperty.cpp TQMetaObject.cpp TQMetaEnum.cpp TQMetaData.cpp TQMessageBox.cpp TQMenuItem.cpp TQMenuData.cpp TQMenuBar.cpp TQMainWindow.cpp TQLocalFs.cpp TQListViewItem.cpp TQListView.cpp TQListBoxText.cpp TQListBoxPixmap.cpp TQListBoxItem.cpp TQListBox.cpp TQLineEdit.cpp TQLibrary.cpp TQLCDNumber.cpp TQLayoutItem.cpp TQLayout.cpp TQLabel.cpp TQKeySequence.cpp TQKeyEvent.cpp TQJpUnicodeConv.cpp TQJisCodec.cpp TQIODeviceSource.cpp TQIODevice.cpp TQIntValidator.cpp TQInputDialog.cpp TQIMEvent.cpp TQImageIO.cpp TQImageFormatType.cpp TQImageFormat.cpp TQImageDrag.cpp TQImageDecoder.cpp TQImageConsumer.cpp TQImage.cpp TQIconViewItem.cpp TQIconView.cpp TQIconSet.cpp TQIconDragItem.cpp TQIconDrag.cpp TQHttp.cpp TQHostAddress.cpp TQHideEvent.cpp TQHGroupBox.cpp TQHebrewCodec.cpp TQHeader.cpp TQHButtonGroup.cpp TQHBoxLayout.cpp TQHBox.cpp TQGroupBox.cpp TQGridView.cpp TQGridLayout.cpp TQGrid.cpp TQFtp.cpp TQFrame.cpp TQFontMetrics.cpp TQFontInfo.cpp TQFontDialog.cpp TQFontDatabase.cpp TQFont.cpp TQFocusEvent.cpp TQFocusData.cpp TQFilePreview.cpp TQFileInfo.cpp TQFileIconProvider.cpp TQFileDialog.cpp TQFile.cpp TQEvent.cpp TQEucKrCodec.cpp TQEucJpCodec.cpp TQErrorMessage.cpp TQEditorFactory.cpp TQDropSite.cpp TQDropEvent.cpp TQDragResponseEvent.cpp TQDragObject.cpp TQDragMoveEvent.cpp TQDragManager.cpp TQDragLeaveEvent.cpp TQDragEnterEvent.cpp TQDoubleValidator.cpp TQDomText.cpp TQDomProcessingInstruction.cpp TQDomNotation.cpp TQDomNode.cpp TQDomNamedNodeMap.cpp TQDomImplementation.cpp TQDomEntityReference.cpp TQDomEntity.cpp TQDomElement.cpp TQDomDocumentType.cpp TQDomDocumentFragment.cpp TQDomDocument.cpp TQDomComment.cpp TQDomCharacterData.cpp TQDomCDATASection.cpp TQDomAttr.cpp TQDockWindow.cpp TQDockArea.cpp TQDir.cpp TQDialog.cpp TQDial.cpp TQDesktopWidget.cpp TQDateTimeEditBase.cpp TQDateTimeEdit.cpp TQDateEdit.cpp TQDataView.cpp TQDataTable.cpp TQDataStream.cpp TQDataSource.cpp TQDataSink.cpp TQDataPump.cpp TQDataBrowser.cpp TQCustomMenuItem.cpp TQCustomEvent.cpp TQCursor.cpp TQContextMenuEvent.cpp TQComboTableItem.cpp TQComboBox.cpp TQColorGroup.cpp TQColorDrag.cpp TQColorDialog.cpp TQColor.cpp TQCloseEvent.cpp TQClipboard.cpp TQClassInfo.cpp TQChildEvent.cpp TQCheckTableItem.cpp TQCheckListItem.cpp TQCheckBox.cpp TQCanvasView.cpp TQCanvasText.cpp TQCanvasSprite.cpp TQCanvasSpline.cpp TQCanvasRectangle.cpp TQCanvasPolygonalItem.cpp TQCanvasPolygon.cpp TQCanvasPixmapArray.cpp TQCanvasPixmap.cpp TQCanvasLine.cpp TQCanvasItem.cpp TQCanvasEllipse.cpp TQCanvas.cpp TQButtonGroup.cpp TQButton.cpp TQBuffer.cpp TQBrush.cpp TQBoxLayout.cpp TQBitmap.cpp TQAuServer.cpp TQAsyncIO.cpp TQApplication.cpp TQActionGroup.cpp TQAction.cpp TQAccel.cpp +libtqtjava_la_SOURCES = TQSyntaxHighlighter.cpp TQToolBox.cpp TQSplashScreen.cpp TQSpinWidget.cpp TQHttpResponseHeader.cpp TQHttpRequestHeader.cpp TQHttpHeader.cpp TQEventLoop.cpp TQGLWidget.cpp TQGLFormat.cpp TQGLContext.cpp TQGL.cpp TQGb18030Codec.cpp TQXmlSimpleReader.cpp TQXmlReader.cpp TQXmlParseException.cpp TQXmlNamespaceSupport.cpp TQXmlLocator.cpp TQXmlLexicalHandler.cpp TQXmlInputSource.cpp TQXmlErrorHandler.cpp TQXmlEntityResolver.cpp TQXmlDTDHandler.cpp TQXmlDefaultHandler.cpp TQXmlDeclHandler.cpp TQXmlContentHandler.cpp TQXmlAttributes.cpp TQWorkspace.cpp TQWMatrix.cpp TQWizard.cpp TQWidgetStack.cpp TQWidgetItem.cpp TQWidget.cpp TQWheelEvent.cpp TQWhatsThis.cpp TQVGroupBox.cpp TQVButtonGroup.cpp TQVBoxLayout.cpp TQVBox.cpp TQVariant.cpp TQValidator.cpp TQUuid.cpp TQUtf8Codec.cpp TQUtf16Codec.cpp TQUrlOperator.cpp TQUrlInfo.cpp TQUrl.cpp TQUriDrag.cpp TQTsciiCodec.cpp TQTranslatorMessage.cpp TQTranslator.cpp TQToolTipGroup.cpp TQToolTip.cpp TQToolButton.cpp TQToolBar.cpp qtjava.cpp TQTimerEvent.cpp TQTimer.cpp TQTimeEdit.cpp TQTextView.cpp TQTextStream.cpp TQTextOStream.cpp TQTextIStream.cpp TQTextEncoder.cpp TQTextEdit.cpp TQTextDrag.cpp TQTextDecoder.cpp TQTextCodec.cpp TQTextBrowser.cpp TQTabWidget.cpp TQTabletEvent.cpp TQTableSelection.cpp TQTableItem.cpp TQTable.cpp TQTabDialog.cpp TQTabBar.cpp TQTab.cpp Qt.cpp TQStyleOption.cpp TQStyleSheetItem.cpp TQStyleSheet.cpp TQStyleFactory.cpp TQStyle.cpp TQStoredDrag.cpp TQStatusBar.cpp TQSqlResult.cpp TQSqlRecord.cpp TQSqlQuery.cpp TQSqlPropertyMap.cpp TQSqlIndex.cpp TQSqlForm.cpp TQSqlFieldInfo.cpp TQSqlField.cpp TQSqlError.cpp TQSqlEditorFactory.cpp TQSqlDriver.cpp TQSqlDatabase.cpp TQSqlCursor.cpp TQSql.cpp TQSplitter.cpp TQSpinBox.cpp TQSpacerItem.cpp TQSound.cpp TQSocketNotifier.cpp TQSocketDevice.cpp TQSocket.cpp TQSlider.cpp TQSjisCodec.cpp TQSizePolicy.cpp TQSizeGrip.cpp TQSize.cpp TQSimpleRichText.cpp TQSignalMapper.cpp TQSignal.cpp TQShowEvent.cpp TQSettings.cpp TQSessionManager.cpp TQServerSocket.cpp TQScrollView.cpp TQScrollBar.cpp TQResizeEvent.cpp TQRegion.cpp TQRegExpValidator.cpp TQRegExp.cpp TQRect.cpp TQRangeControl.cpp TQRadioButton.cpp TQPushButton.cpp TQProgressDialog.cpp TQProgressBar.cpp TQProcess.cpp TQPrinter.cpp TQPrintDialog.cpp TQPopupMenu.cpp TQPolygonScanner.cpp TQPointArray.cpp TQPoint.cpp TQPixmap.cpp TQPicture.cpp TQPen.cpp TQPalette.cpp TQPaintEvent.cpp TQPainter.cpp TQPaintDeviceMetrics.cpp TQPaintDevice.cpp TQObjectCleanupHandler.cpp TQObject.cpp TQNetworkProtocol.cpp TQNetworkOperation.cpp TQMultiLineEdit.cpp TQMovie.cpp TQMoveEvent.cpp TQMouseEvent.cpp TQMimeSourceFactory.cpp TQMimeSource.cpp TQMetaProperty.cpp TQMetaObject.cpp TQMetaEnum.cpp TQMetaData.cpp TQMessageBox.cpp TQMenuItem.cpp TQMenuData.cpp TQMenuBar.cpp TQMainWindow.cpp TQLocalFs.cpp TQListViewItem.cpp TQListView.cpp TQListBoxText.cpp TQListBoxPixmap.cpp TQListBoxItem.cpp TQListBox.cpp TQLineEdit.cpp TQLibrary.cpp TQLCDNumber.cpp TQLayoutItem.cpp TQLayout.cpp TQLabel.cpp TQKeySequence.cpp TQKeyEvent.cpp TQJpUnicodeConv.cpp TQJisCodec.cpp TQIODeviceSource.cpp TQIODevice.cpp TQIntValidator.cpp TQInputDialog.cpp TQIMEvent.cpp TQImageIO.cpp TQImageFormatType.cpp TQImageFormat.cpp TQImageDrag.cpp TQImageDecoder.cpp TQImageConsumer.cpp TQImage.cpp TQIconViewItem.cpp TQIconView.cpp TQIconSet.cpp TQIconDragItem.cpp TQIconDrag.cpp TQHttp.cpp TQHostAddress.cpp TQHideEvent.cpp TQHGroupBox.cpp TQHebrewCodec.cpp TQHeader.cpp TQHButtonGroup.cpp TQHBoxLayout.cpp TQHBox.cpp TQGroupBox.cpp TQGridView.cpp TQGridLayout.cpp TQGrid.cpp TQFtp.cpp TQFrame.cpp TQFontMetrics.cpp TQFontInfo.cpp TQFontDialog.cpp TQFontDatabase.cpp TQFont.cpp TQFocusEvent.cpp TQFocusData.cpp TQFilePreview.cpp TQFileInfo.cpp TQFileIconProvider.cpp TQFileDialog.cpp TQFile.cpp TQEvent.cpp TQEucKrCodec.cpp TQEucJpCodec.cpp TQErrorMessage.cpp TQEditorFactory.cpp TQDropSite.cpp TQDropEvent.cpp TQDragResponseEvent.cpp TQDragObject.cpp TQDragMoveEvent.cpp TQDragManager.cpp TQDragLeaveEvent.cpp TQDragEnterEvent.cpp TQDoubleValidator.cpp TQDomText.cpp TQDomProcessingInstruction.cpp TQDomNotation.cpp TQDomNode.cpp TQDomNamedNodeMap.cpp TQDomImplementation.cpp TQDomEntityReference.cpp TQDomEntity.cpp TQDomElement.cpp TQDomDocumentType.cpp TQDomDocumentFragment.cpp TQDomDocument.cpp TQDomComment.cpp TQDomCharacterData.cpp TQDomCDATASection.cpp TQDomAttr.cpp TQDockWindow.cpp TQDockArea.cpp TQDir.cpp TQDialog.cpp TQDial.cpp TQDesktopWidget.cpp TQDateTimeEditBase.cpp TQDateTimeEdit.cpp TQDateEdit.cpp TQDataView.cpp TQDataTable.cpp TQDataStream.cpp TQDataSource.cpp TQDataSink.cpp TQDataPump.cpp TQDataBrowser.cpp TQCustomMenuItem.cpp TQCustomEvent.cpp TQCursor.cpp TQContextMenuEvent.cpp TQComboTableItem.cpp TQComboBox.cpp TQColorGroup.cpp TQColorDrag.cpp TQColorDialog.cpp TQColor.cpp TQCloseEvent.cpp TQClipboard.cpp TQClassInfo.cpp TQChildEvent.cpp TQCheckTableItem.cpp TQCheckListItem.cpp TQCheckBox.cpp TQCanvasView.cpp TQCanvasText.cpp TQCanvasSprite.cpp TQCanvasSpline.cpp TQCanvasRectangle.cpp TQCanvasPolygonalItem.cpp TQCanvasPolygon.cpp TQCanvasPixmapArray.cpp TQCanvasPixmap.cpp TQCanvasLine.cpp TQCanvasItem.cpp TQCanvasEllipse.cpp TQCanvas.cpp TQButtonGroup.cpp TQButton.cpp TQBuffer.cpp TQBrush.cpp TQBoxLayout.cpp TQBitmap.cpp TQAuServer.cpp TQAsyncIO.cpp TQApplication.cpp TQActionGroup.cpp TQAction.cpp TQAccel.cpp KDE_OPTIONS = qtonly -EXTRA_DIST = JavaSlot.cpp JavaSlot.h TQAccel.cpp TQAccel.h TQAction.cpp TQAction.h TQActionGroup.cpp TQActionGroup.h TQApplication.cpp TQApplication.h TQAsyncIO.cpp TQAsyncIO.h TQAuServer.cpp TQAuServer.h TQBitmap.cpp TQBitmap.h TQBoxLayout.cpp TQBoxLayout.h TQBrush.cpp TQBrush.h TQBuffer.cpp TQBuffer.h TQButton.cpp TQButton.h TQButtonGroup.cpp TQButtonGroup.h TQCanvas.cpp TQCanvas.h TQCanvasEllipse.cpp TQCanvasEllipse.h TQCanvasItem.cpp TQCanvasItem.h TQCanvasLine.cpp TQCanvasLine.h TQCanvasPixmap.cpp TQCanvasPixmap.h TQCanvasPixmapArray.cpp TQCanvasPixmapArray.h TQCanvasPolygon.cpp TQCanvasPolygon.h TQCanvasPolygonalItem.cpp TQCanvasPolygonalItem.h TQCanvasRectangle.cpp TQCanvasRectangle.h TQCanvasSpline.cpp TQCanvasSpline.h TQCanvasSprite.cpp TQCanvasSprite.h TQCanvasText.cpp TQCanvasText.h TQCanvasView.cpp TQCanvasView.h TQCheckBox.cpp TQCheckBox.h TQCheckListItem.cpp TQCheckListItem.h TQCheckTableItem.cpp TQCheckTableItem.h TQChildEvent.cpp TQChildEvent.h TQClassInfo.cpp TQClassInfo.h TQClipboard.cpp TQClipboard.h TQCloseEvent.cpp TQCloseEvent.h TQColor.cpp TQColor.h TQColorDialog.cpp TQColorDialog.h TQColorDrag.cpp TQColorDrag.h TQColorGroup.cpp TQColorGroup.h TQComboBox.cpp TQComboBox.h TQComboTableItem.cpp TQComboTableItem.h TQContextMenuEvent.cpp TQContextMenuEvent.h TQCursor.cpp TQCursor.h TQCustomEvent.cpp TQCustomEvent.h TQCustomMenuItem.cpp TQCustomMenuItem.h TQDataBrowser.cpp TQDataBrowser.h TQDataPump.cpp TQDataPump.h TQDataSink.cpp TQDataSink.h TQDataSource.cpp TQDataSource.h TQDataStream.cpp TQDataStream.h TQDataTable.cpp TQDataTable.h TQDataView.cpp TQDataView.h TQDateEdit.cpp TQDateEdit.h TQDateTimeEdit.cpp TQDateTimeEdit.h TQDateTimeEditBase.cpp TQDateTimeEditBase.h TQDesktopWidget.cpp TQDesktopWidget.h TQDial.cpp TQDial.h TQDialog.cpp TQDialog.h TQDir.cpp TQDir.h TQDockArea.cpp TQDockArea.h TQDockWindow.cpp TQDockWindow.h TQDomAttr.cpp TQDomAttr.h TQDomCDATASection.cpp TQDomCDATASection.h TQDomCharacterData.cpp TQDomCharacterData.h TQDomComment.cpp TQDomComment.h TQDomDocument.cpp TQDomDocument.h TQDomDocumentFragment.cpp TQDomDocumentFragment.h TQDomDocumentType.cpp TQDomDocumentType.h TQDomElement.cpp TQDomElement.h TQDomEntity.cpp TQDomEntity.h TQDomEntityReference.cpp TQDomEntityReference.h TQDomImplementation.cpp TQDomImplementation.h TQDomNamedNodeMap.cpp TQDomNamedNodeMap.h TQDomNode.cpp TQDomNode.h TQDomNotation.cpp TQDomNotation.h TQDomProcessingInstruction.cpp TQDomProcessingInstruction.h TQDomText.cpp TQDomText.h TQDoubleValidator.cpp TQDoubleValidator.h TQDragEnterEvent.cpp TQDragEnterEvent.h TQDragLeaveEvent.cpp TQDragLeaveEvent.h TQDragManager.cpp TQDragManager.h TQDragMoveEvent.cpp TQDragMoveEvent.h TQDragObject.cpp TQDragObject.h TQDragResponseEvent.cpp TQDragResponseEvent.h TQDropEvent.cpp TQDropEvent.h TQDropSite.cpp TQDropSite.h TQEditorFactory.cpp TQEditorFactory.h TQErrorMessage.cpp TQErrorMessage.h TQEucJpCodec.cpp TQEucJpCodec.h TQEucKrCodec.cpp TQEucKrCodec.h TQEvent.cpp TQEvent.h TQFile.cpp TQFile.h TQFileDialog.cpp TQFileDialog.h TQFileIconProvider.cpp TQFileIconProvider.h TQFileInfo.cpp TQFileInfo.h TQFilePreview.cpp TQFilePreview.h TQFocusData.cpp TQFocusData.h TQFocusEvent.cpp TQFocusEvent.h TQFont.cpp TQFont.h TQFontDatabase.cpp TQFontDatabase.h TQFontDialog.cpp TQFontDialog.h TQFontInfo.cpp TQFontInfo.h TQFontMetrics.cpp TQFontMetrics.h TQFrame.cpp TQFrame.h TQFtp.cpp TQFtp.h TQGrid.cpp TQGrid.h TQGridLayout.cpp TQGridLayout.h TQGridView.cpp TQGridView.h TQGroupBox.cpp TQGroupBox.h TQHBox.cpp TQHBox.h TQHBoxLayout.cpp TQHBoxLayout.h TQHButtonGroup.cpp TQHButtonGroup.h TQHeader.cpp TQHeader.h TQHebrewCodec.cpp TQHebrewCodec.h TQHGroupBox.cpp TQHGroupBox.h TQHideEvent.cpp TQHideEvent.h TQHostAddress.cpp TQHostAddress.h TQHttp.cpp TQHttp.h TQIconDrag.cpp TQIconDrag.h TQIconDragItem.cpp TQIconDragItem.h TQIconSet.cpp TQIconSet.h TQIconView.cpp TQIconView.h TQIconViewItem.cpp TQIconViewItem.h TQImage.cpp TQImage.h TQImageConsumer.cpp TQImageConsumer.h TQImageDecoder.cpp TQImageDecoder.h TQImageDrag.cpp TQImageDrag.h TQImageFormat.cpp TQImageFormat.h TQImageFormatType.cpp TQImageFormatType.h TQImageIO.cpp TQImageIO.h TQIMEvent.cpp TQIMEvent.h TQInputDialog.cpp TQInputDialog.h TQIntValidator.cpp TQIntValidator.h TQIODevice.cpp TQIODevice.h TQIODeviceSource.cpp TQIODeviceSource.h TQJisCodec.cpp TQJisCodec.h TQJpUnicodeConv.cpp TQJpUnicodeConv.h TQKeyEvent.cpp TQKeyEvent.h TQKeySequence.cpp TQKeySequence.h TQLabel.cpp TQLabel.h TQLayout.cpp TQLayout.h TQLayoutItem.cpp TQLayoutItem.h TQLCDNumber.cpp TQLCDNumber.h TQLibrary.cpp TQLibrary.h TQLineEdit.cpp TQLineEdit.h TQListBox.cpp TQListBox.h TQListBoxItem.cpp TQListBoxItem.h TQListBoxPixmap.cpp TQListBoxPixmap.h TQListBoxText.cpp TQListBoxText.h TQListView.cpp TQListView.h TQListViewItem.cpp TQListViewItem.h TQLocalFs.cpp TQLocalFs.h TQMainWindow.cpp TQMainWindow.h TQMenuBar.cpp TQMenuBar.h TQMenuData.cpp TQMenuData.h TQMenuItem.cpp TQMenuItem.h TQMessageBox.cpp TQMessageBox.h TQMetaData.cpp TQMetaData.h TQMetaEnum.cpp TQMetaEnum.h TQMetaObject.cpp TQMetaObject.h TQMetaProperty.cpp TQMetaProperty.h TQMimeSource.cpp TQMimeSource.h TQMimeSourceFactory.cpp TQMimeSourceFactory.h TQMouseEvent.cpp TQMouseEvent.h TQMoveEvent.cpp TQMoveEvent.h TQMovie.cpp TQMovie.h TQMultiLineEdit.cpp TQMultiLineEdit.h TQNetworkOperation.cpp TQNetworkOperation.h TQNetworkProtocol.cpp TQNetworkProtocol.h TQObject.cpp TQObject.h TQObjectCleanupHandler.cpp TQObjectCleanupHandler.h TQPaintDevice.cpp TQPaintDevice.h TQPaintDeviceMetrics.cpp TQPaintDeviceMetrics.h TQPainter.cpp TQPainter.h TQPaintEvent.cpp TQPaintEvent.h TQPalette.cpp TQPalette.h TQPen.cpp TQPen.h TQPicture.cpp TQPicture.h TQPixmap.cpp TQPixmap.h TQPoint.cpp TQPoint.h TQPointArray.cpp TQPointArray.h TQPolygonScanner.cpp TQPolygonScanner.h TQPopupMenu.cpp TQPopupMenu.h TQPrintDialog.cpp TQPrintDialog.h TQPrinter.cpp TQPrinter.h TQProcess.cpp TQProcess.h TQProgressBar.cpp TQProgressBar.h TQProgressDialog.cpp TQProgressDialog.h TQPushButton.cpp TQPushButton.h TQRadioButton.cpp TQRadioButton.h TQRangeControl.cpp TQRangeControl.h TQRect.cpp TQRect.h TQRegExp.cpp TQRegExp.h TQRegExpValidator.cpp TQRegExpValidator.h TQRegion.cpp TQRegion.h TQResizeEvent.cpp TQResizeEvent.h TQScrollBar.cpp TQScrollBar.h TQScrollView.cpp TQScrollView.h TQSemiModal.cpp TQSemiModal.h TQServerSocket.cpp TQServerSocket.h TQSessionManager.cpp TQSessionManager.h TQSettings.cpp TQSettings.h TQShowEvent.cpp TQShowEvent.h TQSignal.cpp TQSignal.h TQSignalMapper.cpp TQSignalMapper.h TQSimpleRichText.cpp TQSimpleRichText.h TQSize.cpp TQSize.h TQSizeGrip.cpp TQSizeGrip.h TQSizePolicy.cpp TQSizePolicy.h TQSjisCodec.cpp TQSjisCodec.h TQSlider.cpp TQSlider.h TQSocket.cpp TQSocket.h TQSocketDevice.cpp TQSocketDevice.h TQSocketNotifier.cpp TQSocketNotifier.h TQSound.cpp TQSound.h TQSpacerItem.cpp TQSpacerItem.h TQSpinBox.cpp TQSpinBox.h TQSplitter.cpp TQSplitter.h TQSql.cpp TQSql.h TQSqlCursor.cpp TQSqlCursor.h TQSqlDatabase.cpp TQSqlDatabase.h TQSqlDriver.cpp TQSqlDriver.h TQSqlEditorFactory.cpp TQSqlEditorFactory.h TQSqlError.cpp TQSqlError.h TQSqlFieldInfo.cpp TQSqlFieldInfo.h TQSqlField.cpp TQSqlField.h TQSqlForm.cpp TQSqlForm.h TQSqlIndex.cpp TQSqlIndex.h TQSqlPropertyMap.cpp TQSqlPropertyMap.h TQSqlQuery.cpp TQSqlQuery.h TQSqlRecord.cpp TQSqlRecord.h TQSqlResult.cpp TQSqlResult.h TQStatusBar.cpp TQStatusBar.h TQStoredDrag.cpp TQStoredDrag.h TQStyle.cpp TQStyle.h TQStyleOption.cpp TQStyleOption.h TQStyleFactory.cpp TQStyleFactory.h TQStyleSheet.cpp TQStyleSheet.h TQStyleSheetItem.cpp TQStyleSheetItem.h Qt.cpp Qt.h TQTab.cpp TQTab.h TQTabBar.cpp TQTabBar.h TQTabDialog.cpp TQTabDialog.h TQTable.cpp TQTable.h TQTableItem.cpp TQTableItem.h TQTableSelection.cpp TQTableSelection.h TQTabletEvent.cpp TQTabletEvent.h TQTabWidget.cpp TQTabWidget.h TQTextBrowser.cpp TQTextBrowser.h TQTextCodec.cpp TQTextCodec.h TQTextDecoder.cpp TQTextDecoder.h TQTextDrag.cpp TQTextDrag.h TQTextEdit.cpp TQTextEdit.h TQTextEncoder.cpp TQTextEncoder.h TQTextIStream.cpp TQTextIStream.h TQTextOStream.cpp TQTextOStream.h TQTextStream.cpp TQTextStream.h TQTextView.cpp TQTextView.h TQTimeEdit.cpp TQTimeEdit.h TQTimer.cpp TQTimer.h TQTimerEvent.cpp TQTimerEvent.h qtjava.cpp qtjava.h TQToolBar.cpp TQToolBar.h TQToolButton.cpp TQToolButton.h TQToolTip.cpp TQToolTip.h TQToolTipGroup.cpp TQToolTipGroup.h TQTranslator.cpp TQTranslator.h TQTranslatorMessage.cpp TQTranslatorMessage.h TQTsciiCodec.cpp TQTsciiCodec.h QtSupport.cpp TQUriDrag.cpp TQUriDrag.h TQUrl.cpp TQUrl.h TQUrlInfo.cpp TQUrlInfo.h TQUrlOperator.cpp TQUrlOperator.h TQUtf16Codec.cpp TQUtf16Codec.h TQUtf8Codec.cpp TQUtf8Codec.h TQUuid.cpp TQUuid.h TQValidator.cpp TQValidator.h TQVariant.cpp TQVariant.h TQVBox.cpp TQVBox.h TQVBoxLayout.cpp TQVBoxLayout.h TQVButtonGroup.cpp TQVButtonGroup.h TQVGroupBox.cpp TQVGroupBox.h TQWhatsThis.cpp TQWhatsThis.h TQWheelEvent.cpp TQWheelEvent.h TQWidget.cpp TQWidget.h TQWidgetItem.cpp TQWidgetItem.h TQWidgetStack.cpp TQWidgetStack.h TQWizard.cpp TQWizard.h TQWMatrix.cpp TQWMatrix.h TQWorkspace.cpp TQWorkspace.h TQXmlAttributes.cpp TQXmlAttributes.h TQXmlContentHandler.cpp TQXmlContentHandler.h TQXmlDeclHandler.cpp TQXmlDeclHandler.h TQXmlDefaultHandler.cpp TQXmlDefaultHandler.h TQXmlDTDHandler.cpp TQXmlDTDHandler.h TQXmlEntityResolver.cpp TQXmlEntityResolver.h TQXmlErrorHandler.cpp TQXmlErrorHandler.h TQXmlInputSource.cpp TQXmlInputSource.h TQXmlLexicalHandler.cpp TQXmlLexicalHandler.h TQXmlLocator.cpp TQXmlLocator.h TQXmlNamespaceSupport.cpp TQXmlNamespaceSupport.h TQXmlParseException.cpp TQXmlParseException.h TQXmlReader.cpp TQXmlReader.h TQXmlSimpleReader.cpp TQXmlSimpleReader.h TQGb18030Codec.cpp TQGb18030Codec.h TQGLWidget.cpp TQGLFormat.cpp TQGLContext.cpp TQGL.cpp TQGLWidget.h TQGLFormat.h TQGLContext.h TQGL.h TQEventLoop.cpp TQHttpHeader.cpp TQHttpRequestHeader.cpp TQHttpResponseHeader.cpp TQSpinWidget.cpp TQSplashScreen.cpp TQToolBox.cpp TQEventLoop.h TQHttpHeader.h TQHttpRequestHeader.h TQSpinWidget.h TQSplashScreen.h TQToolBox.h TQHttpResponseHeader.h QtSupport.h TQSyntaxHighlighter.cpp TQSyntaxHighlighter.h +EXTRA_DIST = JavaSlot.cpp JavaSlot.h TQAccel.cpp TQAccel.h TQAction.cpp TQAction.h TQActionGroup.cpp TQActionGroup.h TQApplication.cpp TQApplication.h TQAsyncIO.cpp TQAsyncIO.h TQAuServer.cpp TQAuServer.h TQBitmap.cpp TQBitmap.h TQBoxLayout.cpp TQBoxLayout.h TQBrush.cpp TQBrush.h TQBuffer.cpp TQBuffer.h TQButton.cpp TQButton.h TQButtonGroup.cpp TQButtonGroup.h TQCanvas.cpp TQCanvas.h TQCanvasEllipse.cpp TQCanvasEllipse.h TQCanvasItem.cpp TQCanvasItem.h TQCanvasLine.cpp TQCanvasLine.h TQCanvasPixmap.cpp TQCanvasPixmap.h TQCanvasPixmapArray.cpp TQCanvasPixmapArray.h TQCanvasPolygon.cpp TQCanvasPolygon.h TQCanvasPolygonalItem.cpp TQCanvasPolygonalItem.h TQCanvasRectangle.cpp TQCanvasRectangle.h TQCanvasSpline.cpp TQCanvasSpline.h TQCanvasSprite.cpp TQCanvasSprite.h TQCanvasText.cpp TQCanvasText.h TQCanvasView.cpp TQCanvasView.h TQCheckBox.cpp TQCheckBox.h TQCheckListItem.cpp TQCheckListItem.h TQCheckTableItem.cpp TQCheckTableItem.h TQChildEvent.cpp TQChildEvent.h TQClassInfo.cpp TQClassInfo.h TQClipboard.cpp TQClipboard.h TQCloseEvent.cpp TQCloseEvent.h TQColor.cpp TQColor.h TQColorDialog.cpp TQColorDialog.h TQColorDrag.cpp TQColorDrag.h TQColorGroup.cpp TQColorGroup.h TQComboBox.cpp TQComboBox.h TQComboTableItem.cpp TQComboTableItem.h TQContextMenuEvent.cpp TQContextMenuEvent.h TQCursor.cpp TQCursor.h TQCustomEvent.cpp TQCustomEvent.h TQCustomMenuItem.cpp TQCustomMenuItem.h TQDataBrowser.cpp TQDataBrowser.h TQDataPump.cpp TQDataPump.h TQDataSink.cpp TQDataSink.h TQDataSource.cpp TQDataSource.h TQDataStream.cpp TQDataStream.h TQDataTable.cpp TQDataTable.h TQDataView.cpp TQDataView.h TQDateEdit.cpp TQDateEdit.h TQDateTimeEdit.cpp TQDateTimeEdit.h TQDateTimeEditBase.cpp TQDateTimeEditBase.h TQDesktopWidget.cpp TQDesktopWidget.h TQDial.cpp TQDial.h TQDialog.cpp TQDialog.h TQDir.cpp TQDir.h TQDockArea.cpp TQDockArea.h TQDockWindow.cpp TQDockWindow.h TQDomAttr.cpp TQDomAttr.h TQDomCDATASection.cpp TQDomCDATASection.h TQDomCharacterData.cpp TQDomCharacterData.h TQDomComment.cpp TQDomComment.h TQDomDocument.cpp TQDomDocument.h TQDomDocumentFragment.cpp TQDomDocumentFragment.h TQDomDocumentType.cpp TQDomDocumentType.h TQDomElement.cpp TQDomElement.h TQDomEntity.cpp TQDomEntity.h TQDomEntityReference.cpp TQDomEntityReference.h TQDomImplementation.cpp TQDomImplementation.h TQDomNamedNodeMap.cpp TQDomNamedNodeMap.h TQDomNode.cpp TQDomNode.h TQDomNotation.cpp TQDomNotation.h TQDomProcessingInstruction.cpp TQDomProcessingInstruction.h TQDomText.cpp TQDomText.h TQDoubleValidator.cpp TQDoubleValidator.h TQDragEnterEvent.cpp TQDragEnterEvent.h TQDragLeaveEvent.cpp TQDragLeaveEvent.h TQDragManager.cpp TQDragManager.h TQDragMoveEvent.cpp TQDragMoveEvent.h TQDragObject.cpp TQDragObject.h TQDragResponseEvent.cpp TQDragResponseEvent.h TQDropEvent.cpp TQDropEvent.h TQDropSite.cpp TQDropSite.h TQEditorFactory.cpp TQEditorFactory.h TQErrorMessage.cpp TQErrorMessage.h TQEucJpCodec.cpp TQEucJpCodec.h TQEucKrCodec.cpp TQEucKrCodec.h TQEvent.cpp TQEvent.h TQFile.cpp TQFile.h TQFileDialog.cpp TQFileDialog.h TQFileIconProvider.cpp TQFileIconProvider.h TQFileInfo.cpp TQFileInfo.h TQFilePreview.cpp TQFilePreview.h TQFocusData.cpp TQFocusData.h TQFocusEvent.cpp TQFocusEvent.h TQFont.cpp TQFont.h TQFontDatabase.cpp TQFontDatabase.h TQFontDialog.cpp TQFontDialog.h TQFontInfo.cpp TQFontInfo.h TQFontMetrics.cpp TQFontMetrics.h TQFrame.cpp TQFrame.h TQFtp.cpp TQFtp.h TQGrid.cpp TQGrid.h TQGridLayout.cpp TQGridLayout.h TQGridView.cpp TQGridView.h TQGroupBox.cpp TQGroupBox.h TQHBox.cpp TQHBox.h TQHBoxLayout.cpp TQHBoxLayout.h TQHButtonGroup.cpp TQHButtonGroup.h TQHeader.cpp TQHeader.h TQHebrewCodec.cpp TQHebrewCodec.h TQHGroupBox.cpp TQHGroupBox.h TQHideEvent.cpp TQHideEvent.h TQHostAddress.cpp TQHostAddress.h TQHttp.cpp TQHttp.h TQIconDrag.cpp TQIconDrag.h TQIconDragItem.cpp TQIconDragItem.h TQIconSet.cpp TQIconSet.h TQIconView.cpp TQIconView.h TQIconViewItem.cpp TQIconViewItem.h TQImage.cpp TQImage.h TQImageConsumer.cpp TQImageConsumer.h TQImageDecoder.cpp TQImageDecoder.h TQImageDrag.cpp TQImageDrag.h TQImageFormat.cpp TQImageFormat.h TQImageFormatType.cpp TQImageFormatType.h TQImageIO.cpp TQImageIO.h TQIMEvent.cpp TQIMEvent.h TQInputDialog.cpp TQInputDialog.h TQIntValidator.cpp TQIntValidator.h TQIODevice.cpp TQIODevice.h TQIODeviceSource.cpp TQIODeviceSource.h TQJisCodec.cpp TQJisCodec.h TQJpUnicodeConv.cpp TQJpUnicodeConv.h TQKeyEvent.cpp TQKeyEvent.h TQKeySequence.cpp TQKeySequence.h TQLabel.cpp TQLabel.h TQLayout.cpp TQLayout.h TQLayoutItem.cpp TQLayoutItem.h TQLCDNumber.cpp TQLCDNumber.h TQLibrary.cpp TQLibrary.h TQLineEdit.cpp TQLineEdit.h TQListBox.cpp TQListBox.h TQListBoxItem.cpp TQListBoxItem.h TQListBoxPixmap.cpp TQListBoxPixmap.h TQListBoxText.cpp TQListBoxText.h TQListView.cpp TQListView.h TQListViewItem.cpp TQListViewItem.h TQLocalFs.cpp TQLocalFs.h TQMainWindow.cpp TQMainWindow.h TQMenuBar.cpp TQMenuBar.h TQMenuData.cpp TQMenuData.h TQMenuItem.cpp TQMenuItem.h TQMessageBox.cpp TQMessageBox.h TQMetaData.cpp TQMetaData.h TQMetaEnum.cpp TQMetaEnum.h TQMetaObject.cpp TQMetaObject.h TQMetaProperty.cpp TQMetaProperty.h TQMimeSource.cpp TQMimeSource.h TQMimeSourceFactory.cpp TQMimeSourceFactory.h TQMouseEvent.cpp TQMouseEvent.h TQMoveEvent.cpp TQMoveEvent.h TQMovie.cpp TQMovie.h TQMultiLineEdit.cpp TQMultiLineEdit.h TQNetworkOperation.cpp TQNetworkOperation.h TQNetworkProtocol.cpp TQNetworkProtocol.h TQObject.cpp TQObject.h TQObjectCleanupHandler.cpp TQObjectCleanupHandler.h TQPaintDevice.cpp TQPaintDevice.h TQPaintDeviceMetrics.cpp TQPaintDeviceMetrics.h TQPainter.cpp TQPainter.h TQPaintEvent.cpp TQPaintEvent.h TQPalette.cpp TQPalette.h TQPen.cpp TQPen.h TQPicture.cpp TQPicture.h TQPixmap.cpp TQPixmap.h TQPoint.cpp TQPoint.h TQPointArray.cpp TQPointArray.h TQPolygonScanner.cpp TQPolygonScanner.h TQPopupMenu.cpp TQPopupMenu.h TQPrintDialog.cpp TQPrintDialog.h TQPrinter.cpp TQPrinter.h TQProcess.cpp TQProcess.h TQProgressBar.cpp TQProgressBar.h TQProgressDialog.cpp TQProgressDialog.h TQPushButton.cpp TQPushButton.h TQRadioButton.cpp TQRadioButton.h TQRangeControl.cpp TQRangeControl.h TQRect.cpp TQRect.h TQRegExp.cpp TQRegExp.h TQRegExpValidator.cpp TQRegExpValidator.h TQRegion.cpp TQRegion.h TQResizeEvent.cpp TQResizeEvent.h TQScrollBar.cpp TQScrollBar.h TQScrollView.cpp TQScrollView.h TQServerSocket.cpp TQServerSocket.h TQSessionManager.cpp TQSessionManager.h TQSettings.cpp TQSettings.h TQShowEvent.cpp TQShowEvent.h TQSignal.cpp TQSignal.h TQSignalMapper.cpp TQSignalMapper.h TQSimpleRichText.cpp TQSimpleRichText.h TQSize.cpp TQSize.h TQSizeGrip.cpp TQSizeGrip.h TQSizePolicy.cpp TQSizePolicy.h TQSjisCodec.cpp TQSjisCodec.h TQSlider.cpp TQSlider.h TQSocket.cpp TQSocket.h TQSocketDevice.cpp TQSocketDevice.h TQSocketNotifier.cpp TQSocketNotifier.h TQSound.cpp TQSound.h TQSpacerItem.cpp TQSpacerItem.h TQSpinBox.cpp TQSpinBox.h TQSplitter.cpp TQSplitter.h TQSql.cpp TQSql.h TQSqlCursor.cpp TQSqlCursor.h TQSqlDatabase.cpp TQSqlDatabase.h TQSqlDriver.cpp TQSqlDriver.h TQSqlEditorFactory.cpp TQSqlEditorFactory.h TQSqlError.cpp TQSqlError.h TQSqlFieldInfo.cpp TQSqlFieldInfo.h TQSqlField.cpp TQSqlField.h TQSqlForm.cpp TQSqlForm.h TQSqlIndex.cpp TQSqlIndex.h TQSqlPropertyMap.cpp TQSqlPropertyMap.h TQSqlQuery.cpp TQSqlQuery.h TQSqlRecord.cpp TQSqlRecord.h TQSqlResult.cpp TQSqlResult.h TQStatusBar.cpp TQStatusBar.h TQStoredDrag.cpp TQStoredDrag.h TQStyle.cpp TQStyle.h TQStyleOption.cpp TQStyleOption.h TQStyleFactory.cpp TQStyleFactory.h TQStyleSheet.cpp TQStyleSheet.h TQStyleSheetItem.cpp TQStyleSheetItem.h Qt.cpp Qt.h TQTab.cpp TQTab.h TQTabBar.cpp TQTabBar.h TQTabDialog.cpp TQTabDialog.h TQTable.cpp TQTable.h TQTableItem.cpp TQTableItem.h TQTableSelection.cpp TQTableSelection.h TQTabletEvent.cpp TQTabletEvent.h TQTabWidget.cpp TQTabWidget.h TQTextBrowser.cpp TQTextBrowser.h TQTextCodec.cpp TQTextCodec.h TQTextDecoder.cpp TQTextDecoder.h TQTextDrag.cpp TQTextDrag.h TQTextEdit.cpp TQTextEdit.h TQTextEncoder.cpp TQTextEncoder.h TQTextIStream.cpp TQTextIStream.h TQTextOStream.cpp TQTextOStream.h TQTextStream.cpp TQTextStream.h TQTextView.cpp TQTextView.h TQTimeEdit.cpp TQTimeEdit.h TQTimer.cpp TQTimer.h TQTimerEvent.cpp TQTimerEvent.h qtjava.cpp qtjava.h TQToolBar.cpp TQToolBar.h TQToolButton.cpp TQToolButton.h TQToolTip.cpp TQToolTip.h TQToolTipGroup.cpp TQToolTipGroup.h TQTranslator.cpp TQTranslator.h TQTranslatorMessage.cpp TQTranslatorMessage.h TQTsciiCodec.cpp TQTsciiCodec.h QtSupport.cpp TQUriDrag.cpp TQUriDrag.h TQUrl.cpp TQUrl.h TQUrlInfo.cpp TQUrlInfo.h TQUrlOperator.cpp TQUrlOperator.h TQUtf16Codec.cpp TQUtf16Codec.h TQUtf8Codec.cpp TQUtf8Codec.h TQUuid.cpp TQUuid.h TQValidator.cpp TQValidator.h TQVariant.cpp TQVariant.h TQVBox.cpp TQVBox.h TQVBoxLayout.cpp TQVBoxLayout.h TQVButtonGroup.cpp TQVButtonGroup.h TQVGroupBox.cpp TQVGroupBox.h TQWhatsThis.cpp TQWhatsThis.h TQWheelEvent.cpp TQWheelEvent.h TQWidget.cpp TQWidget.h TQWidgetItem.cpp TQWidgetItem.h TQWidgetStack.cpp TQWidgetStack.h TQWizard.cpp TQWizard.h TQWMatrix.cpp TQWMatrix.h TQWorkspace.cpp TQWorkspace.h TQXmlAttributes.cpp TQXmlAttributes.h TQXmlContentHandler.cpp TQXmlContentHandler.h TQXmlDeclHandler.cpp TQXmlDeclHandler.h TQXmlDefaultHandler.cpp TQXmlDefaultHandler.h TQXmlDTDHandler.cpp TQXmlDTDHandler.h TQXmlEntityResolver.cpp TQXmlEntityResolver.h TQXmlErrorHandler.cpp TQXmlErrorHandler.h TQXmlInputSource.cpp TQXmlInputSource.h TQXmlLexicalHandler.cpp TQXmlLexicalHandler.h TQXmlLocator.cpp TQXmlLocator.h TQXmlNamespaceSupport.cpp TQXmlNamespaceSupport.h TQXmlParseException.cpp TQXmlParseException.h TQXmlReader.cpp TQXmlReader.h TQXmlSimpleReader.cpp TQXmlSimpleReader.h TQGb18030Codec.cpp TQGb18030Codec.h TQGLWidget.cpp TQGLFormat.cpp TQGLContext.cpp TQGL.cpp TQGLWidget.h TQGLFormat.h TQGLContext.h TQGL.h TQEventLoop.cpp TQHttpHeader.cpp TQHttpRequestHeader.cpp TQHttpResponseHeader.cpp TQSpinWidget.cpp TQSplashScreen.cpp TQToolBox.cpp TQEventLoop.h TQHttpHeader.h TQHttpRequestHeader.h TQSpinWidget.h TQSplashScreen.h TQToolBox.h TQHttpResponseHeader.h QtSupport.h TQSyntaxHighlighter.cpp TQSyntaxHighlighter.h ####### tdevelop will overwrite this part!!! (end)############ diff --git a/qtjava/javalib/qtjava/QtUtils.h b/qtjava/javalib/qtjava/QtUtils.h index 823bac23..7d88adb9 100644 --- a/qtjava/javalib/qtjava/QtUtils.h +++ b/qtjava/javalib/qtjava/QtUtils.h @@ -8,7 +8,7 @@ class QtUtils : public TQObject { - Q_OBJECT + TQ_OBJECT public: QtUtils(); diff --git a/qtjava/javalib/qtjava/TQButton.cpp b/qtjava/javalib/qtjava/TQButton.cpp index 05f9f8d4..fdf3e7ae 100644 --- a/qtjava/javalib/qtjava/TQButton.cpp +++ b/qtjava/javalib/qtjava/TQButton.cpp @@ -473,13 +473,6 @@ Java_org_trinitydesktop_qt_QButton_autoRepeat(JNIEnv* env, jobject obj) return xret; } -JNIEXPORT jboolean JNICALL -Java_org_trinitydesktop_qt_QButton_autoResize(JNIEnv* env, jobject obj) -{ - jboolean xret = (jboolean) ((TQButton*) QtSupport::getQt(env, obj))->autoResize(); - return xret; -} - JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QButton_className(JNIEnv* env, jobject obj) { @@ -701,13 +694,6 @@ Java_org_trinitydesktop_qt_QButton_setAutoRepeat(JNIEnv* env, jobject obj, jbool } JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QButton_setAutoResize(JNIEnv* env, jobject obj, jboolean arg1) -{ - ((TQButton*) QtSupport::getQt(env, obj))->setAutoResize((bool) arg1); - return; -} - -JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QButton_setDown(JNIEnv* env, jobject obj, jboolean arg1) { ((TQButton*) QtSupport::getQt(env, obj))->setDown((bool) arg1); diff --git a/qtjava/javalib/qtjava/TQButton.h b/qtjava/javalib/qtjava/TQButton.h index 4ce8b710..b4d6aa8e 100644 --- a/qtjava/javalib/qtjava/TQButton.h +++ b/qtjava/javalib/qtjava/TQButton.h @@ -28,8 +28,6 @@ extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QButton_setDown (JNIEnv extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QButton_isDown (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QButton_isOn (JNIEnv *env, jobject); extern JNIEXPORT jint JNICALL Java_org_trinitydesktop_qt_QButton_state (JNIEnv *env, jobject); -extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QButton_autoResize (JNIEnv *env, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QButton_setAutoResize (JNIEnv *env, jobject, jboolean); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QButton_autoRepeat (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QButton_setAutoRepeat (JNIEnv *env, jobject, jboolean); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QButton_isExclusiveToggle (JNIEnv *env, jobject); diff --git a/qtjava/javalib/qtjava/TQLineEdit.cpp b/qtjava/javalib/qtjava/TQLineEdit.cpp index 584ac0ac..a0211baf 100644 --- a/qtjava/javalib/qtjava/TQLineEdit.cpp +++ b/qtjava/javalib/qtjava/TQLineEdit.cpp @@ -131,10 +131,6 @@ public: TQLineEdit::windowActivationChange(arg1); return; } - void protected_repaintArea(int arg1,int arg2) { - TQLineEdit::repaintArea(arg1,arg2); - return; - } ~TQLineEditJBridge() {QtSupport::qtKeyDeleted(this);} void dragLeaveEvent(TQDragLeaveEvent* arg1) { if (!QtSupport::eventDelegate(this,"dragLeaveEvent",(void*)arg1,"org.trinitydesktop.qt.TQDragLeaveEvent")) { @@ -668,20 +664,6 @@ Java_org_trinitydesktop_qt_QLineEdit_cursorForward__ZI(JNIEnv* env, jobject obj, return; } -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QLineEdit_cursorLeft__Z(JNIEnv* env, jobject obj, jboolean mark) -{ - ((TQLineEdit*) QtSupport::getQt(env, obj))->cursorLeft((bool) mark); - return; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QLineEdit_cursorLeft__ZI(JNIEnv* env, jobject obj, jboolean mark, jint steps) -{ - ((TQLineEdit*) QtSupport::getQt(env, obj))->cursorLeft((bool) mark, (int) steps); - return; -} - JNIEXPORT jint JNICALL Java_org_trinitydesktop_qt_QLineEdit_cursorPosition(JNIEnv* env, jobject obj) { @@ -690,20 +672,6 @@ Java_org_trinitydesktop_qt_QLineEdit_cursorPosition(JNIEnv* env, jobject obj) } JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QLineEdit_cursorRight__Z(JNIEnv* env, jobject obj, jboolean mark) -{ - ((TQLineEdit*) QtSupport::getQt(env, obj))->cursorRight((bool) mark); - return; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QLineEdit_cursorRight__ZI(JNIEnv* env, jobject obj, jboolean mark, jint steps) -{ - ((TQLineEdit*) QtSupport::getQt(env, obj))->cursorRight((bool) mark, (int) steps); - return; -} - -JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_cursorWordBackward(JNIEnv* env, jobject obj, jboolean mark) { ((TQLineEdit*) QtSupport::getQt(env, obj))->cursorWordBackward((bool) mark); @@ -873,13 +841,6 @@ Java_org_trinitydesktop_qt_QLineEdit_hasAcceptableInput(JNIEnv* env, jobject obj } JNIEXPORT jboolean JNICALL -Java_org_trinitydesktop_qt_QLineEdit_hasMarkedText(JNIEnv* env, jobject obj) -{ - jboolean xret = (jboolean) ((TQLineEdit*) QtSupport::getQt(env, obj))->hasMarkedText(); - return xret; -} - -JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QLineEdit_hasSelectedText(JNIEnv* env, jobject obj) { jboolean xret = (jboolean) ((TQLineEdit*) QtSupport::getQt(env, obj))->hasSelectedText(); @@ -971,14 +932,6 @@ Java_org_trinitydesktop_qt_QLineEdit_keyPressEvent(JNIEnv* env, jobject obj, job return; } -JNIEXPORT jstring JNICALL -Java_org_trinitydesktop_qt_QLineEdit_markedText(JNIEnv* env, jobject obj) -{ - TQString _qstring; - _qstring = ((TQLineEdit*) QtSupport::getQt(env, obj))->markedText(); - return QtSupport::fromTQString(env, &_qstring); -} - JNIEXPORT jint JNICALL Java_org_trinitydesktop_qt_QLineEdit_maxLength(JNIEnv* env, jobject obj) { @@ -1112,13 +1065,6 @@ Java_org_trinitydesktop_qt_QLineEdit_redo(JNIEnv* env, jobject obj) } JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QLineEdit_repaintArea(JNIEnv* env, jobject obj, jint arg1, jint arg2) -{ - ((TQLineEditJBridge*) QtSupport::getQt(env, obj))->protected_repaintArea((int) arg1, (int) arg2); - return; -} - -JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_resizeEvent(JNIEnv* env, jobject obj, jobject arg1) { ((TQLineEditJBridge*) QtSupport::getQt(env, obj))->protected_resizeEvent((TQResizeEvent*) QtSupport::getQt(env, arg1)); diff --git a/qtjava/javalib/qtjava/TQLineEdit.h b/qtjava/javalib/qtjava/TQLineEdit.h index 08a7cbe5..790372ce 100644 --- a/qtjava/javalib/qtjava/TQLineEdit.h +++ b/qtjava/javalib/qtjava/TQLineEdit.h @@ -30,10 +30,6 @@ extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QLineEdit_minimumSiz extern JNIEXPORT jint JNICALL Java_org_trinitydesktop_qt_QLineEdit_cursorPosition (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QLineEdit_validateAndSet (JNIEnv *env, jobject, jstring, jint, jint, jint); extern JNIEXPORT jint JNICALL Java_org_trinitydesktop_qt_QLineEdit_alignment (JNIEnv *env, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_cursorLeft__ZI (JNIEnv *env, jobject, jboolean, jint); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_cursorLeft__Z (JNIEnv *env, jobject, jboolean); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_cursorRight__ZI (JNIEnv *env, jobject, jboolean, jint); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_cursorRight__Z (JNIEnv *env, jobject, jboolean); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_cursorForward__ZI (JNIEnv *env, jobject, jboolean, jint); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_cursorForward__Z (JNIEnv *env, jobject, jboolean); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_cursorBackward__ZI (JNIEnv *env, jobject, jboolean, jint); @@ -53,8 +49,6 @@ extern JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QLineEdit_selectedTe extern JNIEXPORT jint JNICALL Java_org_trinitydesktop_qt_QLineEdit_selectionStart (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QLineEdit_isUndoAvailable (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QLineEdit_isRedoAvailable (JNIEnv *env, jobject); -extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QLineEdit_hasMarkedText (JNIEnv *env, jobject); -extern JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QLineEdit_markedText (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QLineEdit_dragEnabled (JNIEnv *env, jobject); extern JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QLineEdit_inputMask (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_setInputMask (JNIEnv *env, jobject, jstring); @@ -105,7 +99,6 @@ extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_dropEvent (JN extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_contextMenuEvent (JNIEnv *env, jobject, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QLineEdit_createPopupMenu (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_windowActivationChange (JNIEnv *env, jobject, jboolean); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_repaintArea (JNIEnv *env, jobject, jint, jint); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_finalize (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QLineEdit_dispose (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QLineEdit_isDisposed (JNIEnv *env, jobject); diff --git a/qtjava/javalib/qtjava/TQPalette.cpp b/qtjava/javalib/qtjava/TQPalette.cpp index dbd9d9e1..98b79f40 100644 --- a/qtjava/javalib/qtjava/TQPalette.cpp +++ b/qtjava/javalib/qtjava/TQPalette.cpp @@ -158,13 +158,6 @@ Java_org_trinitydesktop_qt_QPalette_newTQPalette__Lorg_trinitydesktop_qt_QPalett return; } -JNIEXPORT jobject JNICALL -Java_org_trinitydesktop_qt_QPalette_normal(JNIEnv* env, jobject obj) -{ - jobject xret = QtSupport::objectForQtKey(env, (void*)(TQColorGroup *) &((TQPalette*) QtSupport::getQt(env, obj))->normal(), "org.trinitydesktop.qt.TQColorGroup"); - return xret; -} - JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QPalette_op_1equals(JNIEnv* env, jobject obj, jobject p) { @@ -234,11 +227,3 @@ Java_org_trinitydesktop_qt_QPalette_setInactive(JNIEnv* env, jobject obj, jobjec ((TQPalette*) QtSupport::getQt(env, obj))->setInactive((const TQColorGroup&)*(const TQColorGroup*) QtSupport::getQt(env, arg1)); return; } - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QPalette_setNormal(JNIEnv* env, jobject obj, jobject cg) -{ - ((TQPalette*) QtSupport::getQt(env, obj))->setNormal((const TQColorGroup&)*(const TQColorGroup*) QtSupport::getQt(env, cg)); - return; -} - diff --git a/qtjava/javalib/qtjava/TQPalette.h b/qtjava/javalib/qtjava/TQPalette.h index e793cf92..73de43c4 100644 --- a/qtjava/javalib/qtjava/TQPalette.h +++ b/qtjava/javalib/qtjava/TQPalette.h @@ -25,11 +25,9 @@ extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QPalette_copy (JNIEn extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QPalette_active (JNIEnv *env, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QPalette_disabled (JNIEnv *env, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QPalette_inactive (JNIEnv *env, jobject); -extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QPalette_normal (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QPalette_setActive (JNIEnv *env, jobject, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QPalette_setDisabled (JNIEnv *env, jobject, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QPalette_setInactive (JNIEnv *env, jobject, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QPalette_setNormal (JNIEnv *env, jobject, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QPalette_op_1equals (JNIEnv *env, jobject, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QPalette_op_1not_1equals (JNIEnv *env, jobject, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QPalette_isCopyOf (JNIEnv *env, jobject, jobject); diff --git a/qtjava/javalib/qtjava/TQSemiModal.cpp b/qtjava/javalib/qtjava/TQSemiModal.cpp deleted file mode 100644 index 86503ef2..00000000 --- a/qtjava/javalib/qtjava/TQSemiModal.cpp +++ /dev/null @@ -1,464 +0,0 @@ -//Auto-generated by kalyptus. DO NOT EDIT. -#include <tqstring.h> -#include <tqsemimodal.h> -#include <tqnamespace.h> - -#include <qtjava/QtSupport.h> -#include <qtjava/TQSemiModal.h> - -class TQSemiModalJBridge : public TQSemiModal -{ -public: - TQSemiModalJBridge(TQWidget* arg1,const char* arg2,bool arg3,TQt::WFlags arg4) : TQSemiModal(arg1,arg2,arg3,arg4) {}; - TQSemiModalJBridge(TQWidget* arg1,const char* arg2,bool arg3) : TQSemiModal(arg1,arg2,arg3) {}; - TQSemiModalJBridge(TQWidget* arg1,const char* arg2) : TQSemiModal(arg1,arg2) {}; - TQSemiModalJBridge(TQWidget* arg1) : TQSemiModal(arg1) {}; - TQSemiModalJBridge() : TQSemiModal() {}; - ~TQSemiModalJBridge() {QtSupport::qtKeyDeleted(this);} - void dragLeaveEvent(TQDragLeaveEvent* arg1) { - if (!QtSupport::eventDelegate(this,"dragLeaveEvent",(void*)arg1,"org.trinitydesktop.qt.TQDragLeaveEvent")) { - TQWidget::dragLeaveEvent(arg1); - } - return; - } - void setMask(const TQRegion& arg1) { - if (!QtSupport::eventDelegate(this,"setMask",(void*)&arg1,"org.trinitydesktop.qt.TQRegion")) { - TQWidget::setMask(arg1); - } - return; - } - void resizeEvent(TQResizeEvent* arg1) { - if (!QtSupport::eventDelegate(this,"resizeEvent",(void*)arg1,"org.trinitydesktop.qt.TQResizeEvent")) { - TQDialog::resizeEvent(arg1); - } - return; - } - void mouseDoubleClickEvent(TQMouseEvent* arg1) { - if (!QtSupport::eventDelegate(this,"mouseDoubleClickEvent",(void*)arg1,"org.trinitydesktop.qt.TQMouseEvent")) { - TQWidget::mouseDoubleClickEvent(arg1); - } - return; - } - void paletteChange(const TQPalette& arg1) { - if (!QtSupport::eventDelegate(this,"paletteChange",(void*)&arg1,"org.trinitydesktop.qt.TQPalette")) { - TQWidget::paletteChange(arg1); - } - return; - } - void accept() { - if (!QtSupport::voidDelegate(this,"org.trinitydesktop.qt.TQSemiModal","accept")) { - TQDialog::accept(); - } - return; - } - void setActiveWindow() { - if (!QtSupport::voidDelegate(this,"org.trinitydesktop.qt.TQSemiModal","setActiveWindow")) { - TQWidget::setActiveWindow(); - } - return; - } - void dragEnterEvent(TQDragEnterEvent* arg1) { - if (!QtSupport::eventDelegate(this,"dragEnterEvent",(void*)arg1,"org.trinitydesktop.qt.TQDragEnterEvent")) { - TQWidget::dragEnterEvent(arg1); - } - return; - } - void focusOutEvent(TQFocusEvent* arg1) { - if (!QtSupport::eventDelegate(this,"focusOutEvent",(void*)arg1,"org.trinitydesktop.qt.TQFocusEvent")) { - TQWidget::focusOutEvent(arg1); - } - return; - } - void setFocus() { - if (!QtSupport::voidDelegate(this,"org.trinitydesktop.qt.TQSemiModal","setFocus")) { - TQWidget::setFocus(); - } - return; - } - void dragMoveEvent(TQDragMoveEvent* arg1) { - if (!QtSupport::eventDelegate(this,"dragMoveEvent",(void*)arg1,"org.trinitydesktop.qt.TQDragMoveEvent")) { - TQWidget::dragMoveEvent(arg1); - } - return; - } - void styleChange(TQStyle& arg1) { - if (!QtSupport::eventDelegate(this,"styleChange",(void*)&arg1,"org.trinitydesktop.qt.TQStyle")) { - TQWidget::styleChange(arg1); - } - return; - } - void setPaletteBackgroundColor(const TQColor& arg1) { - if (!QtSupport::eventDelegate(this,"setPaletteBackgroundColor",(void*)&arg1,"org.trinitydesktop.qt.TQColor")) { - TQWidget::setPaletteBackgroundColor(arg1); - } - return; - } - void setEraseColor(const TQColor& arg1) { - if (!QtSupport::eventDelegate(this,"setEraseColor",(void*)&arg1,"org.trinitydesktop.qt.TQColor")) { - TQWidget::setEraseColor(arg1); - } - return; - } - void removeChild(TQObject* arg1) { - if (!QtSupport::eventDelegate(this,"removeChild",(void*)arg1,"org.trinitydesktop.qt.TQObject")) { - TQObject::removeChild(arg1); - } - return; - } - void paintEvent(TQPaintEvent* arg1) { - if (!QtSupport::eventDelegate(this,"paintEvent",(void*)arg1,"org.trinitydesktop.qt.TQPaintEvent")) { - TQWidget::paintEvent(arg1); - } - return; - } - void imStartEvent(TQIMEvent* arg1) { - if (!QtSupport::eventDelegate(this,"imStartEvent",(void*)arg1,"org.trinitydesktop.qt.TQIMEvent")) { - TQWidget::imStartEvent(arg1); - } - return; - } - void unsetCursor() { - if (!QtSupport::voidDelegate(this,"org.trinitydesktop.qt.TQSemiModal","unsetCursor")) { - TQWidget::unsetCursor(); - } - return; - } - void hideEvent(TQHideEvent* arg1) { - if (!QtSupport::eventDelegate(this,"hideEvent",(void*)arg1,"org.trinitydesktop.qt.TQHideEvent")) { - TQWidget::hideEvent(arg1); - } - return; - } - void moveEvent(TQMoveEvent* arg1) { - if (!QtSupport::eventDelegate(this,"moveEvent",(void*)arg1,"org.trinitydesktop.qt.TQMoveEvent")) { - TQWidget::moveEvent(arg1); - } - return; - } - void polish() { - if (!QtSupport::voidDelegate(this,"org.trinitydesktop.qt.TQSemiModal","polish")) { - TQWidget::polish(); - } - return; - } - void showMaximized() { - if (!QtSupport::voidDelegate(this,"org.trinitydesktop.qt.TQSemiModal","showMaximized")) { - TQWidget::showMaximized(); - } - return; - } - void setBackgroundPixmap(const TQPixmap& arg1) { - if (!QtSupport::eventDelegate(this,"setBackgroundPixmap",(void*)&arg1,"org.trinitydesktop.qt.TQPixmap")) { - TQWidget::setBackgroundPixmap(arg1); - } - return; - } - void showEvent(TQShowEvent* arg1) { - if (!QtSupport::eventDelegate(this,"showEvent",(void*)arg1,"org.trinitydesktop.qt.TQShowEvent")) { - TQWidget::showEvent(arg1); - } - return; - } - void keyPressEvent(TQKeyEvent* arg1) { - if (!QtSupport::eventDelegate(this,"keyPressEvent",(void*)arg1,"org.trinitydesktop.qt.TQKeyEvent")) { - TQDialog::keyPressEvent(arg1); - } - return; - } - bool customWhatsThis() { - return QtSupport::booleanDelegate(this,"customWhatsThis"); - } - void setPaletteBackgroundPixmap(const TQPixmap& arg1) { - if (!QtSupport::eventDelegate(this,"setPaletteBackgroundPixmap",(void*)&arg1,"org.trinitydesktop.qt.TQPixmap")) { - TQWidget::setPaletteBackgroundPixmap(arg1); - } - return; - } - void setCursor(const TQCursor& arg1) { - if (!QtSupport::eventDelegate(this,"setCursor",(void*)&arg1,"org.trinitydesktop.qt.TQCursor")) { - TQWidget::setCursor(arg1); - } - return; - } - void closeEvent(TQCloseEvent* arg1) { - if (!QtSupport::eventDelegate(this,"closeEvent",(void*)arg1,"org.trinitydesktop.qt.TQCloseEvent")) { - TQDialog::closeEvent(arg1); - } - return; - } - void customEvent(TQCustomEvent* arg1) { - if (!QtSupport::eventDelegate(this,"customEvent",(void*)arg1,"org.trinitydesktop.qt.TQCustomEvent")) { - TQObject::customEvent(arg1); - } - return; - } - void enterEvent(TQEvent* arg1) { - if (!QtSupport::eventDelegate(this,"enterEvent",(void*)arg1,"org.trinitydesktop.qt.TQEvent")) { - TQWidget::enterEvent(arg1); - } - return; - } - void timerEvent(TQTimerEvent* arg1) { - if (!QtSupport::eventDelegate(this,"timerEvent",(void*)arg1,"org.trinitydesktop.qt.TQTimerEvent")) { - TQObject::timerEvent(arg1); - } - return; - } - void mouseReleaseEvent(TQMouseEvent* arg1) { - if (!QtSupport::eventDelegate(this,"mouseReleaseEvent",(void*)arg1,"org.trinitydesktop.qt.TQMouseEvent")) { - TQWidget::mouseReleaseEvent(arg1); - } - return; - } - void setErasePixmap(const TQPixmap& arg1) { - if (!QtSupport::eventDelegate(this,"setErasePixmap",(void*)&arg1,"org.trinitydesktop.qt.TQPixmap")) { - TQWidget::setErasePixmap(arg1); - } - return; - } - void childEvent(TQChildEvent* arg1) { - if (!QtSupport::eventDelegate(this,"childEvent",(void*)arg1,"org.trinitydesktop.qt.TQChildEvent")) { - TQObject::childEvent(arg1); - } - return; - } - void dropEvent(TQDropEvent* arg1) { - if (!QtSupport::eventDelegate(this,"dropEvent",(void*)arg1,"org.trinitydesktop.qt.TQDropEvent")) { - TQWidget::dropEvent(arg1); - } - return; - } - void leaveEvent(TQEvent* arg1) { - if (!QtSupport::eventDelegate(this,"leaveEvent",(void*)arg1,"org.trinitydesktop.qt.TQEvent")) { - TQWidget::leaveEvent(arg1); - } - return; - } - void setIcon(const TQPixmap& arg1) { - if (!QtSupport::eventDelegate(this,"setIcon",(void*)&arg1,"org.trinitydesktop.qt.TQPixmap")) { - TQWidget::setIcon(arg1); - } - return; - } - void updateMask() { - if (!QtSupport::voidDelegate(this,"org.trinitydesktop.qt.TQSemiModal","updateMask")) { - TQWidget::updateMask(); - } - return; - } - void showNormal() { - if (!QtSupport::voidDelegate(this,"org.trinitydesktop.qt.TQSemiModal","showNormal")) { - TQWidget::showNormal(); - } - return; - } - void imComposeEvent(TQIMEvent* arg1) { - if (!QtSupport::eventDelegate(this,"imComposeEvent",(void*)arg1,"org.trinitydesktop.qt.TQIMEvent")) { - TQWidget::imComposeEvent(arg1); - } - return; - } - void mousePressEvent(TQMouseEvent* arg1) { - if (!QtSupport::eventDelegate(this,"mousePressEvent",(void*)arg1,"org.trinitydesktop.qt.TQMouseEvent")) { - TQWidget::mousePressEvent(arg1); - } - return; - } - void mouseMoveEvent(TQMouseEvent* arg1) { - if (!QtSupport::eventDelegate(this,"mouseMoveEvent",(void*)arg1,"org.trinitydesktop.qt.TQMouseEvent")) { - TQWidget::mouseMoveEvent(arg1); - } - return; - } - void setFocusProxy(TQWidget* arg1) { - if (!QtSupport::eventDelegate(this,"setFocusProxy",(void*)arg1,"org.trinitydesktop.qt.TQWidget")) { - TQWidget::setFocusProxy(arg1); - } - return; - } - void fontChange(const TQFont& arg1) { - if (!QtSupport::eventDelegate(this,"fontChange",(void*)&arg1,"org.trinitydesktop.qt.TQFont")) { - TQWidget::fontChange(arg1); - } - return; - } - void setBackgroundColor(const TQColor& arg1) { - if (!QtSupport::eventDelegate(this,"setBackgroundColor",(void*)&arg1,"org.trinitydesktop.qt.TQColor")) { - TQWidget::setBackgroundColor(arg1); - } - return; - } - void adjustSize() { - if (!QtSupport::voidDelegate(this,"org.trinitydesktop.qt.TQSemiModal","adjustSize")) { - TQWidget::adjustSize(); - } - return; - } - void wheelEvent(TQWheelEvent* arg1) { - if (!QtSupport::eventDelegate(this,"wheelEvent",(void*)arg1,"org.trinitydesktop.qt.TQWheelEvent")) { - TQWidget::wheelEvent(arg1); - } - return; - } - void imEndEvent(TQIMEvent* arg1) { - if (!QtSupport::eventDelegate(this,"imEndEvent",(void*)arg1,"org.trinitydesktop.qt.TQIMEvent")) { - TQWidget::imEndEvent(arg1); - } - return; - } - void insertChild(TQObject* arg1) { - if (!QtSupport::eventDelegate(this,"insertChild",(void*)arg1,"org.trinitydesktop.qt.TQObject")) { - TQObject::insertChild(arg1); - } - return; - } - void focusInEvent(TQFocusEvent* arg1) { - if (!QtSupport::eventDelegate(this,"focusInEvent",(void*)arg1,"org.trinitydesktop.qt.TQFocusEvent")) { - TQWidget::focusInEvent(arg1); - } - return; - } - void reject() { - if (!QtSupport::voidDelegate(this,"org.trinitydesktop.qt.TQSemiModal","reject")) { - TQDialog::reject(); - } - return; - } - void tabletEvent(TQTabletEvent* arg1) { - if (!QtSupport::eventDelegate(this,"tabletEvent",(void*)arg1,"org.trinitydesktop.qt.TQTabletEvent")) { - TQWidget::tabletEvent(arg1); - } - return; - } - void keyReleaseEvent(TQKeyEvent* arg1) { - if (!QtSupport::eventDelegate(this,"keyReleaseEvent",(void*)arg1,"org.trinitydesktop.qt.TQKeyEvent")) { - TQWidget::keyReleaseEvent(arg1); - } - return; - } - void contextMenuEvent(TQContextMenuEvent* arg1) { - if (!QtSupport::eventDelegate(this,"contextMenuEvent",(void*)arg1,"org.trinitydesktop.qt.TQContextMenuEvent")) { - TQDialog::contextMenuEvent(arg1); - } - return; - } - void showMinimized() { - if (!QtSupport::voidDelegate(this,"org.trinitydesktop.qt.TQSemiModal","showMinimized")) { - TQWidget::showMinimized(); - } - return; - } -}; - -JNIEXPORT jstring JNICALL -Java_org_trinitydesktop_qt_QSemiModal_className(JNIEnv* env, jobject obj) -{ - const char* _qstring; - _qstring = ((TQSemiModal*) QtSupport::getQt(env, obj))->className(); - return QtSupport::fromCharString(env, (char *) _qstring); -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QSemiModal_dispose(JNIEnv* env, jobject obj) -{ - Java_org_trinitydesktop_qt_QSemiModal_finalize(env, obj); - return; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QSemiModal_finalize(JNIEnv* env, jobject obj) -{ - if (QtSupport::allocatedInJavaWorld(env, obj) && ((TQWidget*)(TQSemiModal*)QtSupport::getQt(env, obj))->parentWidget(TRUE) == 0) { - delete (TQSemiModal*)QtSupport::getQt(env, obj); - QtSupport::setQt(env, obj, 0); - } - return; -} - -JNIEXPORT jboolean JNICALL -Java_org_trinitydesktop_qt_QSemiModal_isDisposed(JNIEnv* env, jobject obj) -{ - return (QtSupport::getQt(env, obj) == 0); -} - -JNIEXPORT jobject JNICALL -Java_org_trinitydesktop_qt_QSemiModal_metaObject(JNIEnv* env, jobject obj) -{ - jobject xret = QtSupport::objectForQtKey(env, (void*)((TQSemiModal*) QtSupport::getQt(env, obj))->metaObject(), "org.trinitydesktop.qt.TQMetaObject"); - return xret; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QSemiModal_newTQSemiModal__(JNIEnv* env, jobject obj) -{ - if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new TQSemiModalJBridge()); - QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); - } - return; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QSemiModal_newTQSemiModal__Lorg_trinitydesktop_qt_QWidget_2(JNIEnv* env, jobject obj, jobject parent) -{ - if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new TQSemiModalJBridge((TQWidget*) QtSupport::getQt(env, parent))); - QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); - } - return; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QSemiModal_newTQSemiModal__Lorg_trinitydesktop_qt_QWidget_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject parent, jstring name) -{ -static TQCString* _qstring_name = 0; - if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new TQSemiModalJBridge((TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name))); - QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); - } - return; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QSemiModal_newTQSemiModal__Lorg_trinitydesktop_qt_QWidget_2Ljava_lang_String_2Z(JNIEnv* env, jobject obj, jobject parent, jstring name, jboolean modal) -{ -static TQCString* _qstring_name = 0; - if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new TQSemiModalJBridge((TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (bool) modal)); - QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); - } - return; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QSemiModal_newTQSemiModal__Lorg_trinitydesktop_qt_QWidget_2Ljava_lang_String_2ZI(JNIEnv* env, jobject obj, jobject parent, jstring name, jboolean modal, jint f) -{ -static TQCString* _qstring_name = 0; - if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new TQSemiModalJBridge((TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (bool) modal, (TQt::WFlags) f)); - QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); - } - return; -} - -JNIEXPORT jstring JNICALL -Java_org_trinitydesktop_qt_QSemiModal_tr__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring arg1) -{ - TQString _qstring; - (void) cls; -static TQCString* _qstring_arg1 = 0; - _qstring = TQSemiModalJBridge::tr((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1)); - return QtSupport::fromTQString(env, &_qstring); -} - -JNIEXPORT jstring JNICALL -Java_org_trinitydesktop_qt_QSemiModal_tr__Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring arg1, jstring arg2) -{ - TQString _qstring; - (void) cls; -static TQCString* _qstring_arg1 = 0; -static TQCString* _qstring_arg2 = 0; - _qstring = TQSemiModalJBridge::tr((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (const char*) QtSupport::toCharString(env, arg2, &_qstring_arg2)); - return QtSupport::fromTQString(env, &_qstring); -} - diff --git a/qtjava/javalib/qtjava/TQSemiModal.h b/qtjava/javalib/qtjava/TQSemiModal.h deleted file mode 100644 index cc7bba39..00000000 --- a/qtjava/javalib/qtjava/TQSemiModal.h +++ /dev/null @@ -1,30 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ - -#ifndef __org_trinitydesktop_qt_QSemiModal__ -#define __org_trinitydesktop_qt_QSemiModal__ - -#include <jni.h> - -#ifdef __cplusplus -extern "C" -{ -#endif - -extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QSemiModal_metaObject (JNIEnv *env, jobject); -extern JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QSemiModal_className (JNIEnv *env, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSemiModal_newTQSemiModal__Lorg_trinitydesktop_qt_QWidget_2Ljava_lang_String_2ZI (JNIEnv *env, jobject, jobject, jstring, jboolean, jint); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSemiModal_newTQSemiModal__Lorg_trinitydesktop_qt_QWidget_2Ljava_lang_String_2Z (JNIEnv *env, jobject, jobject, jstring, jboolean); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSemiModal_newTQSemiModal__Lorg_trinitydesktop_qt_QWidget_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSemiModal_newTQSemiModal__Lorg_trinitydesktop_qt_QWidget_2 (JNIEnv *env, jobject, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSemiModal_newTQSemiModal__ (JNIEnv *env, jobject); -extern JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QSemiModal_tr__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jstring); -extern JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QSemiModal_tr__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSemiModal_finalize (JNIEnv *env, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSemiModal_dispose (JNIEnv *env, jobject); -extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QSemiModal_isDisposed (JNIEnv *env, jobject); - -#ifdef __cplusplus -} -#endif - -#endif /* __org_trinitydesktop_qt_QSemiModal__ */ diff --git a/qtjava/javalib/qtjava/TQSignal.cpp b/qtjava/javalib/qtjava/TQSignal.cpp index 0dd4ef00..9a37dc57 100644 --- a/qtjava/javalib/qtjava/TQSignal.cpp +++ b/qtjava/javalib/qtjava/TQSignal.cpp @@ -59,13 +59,6 @@ Java_org_trinitydesktop_qt_QSignal_activate(JNIEnv* env, jobject obj) return; } -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QSignal_block(JNIEnv* env, jobject obj, jboolean b) -{ - ((TQSignal*) QtSupport::getQt(env, obj))->block((bool) b); - return; -} - JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QSignal_className(JNIEnv* env, jobject obj) { @@ -113,13 +106,6 @@ Java_org_trinitydesktop_qt_QSignal_finalize(JNIEnv* env, jobject obj) } JNIEXPORT jboolean JNICALL -Java_org_trinitydesktop_qt_QSignal_isBlocked(JNIEnv* env, jobject obj) -{ - jboolean xret = (jboolean) ((TQSignal*) QtSupport::getQt(env, obj))->isBlocked(); - return xret; -} - -JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QSignal_isDisposed(JNIEnv* env, jobject obj) { return (QtSupport::getQt(env, obj) == 0); @@ -163,20 +149,6 @@ static TQCString* _qstring_name = 0; return; } -JNIEXPORT jint JNICALL -Java_org_trinitydesktop_qt_QSignal_parameter(JNIEnv* env, jobject obj) -{ - jint xret = (jint) ((TQSignal*) QtSupport::getQt(env, obj))->parameter(); - return xret; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QSignal_setParameter(JNIEnv* env, jobject obj, jint value) -{ - ((TQSignal*) QtSupport::getQt(env, obj))->setParameter((int) value); - return; -} - JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSignal_setValue(JNIEnv* env, jobject obj, jobject value) { diff --git a/qtjava/javalib/qtjava/TQSignal.h b/qtjava/javalib/qtjava/TQSignal.h index e8a2f296..15997e2b 100644 --- a/qtjava/javalib/qtjava/TQSignal.h +++ b/qtjava/javalib/qtjava/TQSignal.h @@ -19,10 +19,6 @@ extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QSignal_connect (JN extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QSignal_disconnect__Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QSignal_disconnect__Lorg_trinitydesktop_qt_QObject_2 (JNIEnv *env, jobject, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSignal_activate (JNIEnv *env, jobject); -extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QSignal_isBlocked (JNIEnv *env, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSignal_block (JNIEnv *env, jobject, jboolean); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSignal_setParameter (JNIEnv *env, jobject, jint); -extern JNIEXPORT jint JNICALL Java_org_trinitydesktop_qt_QSignal_parameter (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSignal_setValue (JNIEnv *env, jobject, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QSignal_value (JNIEnv *env, jobject); extern JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QSignal_tr__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jstring); diff --git a/qtjava/javalib/qtjava/TQToolButton.cpp b/qtjava/javalib/qtjava/TQToolButton.cpp index 372ec0df..af6ad45a 100644 --- a/qtjava/javalib/qtjava/TQToolButton.cpp +++ b/qtjava/javalib/qtjava/TQToolButton.cpp @@ -473,13 +473,6 @@ Java_org_trinitydesktop_qt_QToolButton_iconSet__(JNIEnv* env, jobject obj) return xret; } -JNIEXPORT jobject JNICALL -Java_org_trinitydesktop_qt_QToolButton_iconSet__Z(JNIEnv* env, jobject obj, jboolean on) -{ - jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(((TQToolButton*) QtSupport::getQt(env, obj))->iconSet((bool) on)), "org.trinitydesktop.qt.TQIconSet", TRUE); - return xret; -} - JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QToolButton_isDisposed(JNIEnv* env, jobject obj) { @@ -588,20 +581,6 @@ static TQCString* _qstring_name = 0; return; } -JNIEXPORT jobject JNICALL -Java_org_trinitydesktop_qt_QToolButton_offIconSet(JNIEnv* env, jobject obj) -{ - jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(((TQToolButton*) QtSupport::getQt(env, obj))->offIconSet()), "org.trinitydesktop.qt.TQIconSet", TRUE); - return xret; -} - -JNIEXPORT jobject JNICALL -Java_org_trinitydesktop_qt_QToolButton_onIconSet(JNIEnv* env, jobject obj) -{ - jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(((TQToolButton*) QtSupport::getQt(env, obj))->onIconSet()), "org.trinitydesktop.qt.TQIconSet", TRUE); - return xret; -} - JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_openPopup(JNIEnv* env, jobject obj) { @@ -645,27 +624,6 @@ Java_org_trinitydesktop_qt_QToolButton_setIconSet__Lorg_trinitydesktop_qt_QIconS } JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QToolButton_setIconSet__Lorg_trinitydesktop_qt_QIconSet_2Z(JNIEnv* env, jobject obj, jobject arg1, jboolean on) -{ - ((TQToolButton*) QtSupport::getQt(env, obj))->setIconSet((const TQIconSet&)*(const TQIconSet*) QtSupport::getQt(env, arg1), (bool) on); - return; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QToolButton_setOffIconSet(JNIEnv* env, jobject obj, jobject arg1) -{ - ((TQToolButton*) QtSupport::getQt(env, obj))->setOffIconSet((const TQIconSet&)*(const TQIconSet*) QtSupport::getQt(env, arg1)); - return; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QToolButton_setOnIconSet(JNIEnv* env, jobject obj, jobject arg1) -{ - ((TQToolButton*) QtSupport::getQt(env, obj))->setOnIconSet((const TQIconSet&)*(const TQIconSet*) QtSupport::getQt(env, arg1)); - return; -} - -JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_setOn(JNIEnv* env, jobject obj, jboolean enable) { ((TQToolButton*) QtSupport::getQt(env, obj))->setOn((bool) enable); diff --git a/qtjava/javalib/qtjava/TQToolButton.h b/qtjava/javalib/qtjava/TQToolButton.h index 6a34cf61..563369ee 100644 --- a/qtjava/javalib/qtjava/TQToolButton.h +++ b/qtjava/javalib/qtjava/TQToolButton.h @@ -20,12 +20,6 @@ extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_newTQToolBu extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_newTQToolButton__ILorg_trinitydesktop_qt_QWidget_2 (JNIEnv *env, jobject, jint, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QToolButton_sizeHint (JNIEnv *env, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QToolButton_minimumSizeHint (JNIEnv *env, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_setOnIconSet (JNIEnv *env, jobject, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_setOffIconSet (JNIEnv *env, jobject, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_setIconSet__Lorg_trinitydesktop_qt_QIconSet_2Z (JNIEnv *env, jobject, jobject, jboolean); -extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QToolButton_onIconSet (JNIEnv *env, jobject); -extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QToolButton_offIconSet (JNIEnv *env, jobject); -extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QToolButton_iconSet__Z (JNIEnv *env, jobject, jboolean); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_setIconSet__Lorg_trinitydesktop_qt_QIconSet_2 (JNIEnv *env, jobject, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QToolButton_iconSet__ (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QToolButton_usesBigPixmap (JNIEnv *env, jobject); diff --git a/qtjava/javalib/test/AppWizardBase.java b/qtjava/javalib/test/AppWizardBase.java index 7eec9481..fcb04c79 100644 --- a/qtjava/javalib/test/AppWizardBase.java +++ b/qtjava/javalib/test/AppWizardBase.java @@ -181,8 +181,8 @@ AppWizardBase( TQWidget parent, String name, boolean modal, int fl ) addPage( privateWidget_2, tr( "Header" ) ); // signals and slots connections - connect( loadheader_button, SIGNAL( "clicked()" ), this, SLOT( "slotLoadHeader()" ) ); - connect( newheader_button, SIGNAL( "clicked()" ), this, SLOT( "slotNewHeader()" ) ); + connect( loadheader_button, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "slotLoadHeader()" ) ); + connect( newheader_button, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "slotNewHeader()" ) ); // tab order setTabOrder( loadheader_button, newheader_button ); diff --git a/qtjava/javalib/test/FilePropsPageBase.java b/qtjava/javalib/test/FilePropsPageBase.java index d583a05b..48e79172 100644 --- a/qtjava/javalib/test/FilePropsPageBase.java +++ b/qtjava/javalib/test/FilePropsPageBase.java @@ -114,8 +114,8 @@ public FilePropsPageBase( TQWidget parent, String name, int fl ) grid.addWidget( desc_textview, 1, 1 ); // signals and slots connections - connect( classname_edit, SIGNAL( "textChanged(String)" ), this, SLOT( "slotClassnameChanged(String)" ) ); - connect( classes_listbox, SIGNAL( "mouseButtonClicked(int,TQListBoxItem,TQPoint)" ), this, SLOT( "slotSelectionChanged()" ) ); + connect( classname_edit, TQ_SIGNAL( "textChanged(String)" ), this, TQ_SLOT( "slotClassnameChanged(String)" ) ); + connect( classes_listbox, TQ_SIGNAL( "mouseButtonClicked(int,TQListBoxItem,TQPoint)" ), this, TQ_SLOT( "slotSelectionChanged()" ) ); // tab order setTabOrder( classes_listbox, classname_edit ); diff --git a/qtjava/javalib/test/ISBNValidator.java b/qtjava/javalib/test/ISBNValidator.java index 1f03525e..1d909a10 100644 --- a/qtjava/javalib/test/ISBNValidator.java +++ b/qtjava/javalib/test/ISBNValidator.java @@ -148,8 +148,8 @@ public class ISBNValidator extends TQValidator // set up a receiver for the returnPressed() signal ReturnReceiver receiver = new ReturnReceiver(); - TQObject.connect( myedit, SIGNAL( "returnPressed()" ), - receiver, SLOT( "slotReturnPressed()" ) ); + TQObject.connect( myedit, TQ_SIGNAL( "returnPressed()" ), + receiver, TQ_SLOT( "slotReturnPressed()" ) ); myapp.setMainWidget( myedit ); myedit.show(); diff --git a/qtjava/javalib/test/ScribbleWindow.java b/qtjava/javalib/test/ScribbleWindow.java index 33296e3d..fc040f17 100644 --- a/qtjava/javalib/test/ScribbleWindow.java +++ b/qtjava/javalib/test/ScribbleWindow.java @@ -42,7 +42,7 @@ public class ScribbleWindow extends TQWidget { // create a pop-up menu _popupmenu = new TQPopupMenu(); - _popupmenu.insertItem( "&Clear", this, SLOT( "slotClearArea()" ) ); + _popupmenu.insertItem( "&Clear", this, TQ_SLOT( "slotClearArea()" ) ); } /** @@ -167,10 +167,10 @@ public class ScribbleWindow extends TQWidget { /* The next lines build the menu bar. We first create the menus * one by one, then add them to the menu bar. */ _filemenu = new TQPopupMenu(); // create a file menu - _filemenu.insertItem( "&Load", this, SLOT( "slotLoad()" ) ); - _filemenu.insertItem( "&Save", this, SLOT( "slotSave()" ) ); + _filemenu.insertItem( "&Load", this, TQ_SLOT( "slotLoad()" ) ); + _filemenu.insertItem( "&Save", this, TQ_SLOT( "slotSave()" ) ); _filemenu.insertSeparator(); - _filemenu.insertItem( "&Quit", tqApp(), SLOT( "quit()" ) ); + _filemenu.insertItem( "&Quit", tqApp(), TQ_SLOT( "quit()" ) ); _colormenu = new TQPopupMenu(); // create a color menu _colormenu.insertItem( "B&lack", COLOR_MENU_ID_BLACK); @@ -178,12 +178,12 @@ public class ScribbleWindow extends TQWidget { _colormenu.insertItem( "&Blue", COLOR_MENU_ID_BLUE); _colormenu.insertItem( "&Green", COLOR_MENU_ID_GREEN); _colormenu.insertItem( "&Yellow", COLOR_MENU_ID_YELLOW); - TQObject.connect( _colormenu, SIGNAL( "activated( int )" ), - this, SLOT( "slotColorMenu( int )" ) ); + TQObject.connect( _colormenu, TQ_SIGNAL( "activated( int )" ), + this, TQ_SLOT( "slotColorMenu( int )" ) ); _helpmenu = new TQPopupMenu(); // create a help menu - _helpmenu.insertItem( "&About QtScribble", this, SLOT( "slotAbout()" ) ); - _helpmenu.insertItem( "&About Qt", this, SLOT( "slotAboutQt()" ) ); + _helpmenu.insertItem( "&About QtScribble", this, TQ_SLOT( "slotAbout()" ) ); + _helpmenu.insertItem( "&About Qt", this, TQ_SLOT( "slotAboutQt()" ) ); _menubar = new TQMenuBar( this, "" ); // create a menu bar _menubar.insertItem( "&File", _filemenu ); @@ -198,12 +198,12 @@ public class ScribbleWindow extends TQWidget { _scribblearea = new ScribbleArea(); _scribblearea.setGeometry( 0, 0, 1000, 1000 ); _scrollview.addChild( _scribblearea ); - TQObject.connect( this, SIGNAL( "colorChanged( TQColor )" ), - _scribblearea, SLOT( "setColor( TQColor )" ) ); - TQObject.connect( this, SIGNAL( "save( String )" ), - _scribblearea, SLOT( "slotSave( String )" ) ); - TQObject.connect( this, SIGNAL( "load(String)" ), - _scribblearea, SLOT( "slotLoad( String )" ) ); + TQObject.connect( this, TQ_SIGNAL( "colorChanged( TQColor )" ), + _scribblearea, TQ_SLOT( "setColor( TQColor )" ) ); + TQObject.connect( this, TQ_SIGNAL( "save( String )" ), + _scribblearea, TQ_SLOT( "slotSave( String )" ) ); + TQObject.connect( this, TQ_SIGNAL( "load(String)" ), + _scribblearea, TQ_SLOT( "slotLoad( String )" ) ); } protected void resizeEvent( TQResizeEvent event ) diff --git a/qtjava/javalib/test/SignalForwarder.java b/qtjava/javalib/test/SignalForwarder.java index 28d02560..1d6f2726 100644 --- a/qtjava/javalib/test/SignalForwarder.java +++ b/qtjava/javalib/test/SignalForwarder.java @@ -4,8 +4,8 @@ public class SignalForwarder extends TQDialog { SignalForwarder() { TQPushButton searchButton = new TQPushButton("Search", this); - connect( searchButton, SIGNAL("clicked()"), this, SIGNAL("continueSearch()")); - connect( this, SIGNAL("continueSearch()"), this, SLOT("slotContinueSearch()")); + connect( searchButton, TQ_SIGNAL("clicked()"), this, TQ_SIGNAL("continueSearch()")); + connect( this, TQ_SIGNAL("continueSearch()"), this, TQ_SLOT("slotContinueSearch()")); } public void slotContinueSearch() diff --git a/qtjava/javalib/test/TQTimerTest.java b/qtjava/javalib/test/TQTimerTest.java index c10af496..c68fe67e 100644 --- a/qtjava/javalib/test/TQTimerTest.java +++ b/qtjava/javalib/test/TQTimerTest.java @@ -44,7 +44,7 @@ public class TQTimerTest extends TQWidget { // create a pop-up menu _popupmenu = new TQPopupMenu(); - _popupmenu.insertItem( "&Clear", this, Qt.SLOT( "slotClearArea()" ) ); + _popupmenu.insertItem( "&Clear", this, Qt.TQ_SLOT( "slotClearArea()" ) ); } /** @@ -170,10 +170,10 @@ public class TQTimerTest extends TQWidget { /* The next lines build the menu bar. We first create the menus * one by one, then add them to the menu bar. */ _filemenu = new TQPopupMenu(); // create a file menu - _filemenu.insertItem( "&Load", this, Qt.SLOT( "slotLoad()" ) ); - _filemenu.insertItem( "&Save", this, Qt.SLOT( "slotSave()" ) ); + _filemenu.insertItem( "&Load", this, Qt.TQ_SLOT( "slotLoad()" ) ); + _filemenu.insertItem( "&Save", this, Qt.TQ_SLOT( "slotSave()" ) ); _filemenu.insertSeparator(); - _filemenu.insertItem( "&Quit", Qt.qApp(), Qt.SLOT( "quit()" ) ); + _filemenu.insertItem( "&Quit", Qt.qApp(), Qt.TQ_SLOT( "quit()" ) ); _colormenu = new TQPopupMenu(); // create a color menu _colormenu.insertItem( "B&lack", COLOR_MENU_ID_BLACK); @@ -181,12 +181,12 @@ public class TQTimerTest extends TQWidget { _colormenu.insertItem( "&Blue", COLOR_MENU_ID_BLUE); _colormenu.insertItem( "&Green", COLOR_MENU_ID_GREEN); _colormenu.insertItem( "&Yellow", COLOR_MENU_ID_YELLOW); - TQObject.connect( _colormenu, SIGNAL( "activated(int)" ), - this, SLOT( "slotColorMenu(int)" ) ); + TQObject.connect( _colormenu, TQ_SIGNAL( "activated(int)" ), + this, TQ_SLOT( "slotColorMenu(int)" ) ); _helpmenu = new TQPopupMenu(); // create a help menu - _helpmenu.insertItem( "&About QtScribble", this, SLOT( "slotAbout()" ) ); - _helpmenu.insertItem( "&About Qt", this, SLOT( "slotAboutQt()" ) ); + _helpmenu.insertItem( "&About QtScribble", this, TQ_SLOT( "slotAbout()" ) ); + _helpmenu.insertItem( "&About Qt", this, TQ_SLOT( "slotAboutQt()" ) ); _menubar = new TQMenuBar( this, "" ); // create a menu bar _menubar.insertItem( "&File", _filemenu ); @@ -201,12 +201,12 @@ public class TQTimerTest extends TQWidget { _scribblearea = new ScribbleArea(); _scribblearea.setGeometry( 0, 0, 1000, 1000 ); _scrollview.addChild( _scribblearea ); - TQObject.connect( this, SIGNAL( "colorChanged(TQColor)" ), - _scribblearea, SLOT( "setColor(TQColor)" ) ); - TQObject.connect( this, SIGNAL( "save(java.lang.String)" ), - _scribblearea, SLOT( "slotSave(java.lang.String)" ) ); - TQObject.connect( this, SIGNAL( "load(java.lang.String)" ), - _scribblearea, SLOT( "slotLoad(java.lang.String)" ) ); + TQObject.connect( this, TQ_SIGNAL( "colorChanged(TQColor)" ), + _scribblearea, TQ_SLOT( "setColor(TQColor)" ) ); + TQObject.connect( this, TQ_SIGNAL( "save(java.lang.String)" ), + _scribblearea, TQ_SLOT( "slotSave(java.lang.String)" ) ); + TQObject.connect( this, TQ_SIGNAL( "load(java.lang.String)" ), + _scribblearea, TQ_SLOT( "slotLoad(java.lang.String)" ) ); } public void resizeEvent( TQResizeEvent event ) @@ -298,8 +298,8 @@ public class TQTimerTest extends TQWidget { mywidget.setGeometry(50, 500, 400, 400); TQTimer timer = new TQTimer( mywidget ); - connect( timer, Qt.SIGNAL("timeout()"), - mywidget, Qt.SLOT("timerDone()") ); + connect( timer, Qt.TQ_SIGNAL("timeout()"), + mywidget, Qt.TQ_SLOT("timerDone()") ); timer.start( 2000, false ); // 2 seconds single-shot myapp.setMainWidget(mywidget); diff --git a/qtjava/javalib/tutorial/t10/LCDRange.java b/qtjava/javalib/tutorial/t10/LCDRange.java index 877c65de..71fdd7e0 100644 --- a/qtjava/javalib/tutorial/t10/LCDRange.java +++ b/qtjava/javalib/tutorial/t10/LCDRange.java @@ -10,10 +10,10 @@ public class LCDRange extends TQVBox { slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); } diff --git a/qtjava/javalib/tutorial/t10/Tut10.java b/qtjava/javalib/tutorial/t10/Tut10.java index 2ad781f8..4fd64bb0 100644 --- a/qtjava/javalib/tutorial/t10/Tut10.java +++ b/qtjava/javalib/tutorial/t10/Tut10.java @@ -5,7 +5,7 @@ public class Tut10 extends TQWidget { TQPushButton quit = new TQPushButton("&Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange(this, "angle"); angle.setRange(5, 70); @@ -15,15 +15,15 @@ public class Tut10 extends TQWidget { CannonField cannonField = new CannonField(this, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); - connect(force, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setForce(int)")); - connect(cannonField, SIGNAL("forceChanged(int)"), - force, SLOT("setValue(int)")); + connect(force, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setForce(int)")); + connect(cannonField, TQ_SIGNAL("forceChanged(int)"), + force, TQ_SLOT("setValue(int)")); TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null); grid.addWidget(quit, 0, 0); diff --git a/qtjava/javalib/tutorial/t11/CannonField.java b/qtjava/javalib/tutorial/t11/CannonField.java index 8ba81253..5b4e494a 100644 --- a/qtjava/javalib/tutorial/t11/CannonField.java +++ b/qtjava/javalib/tutorial/t11/CannonField.java @@ -16,8 +16,8 @@ public class CannonField extends TQWidget { f = 0; timerCount = 0; autoShootTimer = new TQTimer(this, "movement handler"); - connect(autoShootTimer, SIGNAL("timeout()"), - this, SLOT("moveShot()")); + connect(autoShootTimer, TQ_SIGNAL("timeout()"), + this, TQ_SLOT("moveShot()")); shoot_ang = 0; shoot_f = 0; diff --git a/qtjava/javalib/tutorial/t11/LCDRange.java b/qtjava/javalib/tutorial/t11/LCDRange.java index 877c65de..71fdd7e0 100644 --- a/qtjava/javalib/tutorial/t11/LCDRange.java +++ b/qtjava/javalib/tutorial/t11/LCDRange.java @@ -10,10 +10,10 @@ public class LCDRange extends TQVBox { slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); } diff --git a/qtjava/javalib/tutorial/t11/Tut11.java b/qtjava/javalib/tutorial/t11/Tut11.java index 3eb3153f..54effd1f 100644 --- a/qtjava/javalib/tutorial/t11/Tut11.java +++ b/qtjava/javalib/tutorial/t11/Tut11.java @@ -5,7 +5,7 @@ public class Tut11 extends TQWidget { TQPushButton quit = new TQPushButton("&Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange(this, "angle"); angle.setRange(5, 70); @@ -15,21 +15,21 @@ public class Tut11 extends TQWidget { CannonField cannonField = new CannonField(this, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); - connect(force, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setForce(int)")); - connect(cannonField, SIGNAL("forceChanged(int)"), - force, SLOT("setValue(int)")); + connect(force, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setForce(int)")); + connect(cannonField, TQ_SIGNAL("forceChanged(int)"), + force, TQ_SLOT("setValue(int)")); TQPushButton shoot = new TQPushButton("&Shoot", this, "shoot"); shoot.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(shoot, SIGNAL("clicked()"), cannonField, SLOT("shoot()")); + connect(shoot, TQ_SIGNAL("clicked()"), cannonField, TQ_SLOT("shoot()")); TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null); grid.addWidget(quit, 0, 0); diff --git a/qtjava/javalib/tutorial/t12/CannonField.java b/qtjava/javalib/tutorial/t12/CannonField.java index d5c53ce7..b897b172 100644 --- a/qtjava/javalib/tutorial/t12/CannonField.java +++ b/qtjava/javalib/tutorial/t12/CannonField.java @@ -19,8 +19,8 @@ public class CannonField extends TQWidget { f = 0; timerCount = 0; autoShootTimer = new TQTimer(this, "movement handler"); - connect(autoShootTimer, SIGNAL("timeout()"), - this, SLOT("moveShot()")); + connect(autoShootTimer, TQ_SIGNAL("timeout()"), + this, TQ_SLOT("moveShot()")); shoot_ang = 0; shoot_f = 0; target = new TQPoint(0, 0); diff --git a/qtjava/javalib/tutorial/t12/LCDRange.java b/qtjava/javalib/tutorial/t12/LCDRange.java index 7992b586..c0e96890 100644 --- a/qtjava/javalib/tutorial/t12/LCDRange.java +++ b/qtjava/javalib/tutorial/t12/LCDRange.java @@ -24,10 +24,10 @@ public class LCDRange extends TQVBox { label = new TQLabel(" ", this, "label", 0); label.setAlignment(AlignCenter); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); } diff --git a/qtjava/javalib/tutorial/t12/Tut12.java b/qtjava/javalib/tutorial/t12/Tut12.java index 845a206b..40da9321 100644 --- a/qtjava/javalib/tutorial/t12/Tut12.java +++ b/qtjava/javalib/tutorial/t12/Tut12.java @@ -5,7 +5,7 @@ public class Tut12 extends TQWidget { TQPushButton quit = new TQPushButton("&Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange("ANGLE", this, "angle"); angle.setRange(5, 70); @@ -15,21 +15,21 @@ public class Tut12 extends TQWidget { CannonField cannonField = new CannonField(this, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); - connect(force, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setForce(int)")); - connect(cannonField, SIGNAL("forceChanged(int)"), - force, SLOT("setValue(int)")); + connect(force, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setForce(int)")); + connect(cannonField, TQ_SIGNAL("forceChanged(int)"), + force, TQ_SLOT("setValue(int)")); TQPushButton shoot = new TQPushButton("&Shoot", this, "shoot"); shoot.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(shoot, SIGNAL("clicked()"), cannonField, SLOT("shoot()")); + connect(shoot, TQ_SIGNAL("clicked()"), cannonField, TQ_SLOT("shoot()")); TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null); grid.addWidget(quit, 0, 0); diff --git a/qtjava/javalib/tutorial/t13/CannonField.java b/qtjava/javalib/tutorial/t13/CannonField.java index b53dfed9..db35ce1b 100644 --- a/qtjava/javalib/tutorial/t13/CannonField.java +++ b/qtjava/javalib/tutorial/t13/CannonField.java @@ -21,8 +21,8 @@ public class CannonField extends TQWidget { f = 0; timerCount = 0; autoShootTimer = new TQTimer(this, "movement handler"); - connect(autoShootTimer, SIGNAL("timeout()"), - this, SLOT("moveShot()")); + connect(autoShootTimer, TQ_SIGNAL("timeout()"), + this, TQ_SLOT("moveShot()")); shoot_ang = 0; shoot_f = 0; target = new TQPoint(0, 0); diff --git a/qtjava/javalib/tutorial/t13/GameBoard.java b/qtjava/javalib/tutorial/t13/GameBoard.java index 25ff0a1e..c887498f 100644 --- a/qtjava/javalib/tutorial/t13/GameBoard.java +++ b/qtjava/javalib/tutorial/t13/GameBoard.java @@ -9,7 +9,7 @@ public class GameBoard extends TQWidget { TQPushButton quit = new TQPushButton("&Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange("ANGLE", this, "angle"); angle.setRange(5, 70); @@ -19,32 +19,32 @@ public class GameBoard extends TQWidget { cannonField = new CannonField(this, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); - connect(force, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setForce(int)")); - connect(cannonField, SIGNAL("forceChanged(int)"), - force, SLOT("setValue(int)")); + connect(force, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setForce(int)")); + connect(cannonField, TQ_SIGNAL("forceChanged(int)"), + force, TQ_SLOT("setValue(int)")); - connect(cannonField, SIGNAL("hit()"), - this, SLOT("hit()")); - connect(cannonField, SIGNAL("missed()"), - this, SLOT("missed()")); + connect(cannonField, TQ_SIGNAL("hit()"), + this, TQ_SLOT("hit()")); + connect(cannonField, TQ_SIGNAL("missed()"), + this, TQ_SLOT("missed()")); TQPushButton shoot = new TQPushButton("&Shoot", this, "shoot"); shoot.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(shoot, SIGNAL("clicked()"), SLOT("fire()")); - connect(cannonField, SIGNAL("canShoot(boolean)"), - shoot, SLOT("setEnabled(boolean)")); + connect(shoot, TQ_SIGNAL("clicked()"), TQ_SLOT("fire()")); + connect(cannonField, TQ_SIGNAL("canShoot(boolean)"), + shoot, TQ_SLOT("setEnabled(boolean)")); TQPushButton restart = new TQPushButton("&New Game", this, "newgame"); restart.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(restart, SIGNAL("clicked()"), this, SLOT("newGame()")); + connect(restart, TQ_SIGNAL("clicked()"), this, TQ_SLOT("newGame()")); hits = new TQLCDNumber(2, this, "hits"); shotsLeft = new TQLCDNumber(2, this, "shotsleft"); diff --git a/qtjava/javalib/tutorial/t13/LCDRange.java b/qtjava/javalib/tutorial/t13/LCDRange.java index 27741f89..794bc72b 100644 --- a/qtjava/javalib/tutorial/t13/LCDRange.java +++ b/qtjava/javalib/tutorial/t13/LCDRange.java @@ -24,10 +24,10 @@ public class LCDRange extends TQWidget { label = new TQLabel(" ", this, "label", 0); label.setAlignment(AlignCenter); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); diff --git a/qtjava/javalib/tutorial/t14/CannonField.java b/qtjava/javalib/tutorial/t14/CannonField.java index a38a71a3..e2a3037f 100644 --- a/qtjava/javalib/tutorial/t14/CannonField.java +++ b/qtjava/javalib/tutorial/t14/CannonField.java @@ -22,8 +22,8 @@ public class CannonField extends TQWidget { f = 0; timerCount = 0; autoShootTimer = new TQTimer(this, "movement handler"); - connect(autoShootTimer, SIGNAL("timeout()"), - this, SLOT("moveShot()")); + connect(autoShootTimer, TQ_SIGNAL("timeout()"), + this, TQ_SLOT("moveShot()")); shoot_ang = 0; shoot_f = 0; target = new TQPoint(0, 0); diff --git a/qtjava/javalib/tutorial/t14/GameBoard.java b/qtjava/javalib/tutorial/t14/GameBoard.java index f44af538..6bc66b17 100644 --- a/qtjava/javalib/tutorial/t14/GameBoard.java +++ b/qtjava/javalib/tutorial/t14/GameBoard.java @@ -10,7 +10,7 @@ public class GameBoard extends TQWidget { TQPushButton quit = new TQPushButton("&Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange("ANGLE", this, "angle"); angle.setRange(5, 70); @@ -23,30 +23,30 @@ public class GameBoard extends TQWidget { cannonField = new CannonField(box, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); - connect(force, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setForce(int)")); - connect(cannonField, SIGNAL("forceChanged(int)"), - force, SLOT("setValue(int)")); + connect(force, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setForce(int)")); + connect(cannonField, TQ_SIGNAL("forceChanged(int)"), + force, TQ_SLOT("setValue(int)")); - connect(cannonField, SIGNAL("hit()"), - this, SLOT("hit()")); - connect(cannonField, SIGNAL("missed()"), - this, SLOT("missed()")); + connect(cannonField, TQ_SIGNAL("hit()"), + this, TQ_SLOT("hit()")); + connect(cannonField, TQ_SIGNAL("missed()"), + this, TQ_SLOT("missed()")); TQPushButton shoot = new TQPushButton("&Shoot", this, "shoot"); shoot.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(shoot, SIGNAL("clicked()"), SLOT("fire()")); + connect(shoot, TQ_SIGNAL("clicked()"), TQ_SLOT("fire()")); TQPushButton restart = new TQPushButton("&New Game", this, "newgame"); restart.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(restart, SIGNAL("clicked()"), this, SLOT("newGame()")); + connect(restart, TQ_SIGNAL("clicked()"), this, TQ_SLOT("newGame()")); hits = new TQLCDNumber(2, this, "hits"); shotsLeft = new TQLCDNumber(2, this, "shotsleft"); @@ -54,13 +54,13 @@ public class GameBoard extends TQWidget { TQLabel shotsLeftL = new TQLabel("SHOTS LEFT", this, "shotsleftLabel", 0); TQAccel accel = new TQAccel(this); - accel.connectItem(accel.insertItem(new TQKeySequence(Key_Enter)), this, SLOT("fire()")); - accel.connectItem(accel.insertItem(new TQKeySequence(Key_Return)), this, SLOT("fire()")); - accel.connectItem(accel.insertItem(new TQKeySequence(CTRL+Key_Q)), tqApp(), SLOT("quit()")); + accel.connectItem(accel.insertItem(new TQKeySequence(Key_Enter)), this, TQ_SLOT("fire()")); + accel.connectItem(accel.insertItem(new TQKeySequence(Key_Return)), this, TQ_SLOT("fire()")); + accel.connectItem(accel.insertItem(new TQKeySequence(CTRL+Key_Q)), tqApp(), TQ_SLOT("quit()")); /*** - accel.connectItem(accel.insertItem(Key_Enter), this, SLOT("fire()")); - accel.connectItem(accel.insertItem(Key_Return), this, SLOT("fire()")); - accel.connectItem(accel.insertItem(CTRL+Key_Q), tqApp(), SLOT("quit()")); + accel.connectItem(accel.insertItem(Key_Enter), this, TQ_SLOT("fire()")); + accel.connectItem(accel.insertItem(Key_Return), this, TQ_SLOT("fire()")); + accel.connectItem(accel.insertItem(CTRL+Key_Q), tqApp(), TQ_SLOT("quit()")); ***/ TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null); grid.addWidget(quit, 0, 0); diff --git a/qtjava/javalib/tutorial/t14/LCDRange.java b/qtjava/javalib/tutorial/t14/LCDRange.java index 27741f89..794bc72b 100644 --- a/qtjava/javalib/tutorial/t14/LCDRange.java +++ b/qtjava/javalib/tutorial/t14/LCDRange.java @@ -24,10 +24,10 @@ public class LCDRange extends TQWidget { label = new TQLabel(" ", this, "label", 0); label.setAlignment(AlignCenter); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); diff --git a/qtjava/javalib/tutorial/t2/Tut2.java b/qtjava/javalib/tutorial/t2/Tut2.java index f5a31bb2..7b27ff11 100644 --- a/qtjava/javalib/tutorial/t2/Tut2.java +++ b/qtjava/javalib/tutorial/t2/Tut2.java @@ -7,7 +7,7 @@ public class Tut2 extends TQObject { quit.resize( 75, 30 ); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), a, SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), a, TQ_SLOT("quit()")); a.setMainWidget(quit); quit.show(); diff --git a/qtjava/javalib/tutorial/t3/Tut3.java b/qtjava/javalib/tutorial/t3/Tut3.java index ef6fc013..119eec97 100644 --- a/qtjava/javalib/tutorial/t3/Tut3.java +++ b/qtjava/javalib/tutorial/t3/Tut3.java @@ -10,7 +10,7 @@ public class Tut3 extends TQObject { TQPushButton quit = new TQPushButton("Quit", box); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), a, SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), a, TQ_SLOT("quit()")); a.setMainWidget(box); box.show(); diff --git a/qtjava/javalib/tutorial/t4/Tut4.java b/qtjava/javalib/tutorial/t4/Tut4.java index 6b14729d..801e7235 100644 --- a/qtjava/javalib/tutorial/t4/Tut4.java +++ b/qtjava/javalib/tutorial/t4/Tut4.java @@ -9,7 +9,7 @@ public class Tut4 extends TQWidget { quit.setGeometry(62, 40, 75, 30); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); } public static void main(String[] args) { diff --git a/qtjava/javalib/tutorial/t5/Tut5.java b/qtjava/javalib/tutorial/t5/Tut5.java index 61e02748..74802681 100644 --- a/qtjava/javalib/tutorial/t5/Tut5.java +++ b/qtjava/javalib/tutorial/t5/Tut5.java @@ -5,7 +5,7 @@ public class Tut5 extends TQVBox { TQPushButton quit = new TQPushButton("Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); TQLCDNumber lcd = new TQLCDNumber(2, this, "lcd"); @@ -13,7 +13,7 @@ public class Tut5 extends TQVBox { slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), lcd, SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), lcd, TQ_SLOT("display(int)")); } public static void main(String[] args) { diff --git a/qtjava/javalib/tutorial/t6/LCDRange.java b/qtjava/javalib/tutorial/t6/LCDRange.java index a1d45a47..4d8e6c7c 100644 --- a/qtjava/javalib/tutorial/t6/LCDRange.java +++ b/qtjava/javalib/tutorial/t6/LCDRange.java @@ -7,7 +7,7 @@ public class LCDRange extends TQVBox { TQSlider slider = new TQSlider(Horizontal, this, "slider"); slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), lcd, SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), lcd, TQ_SLOT("display(int)")); } public LCDRange(TQWidget parent) { this(parent, null); diff --git a/qtjava/javalib/tutorial/t6/Tut6.java b/qtjava/javalib/tutorial/t6/Tut6.java index 011742c8..4d3da228 100644 --- a/qtjava/javalib/tutorial/t6/Tut6.java +++ b/qtjava/javalib/tutorial/t6/Tut6.java @@ -5,7 +5,7 @@ public class Tut6 extends TQVBox { TQPushButton quit = new TQPushButton("Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); TQGrid grid = new TQGrid(4, this, null, 0); diff --git a/qtjava/javalib/tutorial/t7/LCDRange.java b/qtjava/javalib/tutorial/t7/LCDRange.java index 62590013..2192de7c 100644 --- a/qtjava/javalib/tutorial/t7/LCDRange.java +++ b/qtjava/javalib/tutorial/t7/LCDRange.java @@ -10,10 +10,10 @@ public class LCDRange extends TQVBox { slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); } public LCDRange(TQWidget parent) { this(parent, null); diff --git a/qtjava/javalib/tutorial/t7/Tut7.java b/qtjava/javalib/tutorial/t7/Tut7.java index b1bd1e87..4e63fdea 100644 --- a/qtjava/javalib/tutorial/t7/Tut7.java +++ b/qtjava/javalib/tutorial/t7/Tut7.java @@ -5,7 +5,7 @@ public class Tut7 extends TQVBox { TQPushButton quit = new TQPushButton("Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); TQGrid grid = new TQGrid(4, this, null, 0); @@ -14,8 +14,8 @@ public class Tut7 extends TQVBox { for(int c = 0; c < 4; c++) { LCDRange lr = new LCDRange(grid); if (previous!=null) - connect(lr, SIGNAL("valueChanged(int)"), - previous, SLOT("setValue(int)")); + connect(lr, TQ_SIGNAL("valueChanged(int)"), + previous, TQ_SLOT("setValue(int)")); previous = lr; } } diff --git a/qtjava/javalib/tutorial/t8/LCDRange.java b/qtjava/javalib/tutorial/t8/LCDRange.java index 877c65de..71fdd7e0 100644 --- a/qtjava/javalib/tutorial/t8/LCDRange.java +++ b/qtjava/javalib/tutorial/t8/LCDRange.java @@ -10,10 +10,10 @@ public class LCDRange extends TQVBox { slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); } diff --git a/qtjava/javalib/tutorial/t8/Tut8.java b/qtjava/javalib/tutorial/t8/Tut8.java index 4159c8e0..4bab948f 100644 --- a/qtjava/javalib/tutorial/t8/Tut8.java +++ b/qtjava/javalib/tutorial/t8/Tut8.java @@ -5,17 +5,17 @@ public class Tut8 extends TQWidget { TQPushButton quit = new TQPushButton("Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange(this, "angle"); angle.setRange(5, 70); CannonField cannonField = new CannonField(this, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null); //2x2, 10 pixel border diff --git a/qtjava/javalib/tutorial/t9/LCDRange.java b/qtjava/javalib/tutorial/t9/LCDRange.java index 877c65de..71fdd7e0 100644 --- a/qtjava/javalib/tutorial/t9/LCDRange.java +++ b/qtjava/javalib/tutorial/t9/LCDRange.java @@ -10,10 +10,10 @@ public class LCDRange extends TQVBox { slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); } diff --git a/qtjava/javalib/tutorial/t9/Tut9.java b/qtjava/javalib/tutorial/t9/Tut9.java index cd8db787..d04c798d 100644 --- a/qtjava/javalib/tutorial/t9/Tut9.java +++ b/qtjava/javalib/tutorial/t9/Tut9.java @@ -5,17 +5,17 @@ public class Tut9 extends TQWidget { TQPushButton quit = new TQPushButton("Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange(this, "angle"); angle.setRange(5, 70); CannonField cannonField = new CannonField(this, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null); //2x2, 10 pixel border diff --git a/qtruby/bin/Makefile.am b/qtruby/bin/Makefile.am index a1005f0b..988ba3d4 100644 --- a/qtruby/bin/Makefile.am +++ b/qtruby/bin/Makefile.am @@ -1,3 +1,5 @@ +CXXFLAGS += $(RUBY_CXXFLAGS) + INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) bin_PROGRAMS = qtrubyinit diff --git a/qtruby/bin/rbqtsh b/qtruby/bin/rbqtsh index 413a037f..ae52df4e 100755 --- a/qtruby/bin/rbqtsh +++ b/qtruby/bin/rbqtsh @@ -317,13 +317,13 @@ class QtShellControl < TQt::MainWindow @helpExampleAction.addTo(helpMenu) @menubar.insertItem(trUtf8("&Help"), helpMenu) - connect(@fileOpenAction, SIGNAL('activated()'), self, SLOT('fileOpen()')) - connect(@fileSaveAction, SIGNAL('activated()'), self, SLOT('fileSave()')) - connect(@fileSaveAsAction, SIGNAL('activated()'), self, SLOT('fileSaveAs()')) - connect(@filePrintAction, SIGNAL('activated()'), self, SLOT('filePrint()')) - connect(@fileExitAction, SIGNAL('activated()'), self, SLOT('fileExit()')) - connect(@runAction, SIGNAL('activated()'), self, SLOT('runSelection()')) - connect(@helpExampleAction, SIGNAL('activated()'), self, SLOT('helpExample()')) + connect(@fileOpenAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('fileOpen()')) + connect(@fileSaveAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('fileSave()')) + connect(@fileSaveAsAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('fileSaveAs()')) + connect(@filePrintAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('filePrint()')) + connect(@fileExitAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('fileExit()')) + connect(@runAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('runSelection()')) + connect(@helpExampleAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('helpExample()')) @executedLines = [] end @@ -497,13 +497,13 @@ def initialize(*k) self.show @shellWindow.show - connect(@shellWindow.comboBox.lineEdit, SIGNAL('returnPressed()'), self, SLOT('evalInput()')) + connect(@shellWindow.comboBox.lineEdit, TQ_SIGNAL('returnPressed()'), self, TQ_SLOT('evalInput()')) @prompt = '<b><font color="blue">$></font></b>' self.setCaption("MainWindow - this") @shellWindow.sessionLog.setText("Ready.<br>") - connect(@shellWindow, SIGNAL('fileNeedsEval(TQString)'), self, SLOT('evalFile(TQString)')) - connect(@shellWindow, SIGNAL('selection(TQString)'), self, SLOT('evalSelection(TQString)')) + connect(@shellWindow, TQ_SIGNAL('fileNeedsEval(TQString)'), self, TQ_SLOT('evalFile(TQString)')) + connect(@shellWindow, TQ_SIGNAL('selection(TQString)'), self, TQ_SLOT('evalSelection(TQString)')) end def logAppend(str) @@ -620,7 +620,7 @@ self.resize(220,240) @vbox.show @sample = TQt::PopupMenu.new(self) $ slots 'there()' -@sample.insertItem("&There", self, SLOT('there()')) +@sample.insertItem("&There", self, TQ_SLOT('there()')) self.menuBar.insertItem("&Here", sample) $ def there; statusBar.message("There...", 2000); end EXAMPLE diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/configure.in.in index db0594a3..bc32a89d 100644 --- a/qtruby/rubylib/qtruby/configure.in.in +++ b/qtruby/configure.in.in @@ -2,6 +2,7 @@ AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby) if test -z "RUBY_EXECUTABLE"; then DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby" + BUILD_qtruby=false else RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"` RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"` @@ -32,6 +33,37 @@ else RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}" fi + # check if Ruby requires explicit specification of C++ standard + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + SAVED_CXXFLAGS="$CXXFLAGS" + for CXX_STD_TEST in "" 11 14 17; do + CXXFLAGS="$SAVED_CXXFLAGS" + if test "x$CXX_STD_TEST" = "x"; then + AC_MSG_CHECKING([Ruby build with default C++ standard]) + RUBY_CXXFLAGS="" + else + AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST]) + RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST" + fi + CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS" + AC_TRY_COMPILE([ + #include <ruby.h> + ],[ ], + ruby_cxx_std=yes, + ruby_cxx_std=no + ) + if test "x$ruby_cxx_std" = "xyes"; then + AC_SUBST(RUBY_CXXFLAGS) + AC_MSG_RESULT(yes) + break + else + AC_MSG_RESULT(no) + fi + done + CXXFLAGS="$SAVED_CXXFLAGS" + AC_LANG_RESTORE + # Removes trailing slashes, if any, to avoid fail to install with recent libtool. RUBY_ARCHDIR=${RUBY_ARCHDIR%/} RUBY_SITEDIR=${RUBY_SITEDIR%/} @@ -46,7 +78,8 @@ else libdir $RUBY_LIBDIR, includedir $RUBY_INCLUDEDIR, librubyarg $RUBY_LIBRUBYARG, - cflags $RUBY_CFLAGS]) + cflags $RUBY_CFLAGS, + cxxflags $RUBY_CXXFLAGS]) AC_SUBST(RUBY_ARCHDIR) AC_SUBST(RUBY_SITEARCHDIR) AC_SUBST(RUBY_SITEDIR) @@ -55,5 +88,6 @@ else AC_SUBST(RUBY_INCLUDEDIR) AC_SUBST(RUBY_LIBRUBYARG) AC_SUBST(RUBY_CFLAGS) + BUILD_qtruby=true fi - +AM_CONDITIONAL(BUILD_qtruby, $BUILD_qtruby) diff --git a/qtruby/rubylib/designer/examples/colortool/mainform.ui b/qtruby/rubylib/designer/examples/colortool/mainform.ui index f4081882..340b6c31 100644 --- a/qtruby/rubylib/designer/examples/colortool/mainform.ui +++ b/qtruby/rubylib/designer/examples/colortool/mainform.ui @@ -215,9 +215,6 @@ <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -229,9 +226,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -294,9 +288,6 @@ <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -308,9 +299,6 @@ <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -322,9 +310,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> diff --git a/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb b/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb index 3f4f5945..e83207d9 100644 --- a/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb +++ b/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb @@ -321,8 +321,8 @@ end def editFind() if ! @findForm @findForm = FindForm.new( self ) - connect( @findForm, SIGNAL( 'lookfor(const TQString&)' ), - self, SLOT( 'lookfor(const TQString&)' ) ) + connect( @findForm, TQ_SIGNAL( 'lookfor(const TQString&)' ), + self, TQ_SLOT( 'lookfor(const TQString&)' ) ) end @findForm.show() end diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp index 8d30b0d7..2eb8e45a 100644 --- a/qtruby/rubylib/designer/rbuic/form.cpp +++ b/qtruby/rubylib/designer/rbuic/form.cpp @@ -241,7 +241,7 @@ void Uic::createFormImpl( const TQDomElement &e ) // children if( !objectNames.isEmpty() ) - tqWarning("WARNING : objectNames should be empty at "__FILE__" line %d\n", __LINE__); + tqWarning("WARNING : objectNames should be empty at %s line %d", __FILE__, __LINE__); nl = e.parentNode().toElement().elementsByTagName( "widget" ); for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget @@ -751,7 +751,7 @@ void Uic::createFormImpl( const TQDomElement &e ) receiver = "self"; out << indent << "TQt::Object.connect(" << sender - << ", TQT_SIGNAL(\"" << signal << "\"), "<< receiver << ", TQT_SLOT(\"" << slot << "\") )" << endl; + << ", TQ_SIGNAL(\"" << signal << "\"), "<< receiver << ", TQ_SLOT(\"" << slot << "\") )" << endl; } } else if ( n.tagName() == "tabstops" ) { // setup tab order diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am index 45876ed6..80363009 100644 --- a/qtruby/rubylib/designer/uilib/Makefile.am +++ b/qtruby/rubylib/designer/uilib/Makefile.am @@ -1,3 +1,5 @@ +CXXFLAGS += $(RUBY_CXXFLAGS) + INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) rubylibdir = $(RUBY_ARCHDIR) diff --git a/qtruby/rubylib/designer/uilib/test/test.rb b/qtruby/rubylib/designer/uilib/test/test.rb index ff3570cc..e089c735 100644 --- a/qtruby/rubylib/designer/uilib/test/test.rb +++ b/qtruby/rubylib/designer/uilib/test/test.rb @@ -15,6 +15,6 @@ if ARGV.length == 2 exit
end
w.show()
- a.connect( a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()') )
+ a.connect( a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()') )
a.exec()
end
diff --git a/qtruby/rubylib/examples/base/rui.rb b/qtruby/rubylib/examples/base/rui.rb index ad14bc11..8f1df3c8 100644 --- a/qtruby/rubylib/examples/base/rui.rb +++ b/qtruby/rubylib/examples/base/rui.rb @@ -11,7 +11,7 @@ def build_actions(actions) } else qt_action = $kIcons.make_qt_action(self, a.text_with_accel, a.icon_type) - connect(qt_action, SIGNAL('activated()'), a.rec, a.slot) + connect(qt_action, TQ_SIGNAL('activated()'), a.rec, a.slot) a.included_in.each { |to| qt_action.addTo(to) } diff --git a/qtruby/rubylib/examples/canvastest/canvastest.rb b/qtruby/rubylib/examples/canvastest/canvastest.rb index b695505c..5c07875b 100644 --- a/qtruby/rubylib/examples/canvastest/canvastest.rb +++ b/qtruby/rubylib/examples/canvastest/canvastest.rb @@ -43,11 +43,11 @@ class MyWidget < TQt::MainWindow fileMenu = TQt::PopupMenu.new(self) actions = [ - RAction.new("&New", Icons::FILE_NEW, self, SLOT('new()'), [fileTools, fileMenu]), - RAction.new("&Open...", Icons::FILE_OPEN, self, SLOT('open()'), [fileTools, fileMenu]), - @save = RAction.new("Save &As...", Icons::FILE_SAVE_AS, self, SLOT('save_as()'), [fileTools, fileMenu]), + RAction.new("&New", Icons::FILE_NEW, self, TQ_SLOT('new()'), [fileTools, fileMenu]), + RAction.new("&Open...", Icons::FILE_OPEN, self, TQ_SLOT('open()'), [fileTools, fileMenu]), + @save = RAction.new("Save &As...", Icons::FILE_SAVE_AS, self, TQ_SLOT('save_as()'), [fileTools, fileMenu]), RSeperator.new([fileMenu]), - RAction.new("E&xit", Icons::EXIT, $qApp, SLOT('quit()'), [fileMenu]) + RAction.new("E&xit", Icons::EXIT, $qApp, TQ_SLOT('quit()'), [fileMenu]) ] build_actions(actions) diff --git a/qtruby/rubylib/examples/network/clientserver/client/client.rb b/qtruby/rubylib/examples/network/clientserver/client/client.rb index 1272adf0..85e769cb 100644 --- a/qtruby/rubylib/examples/network/clientserver/client/client.rb +++ b/qtruby/rubylib/examples/network/clientserver/client/client.rb @@ -12,20 +12,20 @@ class Client < TQt::VBox close = TQt::PushButton.new( tr("Close connection") , self ) quit = TQt::PushButton.new( tr("Quit") , self ) - connect( send, SIGNAL('clicked()'), SLOT('sendToServer()') ) - connect( close, SIGNAL('clicked()'), SLOT('closeConnection()') ) - connect( quit, SIGNAL('clicked()'), $qApp, SLOT('quit()') ) + connect( send, TQ_SIGNAL('clicked()'), TQ_SLOT('sendToServer()') ) + connect( close, TQ_SIGNAL('clicked()'), TQ_SLOT('closeConnection()') ) + connect( quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()') ) # create the socket and connect various of its signals @socket = TQt::Socket.new( self ) - connect( @socket, SIGNAL('connected()'), - SLOT('socketConnected()') ) - connect( @socket, SIGNAL('connectionClosed()'), - SLOT('socketConnectionClosed()') ) - connect( @socket, SIGNAL('readyRead()'), - SLOT('socketReadyRead()') ) - connect( @socket, SIGNAL('error(int)'), - SLOT('socketError(int)') ) + connect( @socket, TQ_SIGNAL('connected()'), + TQ_SLOT('socketConnected()') ) + connect( @socket, TQ_SIGNAL('connectionClosed()'), + TQ_SLOT('socketConnectionClosed()') ) + connect( @socket, TQ_SIGNAL('readyRead()'), + TQ_SLOT('socketReadyRead()') ) + connect( @socket, TQ_SIGNAL('error(int)'), + TQ_SLOT('socketError(int)') ) # connect to the server @infoText.append( tr("Trying to connect to the server\n") ) @@ -41,8 +41,8 @@ class Client < TQt::VBox @socket.close() if @socket.state() == TQt::Socket::Closing # We have a delayed close. - connect( @socket, SIGNAL('delayedCloseFinished()'), - SLOT('socketClosed()') ) + connect( @socket, TQ_SIGNAL('delayedCloseFinished()'), + TQ_SLOT('socketClosed()') ) else # The socket is closed. socketClosed() diff --git a/qtruby/rubylib/examples/network/clientserver/server/server.rb b/qtruby/rubylib/examples/network/clientserver/server/server.rb index 4a53fbf0..2454115f 100644 --- a/qtruby/rubylib/examples/network/clientserver/server/server.rb +++ b/qtruby/rubylib/examples/network/clientserver/server/server.rb @@ -9,10 +9,10 @@ class ClientSocket < TQt::Socket def initialize(sock, parent=nil, name=nil) super( parent, name ) @line = 0 - connect( self, SIGNAL('readyRead()'), - SLOT('readClient()') ) - connect( self, SIGNAL('connectionClosed()'), - SLOT('deleteLater()') ) + connect( self, TQ_SIGNAL('readyRead()'), + TQ_SLOT('readClient()') ) + connect( self, TQ_SIGNAL('connectionClosed()'), + TQ_SLOT('deleteLater()') ) setSocket( sock ) end @@ -84,20 +84,20 @@ class ServerInfo < TQt::VBox # See the comment above about why the 'ClientSocket*' # type cannot be used - connect( @server, SIGNAL('newConnect(TQSocket*)'), - SLOT('newConnect(TQSocket*)') ) - connect( quit, SIGNAL('clicked()'), $qApp, - SLOT('quit()') ) + connect( @server, TQ_SIGNAL('newConnect(TQSocket*)'), + TQ_SLOT('newConnect(TQSocket*)') ) + connect( quit, TQ_SIGNAL('clicked()'), $qApp, + TQ_SLOT('quit()') ) end slots 'newConnect(TQSocket*)', 'connectionClosed()' def newConnect( s ) @infoText.append( tr("New connection\n") ) - connect( s, SIGNAL('logText(const TQString&)'), - @infoText, SLOT('append(const TQString&)') ) - connect( s, SIGNAL('connectionClosed()'), - SLOT('connectionClosed()') ) + connect( s, TQ_SIGNAL('logText(const TQString&)'), + @infoText, TQ_SLOT('append(const TQString&)') ) + connect( s, TQ_SIGNAL('connectionClosed()'), + TQ_SLOT('connectionClosed()') ) end def connectionClosed() diff --git a/qtruby/rubylib/examples/passivepopup/passivepopup.rb b/qtruby/rubylib/examples/passivepopup/passivepopup.rb index 5cc2b4ea..ae3e1374 100644 --- a/qtruby/rubylib/examples/passivepopup/passivepopup.rb +++ b/qtruby/rubylib/examples/passivepopup/passivepopup.rb @@ -19,7 +19,7 @@ class PassiveWindow < TQt::Frame TQt::Label.new(message, self) quit=TQt::PushButton.new(tr("Close"), self) - connect(quit, SIGNAL("clicked()"), SLOT("close()")) + connect(quit, TQ_SIGNAL("clicked()"), TQ_SLOT("close()")) end def show diff --git a/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb b/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb index 618b7d76..0e6a13d0 100644 --- a/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb +++ b/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb @@ -11,7 +11,7 @@ class AnalogClock < TQt::Widget @time = TQt::Time::currentTime @internalTimer = TQt::Timer.new(self) - connect(@internalTimer, SIGNAL('timeout()'), self, SLOT('timeout()')) + connect(@internalTimer, TQ_SIGNAL('timeout()'), self, TQ_SLOT('timeout()')) @internalTimer.start(5000) end diff --git a/qtruby/rubylib/examples/qt-examples/chart/chartform.rb b/qtruby/rubylib/examples/qt-examples/chart/chartform.rb index 0ebff47e..dd3523fd 100644 --- a/qtruby/rubylib/examples/qt-examples/chart/chartform.rb +++ b/qtruby/rubylib/examples/qt-examples/chart/chartform.rb @@ -42,41 +42,41 @@ class ChartForm < TQt::MainWindow fileNewAction = TQt::Action.new( "New Chart", TQt::IconSet.new(TQt::Pixmap.new( "images/file_new.xpm" )), "&New", TQt::KeySequence.new(CTRL+Key_N), self, "new" ) - connect( fileNewAction, SIGNAL( 'activated()' ), self, SLOT( 'fileNew()' ) ) + connect( fileNewAction, TQ_SIGNAL( 'activated()' ), self, TQ_SLOT( 'fileNew()' ) ) fileOpenAction = TQt::Action.new( "Open Chart", TQt::IconSet.new(TQt::Pixmap.new( "images/file_open.xpm" )), "&Open...", TQt::KeySequence.new(CTRL+Key_O), self, "open" ) - connect( fileOpenAction, SIGNAL( 'activated()' ), self, SLOT( 'fileOpen()' ) ) + connect( fileOpenAction, TQ_SIGNAL( 'activated()' ), self, TQ_SLOT( 'fileOpen()' ) ) fileSaveAction = TQt::Action.new( "Save Chart", TQt::IconSet.new(TQt::Pixmap.new( "images/file_save.xpm" )), "&Save", TQt::KeySequence.new(CTRL+Key_S), self, "save" ) - connect( fileSaveAction, SIGNAL( 'activated()' ), self, SLOT( 'fileSave()' ) ) + connect( fileSaveAction, TQ_SIGNAL( 'activated()' ), self, TQ_SLOT( 'fileSave()' ) ) fileSaveAsAction = TQt::Action.new( "Save Chart As", TQt::IconSet.new(TQt::Pixmap.new( "images/file_save.xpm" )), "Save &As...", TQt::KeySequence.new(0), self, "save as" ) - connect( fileSaveAsAction, SIGNAL( 'activated()' ), - self, SLOT( 'fileSaveAs()' ) ) + connect( fileSaveAsAction, TQ_SIGNAL( 'activated()' ), + self, TQ_SLOT( 'fileSaveAs()' ) ) fileSaveAsPixmapAction = TQt::Action.new( "Save Chart As Bitmap", TQt::IconSet.new(TQt::Pixmap.new( "images/file_save.xpm" )), "Save As &Bitmap...", TQt::KeySequence.new(CTRL+Key_B), self, "save as bitmap" ) - connect( fileSaveAsPixmapAction, SIGNAL( 'activated()' ), - self, SLOT( 'fileSaveAsPixmap()' ) ) + connect( fileSaveAsPixmapAction, TQ_SIGNAL( 'activated()' ), + self, TQ_SLOT( 'fileSaveAsPixmap()' ) ) filePrintAction = TQt::Action.new( "Print Chart", TQt::IconSet.new(TQt::Pixmap.new( "images/file_print.xpm" )), "&Print Chart...", TQt::KeySequence.new(CTRL+Key_P), self, "print chart" ) - connect( filePrintAction, SIGNAL( 'activated()' ), - self, SLOT( 'filePrint()' ) ) + connect( filePrintAction, TQ_SIGNAL( 'activated()' ), + self, TQ_SLOT( 'filePrint()' ) ) optionsSetDataAction = TQt::Action.new( "Set Data", TQt::IconSet.new(TQt::Pixmap.new( "images/options_setdata.xpm" )), "Set &Data...", TQt::KeySequence.new(CTRL+Key_D), self, "set data" ) - connect( optionsSetDataAction, SIGNAL( 'activated()' ), - self, SLOT( 'optionsSetData()' ) ) + connect( optionsSetDataAction, TQ_SIGNAL( 'activated()' ), + self, TQ_SLOT( 'optionsSetData()' ) ) chartGroup = TQt::ActionGroup.new( self ) # Connected later @@ -102,17 +102,17 @@ class ChartForm < TQt::MainWindow optionsSetFontAction = TQt::Action.new( "Set Font", TQt::IconSet.new(TQt::Pixmap.new( "images/options_setfont.xpm" )), "Set &Font...", TQt::KeySequence.new(CTRL+Key_F), self, "set font" ) - connect( optionsSetFontAction, SIGNAL( 'activated()' ), - self, SLOT( 'optionsSetFont()' ) ) + connect( optionsSetFontAction, TQ_SIGNAL( 'activated()' ), + self, TQ_SLOT( 'optionsSetFont()' ) ) optionsSetOptionsAction = TQt::Action.new( "Set Options", TQt::IconSet.new(TQt::Pixmap.new( "images/options_setoptions.xpm" )), "Set &Options...", TQt::KeySequence.new(0), self, "set options" ) - connect( optionsSetOptionsAction, SIGNAL( 'activated()' ), - self, SLOT( 'optionsSetOptions()' ) ) + connect( optionsSetOptionsAction, TQ_SIGNAL( 'activated()' ), + self, TQ_SLOT( 'optionsSetOptions()' ) ) fileQuitAction = TQt::Action.new( "Quit", "&Quit", TQt::KeySequence.new(CTRL+Key_Q), self, "quit" ) - connect( fileQuitAction, SIGNAL( 'activated()' ), self, SLOT( 'fileQuit()' ) ) + connect( fileQuitAction, TQ_SIGNAL( 'activated()' ), self, TQ_SLOT( 'fileQuit()' ) ) fileTools = TQt::ToolBar.new( self, "file operations" ) @@ -164,9 +164,9 @@ class ChartForm < TQt::MainWindow helpMenu = TQt::PopupMenu.new( self ) menuBar().insertItem( "&Help", helpMenu ) - helpMenu.insertItem( "&Help", self, SLOT('helpHelp()'), TQt::KeySequence.new(Key_F1) ) - helpMenu.insertItem( "&About", self, SLOT('helpAbout()') ) - helpMenu.insertItem( "About &Qt", self, SLOT('helpAboutQt()') ) + helpMenu.insertItem( "&Help", self, TQ_SLOT('helpHelp()'), TQt::KeySequence.new(Key_F1) ) + helpMenu.insertItem( "&About", self, TQ_SLOT('helpAbout()') ) + helpMenu.insertItem( "About &Qt", self, TQ_SLOT('helpAboutQt()') ) @printer = nil @@ -198,8 +198,8 @@ class ChartForm < TQt::MainWindow # Connect *after* we've set the chart type on so we don't call # drawElements() prematurely. - connect( chartGroup, SIGNAL( 'selected(TQAction*)' ), - self, SLOT( 'updateChartType(TQAction*)' ) ) + connect( chartGroup, TQ_SIGNAL( 'selected(TQAction*)' ), + self, TQ_SLOT( 'updateChartType(TQAction*)' ) ) resize( windowWidth, windowHeight ) if windowX != -1 || windowY != -1 @@ -336,7 +336,7 @@ class ChartForm < TQt::MainWindow end if i < @recentFiles.length() @fileMenu.insertItem( "&%d %s" % [i + 1, @recentFiles[i]], - self, SLOT( 'fileOpenRecent(int)' ), + self, TQ_SLOT( 'fileOpenRecent(int)' ), TQt::KeySequence.new(0), i ) end end diff --git a/qtruby/rubylib/examples/qt-examples/chart/optionsform.rb b/qtruby/rubylib/examples/qt-examples/chart/optionsform.rb index 35c2aea8..a83fe828 100644 --- a/qtruby/rubylib/examples/qt-examples/chart/optionsform.rb +++ b/qtruby/rubylib/examples/qt-examples/chart/optionsform.rb @@ -94,9 +94,9 @@ class OptionsForm < TQt::Dialog @buttonsLayout.addWidget( @cancelPushButton ) @optionsFormLayout.addLayout( @buttonsLayout ) - connect( @fontPushButton, SIGNAL( 'clicked()' ), self, SLOT( 'chooseFont()' ) ) - connect( @okPushButton, SIGNAL( 'clicked()' ), self, SLOT( 'accept()' ) ) - connect( @cancelPushButton, SIGNAL( 'clicked()' ), self, SLOT( 'reject()' ) ) + connect( @fontPushButton, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'chooseFont()' ) ) + connect( @okPushButton, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'accept()' ) ) + connect( @cancelPushButton, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'reject()' ) ) @chartTypeTextLabel.setBuddy( @chartTypeComboBox ) @decimalPlacesTextLabel.setBuddy( @decimalPlacesSpinBox ) diff --git a/qtruby/rubylib/examples/qt-examples/chart/setdataform.rb b/qtruby/rubylib/examples/qt-examples/chart/setdataform.rb index 3f361061..5ef31f45 100644 --- a/qtruby/rubylib/examples/qt-examples/chart/setdataform.rb +++ b/qtruby/rubylib/examples/qt-examples/chart/setdataform.rb @@ -64,15 +64,15 @@ class SetDataForm < TQt::Dialog @tableButtonBox.addLayout( @buttonBox ) - connect( @table, SIGNAL( 'clicked(int,int,int,const TQPoint&)' ), - self, SLOT( 'setChosenColor(int,int)' ) ) - connect( @table, SIGNAL( 'currentChanged(int,int)' ), - self, SLOT( 'currentChanged(int,int)' ) ) - connect( @table, SIGNAL( 'valueChanged(int,int)' ), - self, SLOT( 'valueChanged(int,int)' ) ) - connect( @colorPushButton, SIGNAL( 'clicked()' ), self, SLOT( 'setColor()' ) ) - connect( okPushButton, SIGNAL( 'clicked()' ), self, SLOT( 'accept()' ) ) - connect( cancelPushButton, SIGNAL( 'clicked()' ), self, SLOT( 'reject()' ) ) + connect( @table, TQ_SIGNAL( 'clicked(int,int,int,const TQPoint&)' ), + self, TQ_SLOT( 'setChosenColor(int,int)' ) ) + connect( @table, TQ_SIGNAL( 'currentChanged(int,int)' ), + self, TQ_SLOT( 'currentChanged(int,int)' ) ) + connect( @table, TQ_SIGNAL( 'valueChanged(int,int)' ), + self, TQ_SLOT( 'valueChanged(int,int)' ) ) + connect( @colorPushButton, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'setColor()' ) ) + connect( okPushButton, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'accept()' ) ) + connect( cancelPushButton, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'reject()' ) ) patterns = Array.new(MAX_PATTERNS) patterns[0] = TQt::Pixmap.new( "images/pattern01.xpm" ) diff --git a/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb b/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb index 458dc127..9c428c12 100644 --- a/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb +++ b/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb @@ -55,8 +55,8 @@ class CheckLists < TQt::Widget copy1 = TQt::PushButton.new(' -> ', self) tmp.addWidget(copy1) copy1.setMaximumWidth(copy1.sizeHint.width) - # connect the SIGNAL clicked() of the pushbutton with the SLOT copy1to2() - connect(copy1, SIGNAL('clicked()'), self, SLOT('copy1to2()')) + # connect the TQ_SIGNAL clicked() of the pushbutton with the TQ_SLOT copy1to2() + connect(copy1, TQ_SIGNAL('clicked()'), self, TQ_SLOT('copy1to2()')) # another widget for layouting vbox2 = TQt::VBoxLayout.new(lay) @@ -79,8 +79,8 @@ class CheckLists < TQt::Widget copy2 = TQt::PushButton.new(' -> ', self) lay.addWidget( copy2 ) copy2.setMaximumWidth(copy2.sizeHint.width) - # ...and connect its clicked() SIGNAL to the copy2to3() SLOT - connect(copy2, SIGNAL('clicked()'), self, SLOT('copy2to3()')) + # ...and connect its clicked() TQ_SIGNAL to the copy2to3() TQ_SLOT + connect(copy2, TQ_SIGNAL('clicked()'), self, TQ_SLOT('copy2to3()')) tmp = TQt::VBoxLayout.new(lay) tmp.setMargin(5) @@ -90,7 +90,7 @@ class CheckLists < TQt::Widget tmp.addWidget(@label) end - # SLOT copy1to2() + # TQ_SLOT copy1to2() # # Copies all checked ListViewItems from the first ListView to # the second one, and inserts them as Radio-ListViewItem. @@ -121,7 +121,7 @@ class CheckLists < TQt::Widget end - # SLOT copy2to3() + # TQ_SLOT copy2to3() # # Copies the checked item of the second ListView into the # Label at the right. diff --git a/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/viewer.rb b/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/viewer.rb index feed96f0..17fb43ef 100644 --- a/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/viewer.rb +++ b/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/viewer.rb @@ -27,16 +27,16 @@ class Viewer < TQt::Widget @defaultButton = TQt::PushButton.new('Default', self, 'pushbutton1') @defaultButton.setFont(TQt::Font.new('times')) - connect(@defaultButton, SIGNAL('clicked()'), self, SLOT('setDefault()')) + connect(@defaultButton, TQ_SIGNAL('clicked()'), self, TQ_SLOT('setDefault()')) @sansSerifButton = TQt::PushButton.new('Sans Serif', self, 'pushbutton2') @sansSerifButton.setFont(TQt::Font.new('Helvetica', 12)) - connect(@sansSerifButton, SIGNAL('clicked()'), self, SLOT('setSansSerif()')) + connect(@sansSerifButton, TQ_SIGNAL('clicked()'), self, TQ_SLOT('setSansSerif()')) @italicsButton = TQt::PushButton.new('Italics', self, 'pushbutton1') @italicsButton.setFont(TQt::Font.new('lucida', 12, TQt::Font.Bold, true)) - connect(@italicsButton, SIGNAL('clicked()'), self, SLOT('setItalics()')) + connect(@italicsButton, TQ_SIGNAL('clicked()'), self, TQ_SLOT('setItalics()')) layout end diff --git a/qtruby/rubylib/examples/qt-examples/forever/forever.rb b/qtruby/rubylib/examples/qt-examples/forever/forever.rb index 8cbf9754..1ef42a71 100755 --- a/qtruby/rubylib/examples/qt-examples/forever/forever.rb +++ b/qtruby/rubylib/examples/qt-examples/forever/forever.rb @@ -26,8 +26,8 @@ class Forever < TQt::Widget @rectangles = 0 startTimer( 0 ) # run continuous timer counter = TQt::Timer.new( self ) - connect( counter, SIGNAL("timeout()"), - self, SLOT("updateCaption()") ) + connect( counter, TQ_SIGNAL("timeout()"), + self, TQ_SLOT("updateCaption()") ) counter.start( 1000 ) end diff --git a/qtruby/rubylib/examples/qt-examples/hello/hello.rb b/qtruby/rubylib/examples/qt-examples/hello/hello.rb index ef70154f..4fbb6b69 100644 --- a/qtruby/rubylib/examples/qt-examples/hello/hello.rb +++ b/qtruby/rubylib/examples/qt-examples/hello/hello.rb @@ -13,7 +13,7 @@ class Hello < TQt::Widget @text = text @sin_tbl = [0, 38, 71, 92, 100, 92, 71, 38, 0, -38, -71, -92, -100, -92, -71, -38] timer = TQt::Timer.new(self); - connect(timer, SIGNAL('timeout()'), SLOT('animate()')) + connect(timer, TQ_SIGNAL('timeout()'), TQ_SLOT('animate()')) timer.start(40); resize(260, 130) diff --git a/qtruby/rubylib/examples/qt-examples/hello/main.rb b/qtruby/rubylib/examples/qt-examples/hello/main.rb index 5be3ce68..1b310551 100755 --- a/qtruby/rubylib/examples/qt-examples/hello/main.rb +++ b/qtruby/rubylib/examples/qt-examples/hello/main.rb @@ -14,7 +14,7 @@ end h = Hello.new(s) h.setCaption('QtRuby says hello') -h.connect(h, SIGNAL('clicked()'), a, SLOT('quit()')) +h.connect(h, TQ_SIGNAL('clicked()'), a, TQ_SLOT('quit()')) h.setFont(TQt::Font.new('times', 32, TQt::Font.Bold)) # default font h.setBackgroundColor(TQt::white) # default bg color a.setMainWidget(h) diff --git a/qtruby/rubylib/examples/qt-examples/progress/progress.rb b/qtruby/rubylib/examples/qt-examples/progress/progress.rb index 1ec02614..3b0b11f8 100644 --- a/qtruby/rubylib/examples/qt-examples/progress/progress.rb +++ b/qtruby/rubylib/examples/qt-examples/progress/progress.rb @@ -118,18 +118,18 @@ class CPUWaster < TQt::Widget FIRST_DRAW_ITEM.upto(LAST_DRAW_ITEM) { |i| file.insertItem( "#{drawItemRects(i)} Rectangles", i) } - connect( menubar, SIGNAL('activated(int)'), self, SLOT('doMenuItem(int)') ) + connect( menubar, TQ_SIGNAL('activated(int)'), self, TQ_SLOT('doMenuItem(int)') ) @file.insertSeparator - @file.insertItem("Quit", $qApp, SLOT('quit()')) + @file.insertItem("Quit", $qApp, TQ_SLOT('quit()')) @options = TQt::PopupMenu.new @menubar.insertItem("&Options", options) - @td_id = options.insertItem("Timer driven", self, SLOT('timerDriven()')) - @ld_id = options.insertItem("Loop driven", self, SLOT('loopDriven()')) + @td_id = options.insertItem("Timer driven", self, TQ_SLOT('timerDriven()')) + @ld_id = options.insertItem("Loop driven", self, TQ_SLOT('loopDriven()')) @options.insertSeparator - @dl_id = options.insertItem("Default label", self, SLOT('defaultLabel()')) - @cl_id = options.insertItem("Custom label", self, SLOT('customLabel()')) + @dl_id = options.insertItem("Default label", self, TQ_SLOT('defaultLabel()')) + @cl_id = options.insertItem("Custom label", self, TQ_SLOT('customLabel()')) @options.insertSeparator - @md_id = options.insertItem("No minimum duration", self, SLOT('toggleMinimumDuration()')) + @md_id = options.insertItem("No minimum duration", self, TQ_SLOT('toggleMinimumDuration()')) @options.setCheckable true loopDriven @@ -239,7 +239,7 @@ class CPUWaster < TQt::Widget @rects = n @pb = newProgressDialog("Drawing rectangles.\nUsing timer event.", n, false) @pb.setCaption("Please Wait") - connect(@pb, SIGNAL('cancelled()'), self, SLOT('stopDrawing()')) + connect(@pb, TQ_SIGNAL('cancelled()'), self, TQ_SLOT('stopDrawing()')) enableDrawingItems(false) startTimer(0) @got_stop = false diff --git a/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb b/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb index 1b8bbe35..f16585af 100644 --- a/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb +++ b/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb @@ -48,7 +48,7 @@ class TicTacGameBoard < TQt::Widget ttb = TicTacButton.new(self) ttb.setPalette(p) ttb.setEnabled(false) - connect(ttb, SIGNAL('clicked()'), self, SLOT('buttonClicked()')) + connect(ttb, TQ_SIGNAL('clicked()'), self, TQ_SLOT('buttonClicked()')) grid.addWidget(ttb, i % @nBoard, i / @nBoard) @buttons[i] = ttb @btArray[i] = TicTacButton::Blank @@ -262,7 +262,7 @@ class TicTacToe < TQt::Widget # Create the game board and connect the signal finished() # to this/self gameOver() slot @board = TicTacGameBoard.new(boardSize, self) - connect(@board, SIGNAL('finished()'), self, SLOT('gameOver()')); + connect(@board, TQ_SIGNAL('finished()'), self, TQ_SLOT('gameOver()')); l.addWidget(@board) # Create a horizontal frame line @@ -279,9 +279,9 @@ class TicTacToe < TQt::Widget # Create the push buttons and connect their signals to the right slots @newGame = TQt::PushButton.new('Play!', self) - connect(@newGame, SIGNAL('clicked()'), self, SLOT('newGameClicked()')) + connect(@newGame, TQ_SIGNAL('clicked()'), self, TQ_SLOT('newGameClicked()')) @quit = TQt::PushButton.new('Quit', self) - connect(@quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(@quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) b = TQt::HBoxLayout.new l.addLayout(b) b.addWidget(@newGame) diff --git a/qtruby/rubylib/examples/qtscribble/scribble.rb b/qtruby/rubylib/examples/qtscribble/scribble.rb index 0ba2a4b4..a2ce927b 100644 --- a/qtruby/rubylib/examples/qtscribble/scribble.rb +++ b/qtruby/rubylib/examples/qtscribble/scribble.rb @@ -26,7 +26,7 @@ require 'Qt' # create a pop-up menu @_popupmenu = TQt::PopupMenu.new() - @_popupmenu.insertItem( "&Clear", self, SLOT( "slotClearArea()" ) ) + @_popupmenu.insertItem( "&Clear", self, TQ_SLOT( "slotClearArea()" ) ) end # @@ -159,10 +159,10 @@ class ScribbleWindow < TQt::Widget # The next lines build the menu bar. We first create the menus # one by one, then add them to the menu bar. # @_filemenu = TQt::PopupMenu.new() # create a file menu - @_filemenu.insertItem( "&Load", self, SLOT( "slotLoad()" ) ) - @_filemenu.insertItem( "&Save", self, SLOT( "slotSave()" ) ) + @_filemenu.insertItem( "&Load", self, TQ_SLOT( "slotLoad()" ) ) + @_filemenu.insertItem( "&Save", self, TQ_SLOT( "slotSave()" ) ) @_filemenu.insertSeparator() - @_filemenu.insertItem( "&Quit", $qApp, SLOT( "quit()" ) ) + @_filemenu.insertItem( "&Quit", $qApp, TQ_SLOT( "quit()" ) ) @_colormenu = TQt::PopupMenu.new() # create a color menu @_colormenu.insertItem( "B&lack", COLOR_MENU_ID_BLACK) @@ -170,12 +170,12 @@ class ScribbleWindow < TQt::Widget @_colormenu.insertItem( "&Blue", COLOR_MENU_ID_BLUE) @_colormenu.insertItem( "&Green", COLOR_MENU_ID_GREEN) @_colormenu.insertItem( "&Yellow", COLOR_MENU_ID_YELLOW) - TQt::Object.connect( @_colormenu, SIGNAL( "activated( int )" ), - self, SLOT( "slotColorMenu( int )" ) ) + TQt::Object.connect( @_colormenu, TQ_SIGNAL( "activated( int )" ), + self, TQ_SLOT( "slotColorMenu( int )" ) ) @_helpmenu = TQt::PopupMenu.new() # create a help menu - @_helpmenu.insertItem( "&About QtScribble", self, SLOT( "slotAbout()" ) ) - @_helpmenu.insertItem( "&About Qt", self, SLOT( "slotAboutQt()" ) ) + @_helpmenu.insertItem( "&About QtScribble", self, TQ_SLOT( "slotAbout()" ) ) + @_helpmenu.insertItem( "&About Qt", self, TQ_SLOT( "slotAboutQt()" ) ) @_menubar = TQt::MenuBar.new( self, "" ) # create a menu bar @_menubar.insertItem( "&File", @_filemenu ) @@ -190,12 +190,12 @@ class ScribbleWindow < TQt::Widget @_scribblearea = ScribbleArea.new() @_scribblearea.setGeometry( 0, 0, 1000, 1000 ) @_scrollview.addChild( @_scribblearea ) - TQt::Object.connect( self, SIGNAL( "colorChanged(TQColor)" ), - @_scribblearea, SLOT( "setColor(TQColor)" ) ) - TQt::Object.connect( self, SIGNAL( "save(const TQString&)" ), - @_scribblearea, SLOT( "slotSave(const TQString&)" ) ) - TQt::Object.connect( self, SIGNAL( "load(const TQString&)" ), - @_scribblearea, SLOT( "slotLoad(const TQString&)" ) ) + TQt::Object.connect( self, TQ_SIGNAL( "colorChanged(TQColor)" ), + @_scribblearea, TQ_SLOT( "setColor(TQColor)" ) ) + TQt::Object.connect( self, TQ_SIGNAL( "save(const TQString&)" ), + @_scribblearea, TQ_SLOT( "slotSave(const TQString&)" ) ) + TQt::Object.connect( self, TQ_SIGNAL( "load(const TQString&)" ), + @_scribblearea, TQ_SLOT( "slotLoad(const TQString&)" ) ) end def resizeEvent( event ) diff --git a/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb b/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb index 623abe4b..6ac04192 100644 --- a/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb +++ b/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb @@ -96,14 +96,14 @@ class CameraDialog < TQt::Dialog # The Close button button = TQt::PushButton.new('Close', self, 'Dialog Close') - connect(button, SIGNAL('clicked()'), self, SLOT('close()')) + connect(button, TQ_SIGNAL('clicked()'), self, TQ_SLOT('close()')) button.setDefault(true) button.setFixedSize(button.sizeHint()) buttonLayout.addWidget(button) # The Close button button = TQt::PushButton.new('Reset', self, 'Dialog Reset') - connect(button, SIGNAL('clicked()'), self, SLOT('slotReset()')) + connect(button, TQ_SIGNAL('clicked()'), self, TQ_SLOT('slotReset()')) button.setFixedSize(button.sizeHint()) buttonLayout.addWidget(button) @@ -133,7 +133,7 @@ class CameraDialog < TQt::Dialog layout.addWidget(slider, row, 1) # Connection from slider signal to our slot - connect(slider, SIGNAL('valueChanged(int)'), self, SLOT(slot)) + connect(slider, TQ_SIGNAL('valueChanged(int)'), self, TQ_SLOT(slot)) # Number display num = TQt::Label.new('XXXXX', box) diff --git a/qtruby/rubylib/examples/ruboids/ruboids/World.rb b/qtruby/rubylib/examples/ruboids/ruboids/World.rb index 4bd56d88..6c6e8e34 100644 --- a/qtruby/rubylib/examples/ruboids/ruboids/World.rb +++ b/qtruby/rubylib/examples/ruboids/ruboids/World.rb @@ -51,7 +51,7 @@ class World < TQt::Object } @clock = TQt::Timer.new() - connect(@clock, SIGNAL('timeout()'), self, SLOT('slotMove()')) + connect(@clock, TQ_SIGNAL('timeout()'), self, TQ_SLOT('slotMove()')) @camera = Camera.new # Reads values from params setupTranslation() diff --git a/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb b/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb index 56459729..4ce389be 100644 --- a/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb +++ b/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb @@ -31,7 +31,7 @@ class WorldWindow < TQt::MainWindow # Create and populate file menu menu = TQt::PopupMenu.new(self) - menu.insertItem("Exit", $qApp, SLOT("quit()"), TQt::KeySequence.new(CTRL+Key_Q)) + menu.insertItem("Exit", $qApp, TQ_SLOT("quit()"), TQt::KeySequence.new(CTRL+Key_Q)) # Add file menu to menu bar menuBar.insertItem("&File", menu) @@ -42,7 +42,7 @@ class WorldWindow < TQt::MainWindow # Add options menu to menu bar and link it to method below menuBar.insertItem("&Options", menu) - connect(menu, SIGNAL("activated(int)"), self, SLOT('slotMenuActivated(int)')) + connect(menu, TQ_SIGNAL("activated(int)"), self, TQ_SLOT('slotMenuActivated(int)')) end diff --git a/qtruby/rubylib/examples/testcases/bugs.rb b/qtruby/rubylib/examples/testcases/bugs.rb index 92bb8e80..215aea19 100644 --- a/qtruby/rubylib/examples/testcases/bugs.rb +++ b/qtruby/rubylib/examples/testcases/bugs.rb @@ -21,7 +21,7 @@ def bug3 @file.insertSeparator TQt::debug_level = TQt::DebugLevel::High p $qApp - @file.insertItem("Quit", $qApp, SLOT('quit()')) + @file.insertItem("Quit", $qApp, TQ_SLOT('quit()')) @file.exec end #bug3 diff --git a/qtruby/rubylib/examples/textedit/textedit.rb b/qtruby/rubylib/examples/textedit/textedit.rb index 1f80cb7a..bb67fed7 100644 --- a/qtruby/rubylib/examples/textedit/textedit.rb +++ b/qtruby/rubylib/examples/textedit/textedit.rb @@ -40,7 +40,7 @@ class MyTextEditor < TQt::TextEdit end def createPopupMenu(pos) # virtual pm = TQt::PopupMenu.new - pm.insertItem("Insert Image!", self, SLOT('insert_icon()')) + pm.insertItem("Insert Image!", self, TQ_SLOT('insert_icon()')) pm end def has_metadata @@ -111,18 +111,18 @@ class MyWidget < TQt::MainWindow def initialize() super @editor = MyTextEditor.new(self) - connect(@editor, SIGNAL('textChanged()'), self, SLOT('text_changed()')) - connect(@editor, SIGNAL('saved()'), self, SLOT('saved()')) + connect(@editor, TQ_SIGNAL('textChanged()'), self, TQ_SLOT('text_changed()')) + connect(@editor, TQ_SIGNAL('saved()'), self, TQ_SLOT('saved()')) fileTools = TQt::ToolBar.new(self, "file operations") fileMenu = TQt::PopupMenu.new(self) actions = [ - RAction.new("&New", Icons::FILE_NEW, @editor, SLOT('new()'), [fileTools, fileMenu]), - RAction.new("&Open...", Icons::FILE_OPEN, @editor, SLOT('open()'), [fileTools, fileMenu]), - @save = RAction.new("Save &As...", Icons::FILE_SAVE_AS, @editor, SLOT('save_as()'), [fileTools, fileMenu]), + RAction.new("&New", Icons::FILE_NEW, @editor, TQ_SLOT('new()'), [fileTools, fileMenu]), + RAction.new("&Open...", Icons::FILE_OPEN, @editor, TQ_SLOT('open()'), [fileTools, fileMenu]), + @save = RAction.new("Save &As...", Icons::FILE_SAVE_AS, @editor, TQ_SLOT('save_as()'), [fileTools, fileMenu]), RSeperator.new([fileMenu]), - RAction.new("E&xit", Icons::EXIT, $qApp, SLOT('quit()'), [fileMenu]) + RAction.new("E&xit", Icons::EXIT, $qApp, TQ_SLOT('quit()'), [fileMenu]) ] build_actions(actions) diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am index 7083719c..c273c599 100644 --- a/qtruby/rubylib/qtruby/Makefile.am +++ b/qtruby/rubylib/qtruby/Makefile.am @@ -1,3 +1,5 @@ +CXXFLAGS += $(RUBY_CXXFLAGS) + INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) noinst_HEADERS = qtruby.h marshall.h smokeruby.h extconf.rb diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp index 834cc3b2..7032a205 100644 --- a/qtruby/rubylib/qtruby/Qt.cpp +++ b/qtruby/rubylib/qtruby/Qt.cpp @@ -148,7 +148,7 @@ void *value_to_ptr(VALUE ruby_value) { // ptr on success, null on fail VALUE getPointerObject(void *ptr); bool isTQObject(Smoke *smoke, Smoke::Index classId) { - if(tqstrcmp(smoke->classes[classId].className, "TQObject") == 0) + if(qstrcmp(smoke->classes[classId].className, "TQObject") == 0) return true; for(Smoke::Index *p = smoke->inheritanceList + smoke->classes[classId].parents; *p; @@ -356,7 +356,7 @@ public: void unsupported() { rb_raise(rb_eArgError, "Cannot handle '%s' as return-type of %s::%s", type().name(), - tqstrcmp(_smoke->className(method().classId), "TQGlobalSpace") == 0 ? "" : _smoke->className(method().classId), + qstrcmp(_smoke->className(method().classId), "TQGlobalSpace") == 0 ? "" : _smoke->className(method().classId), _smoke->methodNames[method().name]); } Smoke *smoke() { return _smoke; } @@ -421,7 +421,7 @@ public: } void unsupported() { - if (tqstrcmp(_smoke->className(method().classId), "TQGlobalSpace") == 0) { + if (qstrcmp(_smoke->className(method().classId), "TQGlobalSpace") == 0) { rb_raise(rb_eArgError, "Cannot handle '%s' as argument to %s", type().name(), _smoke->methodNames[method().name]); @@ -964,15 +964,15 @@ get_VALUEtype(VALUE ruby_value) const char *r = ""; if(ruby_value == Qnil) r = "u"; - else if(TYPE(ruby_value) == T_FIXNUM || TYPE(ruby_value) == T_BIGNUM || tqstrcmp(classname, "TQt::Integer") == 0) + else if(TYPE(ruby_value) == T_FIXNUM || TYPE(ruby_value) == T_BIGNUM || qstrcmp(classname, "TQt::Integer") == 0) r = "i"; else if(TYPE(ruby_value) == T_FLOAT) r = "n"; else if(TYPE(ruby_value) == T_STRING) r = "s"; - else if(ruby_value == Qtrue || ruby_value == Qfalse || tqstrcmp(classname, "TQt::Boolean") == 0) + else if(ruby_value == Qtrue || ruby_value == Qfalse || qstrcmp(classname, "TQt::Boolean") == 0) r = "B"; - else if(tqstrcmp(classname, "TQt::Enum") == 0) { + else if(qstrcmp(classname, "TQt::Enum") == 0) { VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qenum_type"), 1, ruby_value); r = StringValuePtr(temp); } else if(TYPE(ruby_value) == T_DATA) { @@ -1375,9 +1375,9 @@ static Smoke::Index new_qvariant_qmap = 0; while (qt_Smoke->ambiguousMethodList[i] != 0) { const char * argType = qt_Smoke->types[qt_Smoke->argumentList[qt_Smoke->methods[qt_Smoke->ambiguousMethodList[i]].args]].name; - if (tqstrcmp(argType, "const TQValueList<TQVariant>&" ) == 0) { + if (qstrcmp(argType, "const TQValueList<TQVariant>&" ) == 0) { new_qvariant_qlist = qt_Smoke->ambiguousMethodList[i]; - } else if (tqstrcmp(argType, "const TQStringVariantMap&" ) == 0) { + } else if (qstrcmp(argType, "const TQStringVariantMap&" ) == 0) { new_qvariant_qmap = qt_Smoke->ambiguousMethodList[i]; } @@ -1493,11 +1493,11 @@ static TQString * pred = 0; VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack); if (_current_method == -1) { const char * op = rb_id2name(SYM2ID(argv[0])); - if ( tqstrcmp(op, "-") == 0 - || tqstrcmp(op, "+") == 0 - || tqstrcmp(op, "/") == 0 - || tqstrcmp(op, "%") == 0 - || tqstrcmp(op, "|") == 0 ) + if ( qstrcmp(op, "-") == 0 + || qstrcmp(op, "+") == 0 + || qstrcmp(op, "/") == 0 + || qstrcmp(op, "%") == 0 + || qstrcmp(op, "|") == 0 ) { // Look for operator methods of the form 'operator+=', 'operator-=' and so on.. char op1[3]; @@ -1872,7 +1872,7 @@ tqt_invoke(int /*argc*/, VALUE * argv, VALUE self) // Now, I need to find out if this means me int index; char *slotname; - bool isSignal = tqstrcmp(rb_id2name(rb_frame_this_func()), "qt_emit") == 0; + bool isSignal = qstrcmp(rb_id2name(rb_frame_this_func()), "qt_emit") == 0; VALUE mocArgs = getslotinfo(self, id, slotname, index, isSignal); if(mocArgs == Qnil) { // No ruby slot/signal found, assume the target is a C++ one @@ -2050,17 +2050,17 @@ setMocType(VALUE /*self*/, VALUE ptr, VALUE idx_value, VALUE name_value, VALUE s MocArgument *arg = 0; Data_Get_Struct(ptr, MocArgument, arg); arg[idx].st.set(qt_Smoke, typeId); - if(tqstrcmp(static_type, "ptr") == 0) + if(qstrcmp(static_type, "ptr") == 0) arg[idx].argType = xmoc_ptr; - else if(tqstrcmp(static_type, "bool") == 0) + else if(qstrcmp(static_type, "bool") == 0) arg[idx].argType = xmoc_bool; - else if(tqstrcmp(static_type, "int") == 0) + else if(qstrcmp(static_type, "int") == 0) arg[idx].argType = xmoc_int; - else if(tqstrcmp(static_type, "double") == 0) + else if(qstrcmp(static_type, "double") == 0) arg[idx].argType = xmoc_double; - else if(tqstrcmp(static_type, "char*") == 0) + else if(qstrcmp(static_type, "char*") == 0) arg[idx].argType = xmoc_charstar; - else if(tqstrcmp(static_type, "TQString") == 0) + else if(qstrcmp(static_type, "TQString") == 0) arg[idx].argType = xmoc_QString; return Qtrue; } @@ -2166,16 +2166,16 @@ make_QUParameter(VALUE /*self*/, VALUE name_value, VALUE type_value, VALUE /*ext TQUParameter *p = new TQUParameter; p->name = new char[strlen(name) + 1]; strcpy((char*)p->name, name); - if(tqstrcmp(type, "bool") == 0) + if(qstrcmp(type, "bool") == 0) p->type = &static_QUType_bool; - else if(tqstrcmp(type, "int") == 0) + else if(qstrcmp(type, "int") == 0) p->type = &static_QUType_int; - else if(tqstrcmp(type, "double") == 0) + else if(qstrcmp(type, "double") == 0) p->type = &static_QUType_double; - else if(tqstrcmp(type, "char*") == 0 || tqstrcmp(type, "const char*") == 0) + else if(qstrcmp(type, "char*") == 0 || qstrcmp(type, "const char*") == 0) p->type = &static_QUType_charstar; - else if(tqstrcmp(type, "TQString") == 0 || tqstrcmp(type, "TQString&") == 0 || - tqstrcmp(type, "const TQString") == 0 || tqstrcmp(type, "const TQString&") == 0) + else if(qstrcmp(type, "TQString") == 0 || qstrcmp(type, "TQString&") == 0 || + qstrcmp(type, "const TQString") == 0 || qstrcmp(type, "const TQString&") == 0) p->type = &static_QUType_TQString; else p->type = &static_QUType_ptr; @@ -2513,10 +2513,10 @@ findAllMethods(int argc, VALUE * argv, VALUE /*self*/) #define PUSH_QTRUBY_METHOD \ if ( (methodRef.flags & (Smoke::mf_internal|Smoke::mf_ctor|Smoke::mf_dtor)) == 0 \ - && tqstrcmp(qt_Smoke->methodNames[methodRef.name], "operator=") != 0 \ - && tqstrcmp(qt_Smoke->methodNames[methodRef.name], "operator!=") != 0 \ - && tqstrcmp(qt_Smoke->methodNames[methodRef.name], "operator--") != 0 \ - && tqstrcmp(qt_Smoke->methodNames[methodRef.name], "operator++") != 0 \ + && qstrcmp(qt_Smoke->methodNames[methodRef.name], "operator=") != 0 \ + && qstrcmp(qt_Smoke->methodNames[methodRef.name], "operator!=") != 0 \ + && qstrcmp(qt_Smoke->methodNames[methodRef.name], "operator--") != 0 \ + && qstrcmp(qt_Smoke->methodNames[methodRef.name], "operator++") != 0 \ && tqstrncmp(qt_Smoke->methodNames[methodRef.name], "operator ", strlen("operator ")) != 0 \ && ( (flags == 0 && (methodRef.flags & (Smoke::mf_static|Smoke::mf_enum|Smoke::mf_protected)) == 0) \ || ( flags == Smoke::mf_static \ @@ -2640,7 +2640,7 @@ isObject(VALUE /*self*/, VALUE obj) { void * ptr = 0; ptr = value_to_ptr(obj); - return (ptr > 0 ? Qtrue : Qfalse); + return (ptr != 0 ? Qtrue : Qfalse); } static VALUE @@ -2747,7 +2747,7 @@ create_qobject_class(VALUE /*self*/, VALUE package_value) if (TQString(package).startsWith("TQt::")) { klass = rb_define_class_under(qt_module, package+strlen("TQt::"), qt_base_class); - if (tqstrcmp(package, "TQt::Application") == 0) { + if (qstrcmp(package, "TQt::Application") == 0) { rb_define_singleton_method(klass, "new", (VALUE (*) (...)) new_qapplication, -1); rb_define_method(klass, "ARGV", (VALUE (*) (...)) qapplication_argv, 0); } @@ -2788,16 +2788,16 @@ create_qt_class(VALUE /*self*/, VALUE package_value) klass = kde_package_to_class(package, qt_base_class); } - if (tqstrcmp(package, "TQt::MetaObject") == 0) { + if (qstrcmp(package, "TQt::MetaObject") == 0) { qmetaobject_class = klass; - } else if (tqstrcmp(package, "TQt::Variant") == 0) { + } else if (qstrcmp(package, "TQt::Variant") == 0) { qvariant_class = klass; rb_define_singleton_method(qvariant_class, "new", (VALUE (*) (...)) new_qvariant, -1); - } else if (tqstrcmp(package, "TQt::ByteArray") == 0) { + } else if (qstrcmp(package, "TQt::ByteArray") == 0) { rb_define_method(klass, "data", (VALUE (*) (...)) qbytearray_data, 0); rb_define_method(klass, "size", (VALUE (*) (...)) qbytearray_size, 0); rb_define_method(klass, "setRawData", (VALUE (*) (...)) qbytearray_setRawData, 1); - } else if (tqstrcmp(package, "TQt::Char") == 0) { + } else if (qstrcmp(package, "TQt::Char") == 0) { rb_define_method(klass, "to_s", (VALUE (*) (...)) qchar_to_s, 0); } diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp index 4759e7fc..12cb70ac 100644 --- a/qtruby/rubylib/qtruby/handlers.cpp +++ b/qtruby/rubylib/qtruby/handlers.cpp @@ -194,15 +194,15 @@ smokeruby_free(void * p) unmapPointer(o, o->classId, 0); object_count --; - if ( tqstrcmp(className, "TQObject") == 0 - || tqstrcmp(className, "TQListBoxItem") == 0 - || tqstrcmp(className, "TQStyleSheetItem") == 0 - || tqstrcmp(className, "KCommand") == 0 - || tqstrcmp(className, "KNamedCommand") == 0 - || tqstrcmp(className, "KMacroCommand") == 0 - || tqstrcmp(className, "TDEAboutData") == 0 - || tqstrcmp(className, "TDECmdLineArgs") == 0 - || tqstrcmp(className, "TQSqlCursor") == 0 ) + if ( qstrcmp(className, "TQObject") == 0 + || qstrcmp(className, "TQListBoxItem") == 0 + || qstrcmp(className, "TQStyleSheetItem") == 0 + || qstrcmp(className, "KCommand") == 0 + || qstrcmp(className, "KNamedCommand") == 0 + || qstrcmp(className, "KMacroCommand") == 0 + || qstrcmp(className, "TDEAboutData") == 0 + || qstrcmp(className, "TDECmdLineArgs") == 0 + || qstrcmp(className, "TQSqlCursor") == 0 ) { // Don't delete instances of these classes for now free(o); @@ -213,19 +213,19 @@ smokeruby_free(void * p) free(o); return; } - } else if (tqstrcmp(className, "TQIconViewItem") == 0) { + } else if (qstrcmp(className, "TQIconViewItem") == 0) { TQIconViewItem * item = (TQIconViewItem *) o->ptr; if (item->iconView() != 0) { free(o); return; } - } else if (tqstrcmp(className, "TQCheckListItem") == 0) { + } else if (qstrcmp(className, "TQCheckListItem") == 0) { TQCheckListItem * item = (TQCheckListItem *) o->ptr; if (item->parent() != 0 || item->listView() != 0) { free(o); return; } - } else if (tqstrcmp(className, "TQListViewItem") == 0) { + } else if (qstrcmp(className, "TQListViewItem") == 0) { TQListViewItem * item = (TQListViewItem *) o->ptr; if (item->parent() != 0 || item->listView() != 0) { free(o); @@ -237,7 +237,7 @@ smokeruby_free(void * p) free(o); return; } - } else if (tqstrcmp(className, "TQPopupMenu") == 0) { + } else if (qstrcmp(className, "TQPopupMenu") == 0) { TQPopupMenu * item = (TQPopupMenu *) o->ptr; if (item->parentWidget(false) != 0) { free(o); @@ -411,7 +411,7 @@ matches_arg(Smoke *smoke, Smoke::Index meth, Smoke::Index argidx, const char *ar { Smoke::Index *arg = smoke->argumentList + smoke->methods[meth].args + argidx; SmokeType type = SmokeType(smoke, *arg); - return type.name() && tqstrcmp(type.name(), argtype) == 0; + return type.name() && qstrcmp(type.name(), argtype) == 0; } void * @@ -819,9 +819,9 @@ static void init_codec() { VALUE temp = rb_gv_get("$KCODE"); KCODE = StringValuePtr(temp); - if (tqstrcmp(KCODE, "EUC") == 0) { + if (qstrcmp(KCODE, "EUC") == 0) { codec = TQTextCodec::codecForName("eucJP"); - } else if (tqstrcmp(KCODE, "SJIS") == 0) { + } else if (qstrcmp(KCODE, "SJIS") == 0) { codec = TQTextCodec::codecForName("Shift-JIS"); } } @@ -833,13 +833,13 @@ qstringFromRString(VALUE rstring) { } TQString * s; - if (tqstrcmp(KCODE, "UTF8") == 0) + if (qstrcmp(KCODE, "UTF8") == 0) s = new TQString(TQString::fromUtf8(StringValuePtr(rstring), RSTRING_LEN(rstring))); - else if (tqstrcmp(KCODE, "EUC") == 0) + else if (qstrcmp(KCODE, "EUC") == 0) s = new TQString(codec->toUnicode(StringValuePtr(rstring))); - else if (tqstrcmp(KCODE, "SJIS") == 0) + else if (qstrcmp(KCODE, "SJIS") == 0) s = new TQString(codec->toUnicode(StringValuePtr(rstring))); - else if(tqstrcmp(KCODE, "NONE") == 0) + else if(qstrcmp(KCODE, "NONE") == 0) s = new TQString(TQString::fromLatin1(StringValuePtr(rstring))); else s = new TQString(TQString::fromLocal8Bit(StringValuePtr(rstring), RSTRING_LEN(rstring))); @@ -852,13 +852,13 @@ rstringFromTQString(TQString * s) { init_codec(); } - if (tqstrcmp(KCODE, "UTF8") == 0) + if (qstrcmp(KCODE, "UTF8") == 0) return rb_str_new2(s->utf8()); - else if (tqstrcmp(KCODE, "EUC") == 0) + else if (qstrcmp(KCODE, "EUC") == 0) return rb_str_new2(codec->fromUnicode(*s)); - else if (tqstrcmp(KCODE, "SJIS") == 0) + else if (qstrcmp(KCODE, "SJIS") == 0) return rb_str_new2(codec->fromUnicode(*s)); - else if (tqstrcmp(KCODE, "NONE") == 0) + else if (qstrcmp(KCODE, "NONE") == 0) return rb_str_new2(s->latin1()); else return rb_str_new2(s->local8Bit()); @@ -1789,7 +1789,7 @@ void marshall_ValueItemList(Marshall *m) { smokeruby_object *o = value_obj_info(item); // Special case for the TQValueList<TQVariant> type - if ( tqstrcmp(ItemSTR, "TQVariant") == 0 + if ( qstrcmp(ItemSTR, "TQVariant") == 0 && (!o || !o->ptr || o->classId != o->smoke->idClass("TQVariant")) ) { // If the value isn't a TQt::Variant, then try and construct diff --git a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb index 4197e9f6..bbbb92e3 100644 --- a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb +++ b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb @@ -277,13 +277,13 @@ module TQt def inspect str = super str.sub(/>$/, " memberName=%s, memberType=%s, object=%s>" % - [memberName.inspect, memberType == 1 ? "SLOT" : "SIGNAL", object.inspect] ) + [memberName.inspect, memberType == 1 ? "TQ_SLOT" : "TQ_SIGNAL", object.inspect] ) end def pretty_print(pp) str = to_s pp.text str.sub(/>$/, "\n memberName=%s,\n memberType=%s,\n object=%s>" % - [memberName.inspect, memberType == 1 ? "SLOT" : "SIGNAL", object.inspect] ) + [memberName.inspect, memberType == 1 ? "TQ_SLOT" : "TQ_SIGNAL", object.inspect] ) end end @@ -1758,7 +1758,7 @@ module TQt return TQt::Object.connect( src, signal, TQt::BlockInvocation.new(target, block, signature), - SLOT("invoke(#{signature})") ) + TQ_SLOT("invoke(#{signature})") ) end def Internal.signal_connect(src, signal, block) @@ -1766,7 +1766,7 @@ module TQt return TQt::Object.connect( src, signal, TQt::SignalBlockInvocation.new(src, block, signature), - SLOT("invoke(#{signature})") ) + TQ_SLOT("invoke(#{signature})") ) end end # TQt::Internal @@ -1878,7 +1878,7 @@ module TQt end # Qt class Object - def SIGNAL(signal) + def TQ_SIGNAL(signal) if signal.kind_of? Symbol return "2" + signal.to_s + "()" else @@ -1886,7 +1886,7 @@ class Object end end - def SLOT(slot) + def TQ_SLOT(slot) if slot.kind_of? Symbol return "1" + slot.to_s + "()" else diff --git a/qtruby/rubylib/qtruby/smokeruby.h b/qtruby/rubylib/qtruby/smokeruby.h index a24aa0dc..dd3b81bb 100644 --- a/qtruby/rubylib/qtruby/smokeruby.h +++ b/qtruby/rubylib/qtruby/smokeruby.h @@ -66,7 +66,7 @@ public: bool operator ==(const SmokeType &b) const { const SmokeType &a = *this; if(a.name() == b.name()) return true; - if(a.name() && b.name() && tqstrcmp(a.name(), b.name()) == 0) + if(a.name() && b.name() && qstrcmp(a.name(), b.name()) == 0) return true; return false; } @@ -100,7 +100,7 @@ public: bool operator ==(const SmokeClass &b) const { const SmokeClass &a = *this; if(a.className() == b.className()) return true; - if(a.className() && b.className() && tqstrcmp(a.className(), b.className()) == 0) + if(a.className() && b.className() && qstrcmp(a.className(), b.className()) == 0) return true; return false; } diff --git a/qtruby/rubylib/tutorial/t10/lcdrange.rb b/qtruby/rubylib/tutorial/t10/lcdrange.rb index 85ed3c0b..98e80fbd 100644 --- a/qtruby/rubylib/tutorial/t10/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t10/lcdrange.rb @@ -10,8 +10,8 @@ class LCDRange < TQt::VBox @slider = TQt::Slider.new(TQt::VBox::Horizontal, self, 'slider') @slider.setRange(0, 99) @slider.setValue(0) - connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) end diff --git a/qtruby/rubylib/tutorial/t10/t10.rb b/qtruby/rubylib/tutorial/t10/t10.rb index b86c9e1b..99b0cd96 100755 --- a/qtruby/rubylib/tutorial/t10/t10.rb +++ b/qtruby/rubylib/tutorial/t10/t10.rb @@ -11,7 +11,7 @@ class MyWidget < TQt::Widget quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( self, 'angle' ) angle.setRange( 5, 70 ) @@ -21,15 +21,15 @@ class MyWidget < TQt::Widget cannonField = CannonField.new( self, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setAngle(int)') ) - connect( cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setAngle(int)') ) + connect( cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) - connect( force, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setForce(int)') ) - connect( cannonField, SIGNAL('forceChanged(int)'), - force, SLOT('setValue(int)') ) + connect( force, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setForce(int)') ) + connect( cannonField, TQ_SIGNAL('forceChanged(int)'), + force, TQ_SLOT('setValue(int)') ) grid = TQt::GridLayout.new( self, 2, 2, 10 ) grid.addWidget( quit, 0, 0 ) diff --git a/qtruby/rubylib/tutorial/t11/cannon.rb b/qtruby/rubylib/tutorial/t11/cannon.rb index 89a2ca24..8429159b 100644 --- a/qtruby/rubylib/tutorial/t11/cannon.rb +++ b/qtruby/rubylib/tutorial/t11/cannon.rb @@ -12,8 +12,8 @@ class CannonField < TQt::Widget @f = 0 @timerCount = 0; @autoShootTimer = TQt::Timer.new( self, 'movement handler' ) - connect( @autoShootTimer, SIGNAL('timeout()'), - self, SLOT('moveShot()') ); + connect( @autoShootTimer, TQ_SIGNAL('timeout()'), + self, TQ_SLOT('moveShot()') ); @shoot_ang = 0 @shoot_f = 0 setPalette( TQt::Palette.new( TQt::Color.new( 250, 250, 200) ) ) diff --git a/qtruby/rubylib/tutorial/t11/lcdrange.rb b/qtruby/rubylib/tutorial/t11/lcdrange.rb index 85ed3c0b..98e80fbd 100644 --- a/qtruby/rubylib/tutorial/t11/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t11/lcdrange.rb @@ -10,8 +10,8 @@ class LCDRange < TQt::VBox @slider = TQt::Slider.new(TQt::VBox::Horizontal, self, 'slider') @slider.setRange(0, 99) @slider.setValue(0) - connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) end diff --git a/qtruby/rubylib/tutorial/t11/t11.rb b/qtruby/rubylib/tutorial/t11/t11.rb index 4b400026..d7ed74c9 100755 --- a/qtruby/rubylib/tutorial/t11/t11.rb +++ b/qtruby/rubylib/tutorial/t11/t11.rb @@ -11,7 +11,7 @@ class MyWidget < TQt::Widget quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( self, 'angle' ) angle.setRange( 5, 70 ) @@ -21,20 +21,20 @@ class MyWidget < TQt::Widget cannonField = CannonField.new( self, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setAngle(int)') ) - connect( cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setAngle(int)') ) + connect( cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) - connect( force, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setForce(int)') ) - connect( cannonField, SIGNAL('forceChanged(int)'), - force, SLOT('setValue(int)') ) + connect( force, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setForce(int)') ) + connect( cannonField, TQ_SIGNAL('forceChanged(int)'), + force, TQ_SLOT('setValue(int)') ) shoot = TQt::PushButton.new( '&Shoot', self, 'shoot' ) shoot.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) ) - connect( shoot, SIGNAL('clicked()'), cannonField, SLOT('shoot()') ) + connect( shoot, TQ_SIGNAL('clicked()'), cannonField, TQ_SLOT('shoot()') ) grid = TQt::GridLayout.new( self, 2, 2, 10 ) grid.addWidget( quit, 0, 0 ) diff --git a/qtruby/rubylib/tutorial/t12/cannon.rb b/qtruby/rubylib/tutorial/t12/cannon.rb index 0d17f880..c4c35432 100644 --- a/qtruby/rubylib/tutorial/t12/cannon.rb +++ b/qtruby/rubylib/tutorial/t12/cannon.rb @@ -12,8 +12,8 @@ class CannonField < TQt::Widget @f = 0 @timerCount = 0; @autoShootTimer = TQt::Timer.new( self, 'movement handler' ) - connect( @autoShootTimer, SIGNAL('timeout()'), - self, SLOT('moveShot()') ); + connect( @autoShootTimer, TQ_SIGNAL('timeout()'), + self, TQ_SLOT('moveShot()') ); @shoot_ang = 0 @shoot_f = 0 @target = TQt::Point.new(0, 0) diff --git a/qtruby/rubylib/tutorial/t12/lcdrange.rb b/qtruby/rubylib/tutorial/t12/lcdrange.rb index 54654165..77b81384 100644 --- a/qtruby/rubylib/tutorial/t12/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t12/lcdrange.rb @@ -17,8 +17,8 @@ class LCDRange < TQt::VBox @slider.setValue(0) @label = TQt::Label.new( ' ', self, 'label' ) @label.setAlignment( TQt::AlignCenter ) - connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) end diff --git a/qtruby/rubylib/tutorial/t12/t12.rb b/qtruby/rubylib/tutorial/t12/t12.rb index 47f81f3b..c836b750 100755 --- a/qtruby/rubylib/tutorial/t12/t12.rb +++ b/qtruby/rubylib/tutorial/t12/t12.rb @@ -12,7 +12,7 @@ class MyWidget < TQt::Widget quit = TQt::PushButton.new('&Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( 'ANGLE', self, 'angle' ) angle.setRange( 5, 70 ) @@ -22,20 +22,20 @@ class MyWidget < TQt::Widget cannonField = CannonField.new( self, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setAngle(int)') ) - connect( cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setAngle(int)') ) + connect( cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) - connect( force, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setForce(int)') ) - connect( cannonField, SIGNAL('forceChanged(int)'), - force, SLOT('setValue(int)') ) + connect( force, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setForce(int)') ) + connect( cannonField, TQ_SIGNAL('forceChanged(int)'), + force, TQ_SLOT('setValue(int)') ) shoot = TQt::PushButton.new( '&Shoot', self, 'shoot' ) shoot.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) ) - connect( shoot, SIGNAL('clicked()'), cannonField, SLOT('shoot()') ) + connect( shoot, TQ_SIGNAL('clicked()'), cannonField, TQ_SLOT('shoot()') ) grid = TQt::GridLayout.new( self, 2, 2, 10 ) grid.addWidget( quit, 0, 0 ) diff --git a/qtruby/rubylib/tutorial/t13/cannon.rb b/qtruby/rubylib/tutorial/t13/cannon.rb index 315760f0..75b637f9 100644 --- a/qtruby/rubylib/tutorial/t13/cannon.rb +++ b/qtruby/rubylib/tutorial/t13/cannon.rb @@ -16,8 +16,8 @@ class CannonField < TQt::Widget @f = 0 @timerCount = 0; @autoShootTimer = TQt::Timer.new( self, "movement handler" ) - connect( @autoShootTimer, SIGNAL('timeout()'), - self, SLOT('moveShot()') ); + connect( @autoShootTimer, TQ_SIGNAL('timeout()'), + self, TQ_SLOT('moveShot()') ); @shoot_ang = 0 @shoot_f = 0 @target = TQt::Point.new(0, 0) diff --git a/qtruby/rubylib/tutorial/t13/gamebrd.rb b/qtruby/rubylib/tutorial/t13/gamebrd.rb index 938dfd49..9a2f475a 100644 --- a/qtruby/rubylib/tutorial/t13/gamebrd.rb +++ b/qtruby/rubylib/tutorial/t13/gamebrd.rb @@ -11,7 +11,7 @@ class GameBoard < TQt::Widget quit = TQt::PushButton.new('&Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( 'ANGLE', self, 'angle' ) angle.setRange( 5, 70 ) @@ -21,32 +21,32 @@ class GameBoard < TQt::Widget @cannonField = CannonField.new( self, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - @cannonField, SLOT('setAngle(int)') ) - connect( @cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + @cannonField, TQ_SLOT('setAngle(int)') ) + connect( @cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) - connect( force, SIGNAL('valueChanged(int)'), - @cannonField, SLOT('setForce(int)') ) - connect( @cannonField, SIGNAL('forceChanged(int)'), - force, SLOT('setValue(int)') ) + connect( force, TQ_SIGNAL('valueChanged(int)'), + @cannonField, TQ_SLOT('setForce(int)') ) + connect( @cannonField, TQ_SIGNAL('forceChanged(int)'), + force, TQ_SLOT('setValue(int)') ) - connect( @cannonField, SIGNAL('hit()'), - self, SLOT('hit()') ) - connect( @cannonField, SIGNAL('missed()'), - self, SLOT('missed()') ) + connect( @cannonField, TQ_SIGNAL('hit()'), + self, TQ_SLOT('hit()') ) + connect( @cannonField, TQ_SIGNAL('missed()'), + self, TQ_SLOT('missed()') ) shoot = TQt::PushButton.new( '&Shoot', self, 'shoot' ) shoot.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) ) - connect( shoot, SIGNAL('clicked()'), SLOT('fire()') ) - connect( @cannonField, SIGNAL('canShoot(bool)'), - shoot, SLOT('setEnabled(bool)') ) + connect( shoot, TQ_SIGNAL('clicked()'), TQ_SLOT('fire()') ) + connect( @cannonField, TQ_SIGNAL('canShoot(bool)'), + shoot, TQ_SLOT('setEnabled(bool)') ) restart = TQt::PushButton.new( '&New Game', self, 'newgame' ) restart.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) ) - connect( restart, SIGNAL('clicked()'), self, SLOT('newGame()') ) + connect( restart, TQ_SIGNAL('clicked()'), self, TQ_SLOT('newGame()') ) @hits = TQt::LCDNumber.new( 2, self, 'hits' ) @shotsLeft = TQt::LCDNumber.new( 2, self, 'shotsleft' ) diff --git a/qtruby/rubylib/tutorial/t13/lcdrange.rb b/qtruby/rubylib/tutorial/t13/lcdrange.rb index 39eb9b1d..50f9a6fb 100644 --- a/qtruby/rubylib/tutorial/t13/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t13/lcdrange.rb @@ -19,8 +19,8 @@ class LCDRange < TQt::Widget @label = TQt::Label.new( ' ', self, 'label' ) @label.setAlignment( TQt::AlignCenter ) - connect(@slider, SIGNAL('valueChanged(int)'), @lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), @lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) diff --git a/qtruby/rubylib/tutorial/t14/cannon.rb b/qtruby/rubylib/tutorial/t14/cannon.rb index c2147714..33d0478d 100644 --- a/qtruby/rubylib/tutorial/t14/cannon.rb +++ b/qtruby/rubylib/tutorial/t14/cannon.rb @@ -15,8 +15,8 @@ class CannonField < TQt::Widget @f = 0 @timerCount = 0; @autoShootTimer = TQt::Timer.new( self, 'movement handler' ) - connect( @autoShootTimer, SIGNAL('timeout()'), - self, SLOT('moveShot()') ) + connect( @autoShootTimer, TQ_SIGNAL('timeout()'), + self, TQ_SLOT('moveShot()') ) @shoot_ang = 0 @shoot_f = 0 @target = TQt::Point.new(0, 0) diff --git a/qtruby/rubylib/tutorial/t14/gamebrd.rb b/qtruby/rubylib/tutorial/t14/gamebrd.rb index 27c403b0..e8ed3096 100644 --- a/qtruby/rubylib/tutorial/t14/gamebrd.rb +++ b/qtruby/rubylib/tutorial/t14/gamebrd.rb @@ -10,7 +10,7 @@ class GameBoard < TQt::Widget quit = TQt::PushButton.new('&Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( 'ANGLE', self, 'angle' ) angle.setRange( 5, 70 ) @@ -22,32 +22,32 @@ class GameBoard < TQt::Widget box.setFrameStyle( TQt::Frame::WinPanel | TQt::Frame::Sunken ) @cannonField = CannonField.new( box, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - @cannonField, SLOT('setAngle(int)') ) - connect( @cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + @cannonField, TQ_SLOT('setAngle(int)') ) + connect( @cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) - connect( force, SIGNAL('valueChanged(int)'), - @cannonField, SLOT('setForce(int)') ) - connect( @cannonField, SIGNAL('forceChanged(int)'), - force, SLOT('setValue(int)') ) + connect( force, TQ_SIGNAL('valueChanged(int)'), + @cannonField, TQ_SLOT('setForce(int)') ) + connect( @cannonField, TQ_SIGNAL('forceChanged(int)'), + force, TQ_SLOT('setValue(int)') ) - connect( @cannonField, SIGNAL('hit()'), - self, SLOT('hit()') ) - connect( @cannonField, SIGNAL('missed()'), - self, SLOT('missed()') ) + connect( @cannonField, TQ_SIGNAL('hit()'), + self, TQ_SLOT('hit()') ) + connect( @cannonField, TQ_SIGNAL('missed()'), + self, TQ_SLOT('missed()') ) shoot = TQt::PushButton.new( '&Shoot', self, 'shoot' ) shoot.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) ) - connect( shoot, SIGNAL('clicked()'), SLOT('fire()') ) - connect( @cannonField, SIGNAL('canShoot(bool)'), - shoot, SLOT('setEnabled(bool)') ) + connect( shoot, TQ_SIGNAL('clicked()'), TQ_SLOT('fire()') ) + connect( @cannonField, TQ_SIGNAL('canShoot(bool)'), + shoot, TQ_SLOT('setEnabled(bool)') ) restart = TQt::PushButton.new( '&New Game', self, 'newgame' ) restart.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) ) - connect( restart, SIGNAL('clicked()'), self, SLOT('newGame()') ) + connect( restart, TQ_SIGNAL('clicked()'), self, TQ_SLOT('newGame()') ) @hits = TQt::LCDNumber.new( 2, self, 'hits' ) @shotsLeft = TQt::LCDNumber.new( 2, self, 'shotsleft' ) @@ -56,11 +56,11 @@ class GameBoard < TQt::Widget accel = TQt::Accel.new( self ) accel.connectItem( accel.insertItem( TQt::KeySequence.new(Key_Enter) ), - self, SLOT('fire()') ) + self, TQ_SLOT('fire()') ) accel.connectItem( accel.insertItem( TQt::KeySequence.new(Key_Return) ), - self, SLOT('fire()') ) + self, TQ_SLOT('fire()') ) accel.connectItem( accel.insertItem( TQt::KeySequence.new(CTRL+Key_Q) ), - $qApp, SLOT('quit()') ) + $qApp, TQ_SLOT('quit()') ) grid = TQt::GridLayout.new( self, 2, 2, 10 ) grid.addWidget( quit, 0, 0 ) diff --git a/qtruby/rubylib/tutorial/t14/lcdrange.rb b/qtruby/rubylib/tutorial/t14/lcdrange.rb index 9cb54b39..e0817103 100644 --- a/qtruby/rubylib/tutorial/t14/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t14/lcdrange.rb @@ -19,8 +19,8 @@ class LCDRange < TQt::Widget @label = TQt::Label.new( ' ', self, 'label' ) @label.setAlignment( TQt::AlignCenter ) - connect(@slider, SIGNAL('valueChanged(int)'), @lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), @lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) diff --git a/qtruby/rubylib/tutorial/t2/t2.rb b/qtruby/rubylib/tutorial/t2/t2.rb index b5e62bca..813eb78f 100755 --- a/qtruby/rubylib/tutorial/t2/t2.rb +++ b/qtruby/rubylib/tutorial/t2/t2.rb @@ -9,7 +9,7 @@ quit = TQt::PushButton.new('Quit', nil) quit.resize(75, 30) quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) -TQt::Object.connect(quit, SIGNAL('clicked()'), a, SLOT('quit()')) +TQt::Object.connect(quit, TQ_SIGNAL('clicked()'), a, TQ_SLOT('quit()')) a.setMainWidget(quit) quit.show diff --git a/qtruby/rubylib/tutorial/t3/t3.rb b/qtruby/rubylib/tutorial/t3/t3.rb index 9a6b32d2..2c1d6b76 100755 --- a/qtruby/rubylib/tutorial/t3/t3.rb +++ b/qtruby/rubylib/tutorial/t3/t3.rb @@ -11,7 +11,7 @@ box.resize(200, 120) quit = TQt::PushButton.new('Quit', box) quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) -a.connect(quit, SIGNAL('clicked()'), SLOT('quit()')) +a.connect(quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()')) a.setMainWidget(box) box.show diff --git a/qtruby/rubylib/tutorial/t4/t4.rb b/qtruby/rubylib/tutorial/t4/t4.rb index dc254a8d..b4f36b78 100755 --- a/qtruby/rubylib/tutorial/t4/t4.rb +++ b/qtruby/rubylib/tutorial/t4/t4.rb @@ -13,7 +13,7 @@ def initialize(parent = nil, name = nil) quit = TQt::PushButton.new('Quit', self, 'quit') quit.setGeometry(62, 40, 75, 30) quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) end end diff --git a/qtruby/rubylib/tutorial/t5/t5.rb b/qtruby/rubylib/tutorial/t5/t5.rb index 56b50d17..72625321 100755 --- a/qtruby/rubylib/tutorial/t5/t5.rb +++ b/qtruby/rubylib/tutorial/t5/t5.rb @@ -10,7 +10,7 @@ def initialize() quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) lcd = TQt::LCDNumber.new(2, self, 'lcd') @@ -18,7 +18,7 @@ def initialize() slider.setRange(0, 99) slider.setValue(0) - connect(slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) + connect(slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) end end diff --git a/qtruby/rubylib/tutorial/t6/t6.rb b/qtruby/rubylib/tutorial/t6/t6.rb index 7d6b4b42..f0bd1afb 100755 --- a/qtruby/rubylib/tutorial/t6/t6.rb +++ b/qtruby/rubylib/tutorial/t6/t6.rb @@ -13,7 +13,7 @@ def initialize(grid) slider.setRange(0, 99) slider.setValue(0) - lcd.connect(slider, SIGNAL('valueChanged(int)'), SLOT('display(int)')) + lcd.connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('display(int)')) end end @@ -25,7 +25,7 @@ def initialize() quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) grid = TQt::Grid.new( 4, self ) for c in 0..3 diff --git a/qtruby/rubylib/tutorial/t7/lcdrange.rb b/qtruby/rubylib/tutorial/t7/lcdrange.rb index 0c673284..4e9e7616 100644 --- a/qtruby/rubylib/tutorial/t7/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t7/lcdrange.rb @@ -11,8 +11,8 @@ class LCDRange < TQt::VBox @slider = TQt::Slider.new(TQt::VBox::Horizontal, self, 'slider') @slider.setRange(0, 99) @slider.setValue(0) - connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) end def value() diff --git a/qtruby/rubylib/tutorial/t7/t7.rb b/qtruby/rubylib/tutorial/t7/t7.rb index f1d56b20..97cfe8d0 100755 --- a/qtruby/rubylib/tutorial/t7/t7.rb +++ b/qtruby/rubylib/tutorial/t7/t7.rb @@ -11,7 +11,7 @@ def initialize() quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) grid = TQt::Grid.new( 4, self ) previous = nil @@ -19,8 +19,8 @@ def initialize() for r in 0..3 lr = LCDRange.new(grid) if previous != nil - connect( lr, SIGNAL('valueChanged(int)'), - previous, SLOT('setValue(int)') ) + connect( lr, TQ_SIGNAL('valueChanged(int)'), + previous, TQ_SLOT('setValue(int)') ) end previous = lr end diff --git a/qtruby/rubylib/tutorial/t8/lcdrange.rb b/qtruby/rubylib/tutorial/t8/lcdrange.rb index 4e3d856f..32481913 100644 --- a/qtruby/rubylib/tutorial/t8/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t8/lcdrange.rb @@ -10,8 +10,8 @@ class LCDRange < TQt::VBox @slider = TQt::Slider.new(TQt::VBox::Horizontal, self, 'slider') @slider.setRange(0, 99) @slider.setValue(0) - connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) end diff --git a/qtruby/rubylib/tutorial/t8/t8.rb b/qtruby/rubylib/tutorial/t8/t8.rb index fad11dd0..bc6a468a 100755 --- a/qtruby/rubylib/tutorial/t8/t8.rb +++ b/qtruby/rubylib/tutorial/t8/t8.rb @@ -11,17 +11,17 @@ class MyWidget < TQt::Widget quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( self, 'angle' ) angle.setRange( 5, 70 ) cannonField = CannonField.new( self, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setAngle(int)') ) - connect( cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setAngle(int)') ) + connect( cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) grid = TQt::GridLayout.new( self, 2, 2, 10 ) # 2x2, 10 pixel border diff --git a/qtruby/rubylib/tutorial/t9/lcdrange.rb b/qtruby/rubylib/tutorial/t9/lcdrange.rb index 208650f3..dddbc381 100644 --- a/qtruby/rubylib/tutorial/t9/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t9/lcdrange.rb @@ -10,8 +10,8 @@ class LCDRange < TQt::VBox @slider = TQt::Slider.new(TQt::VBox::Horizontal, self, 'slider') @slider.setRange(0, 99) @slider.setValue(0) - connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) end diff --git a/qtruby/rubylib/tutorial/t9/t9.rb b/qtruby/rubylib/tutorial/t9/t9.rb index 8a9cf81d..090fc9b0 100755 --- a/qtruby/rubylib/tutorial/t9/t9.rb +++ b/qtruby/rubylib/tutorial/t9/t9.rb @@ -11,17 +11,17 @@ class MyWidget < TQt::Widget quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( self, 'angle' ) angle.setRange( 5, 70 ) cannonField = CannonField.new( self, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setAngle(int)') ) - connect( cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setAngle(int)') ) + connect( cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) grid = TQt::GridLayout.new( self, 2, 2, 10 ) # 2x2, 10 pixel border diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml index e2e84dad..9cf58705 100644 --- a/qtsharp/src/api/qt.xml +++ b/qtsharp/src/api/qt.xml @@ -305,7 +305,7 @@ <qparam type="TQUuidamp" name="arg1"/> <qparam type="TQUnknownInterface**" name="arg2"/> </qmethod> - <qmethod name="isValid" access="public" return="Q_REFCOUNT bool" id="0"/> + <qmethod name="isValid" access="public" return="TQ_REFCOUNT bool" id="0"/> <qmethod name="protected_object" access="protected" return="TQObject*" id="0"/> </qtype> <qtype name="TQAction" access="public"> <qancestor name="TQObject"/> @@ -1187,10 +1187,6 @@ id="0"> <qmethod name="isDown" access="public" return="bool" id="0"/> <qmethod name="isOn" access="public" return="bool" id="0"/> <qmethod name="state" access="public" return="ToggleState" id="0"/> - <qmethod name="autoResize" access="public" return="bool" id="0"/> - <qmethod name="setAutoResize" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> <qmethod name="autoRepeat" access="public" return="bool" id="0"/> <qmethod name="setAutoRepeat" access="public" return="void" id="0"> <qparam type="bool" name="arg1"/> @@ -9318,14 +9314,6 @@ id="0"/> <qparam type="int" name="arg4"/> </qmethod> <qmethod name="alignment" access="public" return="int" id="0"/> - <qmethod name="cursorLeft" access="public" return="void" id="0"> - <qparam type="bool" name="mark"/> - <qparam type="int" name="steps" default="1"/> - </qmethod> - <qmethod name="cursorRight" access="public" return="void" id="0"> - <qparam type="bool" name="mark"/> - <qparam type="int" name="steps" default="1"/> - </qmethod> <qmethod name="cursorForward" access="public" return="void" id="0"> <qparam type="bool" name="mark"/> <qparam type="int" name="steps" default="1"/> @@ -9360,8 +9348,6 @@ id="0"/> </qmethod> <qmethod name="isUndoAvailable" access="public" return="bool" id="0"/> <qmethod name="isRedoAvailable" access="public" return="bool" id="0"/> - <qmethod name="hasMarkedText" access="public" return="bool" id="0"/> - <qmethod name="markedText" access="public" return="TQString" id="0"/> <qmethod name="setPasswordChar" access="public" return="void" id="0"> <qparam type="TQChar" name="c"/> </qmethod> @@ -9426,10 +9412,6 @@ id="0"/> <qmethod name="protected_drawContents" access="protected" return="void" id="0"> <qparam type="TQPainter*" name="painter"/> </qmethod> - <qmethod name="protected_repaintArea" access="protected" return="void" id="0"> - <qparam type="int" name="arg1"/> - <qparam type="int" name="arg2"/> - </qmethod> <qmethod name="protected_createPopupMenu" access="protected" return="TQPopupMenu*" id="0"/> <qmethod name="protected_windowActivationChange" access="protected" @@ -13088,7 +13070,6 @@ id="0"> <qmethod name="active" access="public" return="TQColorGroupamp" id="0"/> <qmethod name="disabled" access="public" return="TQColorGroupamp" id="0"/> <qmethod name="inactive" access="public" return="TQColorGroupamp" id="0"/> - <qmethod name="normal" access="public" return="TQColorGroupamp" id="0"/> <qmethod name="setActive" access="public" return="void" id="0"> <qparam type="TQColorGroupamp" name="arg1"/> </qmethod> @@ -13098,9 +13079,6 @@ id="0"> <qmethod name="setInactive" access="public" return="void" id="0"> <qparam type="TQColorGroupamp" name="arg1"/> </qmethod> - <qmethod name="setNormal" access="public" return="void" id="0"> - <qparam type="TQColorGroupamp" name="cg"/> - </qmethod> <qmethod name="isCopyOf" access="public" return="bool" id="0"> <qparam type="TQPaletteamp" name="arg1"/> </qmethod> @@ -15189,14 +15167,6 @@ id="0"> <qmethod name="tryAccess" access="public" return="bool" id="0"> <qparam type="int" name="arg1"/> </qmethod> -</qtype> <qtype name="TQSemiModal" access="public"> - <qancestor name="TQDialog"/> - <qctor name="TQSemiModal" access="public" id="0"> - <qparam type="TQWidget*" name="parent" default="0"/> - <qparam type="char*" name="name" default="0"/> - <qparam type="bool" name="modal" default="FALSE"/> - <qparam type="WFlags" name="f" default="0"/> - </qctor> </qtype> <qtype name="TQSenderObject" access="public"> <qancestor name="TQObject"/> <qmethod name="setSender" access="public" return="void" id="0"> @@ -15372,14 +15342,6 @@ id="0"> <qparam type="char*" name="member" default="0"/> </qmethod> <qmethod name="activate" access="public" return="void" id="0"/> - <qmethod name="isBlocked" access="public" return="bool" id="0"/> - <qmethod name="block" access="public" return="void" id="0"> - <qparam type="bool" name="b"/> - </qmethod> - <qmethod name="setParameter" access="public" return="void" id="0"> - <qparam type="int" name="value"/> - </qmethod> - <qmethod name="parameter" access="public" return="int" id="0"/> <qmethod name="setValue" access="public" return="void" id="0"> <qparam type="TQVariantamp" name="value"/> </qmethod> @@ -15878,14 +15840,6 @@ id="0"> <qmethod name="protected_event" access="protected" return="bool" id="0"> <qparam type="TQEvent*" name="arg1"/> </qmethod> -</qtype> <qtype name="TQSortedList" access="public"> - <qancestor name="TQPtrList"/> - <qctor name="TQSortedList" access="public" id="0"/> - <qdctor name="TQSortedList" access="public"/> - <qmethod name="compareItems" access="public" return="int" id="0"> - <qparam type="TQPtrCollection::Item" name="s1"/> - <qparam type="TQPtrCollection::Item" name="s2"/> - </qmethod> </qtype> <qtype name="TQSound" access="public"> <qancestor name="TQObject"/> <qctor name="TQSound" access="public" id="0"> @@ -22888,270 +22842,5 @@ value="AlignLeft|AlignRight|AlignHCenter|AlignJustify"/> <qitem name="Contains" value="8"/> <qitem name="ExactMatch" value="16"/> </qenum> -</qtype> <qtype name="QtMultiLineEdit" access="public"> - <qancestor name="QtTableView"/> - <qenum name="EchoMode" access="public"> - <qitem name="Normal" value="0"/> - <qitem name="NoEcho" value="1"/> - <qitem name="Password" value="2"/> - </qenum> - <qenum name="WordWrap" access="public"> - <qitem name="NoWrap" value="0"/> - <qitem name="WidgetWidth" value="1"/> - <qitem name="FixedPixelWidth" value="2"/> - <qitem name="FixedColumnWidth" value="3"/> - </qenum> - <qenum name="WrapPolicy" access="public"> - <qitem name="AtWhiteSpace" value="0"/> - <qitem name="Anywhere" value="1"/> - </qenum> - <qctor name="QtMultiLineEdit" access="public" id="0"> - <qparam type="TQWidget*" name="parent" default="0"/> - <qparam type="char*" name="name" default="0"/> - </qctor> - <qdctor name="QtMultiLineEdit" access="public"/> - <qmethod name="textLine" access="public" return="TQString" id="0"> - <qparam type="int" name="line"/> - </qmethod> - <qmethod name="numLines" access="public" return="int" id="0"/> - <qmethod name="sizeHint" access="public" return="TQSize" id="0"/> - <qmethod name="minimumSizeHint" access="public" return="TQSize" id="0"/> - <qmethod name="sizePolicy" access="public" return="TQSizePolicy" id="0"/> - <qmethod name="setFont" access="public" return="void" id="0"> - <qparam type="TQFontamp" name="font"/> - </qmethod> - <qmethod name="insertLine" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="s"/> - <qparam type="int" name="line" default="-1"/> - </qmethod> - <qmethod name="insertAt" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="s"/> - <qparam type="int" name="line"/> - <qparam type="int" name="col"/> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="removeLine" access="public" return="void" id="0"> - <qparam type="int" name="line"/> - </qmethod> - <qmethod name="cursorPosition" access="public" return="void" id="0"> - <qparam type="int*" name="line"/> - <qparam type="int*" name="col"/> - </qmethod> - <qmethod name="setCursorPosition" access="public" return="void" id="0"> - <qparam type="int" name="line"/> - <qparam type="int" name="col"/> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="getCursorPosition" access="public" return="void" id="0"> - <qparam type="int*" name="line"/> - <qparam type="int*" name="col"/> - </qmethod> - <qmethod name="atBeginning" access="public" return="bool" id="0"/> - <qmethod name="atEnd" access="public" return="bool" id="0"/> - <qmethod name="setFixedVisibleLines" access="public" return="void" id="0"> - <qparam type="int" name="lines"/> - </qmethod> - <qmethod name="maxLineWidth" access="public" return="int" id="0"/> - <qmethod name="setAlignment" access="public" return="void" id="0"> - <qparam type="int" name="flags"/> - </qmethod> - <qmethod name="alignment" access="public" return="int" id="0"/> - <qmethod name="setValidator" access="public" return="void" id="0"> - <qparam type="TQValidator*" name="arg1"/> - </qmethod> - <qmethod name="validator" access="public" return="TQValidator*" id="0"/> - <qmethod name="setEdited" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="edited" access="public" return="bool" id="0"/> - <qmethod name="cursorWordForward" access="public" return="void" id="0"> - <qparam type="bool" name="mark"/> - </qmethod> - <qmethod name="cursorWordBackward" access="public" return="void" id="0"> - <qparam type="bool" name="mark"/> - </qmethod> - <qmethod name="setEchoMode" access="public" return="void" id="0"> - <qparam type="EchoMode" name="arg1"/> - </qmethod> - <qmethod name="echoMode" access="public" return="EchoMode" id="0"/> - <qmethod name="setMaxLength" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="maxLength" access="public" return="int" id="0"/> - <qmethod name="setMaxLineLength" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="maxLineLength" access="public" return="int" id="0"/> - <qmethod name="setMaxLines" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="maxLines" access="public" return="int" id="0"/> - <qmethod name="setHMargin" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="hMargin" access="public" return="int" id="0"/> - <qmethod name="setSelection" access="public" return="void" id="0"> - <qparam type="int" name="row_from"/> - <qparam type="int" name="col_from"/> - <qparam type="int" name="row_to"/> - <qparam type="int" name="col_t"/> - </qmethod> - <qmethod name="setWordWrap" access="public" return="void" id="0"> - <qparam type="WordWrap" name="mode"/> - </qmethod> - <qmethod name="wordWrap" access="public" return="WordWrap" id="0"/> - <qmethod name="setWrapColumnOrWidth" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="wrapColumnOrWidth" access="public" return="int" id="0"/> - <qmethod name="setWrapPolicy" access="public" return="void" id="0"> - <qparam type="WrapPolicy" name="policy"/> - </qmethod> - <qmethod name="wrapPolicy" access="public" return="WrapPolicy" id="0"/> - <qmethod name="autoUpdate" access="public" return="bool" id="0"/> - <qmethod name="setAutoUpdate" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="setUndoEnabled" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="isUndoEnabled" access="public" return="bool" id="0"/> - <qmethod name="setUndoDepth" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="undoDepth" access="public" return="int" id="0"/> - <qmethod name="isReadOnly" access="public" return="bool" id="0"/> - <qmethod name="isOverwriteMode" access="public" return="bool" id="0"/> - <qmethod name="text" access="public" return="TQString" id="0"/> - <qmethod name="length" access="public" return="int" id="0"/> - <qmethod name="setText" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="arg1"/> - </qmethod> - <qmethod name="setReadOnly" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="setOverwriteMode" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="clear" access="public" return="void" id="0"/> - <qmethod name="append" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="arg1"/> - </qmethod> - <qmethod name="deselect" access="public" return="void" id="0"/> - <qmethod name="selectAll" access="public" return="void" id="0"/> - <qmethod name="paste" access="public" return="void" id="0"/> - <qmethod name="pasteSubType" access="public" return="void" id="0"> - <qparam type="TQCStringamp" name="subtype"/> - </qmethod> - <qmethod name="copyText" access="public" return="void" id="0"/> - <qmethod name="copy" access="public" return="void" id="0"/> - <qmethod name="cut" access="public" return="void" id="0"/> - <qmethod name="insert" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="arg1"/> - </qmethod> - <qmethod name="undo" access="public" return="void" id="0"/> - <qmethod name="redo" access="public" return="void" id="0"/> - <qmethod name="setDefaultTabStop" access="public static" return="void" id="0"> - <qparam type="int" name="ex"/> - </qmethod> - <qmethod name="defaultTabStop" access="public static" return="int" id="0"/> - <qmethod name="protected_paintCell" access="protected" return="void" id="0"> - <qparam type="TQPainter*" name="arg1"/> - <qparam type="int" name="row"/> - <qparam type="int" name="col"/> - </qmethod> - <qmethod name="protected_event" access="protected" return="bool" id="0"> - <qparam type="TQEvent*" name="arg1"/> - </qmethod> - <qmethod name="protected_focusNextPrevChild" access="protected" return="bool" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="protected_hasMarkedText" access="protected" return="bool" id="0"/> - <qmethod name="protected_markedText" access="protected" return="TQString" id="0"/> - <qmethod name="protected_textWidth" access="protected" return="int" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="protected_textWidth" access="protected" return="int" id="1"> - <qparam type="TQStringamp" name="arg1"/> - </qmethod> - <qmethod name="protected_cursorPoint" access="protected" return="TQPoint" id="0"/> - <qmethod name="protected_insert" access="protected" return="void" id="1"> - <qparam type="TQStringamp" name="arg1"/> - <qparam type="bool" name="mark"/> - </qmethod> - <qmethod name="protected_newLine" access="protected" return="void" id="0"/> - <qmethod name="protected_killLine" access="protected" return="void" id="0"/> - <qmethod name="protected_pageUp" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_pageDown" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_cursorLeft" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - <qparam type="bool" name="wrap" default="TRUE"/> - </qmethod> - <qmethod name="protected_cursorRight" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - <qparam type="bool" name="wrap" default="TRUE"/> - </qmethod> - <qmethod name="protected_cursorUp" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_cursorDown" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_backspace" access="protected" return="void" id="0"/> - <qmethod name="protected_del" access="protected" return="void" id="0"/> - <qmethod name="protected_home" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_end" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_getMarkedRegion" access="protected" return="bool" id="0"> - <qparam type="int*" name="line1"/> - <qparam type="int*" name="col1"/> - <qparam type="int*" name="line2"/> - <qparam type="int*" name="col2"/> - </qmethod> - <qmethod name="protected_lineLength" access="protected" return="int" id="0"> - <qparam type="int" name="row"/> - </qmethod> - <qmethod name="protected_getString" access="protected" return="TQString*" id="0"> - <qparam type="int" name="row"/> - </qmethod> - <qmethod name="protected_isEndOfParagraph" access="protected" return="bool" id="0"> - <qparam type="int" name="row"/> - </qmethod> - <qmethod name="protected_stringShown" access="protected" return="TQString" id="0"> - <qparam type="int" name="row"/> - </qmethod> - <qmethod name="protected_insertChar" access="protected" return="void" id="0"> - <qparam type="TQChar" name="arg1"/> - </qmethod> -</qtype> <qtype name="QtTableView" access="public"> - <qancestor name="TQFrame"/> - <qmethod name="setBackgroundColor" access="public" return="void" id="0"> - <qparam type="TQColoramp" name="arg1"/> - </qmethod> - <qmethod name="setPalette" access="public" return="void" id="0"> - <qparam type="TQPaletteamp" name="arg1"/> - </qmethod> - <qmethod name="show" access="public" return="void" id="0"/> - <qmethod name="repaint" access="public" return="void" id="0"> - <qparam type="bool" name="erase" default="TRUE"/> - </qmethod> - <qmethod name="repaint" access="public" return="void" id="1"> - <qparam type="int" name="x"/> - <qparam type="int" name="y"/> - <qparam type="int" name="w"/> - <qparam type="int" name="h"/> - <qparam type="bool" name="erase" default="TRUE"/> - </qmethod> - <qmethod name="repaint" access="public" return="void" id="2"> - <qparam type="TQRectamp" name="arg1"/> - <qparam type="bool" name="erase" default="TRUE"/> - </qmethod> </qtype> </qtypes> diff --git a/qtsharp/src/bindings/qt.build b/qtsharp/src/bindings/qt.build index 1481dddd..ec782f49 100644 --- a/qtsharp/src/bindings/qt.build +++ b/qtsharp/src/bindings/qt.build @@ -332,7 +332,6 @@ <file name="TQScrollBar.cs" /> <file name="TQScrollView.cs" /> <file name="TQSemaphore.cs" /> - <file name="TQSemiModal.cs" /> <file name="TQSenderObject.cs" /> <file name="TQServerSocket.cs" /> <file name="TQSessionManager.cs" /> @@ -352,7 +351,6 @@ <file name="TQSocket.cs" /> <file name="TQSocketDevice.cs" /> <file name="TQSocketNotifier.cs" /> - <file name="TQSortedList.cs" /> <file name="TQSound.cs" /> <file name="TQSpacerItem.cs" /> <file name="TQSpinBox.cs" /> @@ -463,9 +461,7 @@ <file name="TQXmlSimpleReader.cs" /> <file name="TQXtApplication.cs" /> <file name="TQXtWidget.cs" /> - <file name="QtMultiLineEdit.cs" /> <file name="QtSupport.cs" /> - <file name="QtTableView.cs" /> <file name="RasterOp.cs" /> <file name="StringComparisonMode.cs" /> <file name="TextFlags.cs" /> diff --git a/qtsharp/src/bindings/static/QtSignal.cs b/qtsharp/src/bindings/static/QtSignal.cs index 6660de87..6a76ed09 100644 --- a/qtsharp/src/bindings/static/QtSignal.cs +++ b/qtsharp/src/bindings/static/QtSignal.cs @@ -162,120 +162,120 @@ namespace Qt { switch (slotobj.Args) { case "()": del = Delegate.CreateDelegate (typeof (del_void), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_void (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_void (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(bool)": del = Delegate.CreateDelegate (typeof (del_bool), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_bool (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_bool (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(short)": del = Delegate.CreateDelegate (typeof (del_short), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_short (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_short (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(int)": del = Delegate.CreateDelegate (typeof (del_int), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_int (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_int (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(long)": del = Delegate.CreateDelegate (typeof (del_long), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_long (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_long (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(float)": del = Delegate.CreateDelegate (typeof (del_float), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_float (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_float (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(double)": del = Delegate.CreateDelegate (typeof (del_double), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_double (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_double (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(TQString)": realsignal = sigobj.Name + "(const TQString&)"; Console.WriteLine("Connecting signal, sigobj.Name = {0}, realsignal = {1}", sigobj.Name, realsignal); del = Delegate.CreateDelegate (typeof (del_QString), slotobj, "SlotBridge_QString"); - slotobj.WrapperPtr = csharp_connect_QString (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QString (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQDockWindow)": realsignal = sigobj.Name + "(TQDockWindow*)"; del = Delegate.CreateDelegate (typeof (del_QDockWindow), slotobj, "SlotBridge_QDockWindow"); - slotobj.WrapperPtr = csharp_connect_QDockWindow (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QDockWindow (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQDropEvent)": realsignal = sigobj.Name + "(TQDropEvent*)"; del = Delegate.CreateDelegate (typeof (del_QDropEvent), slotobj, "SlotBridge_QDropEvent"); - slotobj.WrapperPtr = csharp_connect_QDropEvent (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QDropEvent (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQDropEvent,TQListViewItem)": realsignal = sigobj.Name + "(TQDropEvent*,TQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QDropEventTQListViewItem), slotobj, "SlotBridge_QDropEventTQListViewItem"); - slotobj.WrapperPtr = csharp_connect_QDropEventTQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QDropEventTQListViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQIconViewItem)": realsignal = sigobj.Name + "(TQIconViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QIconViewItem), slotobj, "SlotBridge_QIconViewItem"); - slotobj.WrapperPtr = csharp_connect_QIconViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QIconViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQListBoxItem)": realsignal = sigobj.Name + "(TQListBoxItem*)"; del = Delegate.CreateDelegate (typeof (del_QListBoxItem), slotobj, "SlotBridge_QListBoxItem"); - slotobj.WrapperPtr = csharp_connect_QListBoxItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QListBoxItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQListViewItem)": realsignal = sigobj.Name + "(TQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QListViewItem), slotobj, "SlotBridge_QListViewItem"); - slotobj.WrapperPtr = csharp_connect_QListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QListViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQListViewItem,TQListViewItem)": realsignal = sigobj.Name + "(TQListViewItem*,TQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QListViewItemTQListViewItem), slotobj, "SlotBridge_QListViewItemTQListViewItem"); - slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQListViewItem,TQListViewItem,TQListViewItem)": realsignal = sigobj.Name + "(TQListViewItem*,TQListViewItem*,TQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QListViewItemTQListViewItemTQListViewItem), slotobj, "SlotBridge_QListViewItemTQListViewItemTQListViewItem"); - slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItemTQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItemTQListViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQNetworkOperation)": realsignal = sigobj.Name + "(TQNetworkOperation*)"; del = Delegate.CreateDelegate (typeof (del_QNetworkOperation), slotobj, "SlotBridge_QNetworkOperation"); - slotobj.WrapperPtr = csharp_connect_QNetworkOperation (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QNetworkOperation (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQObject)": realsignal = sigobj.Name + "(TQObject*)"; del = Delegate.CreateDelegate (typeof (del_QObject), slotobj, "SlotBridge_QObject"); - slotobj.WrapperPtr = csharp_connect_QObject (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QObject (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQToolBar)": realsignal = sigobj.Name + "(TQToolBar*)"; del = Delegate.CreateDelegate (typeof (del_QToolBar), slotobj, "SlotBridge_QToolBar"); - slotobj.WrapperPtr = csharp_connect_QToolBar (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QToolBar (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQWidget)": realsignal = sigobj.Name + "(TQWidget*)"; del = Delegate.CreateDelegate (typeof (del_QWidget), slotobj, "SlotBridge_QWidget"); - slotobj.WrapperPtr = csharp_connect_QWidget (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QWidget (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(int,TQIconViewItem)": realsignal = sigobj.Name + "(int,TQIconViewItem*)"; del = Delegate.CreateDelegate (typeof (del_intTQIconViewItem), slotobj, "SlotBridge_intTQIconViewItem"); - slotobj.WrapperPtr = csharp_connect_intTQIconViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intTQIconViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(int,TQListBoxItem)": realsignal = sigobj.Name + "(int,TQListBoxItem*)"; del = Delegate.CreateDelegate (typeof (del_intTQListBoxItem), slotobj, "SlotBridge_intTQListBoxItem"); - slotobj.WrapperPtr = csharp_connect_intTQListBoxItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intTQListBoxItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(int,bool)": del = Delegate.CreateDelegate (typeof (del_intbool), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_intbool (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intbool (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(int,int)": del = Delegate.CreateDelegate (typeof (del_intint), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_intint (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intint (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(int,int,int)": del = Delegate.CreateDelegate (typeof (del_intintint), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_intintint (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intintint (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; default: throw new ArgumentException ("Unsupported method prototype for C++ signal -> C# slot connection: " + slotobj.Args); @@ -292,7 +292,7 @@ namespace Qt { // ...a C++ slot. C++ slots are C# methods, so we should never get here. else { throw new ArgumentException(receiver+" has no slot '"+slot+"'"); - // return qt_QObject_connect1(sender.RawObject, TQT_SIGNAL(signal), receiver.RawObject, TQT_SLOT(slot)); + // return qt_QObject_connect1(sender.RawObject, TQ_SIGNAL(signal), receiver.RawObject, TQ_SLOT(slot)); } } } @@ -330,11 +330,11 @@ namespace Qt { string mangle = MangleArgs(args); // HACK Wrap target signal in a slot and connect the slot to the sender. - return Connect(sender, TQT_SIGNAL(signal), targetobj, TQT_SLOT("Emit_"+mangle+args)); + return Connect(sender, TQ_SIGNAL(signal), targetobj, TQ_SLOT("Emit_"+mangle+args)); } // ...a C++ signal else - return qt_QObject_connect1(sender.RawObject, TQT_SIGNAL(signal), receiver.RawObject, TQT_SIGNAL(target)); + return qt_QObject_connect1(sender.RawObject, TQ_SIGNAL(signal), receiver.RawObject, TQ_SIGNAL(target)); } } @@ -410,7 +410,7 @@ namespace Qt { // ...a C++ slot. C++ slots are C# methods, so we should never get here. else { throw new ArgumentException(receiver+" has no slot '"+slot+"'"); - // return qt_QObject_disconnect2(sender.RawObject, TQT_SIGNAL(signal), receiver.RawObject, TQT_SLOT(slot)); + // return qt_QObject_disconnect2(sender.RawObject, TQ_SIGNAL(signal), receiver.RawObject, TQ_SLOT(slot)); } } } @@ -449,11 +449,11 @@ namespace Qt { if (receiver.CsSignalMap.Contains(target)) { QtSignal targetobj = receiver.CsSignalMap[target]; string args = "(" + target.Split(new char[] {'('})[1]; - return Disconnect(sender, TQT_SIGNAL(signal), targetobj, TQT_SLOT("emit_"+args)); + return Disconnect(sender, TQ_SIGNAL(signal), targetobj, TQ_SLOT("emit_"+args)); } // ...a C++ signal else { - return qt_QObject_disconnect2(sender.RawObject, TQT_SIGNAL(signal), receiver.RawObject, TQT_SLOT(target)); + return qt_QObject_disconnect2(sender.RawObject, TQ_SIGNAL(signal), receiver.RawObject, TQ_SLOT(target)); } } } @@ -474,7 +474,7 @@ namespace Qt { foreach (QtSignal signal in signals) foreach (QtSlot slot in new ArrayList (signal.Slots)) - Disconnect (sender, TQT_SIGNAL (signal.Signal), slot.Receiver, TQT_SLOT (slot.Slot)); + Disconnect (sender, TQ_SIGNAL (signal.Signal), slot.Receiver, TQ_SLOT (slot.Slot)); return true; } @@ -495,7 +495,7 @@ namespace Qt { foreach (QtSignal signal in signals) foreach (QtSlot slot in new ArrayList (signal.Slots)) - Disconnect (signal.Sender, TQT_SIGNAL (signal.Name), receiver, TQT_SLOT (slot.Name)); + Disconnect (signal.Sender, TQ_SIGNAL (signal.Name), receiver, TQ_SLOT (slot.Name)); return true; } @@ -509,7 +509,7 @@ namespace Qt { QtSignal sig = map[signal]; if (sig != null) { foreach (QtSlot slot in new ArrayList (sig.Slots)) - Disconnect (sender, TQT_SIGNAL(signal), slot.Receiver, TQT_SLOT(slot.Slot)); + Disconnect (sender, TQ_SIGNAL(signal), slot.Receiver, TQ_SLOT(slot.Slot)); } } @@ -527,7 +527,7 @@ namespace Qt { if (sig != null) { foreach (QtSlot slot in new ArrayList (sig.Slots)) if (slot.Receiver == receiver) - Disconnect (sender, signal, receiver, TQT_SLOT (slot.Name)); + Disconnect (sender, signal, receiver, TQ_SLOT (slot.Name)); } } diff --git a/qtsharp/src/bindings/static/QtSupport.cs b/qtsharp/src/bindings/static/QtSupport.cs index 155bdd62..d7cddad0 100644 --- a/qtsharp/src/bindings/static/QtSupport.cs +++ b/qtsharp/src/bindings/static/QtSupport.cs @@ -165,7 +165,7 @@ namespace Qt { Console.WriteLine (format, arg); } - public static string TQT_SIGNAL (string signal) + public static string TQ_SIGNAL (string signal) { return "2"+ Regex.Replace (signal, @"\s*\(\s*\)", "()"); @@ -173,7 +173,7 @@ namespace Qt { } - public static string TQT_SLOT (string slot) + public static string TQ_SLOT (string slot) { return "1" + Regex.Replace (slot, @"\s*\(\s*\)", "()"); diff --git a/qtsharp/src/bindings/static/TQToolButton.cs b/qtsharp/src/bindings/static/TQToolButton.cs index 6f3d7dfa..54a3410a 100644 --- a/qtsharp/src/bindings/static/TQToolButton.cs +++ b/qtsharp/src/bindings/static/TQToolButton.cs @@ -38,7 +38,7 @@ namespace Qt { qparent.AddChild (this); RegisterObject (this); - Connect (this, TQT_SIGNAL ("destroyed ()"), TQT_SLOT ("NativeDestroyed ()")); + Connect (this, TQ_SIGNAL ("destroyed ()"), TQ_SLOT ("NativeDestroyed ()")); } [DllImport("libtqtc", CharSet=CharSet.Ansi)] @@ -46,14 +46,14 @@ namespace Qt { public TQToolButton (TQIconSet iconSet, TQString textLabel, TQString groupText, TQObject receiver, string slot, TQToolBar parent, string name) : this (TQNull.Instance) { rawObject = qt_new_QToolButton1 (iconSet.RawObject, textLabel.RawObject, groupText.RawObject, IntPtr.Zero, null, parent != null ? parent.RawObject : IntPtr.Zero, name); - Connect( this, TQT_SIGNAL("clicked()"), receiver, slot ); + Connect( this, TQ_SIGNAL("clicked()"), receiver, slot ); if ((qparent = parent) != null) qparent.AddChild (this); RegisterObject (this); - Connect (this, TQT_SIGNAL ("destroyed ()"), TQT_SLOT ("NativeDestroyed ()")); + Connect (this, TQ_SIGNAL ("destroyed ()"), TQ_SLOT ("NativeDestroyed ()")); } [DllImport("libtqtc", CharSet=CharSet.Ansi)] @@ -66,7 +66,7 @@ namespace Qt { qparent.AddChild (this); RegisterObject (this); - Connect (this, TQT_SIGNAL ("destroyed ()"), TQT_SLOT ("NativeDestroyed ()")); + Connect (this, TQ_SIGNAL ("destroyed ()"), TQ_SLOT ("NativeDestroyed ()")); } public TQToolButton (TQWidget parent) : this (parent, "") {} @@ -175,26 +175,6 @@ namespace Qt { } [DllImport("libtqtc", CharSet=CharSet.Ansi)] - private static extern void qt_QToolButton_setIconSet1 (IntPtr raw, IntPtr set, bool on); - public void SetIconSet (TQIconSet set, bool on) - { - if (disposed) - throw new ObjectDisposedException (this+": Attempted use of disposed object"); - - qt_QToolButton_setIconSet1 (rawObject, set.RawObject, on); - } - - [DllImport("libtqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QToolButton_iconSet (IntPtr raw, bool on); - public TQIconSet IconSet (bool on) - { - if (disposed) - throw new ObjectDisposedException (this+": Attempted use of disposed object"); - - return LookupObject (qt_QToolButton_iconSet (rawObject, on), typeof (TQIconSet)) as TQIconSet; - } - - [DllImport("libtqtc", CharSet=CharSet.Ansi)] private static extern void qt_QToolButton_setPopupDelay (IntPtr raw, int delay); public void SetPopupDelay (int delay) { diff --git a/qtsharp/src/examples/samples/display.cs b/qtsharp/src/examples/samples/display.cs index daf8daa0..8d94b5f8 100644 --- a/qtsharp/src/examples/samples/display.cs +++ b/qtsharp/src/examples/samples/display.cs @@ -26,10 +26,10 @@ namespace QtSamples { public Display () { filemenu = new TQPopupMenu (null, "filemenu"); - filemenu.InsertItem ("&Quit", tqApp, TQT_SLOT ("quit()")); + filemenu.InsertItem ("&Quit", tqApp, TQ_SLOT ("quit()")); aboutmenu = new TQPopupMenu(null, "aboutmenu"); - aboutmenu.InsertItem("&About Qt-Sharp", this, TQT_SLOT("slotAbout()")); + aboutmenu.InsertItem("&About Qt-Sharp", this, TQ_SLOT("slotAbout()")); menubar = new TQMenuBar(this, ""); menubar.InsertItem("&File", filemenu); diff --git a/qtsharp/src/examples/samples/emit.cs b/qtsharp/src/examples/samples/emit.cs index 125166a2..08a27555 100644 --- a/qtsharp/src/examples/samples/emit.cs +++ b/qtsharp/src/examples/samples/emit.cs @@ -13,8 +13,8 @@ namespace QtSamples { { TQPushButton pb = new TQPushButton ("Papa Smurf", this); - Connect (pb, TQT_SIGNAL ("clicked ()"), TQT_SLOT ("DoEmit ()")); - Connect (this, TQT_SIGNAL ("MySignal ()"), TQT_SLOT ("PrintStuff ()")); + Connect (pb, TQ_SIGNAL ("clicked ()"), TQ_SLOT ("DoEmit ()")); + Connect (this, TQ_SIGNAL ("MySignal ()"), TQ_SLOT ("PrintStuff ()")); } public void DoEmit () diff --git a/qtsharp/src/examples/samples/hello.cs b/qtsharp/src/examples/samples/hello.cs index 1039aa34..524c4d4c 100644 --- a/qtsharp/src/examples/samples/hello.cs +++ b/qtsharp/src/examples/samples/hello.cs @@ -25,7 +25,7 @@ namespace QtSamples { public HelloWorld () : base (null) { TQPushButton pb = new TQPushButton ("Hello Qt-Sharp-0.7!", this); - TQObject.Connect (pb, TQT_SIGNAL ("clicked()"), this, TQT_SLOT("SlotClicked()")); + TQObject.Connect (pb, TQ_SIGNAL ("clicked()"), this, TQ_SLOT("SlotClicked()")); } public void SlotClicked () diff --git a/qtsharp/src/examples/samples/mandelbrot.cs b/qtsharp/src/examples/samples/mandelbrot.cs index 3850b781..77acb98d 100644 --- a/qtsharp/src/examples/samples/mandelbrot.cs +++ b/qtsharp/src/examples/samples/mandelbrot.cs @@ -213,7 +213,7 @@ public class ImageDialog : TQDialog { pixmapLabel.SetScaledContents (true); dialogLayout.AddWidget (pixmapLabel); - TQObject.Connect (redrawButton, TQT_SIGNAL ("clicked()"), this, TQT_SLOT ("Redraw()")); + TQObject.Connect (redrawButton, TQ_SIGNAL ("clicked()"), this, TQ_SLOT ("Redraw()")); Redraw (); } diff --git a/qtsharp/src/examples/samples/mandelbrot2.cs b/qtsharp/src/examples/samples/mandelbrot2.cs index 175ef9bc..08f7bc56 100644 --- a/qtsharp/src/examples/samples/mandelbrot2.cs +++ b/qtsharp/src/examples/samples/mandelbrot2.cs @@ -272,7 +272,7 @@ public class ImageDialog : TQDialog { //pixmapLabel.SetPixmap( new TQPixmap( image ) ); - TQObject.Connect (redrawButton, TQT_SIGNAL ("clicked()"), pixmapLabel, TQT_SLOT ("Repaint()")); + TQObject.Connect (redrawButton, TQ_SIGNAL ("clicked()"), pixmapLabel, TQ_SLOT ("Repaint()")); //Redraw (); } diff --git a/qtsharp/src/examples/samples/qstring-slot.cs b/qtsharp/src/examples/samples/qstring-slot.cs index c0559f5b..be807ea0 100644 --- a/qtsharp/src/examples/samples/qstring-slot.cs +++ b/qtsharp/src/examples/samples/qstring-slot.cs @@ -15,7 +15,7 @@ public class MyWidget : TQVBox label = new TQLabel( this, "label" ); label.SetText("Default"); - TQObject.Connect( lineEdit, TQT_SIGNAL("textChanged(TQString)"), + TQObject.Connect( lineEdit, TQ_SIGNAL("textChanged(TQString)"), label, "SetText(TQString)" ); } diff --git a/qtsharp/src/examples/samples/quantumfractals.cs b/qtsharp/src/examples/samples/quantumfractals.cs index 3020eae6..a213f948 100644 --- a/qtsharp/src/examples/samples/quantumfractals.cs +++ b/qtsharp/src/examples/samples/quantumfractals.cs @@ -37,9 +37,9 @@ namespace Qf { //Setup the filemenu filemenu = new TQPopupMenu (null, "filemenu"); - filemenu.InsertItem ("&Screenshot", display, TQT_SLOT ("SlotScreenshot()")); + filemenu.InsertItem ("&Screenshot", display, TQ_SLOT ("SlotScreenshot()")); filemenu.InsertSeparator (); - filemenu.InsertItem ("&Quit", tqApp, TQT_SLOT ("quit()")); + filemenu.InsertItem ("&Quit", tqApp, TQ_SLOT ("quit()")); //Setup the shapemenu shapemenu = new TQPopupMenu (null, "typemenu"); @@ -52,12 +52,12 @@ namespace Qf { shapemenu.InsertItem( "&Icosidodecahedron", 6); //Connect the shapemenu - TQObject.Connect (shapemenu, TQT_SIGNAL ("activated(int)"), - display, TQT_SLOT("SlotShapeMenu(int)")); + TQObject.Connect (shapemenu, TQ_SIGNAL ("activated(int)"), + display, TQ_SLOT("SlotShapeMenu(int)")); //Setup the settingsmenu settingsmenu = new TQPopupMenu (null, "settingsmenu"); - settingsmenu.InsertItem ("&Alpha", display, TQT_SLOT ("SlotSetAlpha()")); + settingsmenu.InsertItem ("&Alpha", display, TQ_SLOT ("SlotSetAlpha()")); //Setup the menubar menubar = new TQMenuBar (this, ""); @@ -144,20 +144,20 @@ namespace Qf { buttons.AddWidget (intense); //Connect the buttons and SlotQuit - TQObject.Connect (start, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotStart()")); - TQObject.Connect (stop, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotStop()")); - TQObject.Connect (reset, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotReset()")); - TQObject.Connect (gray, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotGray()")); - TQObject.Connect (intense, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotIntense()")); - TQObject.Connect (buffer, TQT_SIGNAL ("Painted()"), - this, TQT_SLOT ("SlotSetLabels()")); - TQObject.Connect (tqApp, TQT_SIGNAL ("lastWindowClosed ()"), - this, TQT_SLOT ("SlotQuit ()")); + TQObject.Connect (start, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotStart()")); + TQObject.Connect (stop, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotStop()")); + TQObject.Connect (reset, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotReset()")); + TQObject.Connect (gray, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotGray()")); + TQObject.Connect (intense, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotIntense()")); + TQObject.Connect (buffer, TQ_SIGNAL ("Painted()"), + this, TQ_SLOT ("SlotSetLabels()")); + TQObject.Connect (tqApp, TQ_SIGNAL ("lastWindowClosed ()"), + this, TQ_SLOT ("SlotQuit ()")); //Layout labels labels = new TQVBoxLayout (layout); diff --git a/qtsharp/src/examples/samples/scribblewindow.cs b/qtsharp/src/examples/samples/scribblewindow.cs index 405b0e31..e078387c 100644 --- a/qtsharp/src/examples/samples/scribblewindow.cs +++ b/qtsharp/src/examples/samples/scribblewindow.cs @@ -36,18 +36,18 @@ namespace QtSamples { ScribbleWindow () : base (null, null) { filemenu = new TQPopupMenu (null, "filemenu"); - filemenu.InsertItem ("&Load", this, TQT_SLOT ("SlotLoad()") ); - filemenu.InsertItem ("&Save", this, TQT_SLOT ("SlotSave()") ); + filemenu.InsertItem ("&Load", this, TQ_SLOT ("SlotLoad()") ); + filemenu.InsertItem ("&Save", this, TQ_SLOT ("SlotSave()") ); filemenu.InsertSeparator (); - filemenu.InsertItem ("&Quit", tqApp, TQT_SLOT ("quit()")); + filemenu.InsertItem ("&Quit", tqApp, TQ_SLOT ("quit()")); aboutmenu = new TQPopupMenu (null, "helpmenu"); - aboutmenu.InsertItem ("&About Qt-Sharp", this, TQT_SLOT ("SlotAboutQtSharp()")); - aboutmenu.InsertItem ("&About Qt", this, TQT_SLOT ("SlotAboutQt()")); + aboutmenu.InsertItem ("&About Qt-Sharp", this, TQ_SLOT ("SlotAboutQtSharp()")); + aboutmenu.InsertItem ("&About Qt", this, TQ_SLOT ("SlotAboutQt()")); menubar = new TQMenuBar (this, ""); menubar.InsertItem ("&File", filemenu); - menubar.InsertItem ("&Color", this, TQT_SLOT("SlotColorChooser()")); + menubar.InsertItem ("&Color", this, TQ_SLOT("SlotColorChooser()")); menubar.InsertItem ("&About", aboutmenu); scrollview = new TQScrollView (this); @@ -58,12 +58,12 @@ namespace QtSamples { this.SetCentralWidget (scrollview); SetMaximumSize (Width (), Height () - menubar.Height ()); - TQObject.Connect (this, TQT_SIGNAL ("colorChanged(TQColor)"), - scribblearea, TQT_SLOT ("SlotSetColor(TQColor)") ); - TQObject.Connect (this, TQT_SIGNAL ("load(TQString)"), - scribblearea, TQT_SLOT ("PerformLoad(TQString)") ); - TQObject.Connect (this, TQT_SIGNAL ("save(TQString)"), - scribblearea, TQT_SLOT ("PerformSave(TQString)") ); + TQObject.Connect (this, TQ_SIGNAL ("colorChanged(TQColor)"), + scribblearea, TQ_SLOT ("SlotSetColor(TQColor)") ); + TQObject.Connect (this, TQ_SIGNAL ("load(TQString)"), + scribblearea, TQ_SLOT ("PerformLoad(TQString)") ); + TQObject.Connect (this, TQ_SIGNAL ("save(TQString)"), + scribblearea, TQ_SLOT ("PerformSave(TQString)") ); } public void SlotLoad () @@ -123,7 +123,7 @@ namespace QtSamples { SetBackgroundMode (Qt.BackgroundMode.NoBackground); popupmenu = new TQPopupMenu(); - popupmenu.InsertItem ("&Clear", this, TQT_SLOT ("SlotClearArea()") ); + popupmenu.InsertItem ("&Clear", this, TQ_SLOT ("SlotClearArea()") ); mouseMoveEvent += new MouseMoveEvent (MouseMoved); mousePressEvent += new MousePressEvent (MousePressed); diff --git a/qtsharp/src/examples/tutorials/t2.cs b/qtsharp/src/examples/tutorials/t2.cs index 5dbe07d1..3692e8f4 100644 --- a/qtsharp/src/examples/tutorials/t2.cs +++ b/qtsharp/src/examples/tutorials/t2.cs @@ -18,8 +18,8 @@ public class Example { quit.SetFont (new TQFont ("Times", 18, TQFont.Weight.Bold)); // In C++, TQFont::Bold is sufficient - TQObject.Connect ( quit, QtSupport.TQT_SIGNAL ("clicked()"), a, QtSupport.TQT_SLOT ("Quit()") ); - // TQT_SIGNAL and TQT_SLOT are static functions of QtSupport + TQObject.Connect ( quit, QtSupport.TQ_SIGNAL ("clicked()"), a, QtSupport.TQ_SLOT ("Quit()") ); + // TQ_SIGNAL and TQ_SLOT are static functions of QtSupport a.SetMainWidget (quit); quit.Show (); diff --git a/qtsharp/src/examples/tutorials/t3.cs b/qtsharp/src/examples/tutorials/t3.cs index 26fece72..90e9b803 100644 --- a/qtsharp/src/examples/tutorials/t3.cs +++ b/qtsharp/src/examples/tutorials/t3.cs @@ -19,8 +19,8 @@ public class Example { quit.SetFont (new TQFont ("Times", 18, TQFont.Weight.Bold)); // In C++, TQFont::Bold is sufficient - TQObject.Connect ( quit, QtSupport.TQT_SIGNAL ("clicked()"), a, QtSupport.TQT_SLOT ("Quit()") ); - // TQT_SIGNAL and TQT_SLOT are static functions of QtSupport + TQObject.Connect ( quit, QtSupport.TQ_SIGNAL ("clicked()"), a, QtSupport.TQ_SLOT ("Quit()") ); + // TQ_SIGNAL and TQ_SLOT are static functions of QtSupport a.SetMainWidget (box); box.Show (); diff --git a/qtsharp/src/examples/tutorials/t4.cs b/qtsharp/src/examples/tutorials/t4.cs index b3e66a07..1e182bb2 100644 --- a/qtsharp/src/examples/tutorials/t4.cs +++ b/qtsharp/src/examples/tutorials/t4.cs @@ -17,7 +17,7 @@ public class MyWidget : TQWidget { quit.SetGeometry (62, 40, 75, 30); quit.SetFont (new TQFont ("Times", 18, TQFont.Weight.Bold) ); - Connect ( quit, TQT_SIGNAL ("clicked()"), tqApp, TQT_SLOT ("Quit()") ); + Connect ( quit, TQ_SIGNAL ("clicked()"), tqApp, TQ_SLOT ("Quit()") ); // In C++, tqApp is a global variable. Here it's a property of the TQObject // class, which we inherit, giving the same effect. We also inherit the // static method connect(). diff --git a/qtsharp/src/examples/tutorials/t5.cs b/qtsharp/src/examples/tutorials/t5.cs index 05ff5e96..4500af56 100644 --- a/qtsharp/src/examples/tutorials/t5.cs +++ b/qtsharp/src/examples/tutorials/t5.cs @@ -13,7 +13,7 @@ public class MyWidget : TQVBox { TQPushButton quit = new TQPushButton ("Quit", this, "quit"); quit.SetFont ( new TQFont ("Times", 18, TQFont.Weight.Bold) ); - TQObject.Connect ( quit, TQT_SIGNAL ("clicked()"), tqApp, TQT_SLOT ("Quit()") ); + TQObject.Connect ( quit, TQ_SIGNAL ("clicked()"), tqApp, TQ_SLOT ("Quit()") ); TQLCDNumber lcd = new TQLCDNumber (2, this, "lcd" ); @@ -22,7 +22,7 @@ public class MyWidget : TQVBox { slider.SetRange (0, 99); slider.SetValue (0); - Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), lcd, TQT_SLOT ("Display(int)") ); + Connect ( slider, TQ_SIGNAL ("valueChanged(int)"), lcd, TQ_SLOT ("Display(int)") ); } public MyWidget (TQWidget parent) : this (parent, "") {} diff --git a/qtsharp/src/examples/tutorials/t6.cs b/qtsharp/src/examples/tutorials/t6.cs index 910d13d1..90d94b5b 100644 --- a/qtsharp/src/examples/tutorials/t6.cs +++ b/qtsharp/src/examples/tutorials/t6.cs @@ -15,7 +15,7 @@ public class LCDRange : TQVBox { slider.SetRange (0, 99); slider.SetValue (0); - Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), lcd, TQT_SLOT ("Display(int)") ); + Connect ( slider, TQ_SIGNAL ("valueChanged(int)"), lcd, TQ_SLOT ("Display(int)") ); } public LCDRange (TQWidget parent) : this (parent, "") {} @@ -31,7 +31,7 @@ public class MyWidget : TQVBox { TQPushButton quit = new TQPushButton ("Quit", this, "quit"); quit.SetFont ( new TQFont ("Times", 18, TQFont.Weight.Bold) ); - Connect ( quit, TQT_SIGNAL ("clicked()"), tqApp, TQT_SLOT ("Quit()") ); + Connect ( quit, TQ_SIGNAL ("clicked()"), tqApp, TQ_SLOT ("Quit()") ); TQGrid grid = new TQGrid (4, this); diff --git a/qtsharp/src/examples/tutorials/t7.cs b/qtsharp/src/examples/tutorials/t7.cs index 1372bf15..ecc9b244 100644 --- a/qtsharp/src/examples/tutorials/t7.cs +++ b/qtsharp/src/examples/tutorials/t7.cs @@ -21,8 +21,8 @@ public class LCDRange : TQVBox { slider.SetRange (0, 99); slider.SetValue (0); - Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), lcd, TQT_SLOT ("Display(int)") ); - Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), TQT_SIGNAL ("valueChanged(int)")); + Connect ( slider, TQ_SIGNAL ("valueChanged(int)"), lcd, TQ_SLOT ("Display(int)") ); + Connect ( slider, TQ_SIGNAL ("valueChanged(int)"), TQ_SIGNAL ("valueChanged(int)")); } public LCDRange (TQWidget parent) : this (parent, "") {} @@ -43,7 +43,7 @@ public class MyWidget : TQVBox { TQPushButton quit = new TQPushButton ("Quit", this, "quit"); quit.SetFont ( new TQFont ("Times", 18, TQFont.Weight.Bold) ); - Connect ( quit, TQT_SIGNAL ("clicked()"), tqApp, TQT_SLOT ("Quit()") ); + Connect ( quit, TQ_SIGNAL ("clicked()"), tqApp, TQ_SLOT ("Quit()") ); TQGrid grid = new TQGrid (4, this); @@ -53,8 +53,8 @@ public class MyWidget : TQVBox { for ( int r = 0; r < 4; r++ ) { LCDRange lr = new LCDRange (grid); if (previous != null) - Connect (lr, TQT_SIGNAL ("valueChanged(int)"), - previous, TQT_SLOT ("SetValue(int)") ); + Connect (lr, TQ_SIGNAL ("valueChanged(int)"), + previous, TQ_SLOT ("SetValue(int)") ); previous = lr; } } diff --git a/qtsharp/src/generator/Printer.cs b/qtsharp/src/generator/Printer.cs index 1289f107..3b852e72 100644 --- a/qtsharp/src/generator/Printer.cs +++ b/qtsharp/src/generator/Printer.cs @@ -518,7 +518,7 @@ namespace QtCSharp { public string DefaultConnections () { if (qtype.IsTQObject) - return "\n\t\t\tConnect (this, TQT_SIGNAL (\"destroyed ()\"), TQT_SLOT (\"NativeDestroyed ()\"));"; + return "\n\t\t\tConnect (this, TQ_SIGNAL (\"destroyed ()\"), TQ_SLOT (\"NativeDestroyed ()\"));"; else return ""; } diff --git a/qtsharp/src/generator/TQTypeMap.cs b/qtsharp/src/generator/TQTypeMap.cs index 8318cca4..3acda3c7 100644 --- a/qtsharp/src/generator/TQTypeMap.cs +++ b/qtsharp/src/generator/TQTypeMap.cs @@ -59,7 +59,7 @@ namespace QtCSharp { mastermap.Add ("HPALETTE", "uint"); mastermap.Add ("HRGN", "uint"); mastermap.Add ("Display", "IntPtr"); - mastermap.Add ("Q_REFCOUNT bool", "bool"); + mastermap.Add ("TQ_REFCOUNT bool", "bool"); mastermap.Add ("EventRef", "IntPtr"); mastermap.Add ("MSG", "IntPtr"); mastermap.Add ("XEvent", "IntPtr"); @@ -323,7 +323,6 @@ namespace QtCSharp { //mastermap.Add ("ResizeMode", "TQListView.ResizeMode"); //mastermap.Add ("ResizeMode", "TQListView.ResizeMode"); //mastermap.Add ("EchoMode", "TQLineEdit.EchoMode"); - //mastermap.Add ("EchoMode", "QtMultiLineEdit.EchoMode"); //mastermap.Add ("ColorMode", "TQApplication.ColorMode"); //mastermap.Add ("ColorMode", "TQPrinter.ColorMode"); //mastermap.Add ("ColorMode", "TQPixmap.ColorMode"); @@ -345,9 +344,7 @@ namespace QtCSharp { //mastermap.Add ("Orientation", "TQPrinter.Orientation"); //mastermap.Add ("Orientation", "Qt.Orientation"); //mastermap.Add ("WrapPolicy", "TQTextEdit.WrapPolicy"); - //mastermap.Add ("WrapPolicy", "QtMultiLineEdit.WrapPolicy"); //mastermap.Add ("WordWrap", "TQTextEdit.WordWrap"); - //mastermap.Add ("WordWrap", "QtMultiLineEdit.WordWrap"); // These are here in case we need to override the mastermap pinvoketypes = new Hashtable (); diff --git a/qtsharp/src/libtqtsharp/customslot.h b/qtsharp/src/libtqtsharp/customslot.h index eda314ee..1c1bcc08 100644 --- a/qtsharp/src/libtqtsharp/customslot.h +++ b/qtsharp/src/libtqtsharp/customslot.h @@ -31,7 +31,7 @@ class CustomSlot: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/qtsharp/src/libtqtsharp/qtsharp.cpp b/qtsharp/src/libtqtsharp/qtsharp.cpp index 7f433d76..bf3dc28f 100644 --- a/qtsharp/src/libtqtsharp/qtsharp.cpp +++ b/qtsharp/src/libtqtsharp/qtsharp.cpp @@ -22,7 +22,7 @@ void qtsharp_QObject_registerEventDelegate (qtsharp_EventDelegate delegate) TQObject *csharp_connect_void (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(void)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (void)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (void)))) { delete cs; cs = 0L; } @@ -32,7 +32,7 @@ TQObject *csharp_connect_void (TQObject *sender, const char *signal, TQObject *r TQObject *csharp_connect_item_void (TQMenuData *instance, int id, TQObject *receiver, void (*ptr)(void)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! instance->connectItem (id, cs, TQT_SLOT (callback (void)))) { + if (! instance->connectItem (id, cs, TQ_SLOT (callback (void)))) { delete cs; cs = 0L; } @@ -42,7 +42,7 @@ TQObject *csharp_connect_item_void (TQMenuData *instance, int id, TQObject *rece TQObject *csharp_connect_bool (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(bool)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (bool)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (bool)))) { delete cs; cs = 0L; } @@ -52,7 +52,7 @@ TQObject *csharp_connect_bool (TQObject *sender, const char *signal, TQObject *r TQObject *csharp_connect_short (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(short)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (short)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (short)))) { delete cs; cs = 0L; } @@ -62,7 +62,7 @@ TQObject *csharp_connect_short (TQObject *sender, const char *signal, TQObject * TQObject *csharp_connect_int (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int)))) { delete cs; cs = 0L; } @@ -72,7 +72,7 @@ TQObject *csharp_connect_int (TQObject *sender, const char *signal, TQObject *re TQObject *csharp_connect_item_int (TQMenuData *instance, int id, TQObject *receiver, void (*ptr)(int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! instance->connectItem (id, cs, TQT_SLOT (callback (int)))) { + if (! instance->connectItem (id, cs, TQ_SLOT (callback (int)))) { delete cs; cs = 0L; } @@ -82,7 +82,7 @@ TQObject *csharp_connect_item_int (TQMenuData *instance, int id, TQObject *recei TQObject *csharp_connect_long (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(long)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (long)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (long)))) { delete cs; cs = 0L; } @@ -92,7 +92,7 @@ TQObject *csharp_connect_long (TQObject *sender, const char *signal, TQObject *r TQObject *csharp_connect_float (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(float)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (float)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (float)))) { delete cs; cs = 0L; } @@ -102,7 +102,7 @@ TQObject *csharp_connect_float (TQObject *sender, const char *signal, TQObject * TQObject *csharp_connect_double (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(double)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (double)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (double)))) { delete cs; cs = 0L; } @@ -112,7 +112,7 @@ TQObject *csharp_connect_double (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_QString (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(const TQString&)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (const TQString&)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (const TQString&)))) { delete cs; cs = 0L; } @@ -122,7 +122,7 @@ TQObject *csharp_connect_QString (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_QDockWindow (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDockWindow*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQDockWindow*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQDockWindow*)))) { delete cs; cs = 0L; } @@ -132,7 +132,7 @@ TQObject *csharp_connect_QDockWindow (TQObject *sender, const char *signal, TQOb TQObject *csharp_connect_QDropEvent (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDropEvent*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQDropEvent*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQDropEvent*)))) { delete cs; cs = 0L; } @@ -142,7 +142,7 @@ TQObject *csharp_connect_QDropEvent (TQObject *sender, const char *signal, TQObj TQObject *csharp_connect_QDropEventTQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDropEvent*,TQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQDropEvent*,TQListViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQDropEvent*,TQListViewItem*)))) { delete cs; cs = 0L; } @@ -152,7 +152,7 @@ TQObject *csharp_connect_QDropEventTQListViewItem (TQObject *sender, const char TQObject *csharp_connect_QIconViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQIconViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQIconViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQIconViewItem*)))) { delete cs; cs = 0L; } @@ -162,7 +162,7 @@ TQObject *csharp_connect_QIconViewItem (TQObject *sender, const char *signal, TQ TQObject *csharp_connect_QListBoxItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListBoxItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListBoxItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQListBoxItem*)))) { delete cs; cs = 0L; } @@ -172,7 +172,7 @@ TQObject *csharp_connect_QListBoxItem (TQObject *sender, const char *signal, TQO TQObject *csharp_connect_QListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQListViewItem*)))) { delete cs; cs = 0L; } @@ -182,7 +182,7 @@ TQObject *csharp_connect_QListViewItem (TQObject *sender, const char *signal, TQ TQObject *csharp_connect_QListViewItemTQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*,TQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListViewItem*,TQListViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQListViewItem*,TQListViewItem*)))) { delete cs; cs = 0L; } @@ -192,7 +192,7 @@ TQObject *csharp_connect_QListViewItemTQListViewItem (TQObject *sender, const ch TQObject *csharp_connect_QListViewItemTQListViewItemTQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*,TQListViewItem*,TQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListViewItem*,TQListViewItem*,TQListViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQListViewItem*,TQListViewItem*,TQListViewItem*)))) { delete cs; cs = 0L; } @@ -202,7 +202,7 @@ TQObject *csharp_connect_QListViewItemTQListViewItemTQListViewItem (TQObject *se TQObject *csharp_connect_QNetworkOperation (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQNetworkOperation*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQNetworkOperation*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQNetworkOperation*)))) { delete cs; cs = 0L; } @@ -212,7 +212,7 @@ TQObject *csharp_connect_QNetworkOperation (TQObject *sender, const char *signal TQObject *csharp_connect_QObject (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQObject*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQObject*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQObject*)))) { delete cs; cs = 0L; } @@ -222,7 +222,7 @@ TQObject *csharp_connect_QObject (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_QToolBar (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQToolBar*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQToolBar*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQToolBar*)))) { delete cs; cs = 0L; } @@ -232,7 +232,7 @@ TQObject *csharp_connect_QToolBar (TQObject *sender, const char *signal, TQObjec TQObject *csharp_connect_QWidget (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQWidget*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQWidget*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQWidget*)))) { delete cs; cs = 0L; } @@ -242,7 +242,7 @@ TQObject *csharp_connect_QWidget (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_intTQIconViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,TQIconViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,TQIconViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,TQIconViewItem*)))) { delete cs; cs = 0L; } @@ -252,7 +252,7 @@ TQObject *csharp_connect_intTQIconViewItem (TQObject *sender, const char *signal TQObject *csharp_connect_intTQListBoxItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,TQListBoxItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,TQListBoxItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,TQListBoxItem*)))) { delete cs; cs = 0L; } @@ -262,7 +262,7 @@ TQObject *csharp_connect_intTQListBoxItem (TQObject *sender, const char *signal, TQObject *csharp_connect_intbool (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,bool)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,bool)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,bool)))) { delete cs; cs = 0L; } @@ -272,7 +272,7 @@ TQObject *csharp_connect_intbool (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_intint (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,int)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,int)))) { delete cs; cs = 0L; } @@ -282,7 +282,7 @@ TQObject *csharp_connect_intint (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_intintint (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,int,int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,int,int)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,int,int)))) { delete cs; cs = 0L; } diff --git a/qtsharp/src/tests/lookuptest.cs b/qtsharp/src/tests/lookuptest.cs index bfcae6c3..ce3ac8b9 100644 --- a/qtsharp/src/tests/lookuptest.cs +++ b/qtsharp/src/tests/lookuptest.cs @@ -28,7 +28,7 @@ namespace Qt { if (size.GetHashCode () != size2.GetHashCode ()) Console.WriteLine ("ERROR: Hash codes differ for size and size2!"); - Connect (button, TQT_SIGNAL ("clicked()"), TQObject.qApp, TQT_SLOT ("Quit()")); + Connect (button, TQ_SIGNAL ("clicked()"), TQObject.qApp, TQ_SLOT ("Quit()")); } public static void Main (string[] args) diff --git a/qtsharp/src/uicsharp/tests/form5.ui b/qtsharp/src/uicsharp/tests/form5.ui index bb998334..46308250 100644 --- a/qtsharp/src/uicsharp/tests/form5.ui +++ b/qtsharp/src/uicsharp/tests/form5.ui @@ -125,9 +125,6 @@ <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -156,9 +153,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -272,9 +266,6 @@ <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -286,9 +277,6 @@ <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -300,9 +288,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> </actions> <images> diff --git a/qtsharp/src/uicsharp/tests/form6.ui b/qtsharp/src/uicsharp/tests/form6.ui index bcc04572..f97aa87e 100644 --- a/qtsharp/src/uicsharp/tests/form6.ui +++ b/qtsharp/src/uicsharp/tests/form6.ui @@ -85,9 +85,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -102,9 +99,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/qtsharp/src/uicsharp/tests/form9.ui b/qtsharp/src/uicsharp/tests/form9.ui index 3ba562c7..33c6e5f3 100644 --- a/qtsharp/src/uicsharp/tests/form9.ui +++ b/qtsharp/src/uicsharp/tests/form9.ui @@ -165,9 +165,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -182,9 +179,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/qtsharp/src/uicsharp/uicsharp.cs b/qtsharp/src/uicsharp/uicsharp.cs index b6306a1e..b0483258 100644 --- a/qtsharp/src/uicsharp/uicsharp.cs +++ b/qtsharp/src/uicsharp/uicsharp.cs @@ -334,7 +334,7 @@ namespace QtSharp { tmp=tmp.NextSibling as XmlElement; String slot=tmp.InnerText; - writer.WriteLine("\t\tTQObject.Connect({0},TQT_SIGNAL(\"{1}\"),{2},TQT_SLOT(\"{3}\"));", + writer.WriteLine("\t\tTQObject.Connect({0},TQ_SIGNAL(\"{1}\"),{2},TQ_SLOT(\"{3}\"));", sender,signal,receiver,slot); } break; diff --git a/smoke/smoke.h b/smoke/smoke.h index c76d7900..4a320d0b 100644 --- a/smoke/smoke.h +++ b/smoke/smoke.h @@ -34,7 +34,7 @@ THE POSSIBILITY OF SUCH DAMAGE. */ -#define ENABLE_QSTYLECONTROLELEMENTDATA_SLOW_COPY 1 +#define ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY 1 class SmokeBinding; diff --git a/smoke/tde/generate.pl.in b/smoke/tde/generate.pl.in index d5d8416d..511d3d61 100644 --- a/smoke/tde/generate.pl.in +++ b/smoke/tde/generate.pl.in @@ -58,8 +58,6 @@ my %excludes = ( 'ntqgl.h' => 1, # OpenGL 'ntqglcolormap.h' => 1, # OpenGL 'ntqnp.h' => 1, # NSPlugin - 'ntqttableview.h' => 1, # Not in Qt anymore... - 'ntqtmultilineedit.h' => 1, # Not in Qt anymore... 'ntqwidgetfactory.h' => 1, # Just an interface 'ntqsharedmemory.h' => 1, # "not part of the Qt API" they say 'ntqwindowsstyle.h' => 1, # Qt windowsstyle, plugin @@ -185,6 +183,7 @@ find( ); # Launch kalyptus +$ENV{KDE_PREFIX} = "@KDE_PREFIX@"; system "perl kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --allow_k_dcop_accessors --outputdir=$outdir @headers @kdeheaders"; my $exit = $? >> 8; exit $exit if ($exit); diff --git a/smoke/tde/header_list b/smoke/tde/header_list index 76b945dc..87bb9d98 100644 --- a/smoke/tde/header_list +++ b/smoke/tde/header_list @@ -2,9 +2,7 @@ ntqabstractlayout.h ntqaccel.h ntqaccessible.h ntqaction.h -ntqapp.h ntqapplication.h -ntqarray.h ntqasciicache.h ntqasciidict.h ntqassistantclient.h @@ -12,10 +10,8 @@ ntqasyncimageio.h ntqasyncio.h ntqbig5codec.h ntqbitarray.h -ntqbitarry.h ntqbitmap.h ntqbrush.h -ntqbttngrp.h ntqbuffer.h ntqbuttongroup.h ntqbutton.h @@ -23,21 +19,15 @@ ntqcache.h ntqcanvas.h ntqcdestyle.h ntqcheckbox.h -ntqchkbox.h ntqcleanuphandler.h ntqclipboard.h -ntqclipbrd.h -ntqcollect.h -ntqcollection.h ntqcolordialog.h ntqcolor.h ntqcombobox.h -ntqcombo.h ntqcommonstyle.h ntqcompactstyle.h ntqconfig-dist.h ntqconfig.h -ntqconnect.h ntqconnection.h ntqcstring.h ntqcursor.h @@ -47,7 +37,6 @@ ntqdatatable.h ntqdataview.h ntqdatetimeedit.h ntqdatetime.h -ntqdatetm.h ntqdeepcopy.h ntqdesktopwidget.h ntqdial.h @@ -60,9 +49,7 @@ ntqdockwindow.h ntqdom.h ntqdragobject.h ntqdrawutil.h -ntqdrawutl.h ntqdropsite.h -ntqdstream.h ntqeditorfactory.h ntqerrormessage.h ntqeucjpcodec.h @@ -70,20 +57,15 @@ ntqeuckrcodec.h ntqevent.h ntqeventloop.h ntqfeatures.h -ntqfiledef.h ntqfiledialog.h -ntqfiledlg.h ntqfile.h -ntqfileinf.h ntqfileinfo.h ntqfocusdata.h ntqfontdatabase.h ntqfontdialog.h ntqfontdta.h ntqfont.h -ntqfontinf.h ntqfontinfo.h -ntqfontmet.h ntqfontmetrics.h ntqframe.h ntqftp.h @@ -102,7 +84,6 @@ ntqgplugin.h ntqgrid.h ntqgridview.h ntqgroupbox.h -ntqgrpbox.h ntqguardedptr.h ntqgvector.h ntqhbox.h @@ -117,10 +98,8 @@ ntqimageformatplugin.h ntqimage.h ntqinputdialog.h ntqintcache.h -ntqintcach.h ntqintdict.h ntqinterlacestyle.h -ntqiodev.h ntqiodevice.h ntqjiscodec.h ntqjpunicode.h @@ -129,10 +108,8 @@ ntqkeysequence.h ntqlabel.h ntqlayout.h ntqlcdnumber.h -ntqlcdnum.h ntqlocale.h ntqlibrary.h -ntqlined.h ntqlineedit.h ntqlistbox.h ntqlistview.h @@ -142,12 +119,9 @@ ntqmap.h ntqmemarray.h ntqmenubar.h ntqmenudata.h -ntqmenudta.h ntqmessagebox.h ntqmetaobject.h -ntqmetaobj.h ntqmime.h -ntqmlined.h ntqmodules.h ntqmotifdialog.h ntqmotif.h @@ -155,15 +129,11 @@ ntqmotifplusstyle.h ntqmotifstyle.h ntqmotifwidget.h ntqmovie.h -ntqmsgbox.h -ntqmultilinedit.h ntqmultilineedit.h ntqmutex.h ntqnamespace.h ntqnetwork.h ntqnetworkprotocol.h -ntqobjcoll.h -ntqobjdefs.h ntqobjectcleanuphandler.h ntqobjectdefs.h ntqobjectdict.h @@ -174,41 +144,29 @@ ntqpaintdevicemetrics.h ntqpainter.h ntqpair.h ntqpalette.h -ntqpdevmet.h ntqpen.h ntqpicture.h ntqpixmapcache.h ntqpixmap.h ntqplatinumstyle.h -ntqpmcache.h -ntqpntarry.h ntqpointarray.h ntqpoint.h ntqpolygonscanner.h -ntqpopmenu.h ntqpopupmenu.h ntqprintdialog.h ntqprinter.h -ntqprndlg.h ntqprocess.h -ntqprogbar.h -ntqprogdlg.h ntqprogressbar.h ntqprogressdialog.h -ntqpsprn.h ntqptrcollection.h ntqptrdict.h ntqptrlist.h ntqptrqueue.h ntqptrstack.h ntqptrvector.h -ntqpushbt.h ntqpushbutton.h -ntqqueue.h -ntqradiobt.h ntqradiobutton.h ntqrangecontrol.h -ntqrangect.h ntqrect.h ntqregexp.h ntqregion.h @@ -216,11 +174,9 @@ ntqremotefactory.h ntqremoteplugin.h ntqrtlcodec.h ntqscopedptr.h -ntqscrbar.h ntqscrollbar.h ntqscrollview.h ntqsemaphore.h -ntqsemimodal.h ntqserversocket.h ntqsession.h ntqsessionmanager.h @@ -239,8 +195,6 @@ ntqslider.h ntqsocketdevice.h ntqsocket.h ntqsocketnotifier.h -ntqsocknot.h -ntqsortedlist.h ntqsound.h ntqspinbox.h ntqsplashscreen.h @@ -272,7 +226,6 @@ ntqstylesheet.h ntqsyntaxhighlighter.h ntqtabbar.h ntqtabdialog.h -ntqtabdlg.h ntqtable.h ntqtabwidget.h ntqtextbrowser.h @@ -286,15 +239,12 @@ ntqt.h ntqthread.h ntqtimer.h ntqtl.h -ntqtmultilineedit.h ntqtoolbar.h ntqtoolbutton.h ntqtoolbox.h ntqtooltip.h ntqtranslator.h ntqtsciicodec.h -ntqtstream.h -ntqttableview.h ntqurl.h ntqurlinfo.h ntqurloperator.h @@ -310,14 +260,12 @@ ntqvbuttongroup.h ntqvgroupbox.h ntqwaitcondition.h ntqwhatsthis.h -ntqwidcoll.h ntqwidgetfactory.h ntqwidget.h ntqwidgetintdict.h ntqwidgetlist.h ntqwidgetplugin.h ntqwidgetstack.h -ntqwindefs.h ntqwindowdefs.h ntqwindow.h ntqwindowsstyle.h diff --git a/smoke/tde/qtguess.pl.in b/smoke/tde/qtguess.pl.in index bf115fdc..3c80e1d0 100644 --- a/smoke/tde/qtguess.pl.in +++ b/smoke/tde/qtguess.pl.in @@ -263,10 +263,6 @@ our %tests = ( £, 5], "TQT_NO_COLORDIALOG" => ["qcolordialog.h", "TQColorDialog::customCount();", 12], "TQT_NO_COMBOBOX" => ["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10], - "TQT_NO_COMPAT" => ["qfontmetrics.h", q£ - TQFontMetrics *foo= new TQFontMetrics( TQFont() ); - int bar = foo->width( 'c' ); - £, 0], "TQT_NO_COMPONENT" => ["qapplication.h", q£ TQApplication foo( argc, argv ); foo.addLibraryPath( TQString::null ); @@ -315,7 +311,7 @@ our %tests = ( TQStringList keys() const { return TQStringList(); }; bool installIOHandler( const TQString &format ) { return true; }; }; - Q_EXPORT_PLUGIN( TQFoo ) + TQ_EXPORT_PLUGIN( TQFoo ) £], "TQT_NO_IMAGE_DITHER_TO_1" => ["qimage.h", q£ TQImage *foo = new TQImage; @@ -398,16 +394,6 @@ our %tests = ( "TQT_NO_PROGRESSDIALOG" => ["qprogressdialog.h", "TQProgressDialog foo;", 13], "TQT_NO_PUSHBUTTON" => ["qpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12], "TQT_NO_PROPERTIES" => ["qmetaobject.h", "TQMetaProperty foo;", 0], -# "TQT_NO_QTMULTILINEEDIT" => ["qtmultilineedit.h", "QtMultiLineEdit foo;", 15], -# "TQT_NO_QTTABLEVIEW" => ["qttableview.h", "TQFoo foo;", 16, q£ -# class TQFoo: public QtTableView -# { -# public: -# TQFoo() {}; -# ~TQFoo() {}; -# void paintCell( TQPainter *, int, int) {}; -# }; -# £], "TQT_NO_QUUID_STRING" => ["quuid.h", "TQUuid foo( TQString::null );", 8], "TQT_NO_RANGECONTROL" => ["qrangecontrol.h", "TQRangeControl foo;", 10], "TQT_NO_REGEXP" => ["qregexp.h", "TQRegExp foo;", 5], @@ -423,7 +409,6 @@ our %tests = ( "TQT_NO_RICHTEXT" => ["qsimplerichtext.h, qstring.h, qfont.h", "TQSimpleRichText foo( TQString::null, TQFont() );", 10], "TQT_NO_SCROLLBAR" => ["qscrollbar.h", "TQScrollBar foo( (TQWidget *) NULL );", 12], "TQT_NO_SCROLLVIEW" => ["qscrollview.h", "TQScrollView foo;", 12], - "TQT_NO_SEMIMODAL" => ["qsemimodal.h", "TQSemiModal foo;", 10], "TQT_NO_SESSIONMANAGER" => ["qapplication.h", q£ TQApplication foo( argc, argv ); foo.sessionId(); @@ -476,7 +461,7 @@ our %tests = ( TQTextCodec *createForName( const TQString & name ) {return (TQTextCodec *)NULL;} TQTextCodec *createForMib( int mib ) {return (TQTextCodec *)NULL;} }; - Q_EXPORT_PLUGIN( TQFoo ) + TQ_EXPORT_PLUGIN( TQFoo ) £], "TQT_NO_TEXTEDIT" => ["qtextedit.h", "TQTextEdit foo;", 13], "TQT_NO_TEXTSTREAM" => ["qtextstream.h", "TQTextStream foo;", 5], diff --git a/smoke/tqt/configure.in.in b/smoke/tqt/configure.in.in index d571b95b..f75c8236 100644 --- a/smoke/tqt/configure.in.in +++ b/smoke/tqt/configure.in.in @@ -47,17 +47,17 @@ AC_CACHE_VAL(ac_cv_lib_qscintilla, kde_libs_save="$LIBS" kde_cxxflags_save="$CXXFLAGS" - LIBS="-lqscintilla $LIBTQT $LIBS" + LIBS="-ltqscintilla $LIBTQT $LIBS" CXXFLAGS="$CXXFLAGS $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ - #include <qextscintillabase.h> + #include <tqextscintillabase.h> ], [ - QextScintillaBase s; + TQextScintillaBase s; ], - eval "ac_cv_lib_qscintilla='-lqscintilla'", + eval "ac_cv_lib_qscintilla='-ltqscintilla'", eval "ac_cv_lib_qscintilla=no") LDFLAGS=$kde_ldflags_save diff --git a/smoke/tqt/generate.pl.in b/smoke/tqt/generate.pl.in index f1629222..686c6a27 100644 --- a/smoke/tqt/generate.pl.in +++ b/smoke/tqt/generate.pl.in @@ -64,8 +64,6 @@ my %excludes = ( 'ntqgl.h' => 1, # OpenGL 'ntqglcolormap.h' => 1, # OpenGL 'ntqnp.h' => 1, # NSPlugin - 'ntqttableview.h' => 1, # Not in Qt anymore... - 'ntqtmultilineedit.h' => 1, # Not in Qt anymore... 'ntqwidgetfactory.h' => 1, # Just an interface 'ntqsharedmemory.h' => 1, # "not part of the Qt API" they say 'ntqwindowsstyle.h' => 1, # Qt windowsstyle, plugin @@ -132,6 +130,7 @@ foreach $filename (readdir(QT)) { closedir QT; # Launch kalyptus +$ENV{KDE_PREFIX} = "@KDE_PREFIX@"; chdir "../smoke/tqt"; system "perl -I@top_srcdir@/kalyptus @top_srcdir@/kalyptus/kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --outputdir=$outdir @headers"; my $exit = $? >> 8; diff --git a/smoke/tqt/header_list b/smoke/tqt/header_list index 76b945dc..87bb9d98 100644 --- a/smoke/tqt/header_list +++ b/smoke/tqt/header_list @@ -2,9 +2,7 @@ ntqabstractlayout.h ntqaccel.h ntqaccessible.h ntqaction.h -ntqapp.h ntqapplication.h -ntqarray.h ntqasciicache.h ntqasciidict.h ntqassistantclient.h @@ -12,10 +10,8 @@ ntqasyncimageio.h ntqasyncio.h ntqbig5codec.h ntqbitarray.h -ntqbitarry.h ntqbitmap.h ntqbrush.h -ntqbttngrp.h ntqbuffer.h ntqbuttongroup.h ntqbutton.h @@ -23,21 +19,15 @@ ntqcache.h ntqcanvas.h ntqcdestyle.h ntqcheckbox.h -ntqchkbox.h ntqcleanuphandler.h ntqclipboard.h -ntqclipbrd.h -ntqcollect.h -ntqcollection.h ntqcolordialog.h ntqcolor.h ntqcombobox.h -ntqcombo.h ntqcommonstyle.h ntqcompactstyle.h ntqconfig-dist.h ntqconfig.h -ntqconnect.h ntqconnection.h ntqcstring.h ntqcursor.h @@ -47,7 +37,6 @@ ntqdatatable.h ntqdataview.h ntqdatetimeedit.h ntqdatetime.h -ntqdatetm.h ntqdeepcopy.h ntqdesktopwidget.h ntqdial.h @@ -60,9 +49,7 @@ ntqdockwindow.h ntqdom.h ntqdragobject.h ntqdrawutil.h -ntqdrawutl.h ntqdropsite.h -ntqdstream.h ntqeditorfactory.h ntqerrormessage.h ntqeucjpcodec.h @@ -70,20 +57,15 @@ ntqeuckrcodec.h ntqevent.h ntqeventloop.h ntqfeatures.h -ntqfiledef.h ntqfiledialog.h -ntqfiledlg.h ntqfile.h -ntqfileinf.h ntqfileinfo.h ntqfocusdata.h ntqfontdatabase.h ntqfontdialog.h ntqfontdta.h ntqfont.h -ntqfontinf.h ntqfontinfo.h -ntqfontmet.h ntqfontmetrics.h ntqframe.h ntqftp.h @@ -102,7 +84,6 @@ ntqgplugin.h ntqgrid.h ntqgridview.h ntqgroupbox.h -ntqgrpbox.h ntqguardedptr.h ntqgvector.h ntqhbox.h @@ -117,10 +98,8 @@ ntqimageformatplugin.h ntqimage.h ntqinputdialog.h ntqintcache.h -ntqintcach.h ntqintdict.h ntqinterlacestyle.h -ntqiodev.h ntqiodevice.h ntqjiscodec.h ntqjpunicode.h @@ -129,10 +108,8 @@ ntqkeysequence.h ntqlabel.h ntqlayout.h ntqlcdnumber.h -ntqlcdnum.h ntqlocale.h ntqlibrary.h -ntqlined.h ntqlineedit.h ntqlistbox.h ntqlistview.h @@ -142,12 +119,9 @@ ntqmap.h ntqmemarray.h ntqmenubar.h ntqmenudata.h -ntqmenudta.h ntqmessagebox.h ntqmetaobject.h -ntqmetaobj.h ntqmime.h -ntqmlined.h ntqmodules.h ntqmotifdialog.h ntqmotif.h @@ -155,15 +129,11 @@ ntqmotifplusstyle.h ntqmotifstyle.h ntqmotifwidget.h ntqmovie.h -ntqmsgbox.h -ntqmultilinedit.h ntqmultilineedit.h ntqmutex.h ntqnamespace.h ntqnetwork.h ntqnetworkprotocol.h -ntqobjcoll.h -ntqobjdefs.h ntqobjectcleanuphandler.h ntqobjectdefs.h ntqobjectdict.h @@ -174,41 +144,29 @@ ntqpaintdevicemetrics.h ntqpainter.h ntqpair.h ntqpalette.h -ntqpdevmet.h ntqpen.h ntqpicture.h ntqpixmapcache.h ntqpixmap.h ntqplatinumstyle.h -ntqpmcache.h -ntqpntarry.h ntqpointarray.h ntqpoint.h ntqpolygonscanner.h -ntqpopmenu.h ntqpopupmenu.h ntqprintdialog.h ntqprinter.h -ntqprndlg.h ntqprocess.h -ntqprogbar.h -ntqprogdlg.h ntqprogressbar.h ntqprogressdialog.h -ntqpsprn.h ntqptrcollection.h ntqptrdict.h ntqptrlist.h ntqptrqueue.h ntqptrstack.h ntqptrvector.h -ntqpushbt.h ntqpushbutton.h -ntqqueue.h -ntqradiobt.h ntqradiobutton.h ntqrangecontrol.h -ntqrangect.h ntqrect.h ntqregexp.h ntqregion.h @@ -216,11 +174,9 @@ ntqremotefactory.h ntqremoteplugin.h ntqrtlcodec.h ntqscopedptr.h -ntqscrbar.h ntqscrollbar.h ntqscrollview.h ntqsemaphore.h -ntqsemimodal.h ntqserversocket.h ntqsession.h ntqsessionmanager.h @@ -239,8 +195,6 @@ ntqslider.h ntqsocketdevice.h ntqsocket.h ntqsocketnotifier.h -ntqsocknot.h -ntqsortedlist.h ntqsound.h ntqspinbox.h ntqsplashscreen.h @@ -272,7 +226,6 @@ ntqstylesheet.h ntqsyntaxhighlighter.h ntqtabbar.h ntqtabdialog.h -ntqtabdlg.h ntqtable.h ntqtabwidget.h ntqtextbrowser.h @@ -286,15 +239,12 @@ ntqt.h ntqthread.h ntqtimer.h ntqtl.h -ntqtmultilineedit.h ntqtoolbar.h ntqtoolbutton.h ntqtoolbox.h ntqtooltip.h ntqtranslator.h ntqtsciicodec.h -ntqtstream.h -ntqttableview.h ntqurl.h ntqurlinfo.h ntqurloperator.h @@ -310,14 +260,12 @@ ntqvbuttongroup.h ntqvgroupbox.h ntqwaitcondition.h ntqwhatsthis.h -ntqwidcoll.h ntqwidgetfactory.h ntqwidget.h ntqwidgetintdict.h ntqwidgetlist.h ntqwidgetplugin.h ntqwidgetstack.h -ntqwindefs.h ntqwindowdefs.h ntqwindow.h ntqwindowsstyle.h diff --git a/smoke/tqt/qscintilla_header_list b/smoke/tqt/qscintilla_header_list index 0da11cb6..3f7aaccf 100644 --- a/smoke/tqt/qscintilla_header_list +++ b/smoke/tqt/qscintilla_header_list @@ -1,22 +1,22 @@ -qextscintilla.h -qextscintillaapis.h -qextscintillabase.h -qextscintillacommand.h -qextscintillacommandset.h -qextscintilladocument.h -qextscintillaglobal.h -qextscintillalexer.h -qextscintillalexerbash.h -qextscintillalexercpp.h -qextscintillalexercsharp.h -qextscintillalexerhtml.h -qextscintillalexeridl.h -qextscintillalexerjava.h -qextscintillalexerjavascript.h -qextscintillalexerlua.h -qextscintillalexerperl.h -qextscintillalexerpython.h -qextscintillalexerruby.h -qextscintillalexersql.h -qextscintillamacro.h -qextscintillaprinter.h +tqextscintilla.h +tqextscintillaapis.h +tqextscintillabase.h +tqextscintillacommand.h +tqextscintillacommandset.h +tqextscintilladocument.h +tqextscintillaglobal.h +tqextscintillalexer.h +tqextscintillalexerbash.h +tqextscintillalexercpp.h +tqextscintillalexercsharp.h +tqextscintillalexerhtml.h +tqextscintillalexeridl.h +tqextscintillalexerjava.h +tqextscintillalexerjavascript.h +tqextscintillalexerlua.h +tqextscintillalexerperl.h +tqextscintillalexerpython.h +tqextscintillalexerruby.h +tqextscintillalexersql.h +tqextscintillamacro.h +tqextscintillaprinter.h diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in index bf115fdc..3c80e1d0 100644 --- a/smoke/tqt/qtguess.pl.in +++ b/smoke/tqt/qtguess.pl.in @@ -263,10 +263,6 @@ our %tests = ( £, 5], "TQT_NO_COLORDIALOG" => ["qcolordialog.h", "TQColorDialog::customCount();", 12], "TQT_NO_COMBOBOX" => ["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10], - "TQT_NO_COMPAT" => ["qfontmetrics.h", q£ - TQFontMetrics *foo= new TQFontMetrics( TQFont() ); - int bar = foo->width( 'c' ); - £, 0], "TQT_NO_COMPONENT" => ["qapplication.h", q£ TQApplication foo( argc, argv ); foo.addLibraryPath( TQString::null ); @@ -315,7 +311,7 @@ our %tests = ( TQStringList keys() const { return TQStringList(); }; bool installIOHandler( const TQString &format ) { return true; }; }; - Q_EXPORT_PLUGIN( TQFoo ) + TQ_EXPORT_PLUGIN( TQFoo ) £], "TQT_NO_IMAGE_DITHER_TO_1" => ["qimage.h", q£ TQImage *foo = new TQImage; @@ -398,16 +394,6 @@ our %tests = ( "TQT_NO_PROGRESSDIALOG" => ["qprogressdialog.h", "TQProgressDialog foo;", 13], "TQT_NO_PUSHBUTTON" => ["qpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12], "TQT_NO_PROPERTIES" => ["qmetaobject.h", "TQMetaProperty foo;", 0], -# "TQT_NO_QTMULTILINEEDIT" => ["qtmultilineedit.h", "QtMultiLineEdit foo;", 15], -# "TQT_NO_QTTABLEVIEW" => ["qttableview.h", "TQFoo foo;", 16, q£ -# class TQFoo: public QtTableView -# { -# public: -# TQFoo() {}; -# ~TQFoo() {}; -# void paintCell( TQPainter *, int, int) {}; -# }; -# £], "TQT_NO_QUUID_STRING" => ["quuid.h", "TQUuid foo( TQString::null );", 8], "TQT_NO_RANGECONTROL" => ["qrangecontrol.h", "TQRangeControl foo;", 10], "TQT_NO_REGEXP" => ["qregexp.h", "TQRegExp foo;", 5], @@ -423,7 +409,6 @@ our %tests = ( "TQT_NO_RICHTEXT" => ["qsimplerichtext.h, qstring.h, qfont.h", "TQSimpleRichText foo( TQString::null, TQFont() );", 10], "TQT_NO_SCROLLBAR" => ["qscrollbar.h", "TQScrollBar foo( (TQWidget *) NULL );", 12], "TQT_NO_SCROLLVIEW" => ["qscrollview.h", "TQScrollView foo;", 12], - "TQT_NO_SEMIMODAL" => ["qsemimodal.h", "TQSemiModal foo;", 10], "TQT_NO_SESSIONMANAGER" => ["qapplication.h", q£ TQApplication foo( argc, argv ); foo.sessionId(); @@ -476,7 +461,7 @@ our %tests = ( TQTextCodec *createForName( const TQString & name ) {return (TQTextCodec *)NULL;} TQTextCodec *createForMib( int mib ) {return (TQTextCodec *)NULL;} }; - Q_EXPORT_PLUGIN( TQFoo ) + TQ_EXPORT_PLUGIN( TQFoo ) £], "TQT_NO_TEXTEDIT" => ["qtextedit.h", "TQTextEdit foo;", 13], "TQT_NO_TEXTSTREAM" => ["qtextstream.h", "TQTextStream foo;", 5], diff --git a/tdejava/koala/examples/kscribble/KPenBrushDlg.java b/tdejava/koala/examples/kscribble/KPenBrushDlg.java index afbe7d38..c55f4519 100644 --- a/tdejava/koala/examples/kscribble/KPenBrushDlg.java +++ b/tdejava/koala/examples/kscribble/KPenBrushDlg.java @@ -31,9 +31,9 @@ public class KPenBrushDlg extends TQDialog { TQWhatsThis.add(width_spbox,i18n("Select brush width")); width_spbox.setValue(curr); - connect(default_btn, SIGNAL("clicked()"), this, SLOT("slotDefault()")); - connect(ok_btn, SIGNAL("clicked()"), this, SLOT("accept()")); - connect(cancel_btn, SIGNAL("clicked()"), this, SLOT("reject()")); + connect(default_btn, TQ_SIGNAL("clicked()"), this, TQ_SLOT("slotDefault()")); + connect(ok_btn, TQ_SIGNAL("clicked()"), this, TQ_SLOT("accept()")); + connect(cancel_btn, TQ_SIGNAL("clicked()"), this, TQ_SLOT("reject()")); } diff --git a/tdejava/koala/examples/kscribble/KScribbleApp.java b/tdejava/koala/examples/kscribble/KScribbleApp.java index 8283a4ce..e333d4ed 100644 --- a/tdejava/koala/examples/kscribble/KScribbleApp.java +++ b/tdejava/koala/examples/kscribble/KScribbleApp.java @@ -90,20 +90,20 @@ public class KScribbleApp extends TDEMainWindow implements Resource { TDEAccel keyAccel = new TDEAccel(this); // fileMenu accelerators - keyAccel.insert(TDEStdAccel.New, this, SLOT("slotFileNew()")); - keyAccel.insert(TDEStdAccel.Open, this, SLOT("slotFileOpen()")); - keyAccel.insert(TDEStdAccel.Save, this, SLOT("slotFileSave()")); - keyAccel.insert(TDEStdAccel.Close, this, SLOT("slotFileClose()")); - keyAccel.insert(TDEStdAccel.Print, this, SLOT("slotFilePrint()")); - keyAccel.insert(TDEStdAccel.Quit, this, SLOT("slotFileQuit()")); + keyAccel.insert(TDEStdAccel.New, this, TQ_SLOT("slotFileNew()")); + keyAccel.insert(TDEStdAccel.Open, this, TQ_SLOT("slotFileOpen()")); + keyAccel.insert(TDEStdAccel.Save, this, TQ_SLOT("slotFileSave()")); + keyAccel.insert(TDEStdAccel.Close, this, TQ_SLOT("slotFileClose()")); + keyAccel.insert(TDEStdAccel.Print, this, TQ_SLOT("slotFilePrint()")); + keyAccel.insert(TDEStdAccel.Quit, this, TQ_SLOT("slotFileQuit()")); // editMenu accelerators - keyAccel.insert(TDEStdAccel.Cut, this, SLOT("slotEditCut()")); - keyAccel.insert(TDEStdAccel.Copy, this, SLOT("slotEditCopy()")); - keyAccel.insert(TDEStdAccel.Paste, this, SLOT("slotEditPaste()")); + keyAccel.insert(TDEStdAccel.Cut, this, TQ_SLOT("slotEditCut()")); + keyAccel.insert(TDEStdAccel.Copy, this, TQ_SLOT("slotEditCopy()")); + keyAccel.insert(TDEStdAccel.Paste, this, TQ_SLOT("slotEditPaste()")); // help accelerator - keyAccel.insert(TDEStdAccel.Help, this, SLOT("appHelpActivated()")); + keyAccel.insert(TDEStdAccel.Help, this, TQ_SLOT("appHelpActivated()")); keyAccel.readSettings(); @@ -115,7 +115,7 @@ public class KScribbleApp extends TDEMainWindow implements Resource { // MENUBAR pRecentFileMenu = new TQPopupMenu(this); - connect(pRecentFileMenu, SIGNAL("activated(int)"), SLOT("slotFileOpenRecent(int)")); + connect(pRecentFileMenu, TQ_SIGNAL("activated(int)"), TQ_SLOT("slotFileOpenRecent(int)")); /////////////////////////////////////////////////////////////////// @@ -185,21 +185,21 @@ public class KScribbleApp extends TDEMainWindow implements Resource { /////////////////////////////////////////////////////////////////// // CONNECT THE MENU SLOTS WITH SIGNALS // for execution slots and statusbar messages - connect(pFileMenu, SIGNAL("activated(int)"), SLOT("commandCallback(int)")); - connect(pFileMenu, SIGNAL("highlighted(int)"), SLOT("statusCallback(int)")); + connect(pFileMenu, TQ_SIGNAL("activated(int)"), TQ_SLOT("commandCallback(int)")); + connect(pFileMenu, TQ_SIGNAL("highlighted(int)"), TQ_SLOT("statusCallback(int)")); - connect(pEditMenu, SIGNAL("activated(int)"), SLOT("commandCallback(int)")); - connect(pEditMenu, SIGNAL("highlighted(int)"), SLOT("statusCallback(int)")); + connect(pEditMenu, TQ_SIGNAL("activated(int)"), TQ_SLOT("commandCallback(int)")); + connect(pEditMenu, TQ_SIGNAL("highlighted(int)"), TQ_SLOT("statusCallback(int)")); - connect(pPenMenu, SIGNAL("activated(int)"), SLOT("commandCallback(int)")); - connect(pPenMenu, SIGNAL("highlighted(int)"), SLOT("statusCallback(int)")); + connect(pPenMenu, TQ_SIGNAL("activated(int)"), TQ_SLOT("commandCallback(int)")); + connect(pPenMenu, TQ_SIGNAL("highlighted(int)"), TQ_SLOT("statusCallback(int)")); - connect(pViewMenu, SIGNAL("activated(int)"), SLOT("commandCallback(int)")); - connect(pViewMenu, SIGNAL("highlighted(int)"), SLOT("statusCallback(int)")); + connect(pViewMenu, TQ_SIGNAL("activated(int)"), TQ_SLOT("commandCallback(int)")); + connect(pViewMenu, TQ_SIGNAL("highlighted(int)"), TQ_SLOT("statusCallback(int)")); - connect(pWindowMenu, SIGNAL("aboutToShow()" ), SLOT( "windowMenuAboutToShow()" ) ); - connect(pWindowMenu, SIGNAL("activated(int)"), SLOT("commandCallback(int)")); - connect(pWindowMenu, SIGNAL("highlighted(int)"), SLOT("statusCallback(int)")); + connect(pWindowMenu, TQ_SIGNAL("aboutToShow()" ), TQ_SLOT( "windowMenuAboutToShow()" ) ); + connect(pWindowMenu, TQ_SIGNAL("activated(int)"), TQ_SLOT("commandCallback(int)")); + connect(pWindowMenu, TQ_SIGNAL("highlighted(int)"), TQ_SLOT("statusCallback(int)")); } @@ -221,8 +221,8 @@ public class KScribbleApp extends TDEMainWindow implements Resource { toolBar().insertButton(KDE.BarIcon("pencolor"), ID_PEN_COLOR, true, i18n("Color"),-1 ); toolBar().insertButton(KDE.BarIcon("penwidth"), ID_PEN_BRUSH, true, i18n("Width"),-1 ); toolBar().insertSeparator(); - toolBar().insertButton(KDE.BarIcon("help"), ID_HELP_CONTENTS, SIGNAL("clicked()"), - this, SLOT("appHelpActivated()"), true,i18n("Help"),-1); + toolBar().insertButton(KDE.BarIcon("help"), ID_HELP_CONTENTS, TQ_SIGNAL("clicked()"), + this, TQ_SLOT("appHelpActivated()"), true,i18n("Help"),-1); TQToolButton btnwhat = TQWhatsThis.whatsThisButton(toolBar()); TQToolTip.add(btnwhat, i18n("What's this...?")); @@ -235,9 +235,9 @@ public class KScribbleApp extends TDEMainWindow implements Resource { /////////////////////////////////////////////////////////////////// // CONNECT THE TOOLBAR SLOTS WITH SIGNALS - add new created toolbars by their according number // connect for invoking the slot actions - connect(toolBar(), SIGNAL("clicked(int)"), SLOT("commandCallback(int)")); + connect(toolBar(), TQ_SIGNAL("clicked(int)"), TQ_SLOT("commandCallback(int)")); // connect for the status help on holing icons pressed with the mouse button - connect(toolBar(), SIGNAL("pressed(int)"), SLOT("statusCallback(int)")); + connect(toolBar(), TQ_SIGNAL("pressed(int)"), TQ_SLOT("statusCallback(int)")); } @@ -261,7 +261,7 @@ public class KScribbleApp extends TDEMainWindow implements Resource { TQVBox view_back = new TQVBox( this ); view_back.setFrameStyle( TQFrame.StyledPanel | TQFrame.Sunken ); pWorkspace = new TQWorkspace( view_back, "" ); - connect(pWorkspace, SIGNAL("windowActivated(TQWidget)"), this, SLOT("setWndTitle(TQWidget)")); + connect(pWorkspace, TQ_SIGNAL("windowActivated(TQWidget)"), this, TQ_SLOT("setWndTitle(TQWidget)")); // setView(view_back); setCentralWidget(view_back); } @@ -355,9 +355,9 @@ public class KScribbleApp extends TDEMainWindow implements Resource { pWindowMenu.insertItem(i18n("&New Window"), ID_WINDOW_NEW_WINDOW); pWindowMenu.insertItem(i18n("&Cascade"), - pWorkspace, SLOT("cascade()" ),new TQKeySequence(0) , ID_WINDOW_CASCADE ); + pWorkspace, TQ_SLOT("cascade()" ),new TQKeySequence(0) , ID_WINDOW_CASCADE ); pWindowMenu.insertItem(i18n("&Tile"), - pWorkspace, SLOT("tile()" ),new TQKeySequence(0) , ID_WINDOW_TILE ); + pWorkspace, TQ_SLOT("tile()" ),new TQKeySequence(0) , ID_WINDOW_TILE ); if ( pWorkspace.windowList().isEmpty() ) { @@ -372,7 +372,7 @@ public class KScribbleApp extends TDEMainWindow implements Resource { for ( int i = 0; i < windows.size(); ++i ) { int id = pWindowMenu.insertItem((i+1)+ ((TQWidget)windows.get(i)).caption(), - this, SLOT( "windowMenuActivated( int )" ) ); + this, TQ_SLOT( "windowMenuActivated( int )" ) ); pWindowMenu.setItemParameter( id, i ); pWindowMenu.setItemChecked( id, pWorkspace.activeWindow() == (TQWidget)windows.get(i) ); } diff --git a/tdejava/koala/examples/simplemail/SimpleMailFrm.java b/tdejava/koala/examples/simplemail/SimpleMailFrm.java index bbbe3d0a..a6f0206a 100644 --- a/tdejava/koala/examples/simplemail/SimpleMailFrm.java +++ b/tdejava/koala/examples/simplemail/SimpleMailFrm.java @@ -182,8 +182,8 @@ class SimpleMailFrm extends TDEMainWindow { } void setEventHandlers() { - connect( btCancel, SIGNAL("clicked()"), parentApp, SLOT("quit()")); - connect( btSend,SIGNAL("clicked()"),this,SLOT("sendMail()")); + connect( btCancel, TQ_SIGNAL("clicked()"), parentApp, TQ_SLOT("quit()")); + connect( btSend,TQ_SIGNAL("clicked()"),this,TQ_SLOT("sendMail()")); } diff --git a/tdejava/koala/org/trinitydesktop/koala/BrowserExtension.java b/tdejava/koala/org/trinitydesktop/koala/BrowserExtension.java index d2d2ee08..a571d933 100644 --- a/tdejava/koala/org/trinitydesktop/koala/BrowserExtension.java +++ b/tdejava/koala/org/trinitydesktop/koala/BrowserExtension.java @@ -220,7 +220,7 @@ public class BrowserExtension extends TQObject { public native void pasteRequest(); /** Returns a map containing the action names as keys and corresponding - SLOT()'ified method names as data entries. + TQ_SLOT()'ified method names as data entries. This is very useful for the host component, when connecting the own signals with the extension's slots. @@ -235,11 +235,11 @@ public class BrowserExtension extends TQObject { iterating over the action slot map, returned by this method) Connecting to the slot can be done like this: <pre> - connect( yourObject, SIGNAL("yourSignal()"), + connect( yourObject, TQ_SIGNAL("yourSignal()"), extension, mapIterator.data() ) </pre> (where "mapIterator" is your TQMap<String,String> iterator) - @short Returns a map containing the action names as keys and corresponding SLOT()'ified method names as data entries. + @short Returns a map containing the action names as keys and corresponding TQ_SLOT()'ified method names as data entries. */ // KParts::BrowserExtension::ActionSlotMap actionSlotMap(); >>>> NOT CONVERTED /** diff --git a/tdejava/koala/org/trinitydesktop/koala/Job.java b/tdejava/koala/org/trinitydesktop/koala/Job.java index 82966174..b0748879 100644 --- a/tdejava/koala/org/trinitydesktop/koala/Job.java +++ b/tdejava/koala/org/trinitydesktop/koala/Job.java @@ -14,8 +14,8 @@ import org.trinitydesktop.qt.TQObject; For all jobs created in an application, the code looks like <pre> TDEIO.Job job = TDEIO.someoperation( some parameters ); - connect( job, SIGNAL("result( TDEIO.Job )"), - this, SLOT("slotResult( TDEIO.Job )") ); + connect( job, TQ_SIGNAL("result( TDEIO.Job )"), + this, TQ_SLOT("slotResult( TDEIO.Job )") ); </pre> (other connects, specific to the job) And slotResult is usually at least: diff --git a/tdejava/koala/org/trinitydesktop/koala/KAudioPlayer.java b/tdejava/koala/org/trinitydesktop/koala/KAudioPlayer.java index 69976a68..f41809a6 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KAudioPlayer.java +++ b/tdejava/koala/org/trinitydesktop/koala/KAudioPlayer.java @@ -23,7 +23,7 @@ import org.trinitydesktop.qt.TQObject; If you want to use signals & slots, you can do something like: <pre> KAudioPlayer player("/var/share/foo.wav"); - connect(&button, SIGNAL("clicked()"), &player, SLOT("play()")); + connect(&button, TQ_SIGNAL("clicked()"), &player, TQ_SLOT("play()")); </pre> @short This class provides one-shot-and-forget audio playing. diff --git a/tdejava/koala/org/trinitydesktop/koala/KComboBox.java b/tdejava/koala/org/trinitydesktop/koala/KComboBox.java index 3842db13..87fe2a4f 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KComboBox.java +++ b/tdejava/koala/org/trinitydesktop/koala/KComboBox.java @@ -72,7 +72,7 @@ import org.trinitydesktop.qt.TQComboBox; KComboBox combo = new KComboBox( true, this, "mywidget" ); TDECompletion comp = combo.completionObject(); // Connect to the return pressed signal - optional - connect(combo,SIGNAL("returnPressed(String)"),comp,SLOT("addItem(String)")); + connect(combo,TQ_SIGNAL("returnPressed(String)"),comp,TQ_SLOT("addItem(String)")); // Provide the to be completed strings. Note that those are separate from the combo's // contents. comp.insertItems( someArrayList ); @@ -83,7 +83,7 @@ import org.trinitydesktop.qt.TQComboBox; KURLCompletion comp = new KURLCompletion(); combo.setCompletionObject( comp ); // Connect to the return pressed signal - optional - connect(combo,SIGNAL("returnPressed(String)"),comp,SLOT("addItem(String)")); + connect(combo,TQ_SIGNAL("returnPressed(String)"),comp,TQ_SLOT("addItem(String)")); </pre> Note that you have to either delete the allocated completion object when you don't need it anymore, or call diff --git a/tdejava/koala/org/trinitydesktop/koala/KDirOperator.java b/tdejava/koala/org/trinitydesktop/koala/KDirOperator.java index d0f7114f..14a31790 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KDirOperator.java +++ b/tdejava/koala/org/trinitydesktop/koala/KDirOperator.java @@ -34,14 +34,14 @@ import org.trinitydesktop.qt.TQWidget; <pre> KDirOperator op = new KDirOperator( KURL( "file:/home/gis" ), this ); // some signals you might be interested in - connect(op, SIGNAL("urlEntered(KURL)"), - SLOT("urlEntered(KURL)")); - connect(op, SIGNAL("fileHighlighted(const KFileItem )"), - SLOT("fileHighlighted(const KFileItem )")); - connect(op, SIGNAL("fileSelected(const KFileItem )"), - SLOT("fileSelected(const KFileItem )")); - connect(op, SIGNAL("finishedLoading()"), - SLOT("slotLoadingFinished()")); + connect(op, TQ_SIGNAL("urlEntered(KURL)"), + TQ_SLOT("urlEntered(KURL)")); + connect(op, TQ_SIGNAL("fileHighlighted(const KFileItem )"), + TQ_SLOT("fileHighlighted(const KFileItem )")); + connect(op, TQ_SIGNAL("fileSelected(const KFileItem )"), + TQ_SLOT("fileSelected(const KFileItem )")); + connect(op, TQ_SIGNAL("finishedLoading()"), + TQ_SLOT("slotLoadingFinished()")); op.readConfig( TDEGlobal.config(), "Your KDiroperator ConfigGroup" ); op.setView(KFile.Default); </pre> diff --git a/tdejava/koala/org/trinitydesktop/koala/KEditToolbar.java b/tdejava/koala/org/trinitydesktop/koala/KEditToolbar.java index 7705bfe0..9be1e6b7 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KEditToolbar.java +++ b/tdejava/koala/org/trinitydesktop/koala/KEditToolbar.java @@ -31,7 +31,7 @@ import org.trinitydesktop.qt.TQWidget; { saveMainWindowSettings( TDEGlobal.config(), "MainWindow" ); KEditToolbar dlg(actionCollection()); - connect(&dlg,SIGNAL("newToolbarConfig()"),this,SLOT("slotNewToolbarConfig()")); + connect(&dlg,TQ_SIGNAL("newToolbarConfig()"),this,TQ_SLOT("slotNewToolbarConfig()")); dlg.exec(); } void MyClass.slotNewToolbarConfig() // This is called when OK, Apply or Defaults is clicked @@ -52,7 +52,7 @@ import org.trinitydesktop.qt.TQWidget; <pre> saveMainWindowSettings( TDEGlobal.config(), "MainWindow" ); KEditToolbar dlg(factory()); - connect(&dlg,SIGNAL("newToolbarConfig()"),this,SLOT("slotNewToolbarConfig()")); + connect(&dlg,TQ_SIGNAL("newToolbarConfig()"),this,TQ_SLOT("slotNewToolbarConfig()")); dlg.exec(); void MyClass.slotNewToolbarConfig() // This is called when OK, Apply or Defaults is clicked { diff --git a/tdejava/koala/org/trinitydesktop/koala/KFileDialog.java b/tdejava/koala/org/trinitydesktop/koala/KFileDialog.java index 9dc71540..f0a5c0ae 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KFileDialog.java +++ b/tdejava/koala/org/trinitydesktop/koala/KFileDialog.java @@ -324,7 +324,7 @@ public class KFileDialog extends KDialogBase { items into it, e.g.: <pre> yourAction = new TDEAction( i18n("Your Action"), 0, - this, SLOT("yourSlot()"), + this, TQ_SLOT("yourSlot()"), this, "action name" ); yourAction.plug( tdefileDialog.toolBar() ); </pre> diff --git a/tdejava/koala/org/trinitydesktop/koala/KFind.java b/tdejava/koala/org/trinitydesktop/koala/KFind.java index 518b7586..2231cc6b 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KFind.java +++ b/tdejava/koala/org/trinitydesktop/koala/KFind.java @@ -23,11 +23,11 @@ import org.trinitydesktop.qt.TQObject; m_find = new KFind(pattern, options, this); // Connect highlight signal to code which handles highlighting // of found text. - connect( m_find, SIGNAL("highlight( String, int, int )"), - this, SLOT("slotHighlight( String, int, int )") ); + connect( m_find, TQ_SIGNAL("highlight( String, int, int )"), + this, TQ_SLOT("slotHighlight( String, int, int )") ); // Connect findNext signal - called when pressing the button in the dialog - connect( m_find, SIGNAL("findNext()"), - this, SLOT("slotFindNext()") ); + connect( m_find, TQ_SIGNAL("findNext()"), + this, TQ_SLOT("slotFindNext()") ); </pre> If you are using a non-modal find dialog (the recommended new way in KDE-3.2), you should call right away m_find.closeFindNextDialog(). diff --git a/tdejava/koala/org/trinitydesktop/koala/KFindDialog.java b/tdejava/koala/org/trinitydesktop/koala/KFindDialog.java index 9b0d4aa6..01eeac77 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KFindDialog.java +++ b/tdejava/koala/org/trinitydesktop/koala/KFindDialog.java @@ -30,7 +30,7 @@ import org.trinitydesktop.qt.TQWidget; else { m_findDia = new KFindDialog(false,...); - connect( m_findDia, SIGNAL("okClicked()"), this, SLOT("findTextNext()") ); + connect( m_findDia, TQ_SIGNAL("okClicked()"), this, TQ_SLOT("findTextNext()") ); } </pre> Don't forget to delete and reset m_findDia when closed. diff --git a/tdejava/koala/org/trinitydesktop/koala/KHelpMenu.java b/tdejava/koala/org/trinitydesktop/koala/KHelpMenu.java index 8ea163d4..fea442f8 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KHelpMenu.java +++ b/tdejava/koala/org/trinitydesktop/koala/KHelpMenu.java @@ -23,7 +23,7 @@ import org.trinitydesktop.qt.TQObject; or if you just want to open a dialog box: <pre> mHelpMenu = new KHelpMenu( this, <someText> ); - connect( this, SIGNAL("someSignal()"), mHelpMenu,SLOT("mHelpMenu.aboutKDE()")); + connect( this, TQ_SIGNAL("someSignal()"), mHelpMenu,TQ_SLOT("mHelpMenu.aboutKDE()")); </pre> IMPORTANT: The first time you use KHelpMenu.menu(), a TDEPopupMenu object is @@ -52,8 +52,8 @@ import org.trinitydesktop.qt.TQObject; { .. KHelpMenu helpMenu = new KHelpMenu( this ); - connect( helpMenu, SIGNAL("showAboutApplication()"), - this, SLOT("myDialogSlot()")); + connect( helpMenu, TQ_SIGNAL("showAboutApplication()"), + this, TQ_SLOT("myDialogSlot()")); .. } void MyClass.myDialogSlot() @@ -67,7 +67,7 @@ import org.trinitydesktop.qt.TQObject; { KHelpMenu helpMenu = new KHelpMenu( this ); TDEPopupMenu help = mHelpMenu.menu(); - help.connectItem( KHelpMenu.menuAboutApp, this, SLOT("myDialogSlot()") ); + help.connectItem( KHelpMenu.menuAboutApp, this, TQ_SLOT("myDialogSlot()") ); } void MyClass.myDialogSlot() { diff --git a/tdejava/koala/org/trinitydesktop/koala/KHistoryCombo.java b/tdejava/koala/org/trinitydesktop/koala/KHistoryCombo.java index 78507d44..08240f43 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KHistoryCombo.java +++ b/tdejava/koala/org/trinitydesktop/koala/KHistoryCombo.java @@ -39,8 +39,8 @@ public class KHistoryCombo extends KComboBox { yourself via the slot addToHistory. If you want every item added, use <pre> - connect( combo, SIGNAL("activated( String )"), - combo, SLOT("addToHistory( String )")); + connect( combo, TQ_SIGNAL("activated( String )"), + combo, TQ_SLOT("addToHistory( String )")); </pre> Use TQComboBox.setMaxCount() to limit the history. <code>parent</code> the parent object of this widget. diff --git a/tdejava/koala/org/trinitydesktop/koala/KLineEdit.java b/tdejava/koala/org/trinitydesktop/koala/KLineEdit.java index 1b9bdf95..20ebe775 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KLineEdit.java +++ b/tdejava/koala/org/trinitydesktop/koala/KLineEdit.java @@ -68,7 +68,7 @@ import org.trinitydesktop.qt.TQLineEdit; KLineEdit edit = new KLineEdit( this, "mywidget" ); TDECompletion comp = edit.completionObject(); // Connect to the return pressed signal - optional - connect(edit,SIGNAL("returnPressed(String)"),comp,SLOT("addItem(String)")); + connect(edit,TQ_SIGNAL("returnPressed(String)"),comp,TQ_SLOT("addItem(String)")); </pre> To use a customized completion objects or your own completion object : @@ -77,7 +77,7 @@ import org.trinitydesktop.qt.TQLineEdit; KURLCompletion comp = new KURLCompletion(); edit.setCompletionObject( comp ); // Connect to the return pressed signal - optional - connect(edit,SIGNAL("returnPressed(String)"),comp,SLOT("addItem(String)")); + connect(edit,TQ_SIGNAL("returnPressed(String)"),comp,TQ_SLOT("addItem(String)")); </pre> Note if you specify your own completion object you have to either delete it when you don't need it anymore, or you can tell KLineEdit to delete it diff --git a/tdejava/koala/org/trinitydesktop/koala/KMdiChildView.java b/tdejava/koala/org/trinitydesktop/koala/KMdiChildView.java index 82a1b005..b13a9669 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KMdiChildView.java +++ b/tdejava/koala/org/trinitydesktop/koala/KMdiChildView.java @@ -60,7 +60,7 @@ import org.trinitydesktop.qt.TQWidget; flags = KMdi.Hide; } // set the accelerators for Toplevel MDI mode (each toplevel window needs its own accels - connect( m_pParent, SIGNAL("childViewIsDetachedNow(TQWidget)"), this, SLOT("initKeyAccel(TQWidget)") ); + connect( m_pParent, TQ_SIGNAL("childViewIsDetachedNow(TQWidget)"), this, TQ_SLOT("initKeyAccel(TQWidget)") ); m_pParent.addWindow( pMDICover, flags); // correct the default settings of KMdi ('cause we haven't a tab order for subwidget focuses) pMDICover.setFirstFocusableChildWidget(null); diff --git a/tdejava/koala/org/trinitydesktop/koala/KRegExpEditorInterface.java b/tdejava/koala/org/trinitydesktop/koala/KRegExpEditorInterface.java index 6fcb3b90..be9bfdb6 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KRegExpEditorInterface.java +++ b/tdejava/koala/org/trinitydesktop/koala/KRegExpEditorInterface.java @@ -33,7 +33,7 @@ import org.trinitydesktop.qt.QtSupport; </pre> Note: signals and slots must be connected to the editorDialog object, not to the editor object: <pre> - connect( editorDialog, SIGNAL("canUndo( boolean )"), undoBut, SLOT("setEnabled( boolean )") ); + connect( editorDialog, TQ_SIGNAL("canUndo( boolean )"), undoBut, TQ_SLOT("setEnabled( boolean )") ); </pre> If you want to create an instance of the editor widget, i.e. not the dialog, then you must do it in the following way: diff --git a/tdejava/koala/org/trinitydesktop/koala/KReplace.java b/tdejava/koala/org/trinitydesktop/koala/KReplace.java index 8494d57e..bce94d7c 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KReplace.java +++ b/tdejava/koala/org/trinitydesktop/koala/KReplace.java @@ -22,14 +22,14 @@ import org.trinitydesktop.qt.TQWidget; m_replace = new KReplace(pattern, replacement, options, this); // Connect signals to code which handles highlighting // of found text, and on-the-fly replacement. - connect( m_replace, SIGNAL("highlight( String, int, int )"), - this, SLOT("slotHighlight( String, int, int )") ); + connect( m_replace, TQ_SIGNAL("highlight( String, int, int )"), + this, TQ_SLOT("slotHighlight( String, int, int )") ); // Connect findNext signal - called when pressing the button in the dialog - connect( m_replace, SIGNAL("findNext()"), - this, SLOT("slotReplaceNext()") ); + connect( m_replace, TQ_SIGNAL("findNext()"), + this, TQ_SLOT("slotReplaceNext()") ); // Connect replace signal - called when doing a replacement - connect( m_replace, SIGNAL("replace(String, int, int, int)"), - this, SLOT("slotReplace(String, int, int, int)") ); + connect( m_replace, TQ_SIGNAL("replace(String, int, int, int)"), + this, TQ_SLOT("slotReplace(String, int, int, int)") ); </pre> Then initialize the variables determining the "current position" (to the cursor, if the option FromCursor is set, diff --git a/tdejava/koala/org/trinitydesktop/koala/KScanDialog.java b/tdejava/koala/org/trinitydesktop/koala/KScanDialog.java index 3ef8525d..88683ccc 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KScanDialog.java +++ b/tdejava/koala/org/trinitydesktop/koala/KScanDialog.java @@ -21,8 +21,8 @@ import org.trinitydesktop.qt.TQWidget; m_scanDialog = KScanDialog.getScanDialog( this, "scandialog" ); if ( !m_scanDialog ) // no scanning support installed? return; - connect( m_scanDialog, SIGNAL("finalImage( TQImage, int )"), - SLOT("slotScanned( TQImage, int )")); + connect( m_scanDialog, TQ_SIGNAL("finalImage( TQImage, int )"), + TQ_SLOT("slotScanned( TQImage, int )")); } if ( m_scanDialog.setup() ) // only if scanner configured/available m_scanDialog.show(); diff --git a/tdejava/koala/org/trinitydesktop/koala/KStdAction.java b/tdejava/koala/org/trinitydesktop/koala/KStdAction.java index da3d582f..8a2085f8 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KStdAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/KStdAction.java @@ -22,11 +22,11 @@ import org.trinitydesktop.qt.TQWidget; <pre> TDEAction newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("filenew")), TDEStdAccel.shortcut(TDEStdAccel.New), this, - SLOT("fileNew()"), actionCollection()); + TQ_SLOT("fileNew()"), actionCollection()); </pre> You could drop that and replace it with: <pre> - TDEAction newAct = KStdAction.openNew(this, SLOT("fileNew()"), + TDEAction newAct = KStdAction.openNew(this, TQ_SLOT("fileNew()"), actionCollection()); </pre> <li><b>Non-standard Usages</b></li> @@ -47,7 +47,7 @@ import org.trinitydesktop.qt.TQWidget; However, you can change the internal name. In this example, just do something like: <pre> - KStdAction.cut(this, SLOT("editCut()"), actionCollection(), "my_cut"); + KStdAction.cut(this, TQ_SLOT("editCut()"), actionCollection(), "my_cut"); </pre> Now, in your local XML resource file (e.g., yourappui.rc), simply put 'my_cut' where you want it to go. @@ -61,13 +61,13 @@ import org.trinitydesktop.qt.TQWidget; </pre> Another non-standard usage concerns instantiating the action in the first place. Usually, you would use the member functions as - shown above (e.g., KStdAction.cut(this, SLOT, parent)). You + shown above (e.g., KStdAction.cut(this, TQ_SLOT, parent)). You may, however, do this using the enums provided. This author can't think of a reason why you would want to, but, hey, if you do, here's how: <pre> - KStdAction.action(KStdAction.New, this, SLOT("fileNew()"), actionCollection()); - KStdAction.action(KStdAction.Cut, this, SLOT("editCut()"), actionCollection()); + KStdAction.action(KStdAction.New, this, TQ_SLOT("fileNew()"), actionCollection()); + KStdAction.action(KStdAction.Cut, this, TQ_SLOT("editCut()"), actionCollection()); </pre> @author Kurt Granroth <granroth@kde.org> @@ -179,7 +179,7 @@ public class KStdAction { Open a recently used document. The signature of the slot being called is of the form slotURLSelected( KURL ). @param recvr object to receive slot - @param slot The SLOT to invoke when a URL is selected. The slot's + @param slot The slot to invoke when a URL is selected. The slot's signature is slotURLSelected( KURL ). @param parent parent widget @param name name of widget @@ -476,7 +476,7 @@ public class KStdAction { /** Display the configure key bindings dialog. Note that you might be able to use the pre-built KXMLGUIFactory's fuction: - KStdAction.keyBindings(guiFactory(), SLOT("configureShortcuts()"), actionCollection()); + KStdAction.keyBindings(guiFactory(), TQ_SLOT("configureShortcuts()"), actionCollection()); @short Display the configure key bindings dialog. */ public static native TDEAction keyBindings(TQObject recvr, String slot, TDEActionCollection parent, String name); diff --git a/tdejava/koala/org/trinitydesktop/koala/KURLLabel.java b/tdejava/koala/org/trinitydesktop/koala/KURLLabel.java index acba0f8d..2e54b39e 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KURLLabel.java +++ b/tdejava/koala/org/trinitydesktop/koala/KURLLabel.java @@ -27,8 +27,8 @@ import org.trinitydesktop.qt.TQLabel; KURLLabel address = new KURLLabel(this); address.setText("My homepage"); address.setURL("http://www.home.com/~me"); - connect(address, SIGNAL("leftClickedURL(String)"), - SLOT("processMyURL(String)")); + connect(address, TQ_SIGNAL("leftClickedURL(String)"), + TQ_SLOT("processMyURL(String)")); </pre> In this example, the text "My homepage" would be displayed as blue, underlined text. When the mouse passed over it, diff --git a/tdejava/koala/org/trinitydesktop/koala/KXMLGUIFactory.java b/tdejava/koala/org/trinitydesktop/koala/KXMLGUIFactory.java index 153ae1db..1551fd6a 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KXMLGUIFactory.java +++ b/tdejava/koala/org/trinitydesktop/koala/KXMLGUIFactory.java @@ -127,7 +127,7 @@ public class KXMLGUIFactory extends TQObject { This slot can be connected dirrectly to the action to configure shortcuts. This is very simple to do that by adding a single line <pre> - KStdAction.keyBindings( guiFactory(), SLOT("configureShortcuts()"), actionCollection() ); + KStdAction.keyBindings( guiFactory(), TQ_SLOT("configureShortcuts()"), actionCollection() ); </pre> @param bAllowLetterShortcuts Set to false if unmodified alphanumeric keys ('A', '1', etc.) are not permissible shortcuts. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEAccel.java b/tdejava/koala/org/trinitydesktop/koala/TDEAccel.java index 9bb4a0a7..f217325f 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEAccel.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEAccel.java @@ -42,9 +42,9 @@ import org.trinitydesktop.qt.TQAccel; // Insert an action "Scroll Up" which is associated with the "Up" key: pAccel.insert( "Scroll Up", i18n("Scroll up"), i18n("Scroll up the current document by one line."), - Qt.Key_Up, this, SLOT("slotScrollUp()") ); + Qt.Key_Up, this, TQ_SLOT("slotScrollUp()") ); // Insert an standard acclerator action. - pAccel.insert( TDEStdAccel.Print, this, SLOT("slotPrint()") ); + pAccel.insert( TDEStdAccel.Print, this, TQ_SLOT("slotPrint()") ); // Update the shortcuts by read any user-defined settings from the // application's config file. pAccel.readSettings(); @@ -134,7 +134,7 @@ public class TDEAccel extends TQAccel { insert( "Do Something", i18n("Do Something"), i18n("This action allows you to do something really great with this program to " "the currently open document."), - ALT+Key_D, this, SLOT("slotDoSomething()") ); + ALT+Key_D, this, TQ_SLOT("slotDoSomething()") ); </pre> @param sAction The internal name of the action. @param sLabel An i18n'ized short description of the action displayed when @@ -164,7 +164,7 @@ public class TDEAccel extends TQAccel { of the action as for the user-visible label. Usage: <pre> - insert( i18n("Do Something"), ALT+Key_D, this, SLOT("slotDoSomething()") ); + insert( i18n("Do Something"), ALT+Key_D, this, TQ_SLOT("slotDoSomething()") ); </pre> @param psAction The name AND label of the action. @param cutDef The default shortcut for this action. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEAction.java b/tdejava/koala/org/trinitydesktop/koala/TDEAction.java index 3e6abfc2..1120265e 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEAction.java @@ -56,11 +56,11 @@ import org.trinitydesktop.qt.TQObject; TQSignalMapper . A tiny example: <pre> TQSignalMapper desktopNumberMapper = new TQSignalMapper( this ); - connect( desktopNumberMapper, SIGNAL("mapped( int )"), - this, SLOT("moveWindowToDesktop( int )") ); + connect( desktopNumberMapper, TQ_SIGNAL("mapped( int )"), + this, TQ_SLOT("moveWindowToDesktop( int )") ); for ( uint i = 0; i < numberOfDesktops; ++i ) { TDEAction desktopAction = new TDEAction( i18n( "Move Window to Desktop %i" ).arg( i ), ... ); - connect( desktopAction, SIGNAL("activated()"), desktopNumberMapper, SLOT("map()") ); + connect( desktopAction, TQ_SIGNAL("activated()"), desktopNumberMapper, TQ_SLOT("map()") ); desktopNumberMapper.setMapping( desktopAction, i ); } </pre> @@ -85,7 +85,7 @@ import org.trinitydesktop.qt.TQObject; <pre> TDEAction newAct = new TDEAction(i18n("&New"), "filenew", TDEStdAccel.shortcut(TDEStdAccel.New), - this, SLOT("fileNew()"), + this, TQ_SLOT("fileNew()"), actionCollection(), "new"); </pre> This line creates our action. It says that wherever this action is @@ -157,7 +157,7 @@ public class TDEAction extends TQObject { public native String className(); /** Constructs an action with text, potential keyboard - shortcut, and a SLOT to call when this action is invoked by + shortcut, and a slot to call when this action is invoked by the user. If you do not want or have a keyboard shortcut, set the <code>cut</code> param to 0. @@ -167,11 +167,11 @@ public class TDEAction extends TQObject { plugged in a toolbar...). @param text The text that will be displayed. @param cut The corresponding keyboard shortcut. - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. - @short Constructs an action with text, potential keyboard shortcut, and a SLOT to call when this action is invoked by the user. + @short Constructs an action with text, potential keyboard shortcut, and a slot to call when this action is invoked by the user. */ public TDEAction(String text, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name) { super((Class) null); @@ -180,7 +180,7 @@ public class TDEAction extends TQObject { private native void newTDEAction(String text, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name); /** Constructs an action with text, icon, potential keyboard - shortcut, and a SLOT to call when this action is invoked by + shortcut, and a slot to call when this action is invoked by the user. If you do not want or have a keyboard shortcut, set the <code>cut</code> param to 0. @@ -189,11 +189,11 @@ public class TDEAction extends TQObject { @param text The text that will be displayed. @param pix The icon to display. @param cut The corresponding keyboard shortcut. - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. - @short Constructs an action with text, icon, potential keyboard shortcut, and a SLOT to call when this action is invoked by the user. + @short Constructs an action with text, icon, potential keyboard shortcut, and a slot to call when this action is invoked by the user. */ public TDEAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name) { super((Class) null); @@ -202,7 +202,7 @@ public class TDEAction extends TQObject { private native void newTDEAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name); /** Constructs an action with text, icon, potential keyboard - shortcut, and a SLOT to call when this action is invoked by + shortcut, and a slot to call when this action is invoked by the user. The icon is loaded on demand later based on where it is plugged in. If you do not want or have a keyboard shortcut, set the @@ -212,11 +212,11 @@ public class TDEAction extends TQObject { @param text The text that will be displayed. @param pix The icon to display. @param cut The corresponding keyboard shortcut (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. - @short Constructs an action with text, icon, potential keyboard shortcut, and a SLOT to call when this action is invoked by the user. + @short Constructs an action with text, icon, potential keyboard shortcut, and a slot to call when this action is invoked by the user. */ public TDEAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name) { super((Class) null); @@ -228,8 +228,8 @@ public class TDEAction extends TQObject { the text and icon. @param item The KGuiItem with the label and (optional) icon. @param cut The corresponding keyboard shortcut (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short The same as the above constructor, but with a KGuiItem providing the text and icon. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEActionCollection.java b/tdejava/koala/org/trinitydesktop/koala/TDEActionCollection.java index 0b80feb1..e8ac3cc1 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEActionCollection.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEActionCollection.java @@ -19,10 +19,10 @@ import org.trinitydesktop.qt.TQObject; a statusbar, do: <pre> actionCollection().setHighlightingEnabled(true); - connect(actionCollection(), SIGNAL("actionStatusText( String )"), - statusBar(), SLOT("message( String )") ); - connect(actionCollection(), SIGNAL("clearStatusText()"), - statusBar(), SLOT("clear()") ); + connect(actionCollection(), TQ_SIGNAL("actionStatusText( String )"), + statusBar(), TQ_SLOT("message( String )") ); + connect(actionCollection(), TQ_SIGNAL("clearStatusText()"), + statusBar(), TQ_SLOT("clear()") ); </pre> See {@link TDEActionCollectionSignals} for signals emitted by TDEActionCollection @short A managed set of TDEAction objects. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEApplication.java b/tdejava/koala/org/trinitydesktop/koala/TDEApplication.java index 786251b1..9a158da8 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEApplication.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEApplication.java @@ -602,7 +602,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac If the widget with focus provides a cut() slot, call that slot. Thus for a simple application cut can be implemented as: <pre> - KStdAction.cut( kapp, SLOT("cut()"), actionCollection() ); + KStdAction.cut( kapp, TQ_SLOT("cut()"), actionCollection() ); </pre> @short If the widget with focus provides a cut() slot, call that slot. */ @@ -611,7 +611,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac If the widget with focus provides a copy() slot, call that slot. Thus for a simple application copy can be implemented as: <pre> - KStdAction.copy( kapp, SLOT("copy()"), actionCollection() ); + KStdAction.copy( kapp, TQ_SLOT("copy()"), actionCollection() ); </pre> @short If the widget with focus provides a copy() slot, call that slot. */ @@ -620,7 +620,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac If the widget with focus provides a paste() slot, call that slot. Thus for a simple application copy can be implemented as: <pre> - KStdAction.paste( kapp, SLOT("paste()"), actionCollection() ); + KStdAction.paste( kapp, TQ_SLOT("paste()"), actionCollection() ); </pre> @short If the widget with focus provides a paste() slot, call that slot. */ @@ -629,7 +629,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac If the widget with focus provides a clear() slot, call that slot. Thus for a simple application clear() can be implemented as: <pre> - new TDEAction( i18n( "Clear" ), "editclear", 0, kapp, SLOT("clear()"), actionCollection(), "clear" ); + new TDEAction( i18n( "Clear" ), "editclear", 0, kapp, TQ_SLOT("clear()"), actionCollection(), "clear" ); </pre> Note that for some widgets, this may not provide the intended bahavior. For example if you make use of the code above and a TDEListView has the focus, clear() @@ -651,7 +651,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac If the widget with focus provides a selectAll() slot, call that slot. Thus for a simple application select all can be implemented as: <pre> - KStdAction.selectAll( kapp, SLOT("selectAll()"), actionCollection() ); + KStdAction.selectAll( kapp, TQ_SLOT("selectAll()"), actionCollection() ); </pre> @short If the widget with focus provides a selectAll() slot, call that slot. */ @@ -988,19 +988,19 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac /** This method is used internally to determine which edit slots are implemented by the widget that has the focus, and to invoke those slots if available. - @param slot is the slot as returned using the SLOT() macro, for example SLOT("cut()") + @param slot is the slot as returned using the TQ_SLOT() macro, for example TQ_SLOT("cut()") This method can be used in TDEApplication subclasses to implement application wide edit actions not supported by the TDEApplication class. For example (in your subclass): <pre> void MyApplication.deselect() { - invokeEditSlot( SLOT("deselect()") ); + invokeEditSlot( TQ_SLOT("deselect()") ); } </pre> Now in your application calls to MyApplication.deselect() will call this slot on the focused widget if it provides this slot. You can combine this with TDEAction with: <pre> - KStdAction.deselect( (MyApplication)( kapp ), SLOT("cut()"), actionCollection() ); + KStdAction.deselect( (MyApplication)( kapp ), TQ_SLOT("cut()"), actionCollection() ); </pre> @short This method is used internally to determine which edit slots are implemented by the widget that has the focus, and to invoke those slots if available. @see #cut diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEGlobalAccel.java b/tdejava/koala/org/trinitydesktop/koala/TDEGlobalAccel.java index 0ae7a2d0..25823377 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEGlobalAccel.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEGlobalAccel.java @@ -54,7 +54,7 @@ public class TDEGlobalAccel extends TQObject { insert( "Do Something", i18n("Do Something"), i18n("This action allows you to do something really great with this program to " "the currently open document."), - ALT+CTRL+Key_Q, KKey.QtWIN+CTRL+Key_Q, this, SLOT("slotDoSomething()") ); + ALT+CTRL+Key_Q, KKey.QtWIN+CTRL+Key_Q, this, TQ_SLOT("slotDoSomething()") ); </pre> @param sAction The internal name of the action. @param sLabel An i18n'ized short description of the action displayed when diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEListAction.java b/tdejava/koala/org/trinitydesktop/koala/TDEListAction.java index f79e8a67..d74a7fe4 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEListAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEListAction.java @@ -49,8 +49,8 @@ public class TDEListAction extends TDESelectAction { /** @param text The text that will be displayed. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -125,8 +125,8 @@ public class TDEListAction extends TDESelectAction { @param text The text that will be displayed. @param pix The icons that go with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -145,8 +145,8 @@ public class TDEListAction extends TDESelectAction { @param text The text that will be displayed. @param pix The dynamically loaded icon that goes with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEMainWindow.java b/tdejava/koala/org/trinitydesktop/koala/TDEMainWindow.java index 405621c9..2e2dc69a 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEMainWindow.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEMainWindow.java @@ -405,8 +405,8 @@ public class TDEMainWindow extends TQMainWindow implements KXMLGUIBuilderInterfa this function) a connection needs to be made to let TDEMainWindow know when that status (hidden/shown) of the statusbar has changed. For example: - connect(action, SIGNAL("activated()"), - tdemainwindow, SLOT("setSettingsDirty()")); + connect(action, TQ_SIGNAL("activated()"), + tdemainwindow, TQ_SLOT("setSettingsDirty()")); Otherwise the status (hidden/show) of the statusbar might not be saved by TDEMainWindow. @short Sets whether TDEMainWindow should provide a menu that allows showing/hiding of the statusbar ( using TDEToggleStatusBarAction ). @@ -470,7 +470,7 @@ public class TDEMainWindow extends TQMainWindow implements KXMLGUIBuilderInterfa This slot can be connected dirrectly to the action to configure shortcuts. This is very simple to do that by adding a single line <pre> - KStdAction.configureToolbars( guiFactory(), SLOT("configureToolbars()"), + KStdAction.configureToolbars( guiFactory(), TQ_SLOT("configureToolbars()"), actionCollection() ); </pre> @short Show a standard configure toolbar dialog. @@ -513,8 +513,8 @@ public class TDEMainWindow extends TQMainWindow implements KXMLGUIBuilderInterfa <pre> TDEIconLoader &loader = TDEGlobal.iconLoader(); TQPixmap pixmap = loader.loadIcon( "help" ); - toolBar(0).insertButton( pixmap, 0, SIGNAL("clicked()"), - this, SLOT("appHelpActivated()"), true, i18n("Help") ); + toolBar(0).insertButton( pixmap, 0, TQ_SIGNAL("clicked()"), + this, TQ_SLOT("appHelpActivated()"), true, i18n("Help") ); </pre> @short Open the help page for the application. */ diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEPasteTextAction.java b/tdejava/koala/org/trinitydesktop/koala/TDEPasteTextAction.java index 8cab5d46..92477a98 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEPasteTextAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEPasteTextAction.java @@ -30,8 +30,8 @@ public class TDEPasteTextAction extends TDEAction { @param text The text that will be displayed. @param icon The icon to display. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's owner. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's owner. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short Create a TDEPasteTextAction, with a text, an icon, an accelerator, a slot connected to the action, parent and name. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEProcess.java b/tdejava/koala/org/trinitydesktop/koala/TDEProcess.java index 64299b40..b2acf209 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEProcess.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEProcess.java @@ -61,8 +61,8 @@ import org.trinitydesktop.qt.TQObject; TDEProcess proc = new TDEProcess; proc << "my_executable"; proc << "These" << "are" << "the" << "command" << "line" << "args"; - TQApplication.connect(proc, SIGNAL("processExited(TDEProcess )"), - pointer_to_my_object, SLOT("my_objects_slot(TDEProcess )")); + TQApplication.connect(proc, TQ_SIGNAL("processExited(TDEProcess )"), + pointer_to_my_object, TQ_SLOT("my_objects_slot(TDEProcess )")); proc.start(); </pre> This will start "my_executable" with the commandline arguments "These"... diff --git a/tdejava/koala/org/trinitydesktop/koala/TDERadioAction.java b/tdejava/koala/org/trinitydesktop/koala/TDERadioAction.java index 62972c44..e01bd06b 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDERadioAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDERadioAction.java @@ -51,8 +51,8 @@ public class TDERadioAction extends TDEToggleAction { /** @param text The text that will be displayed. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -127,8 +127,8 @@ public class TDERadioAction extends TDEToggleAction { @param text The text that will be displayed. @param pix The icons that go with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -147,8 +147,8 @@ public class TDERadioAction extends TDEToggleAction { @param text The text that will be displayed. @param pix The dynamically loaded icon that goes with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short diff --git a/tdejava/koala/org/trinitydesktop/koala/TDERecentFilesAction.java b/tdejava/koala/org/trinitydesktop/koala/TDERecentFilesAction.java index 973b9a78..12a661d0 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDERecentFilesAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDERecentFilesAction.java @@ -50,8 +50,8 @@ public class TDERecentFilesAction extends TDEListAction { /** @param text The text that will be displayed. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke when a URL is selected. + @param receiver The slot's parent. + @param slot The slot to invoke when a URL is selected. Its signature is of the form slotURLSelected( KURL ). @param parent This action's parent. @param name An internal name for this action. @@ -125,8 +125,8 @@ public class TDERecentFilesAction extends TDEListAction { @param text The text that will be displayed. @param pix The icons that go with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke when a URL is selected. + @param receiver The slot's parent. + @param slot The slot to invoke when a URL is selected. Its signature is of the form slotURLSelected( KURL ). @param parent This action's parent. @param name An internal name for this action. @@ -152,8 +152,8 @@ public class TDERecentFilesAction extends TDEListAction { @param text The text that will be displayed. @param pix The dynamically loaded icon that goes with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke when a URL is selected. + @param receiver The slot's parent. + @param slot The slot to invoke when a URL is selected. Its signature is of the form slotURLSelected( KURL ). @param parent This action's parent. @param name An internal name for this action. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDESelectAction.java b/tdejava/koala/org/trinitydesktop/koala/TDESelectAction.java index 4f29869c..bdf93d4f 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDESelectAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDESelectAction.java @@ -59,8 +59,8 @@ public class TDESelectAction extends TDEAction { /** @param text The text that will be displayed. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -135,8 +135,8 @@ public class TDESelectAction extends TDEAction { @param text The text that will be displayed. @param pix The icons that go with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -155,8 +155,8 @@ public class TDESelectAction extends TDEAction { @param text The text that will be displayed. @param pix The dynamically loaded icon that goes with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEShortcut.java b/tdejava/koala/org/trinitydesktop/koala/TDEShortcut.java index 9ed6a020..82a5a8e5 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEShortcut.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEShortcut.java @@ -15,7 +15,7 @@ import org.trinitydesktop.qt.QtSupport; This can be used to add additional accelerators to a TDEAction. For example, the below code binds the escape key to the close action. <pre> - TDEAction closeAction = KStdAction.close( this, SLOT("close()"), actionCollection() ); + TDEAction closeAction = KStdAction.close( this, TQ_SLOT("close()"), actionCollection() ); TDEShortcut closeShortcut = closeAction.shortcut(); closeShortcut.append( KKey(Key_Escape)); closeAction.setShortcut(closeShortcut); diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEToggleAction.java b/tdejava/koala/org/trinitydesktop/koala/TDEToggleAction.java index 241d4357..e698d422 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEToggleAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEToggleAction.java @@ -53,8 +53,8 @@ public class TDEToggleAction extends TDEAction { /** @param text The text that will be displayed. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -129,8 +129,8 @@ public class TDEToggleAction extends TDEAction { @param text The text that will be displayed. @param pix The icons that go with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -149,8 +149,8 @@ public class TDEToggleAction extends TDEAction { @param text The text that will be displayed. @param pix The dynamically loaded icon that goes with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEToggleFullScreenAction.java b/tdejava/koala/org/trinitydesktop/koala/TDEToggleFullScreenAction.java index 91232c20..386b22ce 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEToggleFullScreenAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEToggleFullScreenAction.java @@ -29,8 +29,8 @@ public class TDEToggleFullScreenAction extends TDEToggleAction { /** Create a TDEToggleFullScreenAction @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param window the window that will switch to/from full screen mode @param name An internal name for this action. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEToolBar.java b/tdejava/koala/org/trinitydesktop/koala/TDEToolBar.java index 2c1db2ad..684297ff 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEToolBar.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEToolBar.java @@ -449,8 +449,8 @@ public class TDEToolBar extends TQToolBar { You will insert a normal button with connection (or use signals from toolbar): <pre> - bar.insertButton(icon, id, SIGNAL("clicked ()"), this, - SLOT (slotClick()), true, "click or wait for popup"); + bar.insertButton(icon, id, TQ_SIGNAL("clicked ()"), this, + TQ_SLOT (slotClick()), true, "click or wait for popup"); </pre> And then add a delayed popup: <pre> diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEToolBarPopupAction.java b/tdejava/koala/org/trinitydesktop/koala/TDEToolBarPopupAction.java index b35991f9..2d0b5fa0 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEToolBarPopupAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEToolBarPopupAction.java @@ -59,8 +59,8 @@ public class TDEToolBarPopupAction extends TDEAction { @param text The text that will be displayed. @param icon The icon to display. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's owner. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's owner. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short Create a TDEToolBarPopupAction, with a text, an icon, an accelerator, a slot connected to the action, parent and name. @@ -83,8 +83,8 @@ public class TDEToolBarPopupAction extends TDEAction { <code>cut</code> param to 0. @param item The text and icon that will be displayed. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's owner. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's owner. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short Create a TDEToolBarPopupAction, with a KGuiItem, an accelerator, a slot connected to the action, parent and name. diff --git a/tdejava/koala/tdejava/TDEJavaSlot.h b/tdejava/koala/tdejava/TDEJavaSlot.h index 7cd9f704..1d316eae 100644 --- a/tdejava/koala/tdejava/TDEJavaSlot.h +++ b/tdejava/koala/tdejava/TDEJavaSlot.h @@ -49,7 +49,7 @@ class TDEJavaSlotFactory; class TDEJavaSlot: public JavaSlot { - Q_OBJECT + TQ_OBJECT public: TDEJavaSlot(JNIEnv * env, jobject receiver, jstring slot); virtual ~TDEJavaSlot(); diff --git a/tdejava/koala/test/kbase/KBase.java b/tdejava/koala/test/kbase/KBase.java index e556adfc..af9e83e7 100644 --- a/tdejava/koala/test/kbase/KBase.java +++ b/tdejava/koala/test/kbase/KBase.java @@ -84,22 +84,22 @@ public KBase() /** initializes the TDEActions of the application */ protected void initActions() { - fileNewWindow = new TDEAction(tr("New &Window"), "", new TDEShortcut(), this, SLOT("slotFileNewWindow()"), actionCollection(),"file_new_window"); - fileNew = KStdAction.openNew(this, SLOT("slotFileNew()"), actionCollection()); - fileOpen = KStdAction.open(this, SLOT("slotFileOpen()"), actionCollection()); - fileOpenRecent = (TDERecentFilesAction) KStdAction.openRecent(this, SLOT("slotFileOpenRecent(KURL)"), actionCollection()); - fileSave = KStdAction.save(this, SLOT("slotFileSave()"), actionCollection()); - fileSaveAs = KStdAction.saveAs(this, SLOT("slotFileSaveAs()"), actionCollection()); + fileNewWindow = new TDEAction(tr("New &Window"), "", new TDEShortcut(), this, TQ_SLOT("slotFileNewWindow()"), actionCollection(),"file_new_window"); + fileNew = KStdAction.openNew(this, TQ_SLOT("slotFileNew()"), actionCollection()); + fileOpen = KStdAction.open(this, TQ_SLOT("slotFileOpen()"), actionCollection()); + fileOpenRecent = (TDERecentFilesAction) KStdAction.openRecent(this, TQ_SLOT("slotFileOpenRecent(KURL)"), actionCollection()); + fileSave = KStdAction.save(this, TQ_SLOT("slotFileSave()"), actionCollection()); + fileSaveAs = KStdAction.saveAs(this, TQ_SLOT("slotFileSaveAs()"), actionCollection()); // this one crashes for me... -// fileClose = KStdAction.close(this, SLOT(slotFileClose()), actionCollection()); - filePrint = KStdAction.print(this, SLOT("slotFilePrint()"), actionCollection()); - fileQuit = KStdAction.quit(this, SLOT("slotFileQuit()"), actionCollection()); - editCut = KStdAction.cut(this, SLOT("slotEditCut()"), actionCollection()); - editCopy = KStdAction.copy(this, SLOT("slotEditCopy()"), actionCollection()); - editPaste = KStdAction.paste(this, SLOT("slotEditPaste()"), actionCollection()); +// fileClose = KStdAction.close(this, TQ_SLOT(slotFileClose()), actionCollection()); + filePrint = KStdAction.print(this, TQ_SLOT("slotFilePrint()"), actionCollection()); + fileQuit = KStdAction.quit(this, TQ_SLOT("slotFileQuit()"), actionCollection()); + editCut = KStdAction.cut(this, TQ_SLOT("slotEditCut()"), actionCollection()); + editCopy = KStdAction.copy(this, TQ_SLOT("slotEditCopy()"), actionCollection()); + editPaste = KStdAction.paste(this, TQ_SLOT("slotEditPaste()"), actionCollection()); createStandardStatusBarAction(); -// viewToolBar = KStdAction.showToolbar(this, SLOT("slotViewToolBar()"), actionCollection()); - viewStatusBar = KStdAction.showStatusbar(this, SLOT("slotViewStatusBar()"), actionCollection()); +// viewToolBar = KStdAction.showToolbar(this, TQ_SLOT("slotViewToolBar()"), actionCollection()); + viewStatusBar = KStdAction.showStatusbar(this, TQ_SLOT("slotViewStatusBar()"), actionCollection()); fileNewWindow.setToolTip(tr("Opens a new application window")); fileNew.setToolTip(tr("Creates a new document")); diff --git a/tdejava/koala/test/kcombobox/KComboBoxTest.java b/tdejava/koala/test/kcombobox/KComboBoxTest.java index 7204b377..a37ddb23 100644 --- a/tdejava/koala/test/kcombobox/KComboBoxTest.java +++ b/tdejava/koala/test/kcombobox/KComboBoxTest.java @@ -93,7 +93,7 @@ import java.util.*; // Create an exit button TQPushButton push = new TQPushButton( "E&xit", w ); - TQObject.connect( push, Qt.SIGNAL("clicked()"), app, Qt.SLOT("closeAllWindows()" ) ); + TQObject.connect( push, Qt.TQ_SIGNAL("clicked()"), app, Qt.TQ_SLOT("closeAllWindows()" ) ); // Insert the widgets into the layout manager. vbox.addWidget( lblrw ); diff --git a/tdejava/koala/test/khelpers/KHelpers.java b/tdejava/koala/test/khelpers/KHelpers.java index fec92eb3..08444f49 100644 --- a/tdejava/koala/test/khelpers/KHelpers.java +++ b/tdejava/koala/test/khelpers/KHelpers.java @@ -41,9 +41,9 @@ public class KHelpers extends TDEMainWindow { idfilenew = file.insertItem("&New"); idfileopen = file.insertItem("&Open..."); idfilesave = file.insertItem("&Save"); - idfilequit = file.insertItem("&Quit", kapp, SLOT("closeAllWindows()")); + idfilequit = file.insertItem("&Quit", kapp, TQ_SLOT("closeAllWindows()")); - connect ( file, SIGNAL( "highlighted(int)"), this, SLOT( "slotMenuEntryHelp (int)")); + connect ( file, TQ_SIGNAL( "highlighted(int)"), this, TQ_SLOT( "slotMenuEntryHelp (int)")); menuBar().insertItem("&File",file); @@ -53,7 +53,7 @@ public class KHelpers extends TDEMainWindow { "that your application can provide help to a user"); help.insertSeparator(); - help.insertItem("Help on a special topic", this, SLOT("slotSpecialHelp()")); + help.insertItem("Help on a special topic", this, TQ_SLOT("slotSpecialHelp()")); menuBar().insertItem("&Help",help); diff --git a/tdejava/koala/test/kmenu/KdeMenuSample.java b/tdejava/koala/test/kmenu/KdeMenuSample.java index ccd46bf5..0db96fca 100644 --- a/tdejava/koala/test/kmenu/KdeMenuSample.java +++ b/tdejava/koala/test/kmenu/KdeMenuSample.java @@ -57,9 +57,9 @@ public class KdeMenuSample extends TDEMainWindow { */ private TQPopupMenu createFileMenu() { TQPopupMenu fileMenu = new TQPopupMenu(this); - fileMenu.insertItem("&Open",this,this.SLOT("fileOpen()")); - fileMenu.insertItem("&Save",this,this.SLOT("fileSave()")); - fileMenu.insertItem("&Quit",kApp,kApp.SLOT("quit()")); + fileMenu.insertItem("&Open",this,this.TQ_SLOT("fileOpen()")); + fileMenu.insertItem("&Save",this,this.TQ_SLOT("fileSave()")); + fileMenu.insertItem("&Quit",kApp,kApp.TQ_SLOT("quit()")); return fileMenu; } diff --git a/tdejava/koala/test/simplebrowser/KSimpleBrowser.java b/tdejava/koala/test/simplebrowser/KSimpleBrowser.java index 83964a0f..c798cd6d 100644 --- a/tdejava/koala/test/simplebrowser/KSimpleBrowser.java +++ b/tdejava/koala/test/simplebrowser/KSimpleBrowser.java @@ -29,8 +29,8 @@ public class KSimpleBrowser extends TDEMainWindow { super(null,name,0); - toolBar().insertLined( "", URLLined, SIGNAL("returnPressed()"), - this, SLOT ("slotNewURL()")); + toolBar().insertLined( "", URLLined, TQ_SIGNAL("returnPressed()"), + this, TQ_SLOT ("slotNewURL()")); toolBar().setItemAutoSized(URLLined); diff --git a/tdejava/koala/test/tdeioslave/KioslaveTest.java b/tdejava/koala/test/tdeioslave/KioslaveTest.java index 81a499c5..1fb97cf8 100644 --- a/tdejava/koala/test/tdeioslave/KioslaveTest.java +++ b/tdejava/koala/test/tdeioslave/KioslaveTest.java @@ -125,7 +125,7 @@ KioslaveTest( String src, String dest, int op, int pr ) // Operation groupbox & buttons opButtons = new TQButtonGroup( "Operation", main_widget ); topLayout.addWidget( opButtons, 10 ); - connect( opButtons, SIGNAL("clicked(int)"), SLOT("changeOperation(int)") ); + connect( opButtons, TQ_SIGNAL("clicked(int)"), TQ_SLOT("changeOperation(int)") ); TQBoxLayout hbLayout = new TQHBoxLayout( opButtons, 15 ); @@ -179,7 +179,7 @@ KioslaveTest( String src, String dest, int op, int pr ) // Progress groupbox & buttons progressButtons = new TQButtonGroup( "Progress dialog mode", main_widget ); topLayout.addWidget( progressButtons, 10 ); - connect( progressButtons, SIGNAL("clicked(int)"), SLOT("changeProgressMode(int)") ); + connect( progressButtons, TQ_SIGNAL("clicked(int)"), TQ_SLOT("changeProgressMode(int)") ); hbLayout = new TQHBoxLayout( progressButtons, 15 ); @@ -207,19 +207,19 @@ KioslaveTest( String src, String dest, int op, int pr ) pbStart = new TQPushButton( "&Start", main_widget ); pbStart.setFixedSize( pbStart.sizeHint() ); - connect( pbStart, SIGNAL("clicked()"), SLOT("startJob()") ); + connect( pbStart, TQ_SIGNAL("clicked()"), TQ_SLOT("startJob()") ); hbLayout.addWidget( pbStart, 5 ); pbStop = new TQPushButton( "Sto&p", main_widget ); pbStop.setFixedSize( pbStop.sizeHint() ); pbStop.setEnabled( false ); - connect( pbStop, SIGNAL("clicked()"), SLOT("stopJob()") ); + connect( pbStop, TQ_SIGNAL("clicked()"), TQ_SLOT("stopJob()") ); hbLayout.addWidget( pbStop, 5 ); // close button close = new TQPushButton( "&Close", main_widget ); close.setFixedSize( close.sizeHint() ); - connect(close, SIGNAL("clicked()"), this, SLOT("slotQuit()")); + connect(close, TQ_SIGNAL("clicked()"), this, TQ_SLOT("slotQuit()")); topLayout.addWidget( close, 5 ); @@ -228,10 +228,10 @@ KioslaveTest( String src, String dest, int op, int pr ) slave = null; // slave = Scheduler.getConnectedSlave(new KURL("ftp://ftp.kde.org")); - Scheduler.connect(SIGNAL("slaveConnected(Slave)"), - this, SLOT("slotSlaveConnected()")); - Scheduler.connect(SIGNAL("slaveError(Slave,int,String)"), - this, SLOT("slotSlaveError()")); + Scheduler.connect(TQ_SIGNAL("slaveConnected(Slave)"), + this, TQ_SLOT("slotSlaveConnected()")); + Scheduler.connect(TQ_SIGNAL("slaveError(Slave,int,String)"), + this, TQ_SLOT("slotSlaveError()")); } @@ -304,14 +304,14 @@ void startJob() { switch ( selectedOperation ) { case List: myJob = TDEIO.listDir( src ); -// connect(myJob, SIGNAL(" entries( Job, const TDEIO.UDSEntryList&)"), -// SLOT(" slotEntries( TDEIO.Job, const TDEIO.UDSEntryList&)")); +// connect(myJob, TQ_SIGNAL(" entries( Job, const TDEIO.UDSEntryList&)"), +// TQ_SLOT(" slotEntries( TDEIO.Job, const TDEIO.UDSEntryList&)")); break; case ListRecursive: myJob = TDEIO.listRecursive( src ); -// connect(myJob, SIGNAL(" entries( TDEIO.Job, const TDEIO.UDSEntryList&)"), - // SLOT(" slotEntries( TDEIO.Job, const TDEIO.UDSEntryList&)")); +// connect(myJob, TQ_SIGNAL(" entries( TDEIO.Job, const TDEIO.UDSEntryList&)"), + // TQ_SLOT(" slotEntries( TDEIO.Job, const TDEIO.UDSEntryList&)")); break; case Stat: @@ -320,15 +320,15 @@ void startJob() { case Get: myJob = TDEIO.get( src, true ); - connect(myJob, SIGNAL("data( Job, byte[])"), - SLOT("slotData( Job, byte[])")); + connect(myJob, TQ_SIGNAL("data( Job, byte[])"), + TQ_SLOT("slotData( Job, byte[])")); break; case Put: putBuffer = 0; myJob = TDEIO.put( src, -1, true, false); - connect(myJob, SIGNAL("dataReq( Job, ByteArrayOutputStream)"), - SLOT("slotDataReq( Job, ByteArrayOutputStream)")); + connect(myJob, TQ_SIGNAL("dataReq( Job, ByteArrayOutputStream)"), + TQ_SLOT("slotDataReq( Job, ByteArrayOutputStream)")); break; case Copy: @@ -362,11 +362,11 @@ void startJob() { job = myJob; } - connect( job, SIGNAL(" result( Job )"), - SLOT(" slotResult( Job )") ); + connect( job, TQ_SIGNAL(" result( Job )"), + TQ_SLOT(" slotResult( Job )") ); - connect( job, SIGNAL(" canceled( Job )"), - SLOT(" slotResult( Job )") ); + connect( job, TQ_SIGNAL(" canceled( Job )"), + TQ_SLOT(" slotResult( Job )") ); if (progressMode == ProgressStatus) { statusProgress.setJob( job ); diff --git a/xparts/mozilla/kmozillapart.h b/xparts/mozilla/kmozillapart.h index 00589d14..b53f4d16 100644 --- a/xparts/mozilla/kmozillapart.h +++ b/xparts/mozilla/kmozillapart.h @@ -8,7 +8,7 @@ class TDEProcess; class KMozillaPart : public XPartHost_KPart { - Q_OBJECT + TQ_OBJECT public: KMozillaPart(TQWidget *parentWidget, const char *widgetName, diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp index 2b916dd5..152469f3 100644 --- a/xparts/mozilla/kshell.cpp +++ b/xparts/mozilla/kshell.cpp @@ -13,7 +13,7 @@ class ShellWindow : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: ShellWindow() @@ -22,7 +22,7 @@ public: setCentralWidget( m_host->widget() ); - connect(m_host, TQT_SIGNAL( actionsInitialized() ), this, TQT_SLOT( mergeGUI() ) ); + connect(m_host, TQ_SIGNAL( actionsInitialized() ), this, TQ_SLOT( mergeGUI() ) ); #if 1 m_partProcess = new TDEProcess; @@ -31,10 +31,10 @@ public: m_partProcess->start(); #endif - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); TDESelectAction *s = new TDESelectAction( "http://www.kde.org" , 0, actionCollection(), "location" ); - connect( s, TQT_SIGNAL(activated( const TQString& ) ), this, TQT_SLOT( slotOpenUrl( const TQString & ) ) ); + connect( s, TQ_SIGNAL(activated( const TQString& ) ), this, TQ_SLOT( slotOpenUrl( const TQString & ) ) ); s->setEditable(true); } virtual ~ShellWindow() diff --git a/xparts/src/gtk/Makefile.am b/xparts/src/gtk/Makefile.am index 839e43db..1acb72f4 100644 --- a/xparts/src/gtk/Makefile.am +++ b/xparts/src/gtk/Makefile.am @@ -7,7 +7,7 @@ lib_LTLIBRARIES = libgtkxparts.la libgtkxparts_la_SOURCES = gtkpart.c gtkbrowserextension.c libgtkxparts_la_LIBADD = $(GTK2_LIBS) $(GLIB2_LIBS) $(top_builddir)/dcopc/libdcopc.la -libgtkxparts_la_LDFLAGS = -L$(prefix)/lib $(all_libraries) -no-undefined +libgtkxparts_la_LDFLAGS = $(all_libraries) -no-undefined gtkxpartsinclude_HEADERS = gtkpart.h gtkbrowserextension.h gtkxpartsincludedir = $(includedir)/xtdeparts diff --git a/xparts/src/tde/kbrowsersignals.h b/xparts/src/tde/kbrowsersignals.h index baee95aa..4fad567e 100644 --- a/xparts/src/tde/kbrowsersignals.h +++ b/xparts/src/tde/kbrowsersignals.h @@ -10,7 +10,7 @@ class XPartHost_KPart; class KBrowserSignals : public KParts::BrowserExtension, virtual public XBrowserSignals { - Q_OBJECT + TQ_OBJECT public: KBrowserSignals( XPartHost_KPart *part, DCOPRef ref ); virtual ~KBrowserSignals(); diff --git a/xparts/src/tde/xparthost_kpart.cpp b/xparts/src/tde/xparthost_kpart.cpp index 54bcb804..84848017 100644 --- a/xparts/src/tde/xparthost_kpart.cpp +++ b/xparts/src/tde/xparthost_kpart.cpp @@ -77,9 +77,9 @@ void XPartHost_KPart::createActions( const TQCString &xmlActions ) TQString type = e.attribute("type"); if(type.isEmpty()) - new TDEAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); + new TDEAction( name, 0, this, TQ_SLOT( actionActivated() ), actionCollection(), name.latin1() ); else if( type == "toggle" ) - new TDEToggleAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); + new TDEToggleAction( name, 0, this, TQ_SLOT( actionActivated() ), actionCollection(), name.latin1() ); kdDebug() << "action=" << name << " type=" << type << endl; } else if ( e.tagName() == "XMLFile" ) { TQString location = e.attribute("location"); diff --git a/xparts/src/tde/xparthost_kpart.h b/xparts/src/tde/xparthost_kpart.h index 8cc54699..a8e74d1e 100644 --- a/xparts/src/tde/xparthost_kpart.h +++ b/xparts/src/tde/xparthost_kpart.h @@ -19,7 +19,7 @@ class QXEmbed; */ class XPartHost_KPart : public KParts::ReadOnlyPart, public XPartHost { - Q_OBJECT + TQ_OBJECT public: XPartHost_KPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name ); diff --git a/xparts/xpart_notepad/Makefile.am b/xparts/xpart_notepad/Makefile.am index 5916508b..f09ec92a 100644 --- a/xparts/xpart_notepad/Makefile.am +++ b/xparts/xpart_notepad/Makefile.am @@ -10,7 +10,7 @@ xparthost_DIR=$(srcdir)/../src/interfaces xp_notepad_SOURCES = xp_notepad.cpp xpart.skel xparthost.stub xp_notepad_LDADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP ../src/tde/libtdexparts.la #xp_notepad_LDFLAGS = -L$(prefix)/lib -lxpcom $(all_libraries) -xp_notepad_LDFLAGS = -L$(prefix)/lib $(all_libraries) +xp_notepad_LDFLAGS = $(all_libraries) shell_xparthost_SOURCES = shell_xparthost.cpp shell_xparthost_LDADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) $(top_builddir)/xparts/src/tde/libtdexparts.la diff --git a/xparts/xpart_notepad/shell_xparthost.cpp b/xparts/xpart_notepad/shell_xparthost.cpp index 666c16a6..c6f35a87 100644 --- a/xparts/xpart_notepad/shell_xparthost.cpp +++ b/xparts/xpart_notepad/shell_xparthost.cpp @@ -19,7 +19,7 @@ ShellWindow::ShellWindow() setCentralWidget( m_host->widget() ); - connect(m_host, TQT_SIGNAL( actionsInitialized() ), this, TQT_SLOT( mergeGUI() ) ); + connect(m_host, TQ_SIGNAL( actionsInitialized() ), this, TQ_SLOT( mergeGUI() ) ); // Launch our XPart child. m_partProcess = new TDEProcess; @@ -28,11 +28,11 @@ ShellWindow::ShellWindow() m_partProcess->start(); // Init our Gui - (void) new TDEAction( "Hop", 0, this, TQT_SLOT(hop()), actionCollection(), "hop" ); - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + (void) new TDEAction( "Hop", 0, this, TQ_SLOT(hop()), actionCollection(), "hop" ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); TDESelectAction *s = new TDESelectAction( "http://www.kde.org" , 0, actionCollection(), "location" ); - connect( s, TQT_SIGNAL(activated( const TQString& ) ), this, TQT_SLOT( slotOpenUrl( const TQString & ) ) ); + connect( s, TQ_SIGNAL(activated( const TQString& ) ), this, TQ_SLOT( slotOpenUrl( const TQString & ) ) ); s->setEditable(true); kdDebug() << "KShell window created" << endl; diff --git a/xparts/xpart_notepad/shell_xparthost.h b/xparts/xpart_notepad/shell_xparthost.h index 4e329822..e11e52f7 100644 --- a/xparts/xpart_notepad/shell_xparthost.h +++ b/xparts/xpart_notepad/shell_xparthost.h @@ -9,7 +9,7 @@ class TDEProcess; class ShellWindow : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: ShellWindow(); diff --git a/xparts/xpart_notepad/xp_notepad_factory.h b/xparts/xpart_notepad/xp_notepad_factory.h index 02d36cfc..2a4fe069 100644 --- a/xparts/xpart_notepad/xp_notepad_factory.h +++ b/xparts/xpart_notepad/xp_notepad_factory.h @@ -34,7 +34,7 @@ class TDEProcess; class XP_NotepadFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: XP_NotepadFactory( bool clone = false ) {} virtual ~XP_NotepadFactory() {} @@ -47,7 +47,7 @@ public: class XP_NotepadPart : public XPartHost_KPart { - Q_OBJECT + TQ_OBJECT public: XP_NotepadPart(TQWidget *parentWidget, const char *widgetName, |