diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-10 12:13:27 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-10 12:13:27 -0500 |
| commit | b6c6d9f8dd1221e5d9dc5b674e93797761470024 (patch) | |
| tree | 94563ba51148e9fd71f5c8df86439c84945d5d81 | |
| parent | 03256f3cd5149f3ff5f5f45765b0b0659db4e036 (diff) | |
| download | tde-b6c6d9f8dd1221e5d9dc5b674e93797761470024.tar.gz tde-b6c6d9f8dd1221e5d9dc5b674e93797761470024.zip | |
rename the following methods:
tqparent parent
tqmask mask
558 files changed, 4579 insertions, 4579 deletions
diff --git a/experimental/tqtinterface/qt4/ChangeLog.immodule b/experimental/tqtinterface/qt4/ChangeLog.immodule index c4526ee0d..261790ec7 100644 --- a/experimental/tqtinterface/qt4/ChangeLog.immodule +++ b/experimental/tqtinterface/qt4/ChangeLog.immodule @@ -38,13 +38,13 @@ input method plugins source compatible with TQt4. * src/kernel/tqinputcontext.cpp - - (TQInputContext): Add 'tqparent' arg + - (TQInputContext): Add 'parent' arg * src/kernel/tqinputcontext.h - Exclude qptrlist.h when compile with TQt4 - (struct TQInputContextMenu): Exclude member variables when compile with TQt4 - - (TQInputContext): Add 'tqparent' arg + - (TQInputContext): Add 'parent' arg - (addActionsTo): New function for TQt4 2004-09-08 YamaKen <yamaken@bp.iij4u.or.jp> @@ -1944,7 +1944,7 @@ * Add new arg statefulTranslation to enable duplicate call within single event loop. This is required to support both TQInputContext::filterEvent() and RTL extensions - * Restore accidencially omitted qt_mode_switch_remove_tqmask + * Restore accidencially omitted qt_mode_switch_remove_mask handling * src/input/tqximinputcontext_p.h diff --git a/experimental/tqtinterface/qt4/changes-3.3.8 b/experimental/tqtinterface/qt4/changes-3.3.8 index 28c99adb1..540d63615 100644 --- a/experimental/tqtinterface/qt4/changes-3.3.8 +++ b/experimental/tqtinterface/qt4/changes-3.3.8 @@ -205,14 +205,14 @@ Mac OS X: widget. - QPrinter - Fixed Intel endian bug in printing of pixmaps with a tqmask/alpha + Fixed Intel endian bug in printing of pixmaps with a mask/alpha channel. Fixed regression where active tool windows would always be disabled - QGLContext Fixed a tearing issue caused by incorrect vertical sync. -- Fixed a rendering issue with transtqparent cursors on Intel macs. +- Fixed a rendering issue with transparent cursors on Intel macs. - Fixed a rendering issue with icons in the dock on Intel macs. diff --git a/experimental/tqtinterface/qt4/changes.immodule b/experimental/tqtinterface/qt4/changes.immodule index 4eaac8dec..5896ecdb5 100644 --- a/experimental/tqtinterface/qt4/changes.immodule +++ b/experimental/tqtinterface/qt4/changes.immodule @@ -145,7 +145,7 @@ API Changes in qt-x11-immodule-unified-qt3.3.3-20040910 * TQInputContext() - Added 'tqparent' arg to be compatible with TQt4. Since the arg + Added 'parent' arg to be compatible with TQt4. Since the arg defaults to 0, no modification of plugins are required. * language() diff --git a/experimental/tqtinterface/qt4/extensions/nsplugin/src/qnp.cpp b/experimental/tqtinterface/qt4/extensions/nsplugin/src/qnp.cpp index 5dc66849e..1efb75b76 100644 --- a/experimental/tqtinterface/qt4/extensions/nsplugin/src/qnp.cpp +++ b/experimental/tqtinterface/qt4/extensions/nsplugin/src/qnp.cpp @@ -1951,18 +1951,18 @@ void qnpxt_socknot_handler( XtPointer pointer, int *, XtInputId *id ) void TQNPXt::registerSocketNotifier( TQSocketNotifier *notifier ) { - XtInputMask tqmask; + XtInputMask mask; switch ( notifier->type() ) { case TQSocketNotifier::Read: - tqmask = XtInputReadMask; + mask = XtInputReadMask; break; case TQSocketNotifier::Write: - tqmask = XtInputWriteMask; + mask = XtInputWriteMask; break; case TQSocketNotifier::Exception: - tqmask = XtInputExceptMask; + mask = XtInputExceptMask; break; default: @@ -1971,7 +1971,7 @@ void TQNPXt::registerSocketNotifier( TQSocketNotifier *notifier ) } XtInputId id = XtAppAddInput( d->appContext, - notifier->socket(), (XtPointer) tqmask, + notifier->socket(), (XtPointer) mask, qnpxt_socknot_handler, this ); d->socknotDict.insert( id, notifier ); @@ -2035,23 +2035,23 @@ bool TQNPXt::processEvents( ProcessEventsFlags flags ) qnpxt_keep_alive(); - // get the pending event tqmask from Xt and process the next event - XtInputMask pendingtqmask = XtAppPending( d->appContext ); - XtInputMask tqmask = pendingtqmask; - if ( pendingtqmask & XtIMTimer ) { - tqmask &= ~XtIMTimer; + // get the pending event mask from Xt and process the next event + XtInputMask pendingmask = XtAppPending( d->appContext ); + XtInputMask mask = pendingmask; + if ( pendingmask & XtIMTimer ) { + mask &= ~XtIMTimer; // zero timers will starve the Xt X event dispatcher... so // process something *instead* of a timer first... - if ( tqmask != 0 ) - XtAppProcessEvent( d->appContext, tqmask ); + if ( mask != 0 ) + XtAppProcessEvent( d->appContext, mask ); // and process a timer afterwards - tqmask = pendingtqmask & XtIMTimer; + mask = pendingmask & XtIMTimer; } if ( canWait ) XtAppProcessEvent( d->appContext, XtIMAll ); else - XtAppProcessEvent( d->appContext, tqmask ); + XtAppProcessEvent( d->appContext, mask ); int nevents = 0; if ( ! ( flags & ExcludeSocketNotifiers ) ) { @@ -2064,7 +2064,7 @@ bool TQNPXt::processEvents( ProcessEventsFlags flags ) } d->activate_timers = FALSE; - return ( canWait || ( pendingtqmask != 0 ) || nevents > 0 ); + return ( canWait || ( pendingmask != 0 ) || nevents > 0 ); } diff --git a/experimental/tqtinterface/qt4/include/private/qt4_qwidget_p.h b/experimental/tqtinterface/qt4/include/private/qt4_qwidget_p.h index f2f21d49a..d3473c902 100644 --- a/experimental/tqtinterface/qt4/include/private/qt4_qwidget_p.h +++ b/experimental/tqtinterface/qt4/include/private/qt4_qwidget_p.h @@ -110,7 +110,7 @@ struct QTLWExtra { uint dnd : 1; // DND properties installed uint validWMState : 1; // is WM_STATE valid? uint waitingForMapNotify : 1; // show() has been called, haven't got the MapNotify yet - WId parentWinId; // tqparent window Id (valid after reparenting) + WId parentWinId; // parent window Id (valid after reparenting) WId userTimeWindow; // window id that contains user-time timestamp when WM supports a _NET_WM_USER_TIME_WINDOW atom QPoint fullScreenOffset; #ifndef QT_NO_XSYNC @@ -165,7 +165,7 @@ struct QWExtra { QPointer<QWidget> focus_proxy; // Implicit pointers (shared_empty/shared_null). - QRegion tqmask; // widget tqmask + QRegion mask; // widget mask QString styleSheet; // Other variables. diff --git a/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/main.cpp b/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/main.cpp index 450bfed04..ab961e506 100644 --- a/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/main.cpp +++ b/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/main.cpp @@ -127,9 +127,9 @@ TQRESULT AccessibleFactory::createAccessibleInterface( const TQString &classname } else if ( classname == "TQButton" ) { *iface = new TQAccessibleButton( object, PushButton ); } else if ( classname == "TQViewportWidget" ) { - *iface = new TQAccessibleViewport( object, object->tqparent() ); + *iface = new TQAccessibleViewport( object, object->parent() ); } else if ( classname == "TQClipperWidget" ) { - *iface = new TQAccessibleViewport( object, object->tqparent()->tqparent() ); + *iface = new TQAccessibleViewport( object, object->parent()->parent() ); } else if ( classname == "TQTextEdit" ) { *iface = new TQAccessibleTextEdit( object ); #ifndef TQT_NO_ICONVIEW diff --git a/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp b/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp index 224ee097f..275594958 100644 --- a/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp +++ b/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp @@ -32,8 +32,8 @@ TQString buddyString( TQWidget *widget ) { - TQWidget *tqparent = widget->parentWidget(); - TQObjectList *ol = tqparent->queryList( "TQLabel", 0, FALSE, FALSE ); + TQWidget *parent = widget->parentWidget(); + TQObjectList *ol = parent->queryList( "TQLabel", 0, FALSE, FALSE ); if ( !ol || !ol->count() ) { delete ol; return TQString::null; @@ -54,8 +54,8 @@ TQString buddyString( TQWidget *widget ) if ( !!str ) return str; - if ( tqparent->inherits( "TQGroupBox" ) ) - return ((TQGroupBox*)tqparent)->title(); + if ( parent->inherits( "TQGroupBox" ) ) + return ((TQGroupBox*)parent)->title(); return TQString::null; } @@ -202,8 +202,8 @@ int TQAccessibleWidget::navigate( NavDirection dir, int startControl ) const case NavNext: case NavPrevious: { - TQWidget *tqparent = w->parentWidget(); - TQObjectList *sl = tqparent ? tqparent->queryList( "TQWidget", 0, FALSE, FALSE ) : 0; + TQWidget *parent = w->parentWidget(); + TQObjectList *sl = parent ? parent->queryList( "TQWidget", 0, FALSE, FALSE ) : 0; if ( !sl ) return -1; TQObject *sib; diff --git a/experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp b/experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp index f0d746c67..66e4597b8 100644 --- a/experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp +++ b/experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp @@ -495,7 +495,7 @@ void TQXIMInputContext::init_xim() XGetWindowAttributes( dpy, TQPaintDevice::x11AppRootWindow(),&attr ); XRegisterIMInstantiateCallback(dpy, 0, 0, 0, (XIMProc) xim_create_callback, 0); - XSelectInput( dpy, TQPaintDevice::x11AppRootWindow(), attr.your_event_tqmask ); + XSelectInput( dpy, TQPaintDevice::x11AppRootWindow(), attr.your_event_mask ); } #else // !USE_X11R6_XIM else if ( XSetLocaleModifiers ("") == 0 ) diff --git a/experimental/tqtinterface/qt4/qmake/book/qmake-commandreference.leaf b/experimental/tqtinterface/qt4/qmake/book/qmake-commandreference.leaf index 8eccfcc82..2a73cfe89 100644 --- a/experimental/tqtinterface/qt4/qmake/book/qmake-commandreference.leaf +++ b/experimental/tqtinterface/qt4/qmake/book/qmake-commandreference.leaf @@ -2000,7 +2000,7 @@ for you. The cache file (mentioned above in the options) is a special file \e qmake will read to find settings not specified in the \c qmake.conf file, the .pro file, or the command line. If \c -nocache is not specified, \e qmake -will try to find a file called \c .qmake.cache in tqparent directories. If +will try to find a file called \c .qmake.cache in parent directories. If it fails to find this file, it will silently ignore this step of processing. diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c index aec9cf880..f23525054 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c @@ -310,7 +310,7 @@ emit_bits (working_state * state, unsigned int code, int size) if (size == 0) ERREXIT(state->cinfo, JERR_HUFF_MISSING_CODE); - put_buffer &= (((INT32) 1)<<size) - 1; /* tqmask off any extra bits in code */ + put_buffer &= (((INT32) 1)<<size) - 1; /* mask off any extra bits in code */ put_bits += size; /* new number of bits in buffer */ diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c index 5567f8808..07f9178b0 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c @@ -239,7 +239,7 @@ emit_bits (phuff_entropy_ptr entropy, unsigned int code, int size) if (entropy->gather_statistics) return; /* do nothing if we're only getting stats */ - put_buffer &= (((INT32) 1)<<size) - 1; /* tqmask off any extra bits in code */ + put_buffer &= (((INT32) 1)<<size) - 1; /* mask off any extra bits in code */ put_bits += size; /* new number of bits in buffer */ diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h index 24e4c5cf7..e11fafa75 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h +++ b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h @@ -68,7 +68,7 @@ typedef FAST_FLOAT FLOAT_MULT_TYPE; /* preferred floating type */ * Each IDCT routine is responsible for range-limiting its results and * converting them to unsigned form (0..MAXJSAMPLE). The raw outputs could * be quite far out of range if the input data is corrupt, so a bulletproof - * range-limiting step is required. We use a tqmask-and-table-lookup method + * range-limiting step is required. We use a mask-and-table-lookup method * to do the combined operations quickly. See the comments with * prepare_range_limit_table (in jdmaster.c) for more info. */ diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c index 9219b1cc5..9c4901aa1 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c @@ -224,7 +224,7 @@ jpeg_calc_output_dimensions (j_decompress_ptr cinfo) * x = range_limit[x & MASK]; * where MASK is 2 bits wider than legal sample data, ie 10 bits for 8-bit * samples. Under normal circumstances this is more than enough range and - * a correct output will be generated; with bogus input data the tqmask will + * a correct output will be generated; with bogus input data the mask will * cause wraparound, and we will safely generate a bogus-but-in-range output. * For the post-IDCT step, we want to convert the data from signed to unsigned * representation by adding CENTERJSAMPLE at the same time that we limit it. diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h index c2b38a74d..a2cae213a 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h +++ b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h @@ -27,7 +27,7 @@ * Maximum number of components (color channels) allowed in JPEG image. * To meet the letter of the JPEG spec, set this to 255. However, darn * few applications need more than 4 channels (maybe 5 for CMYK + alpha - * tqmask). We recommend 10 as a reasonable compromise; use 4 if you are + * mask). We recommend 10 as a reasonable compromise; use 4 if you are * really short on memory. (Each allowed component costs a hundred or so * bytes of storage, whether actually used in an image or not.) */ @@ -51,7 +51,7 @@ #if BITS_IN_JSAMPLE == 8 /* JSAMPLE should be the smallest type that will hold the values 0..255. - * You can use a signed char by having GETJSAMPLE tqmask it with 0xFF. + * You can use a signed char by having GETJSAMPLE mask it with 0xFF. */ #ifdef HAVE_UNSIGNED_CHAR diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c index fd173cff9..0befadf98 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c @@ -71,7 +71,7 @@ #define ODITHER_SIZE 16 /* dimension of dither matrix */ /* NB: if ODITHER_SIZE is not a power of 2, ODITHER_MASK uses will break */ #define ODITHER_CELLS (ODITHER_SIZE*ODITHER_SIZE) /* # cells in matrix */ -#define ODITHER_MASK (ODITHER_SIZE-1) /* tqmask for wrapping around counters */ +#define ODITHER_MASK (ODITHER_SIZE-1) /* mask for wrapping around counters */ typedef int ODITHER_MATRIX[ODITHER_SIZE][ODITHER_SIZE]; typedef int (*ODITHER_MATRIX_PTR)[ODITHER_SIZE]; diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc index bcd97d16c..b50e71686 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc +++ b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc @@ -1712,7 +1712,7 @@ reason for using progressive JPEG. The IJG encoder library generates progressive JPEG files when given a suitable "scan script" defining how to divide the data into scans. -Creation of progressive JPEG files is otherwise transtqparent to the encoder. +Creation of progressive JPEG files is otherwise transparent to the encoder. Progressive JPEG files can also be read transparently by the decoder library. If the decoding application simply uses the library as defined above, it will receive a final decoded image without any indication that the file was @@ -1759,7 +1759,7 @@ Progressive decompression: When buffered-image mode is not used, the decoder library will read all of a multi-scan file during jpeg_start_decompress(), so that it can provide a final decoded image. (Here "multi-scan" means either progressive or -multi-scan sequential.) This makes multi-scan files transtqparent to the +multi-scan sequential.) This makes multi-scan files transparent to the decoding application. However, existing applications that used suspending input with version 5 of the IJG library will need to be modified to check for a suspension return from jpeg_start_decompress(). diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc index 6440b8e85..16b427099 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc +++ b/experimental/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc @@ -582,7 +582,7 @@ The basic element type JSAMPLE will typically be one of unsigned char, (signed) char, or short. Short will be used if samples wider than 8 bits are to be supported (this is a compile-time option). Otherwise, unsigned char is used if possible. If the compiler only supports signed chars, then it is -necessary to tqmask off the value when reading. Thus, all reads of JSAMPLE +necessary to mask off the value when reading. Thus, all reads of JSAMPLE values must be coded as "GETJSAMPLE(value)", where the macro will be defined as "((value) & 0xFF)" on signed-char machines and "((int) (value))" elsewhere. diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libmng/config.guess b/experimental/tqtinterface/qt4/src/3rdparty/libmng/config.guess index 6372bf0d2..dff9e481b 100755 --- a/experimental/tqtinterface/qt4/src/3rdparty/libmng/config.guess +++ b/experimental/tqtinterface/qt4/src/3rdparty/libmng/config.guess @@ -195,7 +195,7 @@ main: .prologue 1 .long 0x47e03d80 # implver \$0 lda \$2,-1 - .long 0x47e20c21 # atqmask \$2,\$1 + .long 0x47e20c21 # amask \$2,\$1 lda \$16,\$Lformat mov \$0,\$17 not \$1,\$18 diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libmng/configure b/experimental/tqtinterface/qt4/src/3rdparty/libmng/configure index 9a796af93..fb7d7bedb 100755 --- a/experimental/tqtinterface/qt4/src/3rdparty/libmng/configure +++ b/experimental/tqtinterface/qt4/src/3rdparty/libmng/configure @@ -647,7 +647,7 @@ ac_unique_file=libmng.h # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its tqparent. + # Try the directory containing this script, then its parent. ac_prog=$0 ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libmng/doc/libmng.txt b/experimental/tqtinterface/qt4/src/3rdparty/libmng/doc/libmng.txt index 22ba338b1..ca6ee8067 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libmng/doc/libmng.txt +++ b/experimental/tqtinterface/qt4/src/3rdparty/libmng/doc/libmng.txt @@ -249,7 +249,7 @@ canvas and an optional separate alpha-channel canvas. The latter is used only with the MNG_CANVAS_RGB8_A8 canvas-style. If the getbkgdline() callback is not supplied the library will -composite full or partially transtqparent pixels in the image against +composite full or partially transparent pixels in the image against a specified background color. See mng_set_bgcolor() for more details. If a chosen canvas-style includes an alpha-channel, this callback is very likely not needed. @@ -674,13 +674,13 @@ actually need to be consecutive in memory. > Alpha composition and application backgrounds -All Network Graphics can be partially transtqparent. This requires +All Network Graphics can be partially transparent. This requires special processing if you need to display an image against some background. Note that the MNG header (MHDR chunk) contains a simplicity field indicating whether transparency information in the file is critical or not. This only applies to embedded images, which means the full image-frame of the MNG may still contain fully -transtqparent pixels! +transparent pixels! Depending on your needs you can supply a single background color, a background canvas or tell the library to return the alpha-channel @@ -706,7 +706,7 @@ which matches your output requirements. This is somewhat more complicated. You will need to set the mng_getbkgdline() callback. This will be called whenever the library -needs to compose a partially transtqparent line. +needs to compose a partially transparent line. This canvas must hold the background against which the image should be composed. Its size must match exactly with the image dimensions @@ -720,7 +720,7 @@ composing will still function properly. > Composing within the application If you have the option in your application to draw a (partially) -transtqparent canvas to the output tqdevice, this option is preferred. +transparent canvas to the output tqdevice, this option is preferred. Select one of the canvas styles that do have an alpha-channel. The library will now supply the appropriate alpha information, diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libmng/doc/man/libmng.3 b/experimental/tqtinterface/qt4/src/3rdparty/libmng/doc/man/libmng.3 index 782e424fd..7a6f544d7 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libmng/doc/man/libmng.3 +++ b/experimental/tqtinterface/qt4/src/3rdparty/libmng/doc/man/libmng.3 @@ -263,7 +263,7 @@ canvas and an optional separate alpha-channel canvas. The latter is used only with the MNG_CANVAS_RGB8_A8 canvas-style. If the getbkgdline() callback is not supplied the library will -composite full or partially transtqparent pixels in the image against +composite full or partially transparent pixels in the image against a specified background color. See mng_set_bgcolor() for more details. If a chosen canvas-style includes an alpha-channel, this callback is very likely not needed. @@ -692,13 +692,13 @@ actually need to be consecutive in memory. .SS Alpha composition and application backgrounds -All Network Graphics can be partially transtqparent. This requires +All Network Graphics can be partially transparent. This requires special processing if you need to display an image against some background. Note that the MNG header (MHDR chunk) contains a simplicity field indicating whether transparency information in the file is critical or not. This only applies to embedded images, which means the full image-frame of the MNG may still contain fully -transtqparent pixels! +transparent pixels! Depending on your needs you can supply a single background color, a background canvas or tell the library to return the alpha-channel @@ -724,7 +724,7 @@ which matches your output requirements. This is somewhat more complicated. You will need to set the mng_getbkgdline() callback. This will be called whenever the library -needs to compose a partially transtqparent line. +needs to compose a partially transparent line. This canvas must hold the background against which the image should be composed. Its size must match exactly with the image dimensions @@ -738,7 +738,7 @@ composing will still function properly. .SS Composing within the application If you have the option in your application to draw a (partially) -transtqparent canvas to the output tqdevice, this option is preferred. +transparent canvas to the output tqdevice, this option is preferred. Select one of the canvas styles that do have an alpha-channel. The library will now supply the appropriate alpha information, diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng.h b/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng.h index 035bb0e1c..9fd616078 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng.h +++ b/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng.h @@ -2137,7 +2137,7 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_WRONGCHUNK (mng_retcode)2050 /* accessing the wrong chunk */ #define MNG_INVALIDENTRYIX (mng_retcode)2051 /* accessing the wrong entry */ #define MNG_NOHEADER (mng_retcode)2052 /* must have had header first */ -#define MNG_NOCORRCHUNK (mng_retcode)2053 /* can't find tqparent chunk */ +#define MNG_NOCORRCHUNK (mng_retcode)2053 /* can't find parent chunk */ #define MNG_NOMHDR (mng_retcode)2054 /* no MNG header available */ #define MNG_IMAGETOOLARGE (mng_retcode)4097 /* input-image way too big */ diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng_display.c b/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng_display.c index 9cf26de7c..1b17d2ac0 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng_display.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng_display.c @@ -574,7 +574,7 @@ mng_retcode clear_canvas (mng_datap pData) set_display_routine (pData); /* determine display routine */ /* get a temporary row-buffer */ - /* it's transtqparent black by default!! */ + /* it's transparent black by default!! */ MNG_ALLOC (pData, pData->pRGBArow, pData->iRowsize) iY = pData->iDestt; /* this is where we start */ diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng_pixels.c b/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng_pixels.c index 2803e3b3b..737921722 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng_pixels.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng_pixels.c @@ -495,7 +495,7 @@ mng_retcode display_rgba8 (mng_datap pData) iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16; if (iFGa16) /* any opacity at all ? */ - { /* fully opaque or background fully transtqparent ? */ + { /* fully opaque or background fully transparent ? */ if ((iFGa16 == 0xFFFF) || (iBGa16 == 0)) { /* plain copy it */ *pScanline = *pDataline; @@ -562,7 +562,7 @@ mng_retcode display_rgba8 (mng_datap pData) iBGa8 = *(pScanline+3); if (iFGa8) /* any opacity at all ? */ - { /* fully opaque or background fully transtqparent ? */ + { /* fully opaque or background fully transparent ? */ if ((iFGa8 == 0xFF) || (iBGa8 == 0)) { /* then simply copy the values */ *pScanline = *pDataline; @@ -682,7 +682,7 @@ mng_retcode display_argb8 (mng_datap pData) iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16; if (iFGa16) /* any opacity at all ? */ - { /* fully opaque or background fully transtqparent ? */ + { /* fully opaque or background fully transparent ? */ if ((iFGa16 == 0xFFFF) || (iBGa16 == 0)) { /* plain copy it */ *pScanline = *(pDataline+6); @@ -749,7 +749,7 @@ mng_retcode display_argb8 (mng_datap pData) iBGa8 = *pScanline; if (iFGa8) /* any opacity at all ? */ - { /* fully opaque or background fully transtqparent ? */ + { /* fully opaque or background fully transparent ? */ if ((iFGa8 == 0xFF) || (iBGa8 == 0)) { /* then simply copy the values */ *pScanline = *(pDataline+3); @@ -876,7 +876,7 @@ mng_retcode display_rgb8_a8 (mng_datap pData) iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16; if (iFGa16) /* any opacity at all ? */ - { /* fully opaque or background fully transtqparent ? */ + { /* fully opaque or background fully transparent ? */ if ((iFGa16 == 0xFFFF) || (iBGa16 == 0)) { /* plain copy it */ *pScanline = *pDataline; @@ -944,7 +944,7 @@ mng_retcode display_rgb8_a8 (mng_datap pData) iBGa8 = *pAlphaline; if (iFGa8) /* any opacity at all ? */ - { /* fully opaque or background fully transtqparent ? */ + { /* fully opaque or background fully transparent ? */ if ((iFGa8 == 0xFF) || (iBGa8 == 0)) { /* then simply copy the values */ *pScanline = *pDataline; @@ -1202,7 +1202,7 @@ mng_retcode display_bgra8 (mng_datap pData) iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16; if (iFGa16) /* any opacity at all ? */ - { /* fully opaque or background fully transtqparent ? */ + { /* fully opaque or background fully transparent ? */ if ((iFGa16 == 0xFFFF) || (iBGa16 == 0)) { /* plain copy it */ *pScanline = *(pDataline+4); @@ -1269,7 +1269,7 @@ mng_retcode display_bgra8 (mng_datap pData) iBGa8 = *(pScanline+3); if (iFGa8) /* any opacity at all ? */ - { /* fully opaque or background fully transtqparent ? */ + { /* fully opaque or background fully transparent ? */ if ((iFGa8 == 0xFF) || (iBGa8 == 0)) { /* then simply copy the values */ *pScanline = *(pDataline+2); @@ -1408,7 +1408,7 @@ mng_retcode display_bgra8_pm (mng_datap pData) for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer; iX += pData->iColinc) { /* get alpha values */ if ((s = pDataline[6]) != 0) /* any opacity at all ? */ - { /* fully opaque or background fully transtqparent ? */ + { /* fully opaque or background fully transparent ? */ if (s == 255) { /* plain copy it */ pScanline[0] = pDataline[4]; @@ -1541,7 +1541,7 @@ mng_retcode display_abgr8 (mng_datap pData) iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16; if (iFGa16) /* any opacity at all ? */ - { /* fully opaque or background fully transtqparent ? */ + { /* fully opaque or background fully transparent ? */ if ((iFGa16 == 0xFFFF) || (iBGa16 == 0)) { /* plain copy it */ *pScanline = *(pDataline+6); @@ -1608,7 +1608,7 @@ mng_retcode display_abgr8 (mng_datap pData) iBGa8 = *pScanline; if (iFGa8) /* any opacity at all ? */ - { /* fully opaque or background fully transtqparent ? */ + { /* fully opaque or background fully transparent ? */ if ((iFGa8 == 0xFF) || (iBGa8 == 0)) { /* then simply copy the values */ *pScanline = *(pDataline+3); @@ -1945,7 +1945,7 @@ mng_retcode retrieve_g8 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { iG = *pWorkrow; /* get the gray-value */ - /* is it transtqparent ? */ + /* is it transparent ? */ if ((mng_uint16)iG == pBuf->iTRNSgray) { *pRGBArow = 0x00; /* nuttin to display */ @@ -2024,7 +2024,7 @@ mng_retcode retrieve_g16 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { iG = mng_get_uint16 (pWorkrow); /* get the gray-value */ - /* is it transtqparent ? */ + /* is it transparent ? */ if (iG == pBuf->iTRNSgray) { /* nuttin to display */ mng_put_uint16 (pRGBArow, 0x0000); @@ -2091,7 +2091,7 @@ mng_retcode retrieve_rgb8 (mng_datap pData) iR = *pWorkrow; /* get the rgb-values */ iG = *(pWorkrow+1); iB = *(pWorkrow+2); - /* is it transtqparent ? */ + /* is it transparent ? */ if (((mng_uint16)iR == pBuf->iTRNSred ) && ((mng_uint16)iG == pBuf->iTRNSgreen) && ((mng_uint16)iB == pBuf->iTRNSblue ) ) @@ -2158,7 +2158,7 @@ mng_retcode retrieve_rgb16 (mng_datap pData) iR = mng_get_uint16 (pWorkrow); /* get the rgb-values */ iG = mng_get_uint16 (pWorkrow+2); iB = mng_get_uint16 (pWorkrow+4); - /* is it transtqparent ? */ + /* is it transparent ? */ if ((iR == pBuf->iTRNSred ) && (iG == pBuf->iTRNSgreen) && (iB == pBuf->iTRNSblue ) ) @@ -2419,7 +2419,7 @@ mng_retcode store_g1 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -2468,7 +2468,7 @@ mng_retcode store_g2 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -2517,7 +2517,7 @@ mng_retcode store_g4 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -2693,7 +2693,7 @@ mng_retcode store_idx1 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -2741,7 +2741,7 @@ mng_retcode store_idx2 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -2788,7 +2788,7 @@ mng_retcode store_idx4 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3180,7 +3180,7 @@ mng_retcode store_jpeg_g8_a1 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3190,7 +3190,7 @@ mng_retcode store_jpeg_g8_a1 (mng_datap pData) if (iB & iM) /* is it opaque ? */ *pOutrow = 0xFF; /* opaque */ else - *pOutrow = 0x00; /* transtqparent */ + *pOutrow = 0x00; /* transparent */ pOutrow += 2; /* next pixel */ iM >>= 1; @@ -3228,7 +3228,7 @@ mng_retcode store_jpeg_g8_a2 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3282,7 +3282,7 @@ mng_retcode store_jpeg_g8_a4 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3394,7 +3394,7 @@ mng_retcode store_jpeg_rgb8_a1 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3404,7 +3404,7 @@ mng_retcode store_jpeg_rgb8_a1 (mng_datap pData) if (iB & iM) /* is it opaque ? */ *pOutrow = 0xFF; /* opaque */ else - *pOutrow = 0x00; /* transtqparent */ + *pOutrow = 0x00; /* transparent */ pOutrow += 4; /* next pixel */ iM >>= 1; @@ -3442,7 +3442,7 @@ mng_retcode store_jpeg_rgb8_a2 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3496,7 +3496,7 @@ mng_retcode store_jpeg_rgb8_a4 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3608,7 +3608,7 @@ mng_retcode store_jpeg_g12_a1 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3618,7 +3618,7 @@ mng_retcode store_jpeg_g12_a1 (mng_datap pData) if (iB & iM) /* opaque ? */ mng_put_uint16 (pOutrow, 0xFFFF);/* opaque */ else - mng_put_uint16 (pOutrow, 0x0000);/* transtqparent */ + mng_put_uint16 (pOutrow, 0x0000);/* transparent */ pOutrow += 4; /* next pixel */ iM >>= 1; @@ -3656,7 +3656,7 @@ mng_retcode store_jpeg_g12_a2 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3710,7 +3710,7 @@ mng_retcode store_jpeg_g12_a4 (mng_datap pData) for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3840,7 +3840,7 @@ mng_retcode delta_g1 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3860,7 +3860,7 @@ mng_retcode delta_g1 (mng_datap pData) { /* pixel add ! */ for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3911,7 +3911,7 @@ mng_retcode delta_g2 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3936,7 +3936,7 @@ mng_retcode delta_g2 (mng_datap pData) { /* pixel add ! */ for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -3995,7 +3995,7 @@ mng_retcode delta_g4 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -4018,7 +4018,7 @@ mng_retcode delta_g4 (mng_datap pData) { /* pixel add ! */ for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -4276,7 +4276,7 @@ mng_retcode delta_idx1 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -4296,7 +4296,7 @@ mng_retcode delta_idx1 (mng_datap pData) { /* pixel add ! */ for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -4347,7 +4347,7 @@ mng_retcode delta_idx2 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -4366,7 +4366,7 @@ mng_retcode delta_idx2 (mng_datap pData) { /* pixel add ! */ for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -4418,7 +4418,7 @@ mng_retcode delta_idx4 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -4437,7 +4437,7 @@ mng_retcode delta_idx4 (mng_datap pData) { /* pixel add ! */ for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -5629,11 +5629,11 @@ mng_retcode process_g1 (mng_datap pData) if (pBuf->bHasTRNS) /* tRNS encountered ? */ { - if (pBuf->iTRNSgray) /* white transtqparent ? */ + if (pBuf->iTRNSgray) /* white transparent ? */ { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -5641,7 +5641,7 @@ mng_retcode process_g1 (mng_datap pData) } if (iB & iM) /* is it white ? */ - /* transtqparent ! */ + /* transparent ! */ mng_put_uint32 (pRGBArow, 0x00000000); else /* opaque black */ mng_put_uint32 (pRGBArow, 0x000000FF); @@ -5650,11 +5650,11 @@ mng_retcode process_g1 (mng_datap pData) iM >>= 1; } } - else /* black transtqparent */ + else /* black transparent */ { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -5664,7 +5664,7 @@ mng_retcode process_g1 (mng_datap pData) if (iB & iM) /* is it white ? */ /* opaque white */ mng_put_uint32 (pRGBArow, 0xFFFFFFFF); - else /* transtqparent */ + else /* transparent */ mng_put_uint32 (pRGBArow, 0x00000000); pRGBArow += 4; /* next pixel */ @@ -5678,7 +5678,7 @@ mng_retcode process_g1 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -5735,7 +5735,7 @@ mng_retcode process_g2 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -5745,7 +5745,7 @@ mng_retcode process_g2 (mng_datap pData) /* determine gray level */ iQ = (mng_uint8)((iB & iM) >> iS); - if (iQ == pBuf->iTRNSgray) /* transtqparent ? */ + if (iQ == pBuf->iTRNSgray) /* transparent ? */ mng_put_uint32 (pRGBArow, 0x00000000); else { @@ -5769,7 +5769,7 @@ mng_retcode process_g2 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -5830,7 +5830,7 @@ mng_retcode process_g4 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -5840,7 +5840,7 @@ mng_retcode process_g4 (mng_datap pData) /* get the gray level */ iQ = (mng_uint8)((iB & iM) >> iS); - if (iQ == pBuf->iTRNSgray) /* transtqparent ? */ + if (iQ == pBuf->iTRNSgray) /* transparent ? */ { *pRGBArow = 0; /* put in intermediate row */ *(pRGBArow+1) = 0; @@ -5868,7 +5868,7 @@ mng_retcode process_g4 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -5925,7 +5925,7 @@ mng_retcode process_g8 (mng_datap pData) { iB = *pWorkrow; /* get next input-byte */ - if (iB == pBuf->iTRNSgray) /* transtqparent ? */ + if (iB == pBuf->iTRNSgray) /* transparent ? */ { *pRGBArow = 0; /* put in intermediate row */ *(pRGBArow+1) = 0; @@ -5997,7 +5997,7 @@ mng_retcode process_g16 (mng_datap pData) { iW = mng_get_uint16 (pWorkrow); /* get input */ - if (iW == pBuf->iTRNSgray) /* transtqparent ? */ + if (iW == pBuf->iTRNSgray) /* transparent ? */ { /* put in intermediate row */ mng_put_uint16 (pRGBArow, 0); mng_put_uint16 (pRGBArow+2, 0); @@ -6070,11 +6070,11 @@ mng_retcode process_rgb8 (mng_datap pData) iR = *pWorkrow; /* get the RGB values */ iG = *(pWorkrow+1); iB = *(pWorkrow+2); - /* transtqparent ? */ + /* transparent ? */ if ((iR == pBuf->iTRNSred) && (iG == pBuf->iTRNSgreen) && (iB == pBuf->iTRNSblue)) { - *pRGBArow = 0; /* this pixel is transtqparent ! */ + *pRGBArow = 0; /* this pixel is transparent ! */ *(pRGBArow+1) = 0; *(pRGBArow+2) = 0; *(pRGBArow+3) = 0; @@ -6084,7 +6084,7 @@ mng_retcode process_rgb8 (mng_datap pData) *pRGBArow = iR; /* copy the RGB values */ *(pRGBArow+1) = iG; *(pRGBArow+2) = iB; - *(pRGBArow+3) = 0xFF; /* this one isn't transtqparent */ + *(pRGBArow+3) = 0xFF; /* this one isn't transparent */ } pWorkrow += 3; /* next pixel */ @@ -6143,10 +6143,10 @@ mng_retcode process_rgb16 (mng_datap pData) iR = mng_get_uint16 (pWorkrow); /* get the RGB values */ iG = mng_get_uint16 (pWorkrow+2); iB = mng_get_uint16 (pWorkrow+4); - /* transtqparent ? */ + /* transparent ? */ if ((iR == pBuf->iTRNSred) && (iG == pBuf->iTRNSgreen) && (iB == pBuf->iTRNSblue)) - { /* transtqparent then */ + { /* transparent then */ mng_put_uint16 (pRGBArow, 0); mng_put_uint16 (pRGBArow+2, 0); mng_put_uint16 (pRGBArow+4, 0); @@ -6219,7 +6219,7 @@ mng_retcode process_idx1 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -6254,7 +6254,7 @@ mng_retcode process_idx1 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -6319,7 +6319,7 @@ mng_retcode process_idx2 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -6354,7 +6354,7 @@ mng_retcode process_idx2 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = *pWorkrow; /* get next input-byte */ pWorkrow++; @@ -6419,7 +6419,7 @@ mng_retcode process_idx4 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = pWorkrow [0]; /* get next input-byte */ pWorkrow++; @@ -6454,7 +6454,7 @@ mng_retcode process_idx4 (mng_datap pData) { for (iX = 0; iX < pData->iRowsamples; iX++) { - if (!iM) /* tqmask underflow ? */ + if (!iM) /* mask underflow ? */ { iB = pWorkrow [0]; /* get next input-byte */ pWorkrow++; diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng_trace.h b/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng_trace.h index e8824da60..2b493ec66 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng_trace.h +++ b/experimental/tqtinterface/qt4/src/3rdparty/libmng/libmng_trace.h @@ -127,7 +127,7 @@ /* ************************************************************************** */ -/* TODO: add a trace-tqmask so certain functions can be excluded */ +/* TODO: add a trace-mask so certain functions can be excluded */ mng_retcode mng_trace (mng_datap pData, mng_uint32 iFunction, diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/CHANGES b/experimental/tqtinterface/qt4/src/3rdparty/libpng/CHANGES index 939baebea..d151a41c7 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/CHANGES +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/CHANGES @@ -185,7 +185,7 @@ version 0.97 [January, 1998] fixed memory leak in pngwrite.c (free info_ptr->text) (Glenn R-P) added more conditions for png_do_background, to avoid changing black pixels to background when a background is supplied and - no pixels are transtqparent + no pixels are transparent repaired PNG_NO_STDIO behaviour tested NODIV support and made it default behaviour (Greg Roelofs) added "-m" option and PNGTEST_DEBUG_MEMORY to pngtest (John Bowler) @@ -747,7 +747,7 @@ version 1.0.7beta12 [May 12, 2000] Made PNG_NO_CONSOLE_IO the default condition when PNG_BUILD_DLL is defined. Use MSC _RPTn debugging instead of fprintf if _MSC_VER is defined. Added png_access_version_number() function. - Check for tqmask&PNG_FREE_CHNK (for TEXT, SCAL, PCAL) in png_free_data(). + Check for mask&PNG_FREE_CHNK (for TEXT, SCAL, PCAL) in png_free_data(). Expanded libpng.3/libpng.txt information about png_data_freer(). version 1.0.7beta14 [May 17, 2000] (beta13 was not published) Changed pnggccrd.c and pngvcrd.c to handle bad adaptive filter types as @@ -1028,7 +1028,7 @@ version 1.2.2beta2 [February 23, 2002] Check for invalid image dimensions in png_get_IHDR. Added missing "fi;" in the install target of the SGI makefiles. Added install-static to all makefiles that make shared libraries. - Always do gamma compensation when image is partially transtqparent. + Always do gamma compensation when image is partially transparent. version 1.2.2beta3 [March 7, 2002] Compute background.gray and background_1.gray even when color_type is RGB in case image gets reduced to gray later. diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/INSTALL b/experimental/tqtinterface/qt4/src/3rdparty/libpng/INSTALL index 93980f33a..1d6dfc5f0 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/INSTALL +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/INSTALL @@ -15,7 +15,7 @@ or "zlib114") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: - .. (the tqparent directory) + .. (the parent directory) libpng (this directory) INSTALL (this file) README diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/example.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/example.c index c7ebb4bb2..191d41b3d 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/example.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/example.c @@ -206,7 +206,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr); - /* Set the background color to draw transtqparent and alpha images over. + /* Set the background color to draw transparent and alpha images over. * It is possible to set the red, green, and blue components directly * for paletted images instead of supplying a palette index. Note that * even if the PNG file supplies a background, you are not required to diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 b/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 index a0fc097e8..b54b54799 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 @@ -200,7 +200,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5 \fI\fB -\fBpng_uint_32 png_get_mmx_flagtqmask (int \fP\fIflag_select\fP\fB, int \fI*compilerID\fP\fB);\fP +\fBpng_uint_32 png_get_mmx_flagmask (int \fP\fIflag_select\fP\fB, int \fI*compilerID\fP\fB);\fP \fI\fB @@ -526,7 +526,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5 \fI\fB -\fBvoid png_set_invalid (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fItqmask\fP\fB);\fP +\fBvoid png_set_invalid (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fImask\fP\fB);\fP \fI\fB @@ -1152,7 +1152,7 @@ dithering, and setting filler.) If this is the case, simply do this: where png_transforms is an integer containing the logical OR of some set of transformation flags. This call is equivalent to png_read_info(), -followed the set of transformations indicated by the transform tqmask, +followed the set of transformations indicated by the transform mask, then png_read_image(), and finally png_read_end(). (The final parameter of this call is not yet used. Someday it might point @@ -1326,12 +1326,12 @@ into the info_ptr is returned for any complex types. png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values); - trans - array of transtqparent entries for + trans - array of transparent entries for palette (PNG_INFO_tRNS) trans_values - graylevel or color sample values of - the single transtqparent color for + the single transparent color for non-paletted images (PNG_INFO_tRNS) - num_trans - number of transtqparent entries + num_trans - number of transparent entries (PNG_INFO_tRNS) png_get_hIST(png_ptr, info_ptr, &hist); @@ -1564,7 +1564,7 @@ is the level of opacity. If you need the alpha channel in an image to be the level of transparency instead of opacity, you can invert the alpha channel (or the tRNS chunk data) after it's read, so that 0 is fully opaque and 255 (in 8-bit or paletted images) or 65535 (in 16-bit -images) is fully transtqparent, with +images) is fully transparent, with png_set_invert_alpha(png_ptr); @@ -2003,8 +2003,8 @@ When you are done, you can free all memory allocated by libpng like this: It is also possible to individually free the info_ptr members that point to libpng-allocated storage with the following function: - png_free_data(png_ptr, info_ptr, tqmask, seq) - tqmask - identifies data to be freed, a tqmask + png_free_data(png_ptr, info_ptr, mask, seq) + mask - identifies data to be freed, a mask containing the logical OR of one or more of PNG_FREE_PLTE, PNG_FREE_TRNS, @@ -2022,7 +2022,7 @@ by the user and not by libpng, and will in those cases do nothing. The "seq" parameter is ignored if only one item of the selected data type, such as PLTE, is allowed. If "seq" is not -1, and multiple items are allowed for the data type identified in -the tqmask, such as text or sPLT, only the n'th item in the structure +the mask, such as text or sPLT, only the n'th item in the structure is freed, where n is "seq". The default behavior is only to free data that was allocated internally @@ -2030,8 +2030,8 @@ by libpng. This can be changed, so that libpng will not free the data, or so that it will free data that was allocated by the user with png_malloc() or png_zalloc() and passed in via a png_set_*() function, with - png_data_freer(png_ptr, info_ptr, freer, tqmask) - tqmask - which data elements are affected + png_data_freer(png_ptr, info_ptr, freer, mask) + mask - which data elements are affected same choices as in png_free_data() freer - one of PNG_DESTROY_WILL_FREE_DATA @@ -2065,8 +2065,8 @@ The png_free_data() function will turn off the "valid" flag for anything it frees. If you need to turn the flag off for a chunk that was freed by your application instead of by libpng, you can use - png_set_invalid(png_ptr, info_ptr, tqmask); - tqmask - identifies the chunks to be made invalid, + png_set_invalid(png_ptr, info_ptr, mask); + mask - identifies the chunks to be made invalid, containing the logical OR of one or more of PNG_INFO_gAMA, PNG_INFO_sBIT, @@ -2525,12 +2525,12 @@ Some of the more important parts of the png_info are: png_set_tRNS(png_ptr, info_ptr, trans, num_trans, trans_values); - trans - array of transtqparent entries for + trans - array of transparent entries for palette (PNG_INFO_tRNS) trans_values - graylevel or color sample values of - the single transtqparent color for + the single transparent color for non-paletted images (PNG_INFO_tRNS) - num_trans - number of transtqparent entries + num_trans - number of transparent entries (PNG_INFO_tRNS) png_set_hIST(png_ptr, info_ptr, hist); @@ -2746,7 +2746,7 @@ png_set_rows() to put image data in the info structure), simply do this: where png_transforms is an integer containing the logical OR of some set of transformation flags. This call is equivalent to png_write_info(), -followed the set of transformations indicated by the transform tqmask, +followed the set of transformations indicated by the transform mask, then png_write_image(), and finally png_write_end(). (The final parameter of this call is not yet used. Someday it might point @@ -2764,7 +2764,7 @@ Note that there is one transformation you may need to do before png_write_info(). In PNG files, the alpha channel in an image is the level of opacity. If your data is supplied as a level of transparency, you can invert the alpha channel before you write it, so -that 0 is fully transtqparent and 255 (in 8-bit or paletted images) or +that 0 is fully transparent and 255 (in 8-bit or paletted images) or 65535 (in 16-bit images) is fully opaque, with png_set_invert_alpha(png_ptr); @@ -2773,7 +2773,7 @@ This must appear before png_write_info() instead of later with the other transformations because in the case of paletted images the tRNS chunk data has to be inverted before the tRNS chunk is written. If your image is not a paletted image, the tRNS data (which in such cases -represents a single color to be rendered as transtqparent) won't need to +represents a single color to be rendered as transparent) won't need to be changed, and you can safely do this transformation after your png_write_info() call. @@ -2999,8 +2999,8 @@ When you are done, you can free all memory used by libpng like this: It is also possible to individually free the info_ptr members that point to libpng-allocated storage with the following function: - png_free_data(png_ptr, info_ptr, tqmask, seq) - tqmask - identifies data to be freed, a tqmask + png_free_data(png_ptr, info_ptr, mask, seq) + mask - identifies data to be freed, a mask containing the logical OR of one or more of PNG_FREE_PLTE, PNG_FREE_TRNS, @@ -3018,7 +3018,7 @@ by the user and not by libpng, and will in those cases do nothing. The "seq" parameter is ignored if only one item of the selected data type, such as PLTE, is allowed. If "seq" is not -1, and multiple items are allowed for the data type identified in -the tqmask, such as text or sPLT, only the n'th item in the structure +the mask, such as text or sPLT, only the n'th item in the structure is freed, where n is "seq". If you allocated data such as a palette that you passed @@ -3030,8 +3030,8 @@ by libpng. This can be changed, so that libpng will not free the data, or so that it will free data that was allocated by the user with png_malloc() or png_zalloc() and passed in via a png_set_*() function, with - png_data_freer(png_ptr, info_ptr, freer, tqmask) - tqmask - which data elements are affected + png_data_freer(png_ptr, info_ptr, freer, mask) + mask - which data elements are affected same choices as in png_free_data() freer - one of PNG_DESTROY_WILL_FREE_DATA @@ -3451,7 +3451,7 @@ A new feature in libpng 1.2.0 is the ability to dynamically switch between standard and optimized versions of some routines. Currently these are limited to three computationally intensive tasks when reading PNG files: decoding row filters, expanding interlacing, and combining interlaced or -transtqparent row data with previous row data. Currently the optimized +transparent row data with previous row data. Currently the optimized versions are available only for x86 (Intel, AMD, etc.) platforms with MMX support, though this may change in future versions. (For example, the non-MMX assembler optimizations for zlib might become similarly @@ -3468,32 +3468,32 @@ enable all possible optimizations (bearing in mind that some "optimizations" may actually run more slowly in rare cases): #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) - png_uint_32 tqmask, flags; + png_uint_32 mask, flags; flags = png_get_asm_flags(png_ptr); - tqmask = png_get_asm_flagtqmask(PNG_SELECT_READ | PNG_SELECT_WRITE); - png_set_asm_flags(png_ptr, flags | tqmask); + mask = png_get_asm_flagmask(PNG_SELECT_READ | PNG_SELECT_WRITE); + png_set_asm_flags(png_ptr, flags | mask); #endif To enable only optimizations relevant to reading PNGs, use PNG_SELECT_READ -by itself when calling png_get_asm_flagtqmask(); similarly for optimizing +by itself when calling png_get_asm_flagmask(); similarly for optimizing only writing. To disable all optimizations: #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) flags = png_get_asm_flags(png_ptr); - tqmask = png_get_asm_flagtqmask(PNG_SELECT_READ | PNG_SELECT_WRITE); - png_set_asm_flags(png_ptr, flags & ~tqmask); + mask = png_get_asm_flagmask(PNG_SELECT_READ | PNG_SELECT_WRITE); + png_set_asm_flags(png_ptr, flags & ~mask); #endif -To enable or disable only MMX-related features, use png_get_mmx_flagtqmask() -in place of png_get_asm_flagtqmask(). The mmx version takes one additional +To enable or disable only MMX-related features, use png_get_mmx_flagmask() +in place of png_get_asm_flagmask(). The mmx version takes one additional parameter: #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) int selection = PNG_SELECT_READ | PNG_SELECT_WRITE; int compilerID; - tqmask = png_get_mmx_flagtqmask(selection, &compilerID); + mask = png_get_mmx_flagmask(selection, &compilerID); #endif On return, compilerID will indicate which version of the MMX assembler @@ -3502,7 +3502,7 @@ Visual C++ (compilerID == 1) and GNU C (a.k.a. gcc/gas, compilerID == 2). On non-x86 platforms or on systems compiled without MMX optimizations, a value of -1 is used. -Note that both png_get_asm_flagtqmask() and png_get_mmx_flagtqmask() return +Note that both png_get_asm_flagmask() and png_get_mmx_flagmask() return all valid, settable optimization bits for the version of the library that's currently in use. In the case of shared (dynamically linked) libraries, this may include optimizations that did not exist at the time the code was @@ -3534,8 +3534,8 @@ the png_mmx_support() function: It returns -1 if MMX support is not compiled into libpng, 0 if MMX code is compiled but MMX is not supported by the processor, or 1 if MMX support -is fully available. Note that png_mmx_support(), png_get_mmx_flagtqmask(), -and png_get_asm_flagtqmask() all may be called without allocating and ini- +is fully available. Note that png_mmx_support(), png_get_mmx_flagmask(), +and png_get_asm_flagmask() all may be called without allocating and ini- tializing any PNG structures (for example, as part of a usage screen or "about" box). @@ -3572,14 +3572,14 @@ certain extensions to PNG for PNG images that are embedded in MNG datastreams. Libpng can support some of these extensions. To enable them, use the png_permit_mng_features() function: - feature_set = png_permit_mng_features(png_ptr, tqmask) - tqmask is a png_uint_32 containing the logical OR of the + feature_set = png_permit_mng_features(png_ptr, mask) + mask is a png_uint_32 containing the logical OR of the features you want to enable. These include PNG_FLAG_MNG_EMPTY_PLTE PNG_FLAG_MNG_FILTER_64 PNG_ALL_MNG_FEATURES feature_set is a png_32_uint that is the logical AND of - your tqmask with the set of MNG features that is + your mask with the set of MNG features that is supported by the version of libpng that you are using. It is an error to use this function when reading or writing a standalone diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt b/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt index 60139c15e..689b56481 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt @@ -361,7 +361,7 @@ dithering, and setting filler.) If this is the case, simply do this: where png_transforms is an integer containing the logical OR of some set of transformation flags. This call is equivalent to png_read_info(), -followed the set of transformations indicated by the transform tqmask, +followed the set of transformations indicated by the transform mask, then png_read_image(), and finally png_read_end(). (The final parameter of this call is not yet used. Someday it might point @@ -535,12 +535,12 @@ into the info_ptr is returned for any complex types. png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values); - trans - array of transtqparent entries for + trans - array of transparent entries for palette (PNG_INFO_tRNS) trans_values - graylevel or color sample values of - the single transtqparent color for + the single transparent color for non-paletted images (PNG_INFO_tRNS) - num_trans - number of transtqparent entries + num_trans - number of transparent entries (PNG_INFO_tRNS) png_get_hIST(png_ptr, info_ptr, &hist); @@ -773,7 +773,7 @@ is the level of opacity. If you need the alpha channel in an image to be the level of transparency instead of opacity, you can invert the alpha channel (or the tRNS chunk data) after it's read, so that 0 is fully opaque and 255 (in 8-bit or paletted images) or 65535 (in 16-bit -images) is fully transtqparent, with +images) is fully transparent, with png_set_invert_alpha(png_ptr); @@ -1212,8 +1212,8 @@ When you are done, you can free all memory allocated by libpng like this: It is also possible to individually free the info_ptr members that point to libpng-allocated storage with the following function: - png_free_data(png_ptr, info_ptr, tqmask, seq) - tqmask - identifies data to be freed, a tqmask + png_free_data(png_ptr, info_ptr, mask, seq) + mask - identifies data to be freed, a mask containing the logical OR of one or more of PNG_FREE_PLTE, PNG_FREE_TRNS, @@ -1231,7 +1231,7 @@ by the user and not by libpng, and will in those cases do nothing. The "seq" parameter is ignored if only one item of the selected data type, such as PLTE, is allowed. If "seq" is not -1, and multiple items are allowed for the data type identified in -the tqmask, such as text or sPLT, only the n'th item in the structure +the mask, such as text or sPLT, only the n'th item in the structure is freed, where n is "seq". The default behavior is only to free data that was allocated internally @@ -1239,8 +1239,8 @@ by libpng. This can be changed, so that libpng will not free the data, or so that it will free data that was allocated by the user with png_malloc() or png_zalloc() and passed in via a png_set_*() function, with - png_data_freer(png_ptr, info_ptr, freer, tqmask) - tqmask - which data elements are affected + png_data_freer(png_ptr, info_ptr, freer, mask) + mask - which data elements are affected same choices as in png_free_data() freer - one of PNG_DESTROY_WILL_FREE_DATA @@ -1274,8 +1274,8 @@ The png_free_data() function will turn off the "valid" flag for anything it frees. If you need to turn the flag off for a chunk that was freed by your application instead of by libpng, you can use - png_set_invalid(png_ptr, info_ptr, tqmask); - tqmask - identifies the chunks to be made invalid, + png_set_invalid(png_ptr, info_ptr, mask); + mask - identifies the chunks to be made invalid, containing the logical OR of one or more of PNG_INFO_gAMA, PNG_INFO_sBIT, @@ -1734,12 +1734,12 @@ Some of the more important parts of the png_info are: png_set_tRNS(png_ptr, info_ptr, trans, num_trans, trans_values); - trans - array of transtqparent entries for + trans - array of transparent entries for palette (PNG_INFO_tRNS) trans_values - graylevel or color sample values of - the single transtqparent color for + the single transparent color for non-paletted images (PNG_INFO_tRNS) - num_trans - number of transtqparent entries + num_trans - number of transparent entries (PNG_INFO_tRNS) png_set_hIST(png_ptr, info_ptr, hist); @@ -1955,7 +1955,7 @@ png_set_rows() to put image data in the info structure), simply do this: where png_transforms is an integer containing the logical OR of some set of transformation flags. This call is equivalent to png_write_info(), -followed the set of transformations indicated by the transform tqmask, +followed the set of transformations indicated by the transform mask, then png_write_image(), and finally png_write_end(). (The final parameter of this call is not yet used. Someday it might point @@ -1973,7 +1973,7 @@ Note that there is one transformation you may need to do before png_write_info(). In PNG files, the alpha channel in an image is the level of opacity. If your data is supplied as a level of transparency, you can invert the alpha channel before you write it, so -that 0 is fully transtqparent and 255 (in 8-bit or paletted images) or +that 0 is fully transparent and 255 (in 8-bit or paletted images) or 65535 (in 16-bit images) is fully opaque, with png_set_invert_alpha(png_ptr); @@ -1982,7 +1982,7 @@ This must appear before png_write_info() instead of later with the other transformations because in the case of paletted images the tRNS chunk data has to be inverted before the tRNS chunk is written. If your image is not a paletted image, the tRNS data (which in such cases -represents a single color to be rendered as transtqparent) won't need to +represents a single color to be rendered as transparent) won't need to be changed, and you can safely do this transformation after your png_write_info() call. @@ -2208,8 +2208,8 @@ When you are done, you can free all memory used by libpng like this: It is also possible to individually free the info_ptr members that point to libpng-allocated storage with the following function: - png_free_data(png_ptr, info_ptr, tqmask, seq) - tqmask - identifies data to be freed, a tqmask + png_free_data(png_ptr, info_ptr, mask, seq) + mask - identifies data to be freed, a mask containing the logical OR of one or more of PNG_FREE_PLTE, PNG_FREE_TRNS, @@ -2227,7 +2227,7 @@ by the user and not by libpng, and will in those cases do nothing. The "seq" parameter is ignored if only one item of the selected data type, such as PLTE, is allowed. If "seq" is not -1, and multiple items are allowed for the data type identified in -the tqmask, such as text or sPLT, only the n'th item in the structure +the mask, such as text or sPLT, only the n'th item in the structure is freed, where n is "seq". If you allocated data such as a palette that you passed @@ -2239,8 +2239,8 @@ by libpng. This can be changed, so that libpng will not free the data, or so that it will free data that was allocated by the user with png_malloc() or png_zalloc() and passed in via a png_set_*() function, with - png_data_freer(png_ptr, info_ptr, freer, tqmask) - tqmask - which data elements are affected + png_data_freer(png_ptr, info_ptr, freer, mask) + mask - which data elements are affected same choices as in png_free_data() freer - one of PNG_DESTROY_WILL_FREE_DATA @@ -2660,7 +2660,7 @@ A new feature in libpng 1.2.0 is the ability to dynamically switch between standard and optimized versions of some routines. Currently these are limited to three computationally intensive tasks when reading PNG files: decoding row filters, expanding interlacing, and combining interlaced or -transtqparent row data with previous row data. Currently the optimized +transparent row data with previous row data. Currently the optimized versions are available only for x86 (Intel, AMD, etc.) platforms with MMX support, though this may change in future versions. (For example, the non-MMX assembler optimizations for zlib might become similarly @@ -2677,32 +2677,32 @@ enable all possible optimizations (bearing in mind that some "optimizations" may actually run more slowly in rare cases): #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) - png_uint_32 tqmask, flags; + png_uint_32 mask, flags; flags = png_get_asm_flags(png_ptr); - tqmask = png_get_asm_flagtqmask(PNG_SELECT_READ | PNG_SELECT_WRITE); - png_set_asm_flags(png_ptr, flags | tqmask); + mask = png_get_asm_flagmask(PNG_SELECT_READ | PNG_SELECT_WRITE); + png_set_asm_flags(png_ptr, flags | mask); #endif To enable only optimizations relevant to reading PNGs, use PNG_SELECT_READ -by itself when calling png_get_asm_flagtqmask(); similarly for optimizing +by itself when calling png_get_asm_flagmask(); similarly for optimizing only writing. To disable all optimizations: #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) flags = png_get_asm_flags(png_ptr); - tqmask = png_get_asm_flagtqmask(PNG_SELECT_READ | PNG_SELECT_WRITE); - png_set_asm_flags(png_ptr, flags & ~tqmask); + mask = png_get_asm_flagmask(PNG_SELECT_READ | PNG_SELECT_WRITE); + png_set_asm_flags(png_ptr, flags & ~mask); #endif -To enable or disable only MMX-related features, use png_get_mmx_flagtqmask() -in place of png_get_asm_flagtqmask(). The mmx version takes one additional +To enable or disable only MMX-related features, use png_get_mmx_flagmask() +in place of png_get_asm_flagmask(). The mmx version takes one additional parameter: #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) int selection = PNG_SELECT_READ | PNG_SELECT_WRITE; int compilerID; - tqmask = png_get_mmx_flagtqmask(selection, &compilerID); + mask = png_get_mmx_flagmask(selection, &compilerID); #endif On return, compilerID will indicate which version of the MMX assembler @@ -2711,7 +2711,7 @@ Visual C++ (compilerID == 1) and GNU C (a.k.a. gcc/gas, compilerID == 2). On non-x86 platforms or on systems compiled without MMX optimizations, a value of -1 is used. -Note that both png_get_asm_flagtqmask() and png_get_mmx_flagtqmask() return +Note that both png_get_asm_flagmask() and png_get_mmx_flagmask() return all valid, settable optimization bits for the version of the library that's currently in use. In the case of shared (dynamically linked) libraries, this may include optimizations that did not exist at the time the code was @@ -2743,8 +2743,8 @@ the png_mmx_support() function: It returns -1 if MMX support is not compiled into libpng, 0 if MMX code is compiled but MMX is not supported by the processor, or 1 if MMX support -is fully available. Note that png_mmx_support(), png_get_mmx_flagtqmask(), -and png_get_asm_flagtqmask() all may be called without allocating and ini- +is fully available. Note that png_mmx_support(), png_get_mmx_flagmask(), +and png_get_asm_flagmask() all may be called without allocating and ini- tializing any PNG structures (for example, as part of a usage screen or "about" box). @@ -2781,14 +2781,14 @@ certain extensions to PNG for PNG images that are embedded in MNG datastreams. Libpng can support some of these extensions. To enable them, use the png_permit_mng_features() function: - feature_set = png_permit_mng_features(png_ptr, tqmask) - tqmask is a png_uint_32 containing the logical OR of the + feature_set = png_permit_mng_features(png_ptr, mask) + mask is a png_uint_32 containing the logical OR of the features you want to enable. These include PNG_FLAG_MNG_EMPTY_PLTE PNG_FLAG_MNG_FILTER_64 PNG_ALL_MNG_FEATURES feature_set is a png_32_uint that is the logical AND of - your tqmask with the set of MNG features that is + your mask with the set of MNG features that is supported by the version of libpng that you are using. It is an error to use this function when reading or writing a standalone diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 b/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 index a75a66902..3c1f37971 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 @@ -27,7 +27,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5 \fI\fB -\fBvoid png_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fItqmask\fP\fB);\fP +\fBvoid png_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fImask\fP\fB);\fP \fI\fB diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.c index d3370d8d7..fc120a2cc 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.c @@ -301,15 +301,15 @@ png_info_init_3(png_infopp ptr_ptr, png_size_t png_info_struct_size) #ifdef PNG_FREE_ME_SUPPORTED void PNGAPI png_data_freer(png_structp png_ptr, png_infop info_ptr, - int freer, png_uint_32 tqmask) + int freer, png_uint_32 mask) { png_debug(1, "in png_data_freer\n"); if (png_ptr == NULL || info_ptr == NULL) return; if(freer == PNG_DESTROY_WILL_FREE_DATA) - info_ptr->free_me |= tqmask; + info_ptr->free_me |= mask; else if(freer == PNG_USER_WILL_FREE_DATA) - info_ptr->free_me &= ~tqmask; + info_ptr->free_me &= ~mask; else png_warning(png_ptr, "Unknown freer parameter in png_data_freer."); @@ -317,7 +317,7 @@ png_data_freer(png_structp png_ptr, png_infop info_ptr, #endif void PNGAPI -png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 tqmask, +png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask, int num) { png_debug(1, "in png_free_data\n"); @@ -327,9 +327,9 @@ png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 tqmask, #if defined(PNG_TEXT_SUPPORTED) /* free text item num or (if num == -1) all text items */ #ifdef PNG_FREE_ME_SUPPORTED -if ((tqmask & PNG_FREE_TEXT) & info_ptr->free_me) +if ((mask & PNG_FREE_TEXT) & info_ptr->free_me) #else -if (tqmask & PNG_FREE_TEXT) +if (mask & PNG_FREE_TEXT) #endif { if (num != -1) @@ -355,9 +355,9 @@ if (tqmask & PNG_FREE_TEXT) #if defined(PNG_tRNS_SUPPORTED) /* free any tRNS entry */ #ifdef PNG_FREE_ME_SUPPORTED -if ((tqmask & PNG_FREE_TRNS) & info_ptr->free_me) +if ((mask & PNG_FREE_TRNS) & info_ptr->free_me) #else -if ((tqmask & PNG_FREE_TRNS) && (png_ptr->flags & PNG_FLAG_FREE_TRNS)) +if ((mask & PNG_FREE_TRNS) && (png_ptr->flags & PNG_FLAG_FREE_TRNS)) #endif { png_free(png_ptr, info_ptr->trans); @@ -372,9 +372,9 @@ if ((tqmask & PNG_FREE_TRNS) && (png_ptr->flags & PNG_FLAG_FREE_TRNS)) #if defined(PNG_sCAL_SUPPORTED) /* free any sCAL entry */ #ifdef PNG_FREE_ME_SUPPORTED -if ((tqmask & PNG_FREE_SCAL) & info_ptr->free_me) +if ((mask & PNG_FREE_SCAL) & info_ptr->free_me) #else -if (tqmask & PNG_FREE_SCAL) +if (mask & PNG_FREE_SCAL) #endif { #if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED) @@ -390,9 +390,9 @@ if (tqmask & PNG_FREE_SCAL) #if defined(PNG_pCAL_SUPPORTED) /* free any pCAL entry */ #ifdef PNG_FREE_ME_SUPPORTED -if ((tqmask & PNG_FREE_PCAL) & info_ptr->free_me) +if ((mask & PNG_FREE_PCAL) & info_ptr->free_me) #else -if (tqmask & PNG_FREE_PCAL) +if (mask & PNG_FREE_PCAL) #endif { png_free(png_ptr, info_ptr->pcal_purpose); @@ -417,9 +417,9 @@ if (tqmask & PNG_FREE_PCAL) #if defined(PNG_iCCP_SUPPORTED) /* free any iCCP entry */ #ifdef PNG_FREE_ME_SUPPORTED -if ((tqmask & PNG_FREE_ICCP) & info_ptr->free_me) +if ((mask & PNG_FREE_ICCP) & info_ptr->free_me) #else -if (tqmask & PNG_FREE_ICCP) +if (mask & PNG_FREE_ICCP) #endif { png_free(png_ptr, info_ptr->iccp_name); @@ -433,9 +433,9 @@ if (tqmask & PNG_FREE_ICCP) #if defined(PNG_sPLT_SUPPORTED) /* free a given sPLT entry, or (if num == -1) all sPLT entries */ #ifdef PNG_FREE_ME_SUPPORTED -if ((tqmask & PNG_FREE_SPLT) & info_ptr->free_me) +if ((mask & PNG_FREE_SPLT) & info_ptr->free_me) #else -if (tqmask & PNG_FREE_SPLT) +if (mask & PNG_FREE_SPLT) #endif { if (num != -1) @@ -467,9 +467,9 @@ if (tqmask & PNG_FREE_SPLT) #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) #ifdef PNG_FREE_ME_SUPPORTED -if ((tqmask & PNG_FREE_UNKN) & info_ptr->free_me) +if ((mask & PNG_FREE_UNKN) & info_ptr->free_me) #else -if (tqmask & PNG_FREE_UNKN) +if (mask & PNG_FREE_UNKN) #endif { if (num != -1) @@ -500,9 +500,9 @@ if (tqmask & PNG_FREE_UNKN) #if defined(PNG_hIST_SUPPORTED) /* free any hIST entry */ #ifdef PNG_FREE_ME_SUPPORTED -if ((tqmask & PNG_FREE_HIST) & info_ptr->free_me) +if ((mask & PNG_FREE_HIST) & info_ptr->free_me) #else -if ((tqmask & PNG_FREE_HIST) && (png_ptr->flags & PNG_FLAG_FREE_HIST)) +if ((mask & PNG_FREE_HIST) && (png_ptr->flags & PNG_FLAG_FREE_HIST)) #endif { png_free(png_ptr, info_ptr->hist); @@ -516,9 +516,9 @@ if ((tqmask & PNG_FREE_HIST) && (png_ptr->flags & PNG_FLAG_FREE_HIST)) /* free any PLTE entry that was internally allocated */ #ifdef PNG_FREE_ME_SUPPORTED -if ((tqmask & PNG_FREE_PLTE) & info_ptr->free_me) +if ((mask & PNG_FREE_PLTE) & info_ptr->free_me) #else -if ((tqmask & PNG_FREE_PLTE) && (png_ptr->flags & PNG_FLAG_FREE_PLTE)) +if ((mask & PNG_FREE_PLTE) && (png_ptr->flags & PNG_FLAG_FREE_PLTE)) #endif { png_zfree(png_ptr, info_ptr->palette); @@ -533,9 +533,9 @@ if ((tqmask & PNG_FREE_PLTE) && (png_ptr->flags & PNG_FLAG_FREE_PLTE)) #if defined(PNG_INFO_IMAGE_SUPPORTED) /* free any image bits attached to the info structure */ #ifdef PNG_FREE_ME_SUPPORTED -if ((tqmask & PNG_FREE_ROWS) & info_ptr->free_me) +if ((mask & PNG_FREE_ROWS) & info_ptr->free_me) #else -if (tqmask & PNG_FREE_ROWS) +if (mask & PNG_FREE_ROWS) #endif { if(info_ptr->row_pointers) @@ -555,9 +555,9 @@ if (tqmask & PNG_FREE_ROWS) #ifdef PNG_FREE_ME_SUPPORTED if(num == -1) - info_ptr->free_me &= ~tqmask; + info_ptr->free_me &= ~mask; else - info_ptr->free_me &= ~(tqmask & ~PNG_FREE_MUL); + info_ptr->free_me &= ~(mask & ~PNG_FREE_MUL); #endif } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.h b/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.h index 76fef59c9..a7e1a4a8b 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.h +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.h @@ -600,7 +600,7 @@ typedef struct png_info_struct png_uint_32 rowbytes; /* bytes needed to hold an untransformed row */ png_colorp palette; /* array of color values (valid & PNG_INFO_PLTE) */ png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */ - png_uint_16 num_trans; /* number of transtqparent palette color (tRNS) */ + png_uint_16 num_trans; /* number of transparent palette color (tRNS) */ png_byte bit_depth; /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */ png_byte color_type; /* see PNG_COLOR_TYPE_ below (from IHDR) */ /* The following three should have been named *_method not *_type */ @@ -671,13 +671,13 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) * other image types that don't need a full alpha channel. There are * "num_trans" transparency values for a paletted image, stored in the * same order as the palette colors, starting from index 0. Values - * for the data are in the range [0, 255], ranging from fully transtqparent + * for the data are in the range [0, 255], ranging from fully transparent * to fully opaque, respectively. For non-paletted images, there is a - * single color specified that should be treated as fully transtqparent. + * single color specified that should be treated as fully transparent. * Data is valid if (valid & PNG_INFO_tRNS) is non-zero. */ - png_bytep trans; /* transtqparent values for paletted image */ - png_color_16 trans_values; /* transtqparent color for non-palette image */ + png_bytep trans; /* transparent values for paletted image */ + png_color_16 trans_values; /* transparent color for non-palette image */ #endif #if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) @@ -1867,7 +1867,7 @@ extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr, /* Reassign responsibility for freeing existing data, whether allocated * by libpng or by the application */ extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr, - png_infop info_ptr, int freer, png_uint_32 tqmask)); + png_infop info_ptr, int freer, png_uint_32 mask)); #endif /* assignments for png_data_freer */ #define PNG_DESTROY_WILL_FREE_DATA 1 @@ -2276,7 +2276,7 @@ PNG_EXPORT(int,png_handle_as_unknown) PNGARG((png_structp png_ptr, png_bytep If you need to turn it off for a chunk that your application has freed, you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK); */ extern PNG_EXPORT(void, png_set_invalid) PNGARG((png_structp png_ptr, - png_infop info_ptr, int tqmask)); + png_infop info_ptr, int mask)); #if defined(PNG_INFO_IMAGE_SUPPORTED) /* The "params" pointer is currently not used and is for future expansion. */ @@ -2384,11 +2384,11 @@ extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp #if !defined(PNG_1_0_X) /* pngget.c */ -extern PNG_EXPORT(png_uint_32,png_get_mmx_flagtqmask) +extern PNG_EXPORT(png_uint_32,png_get_mmx_flagmask) PNGARG((int flag_select, int *compilerID)); /* pngget.c */ -extern PNG_EXPORT(png_uint_32,png_get_asm_flagtqmask) +extern PNG_EXPORT(png_uint_32,png_get_asm_flagmask) PNGARG((int flag_select)); /* pngget.c */ @@ -2950,7 +2950,7 @@ PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr)); /* combine a row of data, dealing with alpha, etc. if requested */ PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row, - int tqmask)); + int mask)); #if defined(PNG_READ_INTERLACING_SUPPORTED) /* expand an interlaced row */ diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c index 105625109..88a1da23c 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c @@ -109,7 +109,7 @@ * listings... Apparently register spillage has to do with ebx, since * it's used to index the global offset table. Commenting it out of the * input-reg lists in png_combine_row() eliminated compiler barfage, so - * ifdef'd with __PIC__ macro: if defined, use a global for untqmask + * ifdef'd with __PIC__ macro: if defined, use a global for unmask * * 19991107: * - verified CPUID clobberage: 12-char string constant ("GenuineIntel", @@ -146,7 +146,7 @@ * pnggccrd.c:994: more than 10 operands in `asm' * pnggccrd.c:1177: more than 10 operands in `asm' * They are all the same problem and can be worked around by using the - * global _untqmask variable unconditionally, not just in the -fPIC case. + * global _unmask variable unconditionally, not just in the -fPIC case. * Reportedly earlier versions of gcc also have the problem with more than * 10 operands; they just don't report it. Much strangeness ensues, etc. * @@ -257,22 +257,22 @@ static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; # define _mmx_supported mmx_supported # define _const4 const4 # define _const6 const6 -# define _mask8_0 tqmask8_0 -# define _mask16_1 tqmask16_1 -# define _mask16_0 tqmask16_0 -# define _mask24_2 tqmask24_2 -# define _mask24_1 tqmask24_1 -# define _mask24_0 tqmask24_0 -# define _mask32_3 tqmask32_3 -# define _mask32_2 tqmask32_2 -# define _mask32_1 tqmask32_1 -# define _mask32_0 tqmask32_0 -# define _mask48_5 tqmask48_5 -# define _mask48_4 tqmask48_4 -# define _mask48_3 tqmask48_3 -# define _mask48_2 tqmask48_2 -# define _mask48_1 tqmask48_1 -# define _mask48_0 tqmask48_0 +# define _mask8_0 mask8_0 +# define _mask16_1 mask16_1 +# define _mask16_0 mask16_0 +# define _mask24_2 mask24_2 +# define _mask24_1 mask24_1 +# define _mask24_0 mask24_0 +# define _mask32_3 mask32_3 +# define _mask32_2 mask32_2 +# define _mask32_1 mask32_1 +# define _mask32_0 mask32_0 +# define _mask48_5 mask48_5 +# define _mask48_4 mask48_4 +# define _mask48_3 mask48_3 +# define _mask48_2 mask48_2 +# define _mask48_1 mask48_1 +# define _mask48_0 mask48_0 # define _LBCarryMask LBCarryMask # define _HBClearMask HBClearMask # define _ActiveMask ActiveMask @@ -281,7 +281,7 @@ static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; # define _ShiftBpp ShiftBpp # define _ShiftRem ShiftRem #ifdef PNG_THREAD_UNSAFE_OK -# define _untqmask untqmask +# define _unmask unmask # define _FullLength FullLength # define _MMXLength MMXLength # define _dif dif @@ -295,14 +295,14 @@ static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; /* These constants are used in the inlined MMX assembly code. Ignore gcc's "At top level: defined but not used" warnings. */ -/* GRR 20000706: originally _untqmask was needed only when compiling with -fPIC, +/* GRR 20000706: originally _unmask was needed only when compiling with -fPIC, * since that case uses the %ebx register for indexing the Global Offset Table * and there were no other registers available. But gcc 2.95 and later emit - * "more than 10 operands in `asm'" errors when %ebx is used to preload untqmask + * "more than 10 operands in `asm'" errors when %ebx is used to preload unmask * in the non-PIC case, so we'll just use the global unconditionally now. */ #ifdef PNG_THREAD_UNSAFE_OK -static int _untqmask; +static int _unmask; #endif static unsigned long long _mask8_0 = 0x0102040810204080LL; @@ -394,19 +394,19 @@ static int _mmx_supported = 2; /* Combines the row recently read in with the previous row. This routine takes care of alpha and transparency if requested. This routine also handles the two methods of progressive display - of interlaced images, depending on the tqmask value. - The tqmask value describes which pixels are to be combined with + of interlaced images, depending on the mask value. + The mask value describes which pixels are to be combined with the row. The pattern always repeats every 8 pixels, so just 8 bits are needed. A one indicates the pixel is to be combined; a zero indicates the pixel is to be skipped. This is in addition to any alpha or transparency value associated with the pixel. - If you want all pixels to be combined, pass 0xff (255) in tqmask. */ + If you want all pixels to be combined, pass 0xff (255) in mask. */ /* Use this routine for the x86 platform - it uses a faster MMX routine if the machine supports MMX. */ void /* PRIVATE */ -png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) +png_combine_row(png_structp png_ptr, png_bytep row, int mask) { png_debug(1, "in png_combine_row (pnggccrd.c)\n"); @@ -418,13 +418,13 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) } #endif - if (tqmask == 0xff) + if (mask == 0xff) { - png_debug(2,"tqmask == 0xff: doing single png_memcpy()\n"); + png_debug(2,"mask == 0xff: doing single png_memcpy()\n"); png_memcpy(row, png_ptr->row_buf + 1, (png_size_t)((png_ptr->width * png_ptr->row_info.pixel_depth + 7) >> 3)); } - else /* (png_combine_row() is never called with tqmask == 0) */ + else /* (png_combine_row() is never called with mask == 0) */ { switch (png_ptr->row_info.pixel_depth) { @@ -459,7 +459,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < png_ptr->width; i++) { - if (m & tqmask) + if (m & mask) { int value; @@ -517,7 +517,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < png_ptr->width; i++) { - if (m & tqmask) + if (m & mask) { value = (*sp >> shift) & 0x3; *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); @@ -571,7 +571,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < png_ptr->width; i++) { - if (m & tqmask) + if (m & mask) { value = (*sp >> shift) & 0xf; *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); @@ -614,14 +614,14 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) int dummy_value_c; int dummy_value_S; int dummy_value_D; - _untqmask = ~tqmask; // global variable for -fPIC version + _unmask = ~mask; // global variable for -fPIC version srcptr = png_ptr->row_buf + 1; dstptr = row; len = png_ptr->width &~7; // reduce to multiple of 8 diff = (int) (png_ptr->width & 7); // amount lost __asm__ __volatile__ ( - "movd _untqmask, %%mm7 \n\t" // load bit pattern + "movd _unmask, %%mm7 \n\t" // load bit pattern "psubb %%mm6, %%mm6 \n\t" // zero mm6 "punpcklbw %%mm7, %%mm7 \n\t" "punpcklwd %%mm7, %%mm7 \n\t" @@ -655,7 +655,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) "movl %%eax, %%ecx \n\t" "cmpl $0, %%ecx \n\t" "jz end8 \n\t" -// preload "movl tqmask, %%edx \n\t" +// preload "movl mask, %%edx \n\t" "sall $24, %%edx \n\t" // make low byte, high byte "secondloop8: \n\t" @@ -682,9 +682,9 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) : "3" (srcptr), // esi // input regs "4" (dstptr), // edi "0" (diff), // eax -// was (untqmask) "b" RESERVED // ebx // Global Offset Table idx +// was (unmask) "b" RESERVED // ebx // Global Offset Table idx "2" (len), // ecx - "1" (tqmask) // edx + "1" (mask) // edx #if 0 /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */ : "%mm0", "%mm4", "%mm6", "%mm7" // clobber list @@ -752,14 +752,14 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) int dummy_value_c; int dummy_value_S; int dummy_value_D; - _untqmask = ~tqmask; // global variable for -fPIC version + _unmask = ~mask; // global variable for -fPIC version srcptr = png_ptr->row_buf + 1; dstptr = row; len = png_ptr->width &~7; // reduce to multiple of 8 diff = (int) (png_ptr->width & 7); // amount lost // __asm__ __volatile__ ( - "movd _untqmask, %%mm7 \n\t" // load bit pattern + "movd _unmask, %%mm7 \n\t" // load bit pattern "psubb %%mm6, %%mm6 \n\t" // zero mm6 "punpcklbw %%mm7, %%mm7 \n\t" "punpcklwd %%mm7, %%mm7 \n\t" @@ -808,7 +808,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) "movl %%eax, %%ecx \n\t" "cmpl $0, %%ecx \n\t" "jz end16 \n\t" -// preload "movl tqmask, %%edx \n\t" +// preload "movl mask, %%edx \n\t" "sall $24, %%edx \n\t" // make low byte, high byte "secondloop16: \n\t" @@ -833,9 +833,9 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) "=D" (dummy_value_D) : "0" (diff), // eax // input regs -// was (untqmask) " " RESERVED // ebx // Global Offset Table idx +// was (unmask) " " RESERVED // ebx // Global Offset Table idx "1" (len), // ecx - "2" (tqmask), // edx + "2" (mask), // edx "3" (srcptr), // esi "4" (dstptr) // edi @@ -905,14 +905,14 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) int dummy_value_c; int dummy_value_S; int dummy_value_D; - _untqmask = ~tqmask; // global variable for -fPIC version + _unmask = ~mask; // global variable for -fPIC version srcptr = png_ptr->row_buf + 1; dstptr = row; len = png_ptr->width &~7; // reduce to multiple of 8 diff = (int) (png_ptr->width & 7); // amount lost // __asm__ __volatile__ ( - "movd _untqmask, %%mm7 \n\t" // load bit pattern + "movd _unmask, %%mm7 \n\t" // load bit pattern "psubb %%mm6, %%mm6 \n\t" // zero mm6 "punpcklbw %%mm7, %%mm7 \n\t" "punpcklwd %%mm7, %%mm7 \n\t" @@ -973,7 +973,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) "movl %%eax, %%ecx \n\t" "cmpl $0, %%ecx \n\t" "jz end24 \n\t" -// preload "movl tqmask, %%edx \n\t" +// preload "movl mask, %%edx \n\t" "sall $24, %%edx \n\t" // make low byte, high byte "secondloop24: \n\t" @@ -1003,9 +1003,9 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) : "3" (srcptr), // esi // input regs "4" (dstptr), // edi "0" (diff), // eax -// was (untqmask) "b" RESERVED // ebx // Global Offset Table idx +// was (unmask) "b" RESERVED // ebx // Global Offset Table idx "2" (len), // ecx - "1" (tqmask) // edx + "1" (mask) // edx #if 0 /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */ : "%mm0", "%mm1", "%mm2" // clobber list @@ -1073,14 +1073,14 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) int dummy_value_c; int dummy_value_S; int dummy_value_D; - _untqmask = ~tqmask; // global variable for -fPIC version + _unmask = ~mask; // global variable for -fPIC version srcptr = png_ptr->row_buf + 1; dstptr = row; len = png_ptr->width &~7; // reduce to multiple of 8 diff = (int) (png_ptr->width & 7); // amount lost // __asm__ __volatile__ ( - "movd _untqmask, %%mm7 \n\t" // load bit pattern + "movd _unmask, %%mm7 \n\t" // load bit pattern "psubb %%mm6, %%mm6 \n\t" // zero mm6 "punpcklbw %%mm7, %%mm7 \n\t" "punpcklwd %%mm7, %%mm7 \n\t" @@ -1151,7 +1151,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) "movl %%eax, %%ecx \n\t" "cmpl $0, %%ecx \n\t" "jz end32 \n\t" -// preload "movl tqmask, %%edx \n\t" +// preload "movl mask, %%edx \n\t" "sall $24, %%edx \n\t" // low byte => high byte "secondloop32: \n\t" @@ -1178,9 +1178,9 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) : "3" (srcptr), // esi // input regs "4" (dstptr), // edi "0" (diff), // eax -// was (untqmask) "b" RESERVED // ebx // Global Offset Table idx +// was (unmask) "b" RESERVED // ebx // Global Offset Table idx "2" (len), // ecx - "1" (tqmask) // edx + "1" (mask) // edx #if 0 /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */ : "%mm0", "%mm1", "%mm2", "%mm3" // clobber list @@ -1248,14 +1248,14 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) int dummy_value_c; int dummy_value_S; int dummy_value_D; - _untqmask = ~tqmask; // global variable for -fPIC version + _unmask = ~mask; // global variable for -fPIC version srcptr = png_ptr->row_buf + 1; dstptr = row; len = png_ptr->width &~7; // reduce to multiple of 8 diff = (int) (png_ptr->width & 7); // amount lost // __asm__ __volatile__ ( - "movd _untqmask, %%mm7 \n\t" // load bit pattern + "movd _unmask, %%mm7 \n\t" // load bit pattern "psubb %%mm6, %%mm6 \n\t" // zero mm6 "punpcklbw %%mm7, %%mm7 \n\t" "punpcklwd %%mm7, %%mm7 \n\t" @@ -1343,7 +1343,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) "movl %%eax, %%ecx \n\t" "cmpl $0, %%ecx \n\t" "jz end48 \n\t" -// preload "movl tqmask, %%edx \n\t" +// preload "movl mask, %%edx \n\t" "sall $24, %%edx \n\t" // make low byte, high byte "secondloop48: \n\t" @@ -1370,9 +1370,9 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) : "3" (srcptr), // esi // input regs "4" (dstptr), // edi "0" (diff), // eax -// was (untqmask) "b" RESERVED // ebx // Global Offset Table idx +// was (unmask) "b" RESERVED // ebx // Global Offset Table idx "2" (len), // ecx - "1" (tqmask) // edx + "1" (mask) // edx #if 0 /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */ : "%mm0", "%mm1", "%mm2", "%mm3" // clobber list @@ -1468,7 +1468,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) } } /* end switch (png_ptr->row_info.pixel_depth) */ - } /* end if (non-trivial tqmask) */ + } /* end if (non-trivial mask) */ } /* end png_combine_row() */ @@ -2802,7 +2802,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, "movl %%edi, _dif \n\t" // take start of row "addl %%ebx, _dif \n\t" // add bpp "addl $0xf, _dif \n\t" // add 7+8 to incr past tqalignment bdry - "andl $0xfffffff8, _dif \n\t" // tqmask to tqalignment boundary + "andl $0xfffffff8, _dif \n\t" // mask to tqalignment boundary "subl %%edi, _dif \n\t" // subtract from start => value ebx at "jz avg_go \n\t" // tqalignment @@ -2901,7 +2901,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, // Avg for each Active // byte // add 2nd active group (Raw(x-bpp)/2) to average with _LBCarry - "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 tqmask to cover + "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 mask to cover // bytes 3-5 "movq %%mm0, %%mm2 \n\t" // mov updated Raws to mm2 "psllq _ShiftBpp, %%mm2 \n\t" // shift data to pos. correctly @@ -2922,7 +2922,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, // byte // add 3rd active group (Raw(x-bpp)/2) to average with _LBCarry - "psllq _ShiftBpp, %%mm6 \n\t" // shift mm6 tqmask to cover last + "psllq _ShiftBpp, %%mm6 \n\t" // shift mm6 mask to cover last // two // bytes "movq %%mm0, %%mm2 \n\t" // mov updated Raws to mm2 @@ -2991,7 +2991,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, // preload "movl prev_row, %%esi \n\t" // esi: Prior(x) "movq %%mm7, %%mm6 \n\t" "movq _LBCarryMask, %%mm5 \n\t" - "psllq _ShiftBpp, %%mm6 \n\t" // create tqmask for 2nd active + "psllq _ShiftBpp, %%mm6 \n\t" // create mask for 2nd active // group // prime the pump: load the first Raw(x-bpp) data set @@ -3118,7 +3118,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, // for each Active byte // add 2nd active group (Raw(x-bpp)/2) to average with _LBCarry - "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 tqmask to cover + "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 mask to cover // bytes 2 & 3 "movq %%mm0, %%mm2 \n\t" // mov updated Raws to mm2 "psllq _ShiftBpp, %%mm2 \n\t" // shift data to pos. correctly @@ -3139,7 +3139,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, // Avg for each Active byte // add 3rd active group (Raw(x-bpp)/2) to average with _LBCarry - "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 tqmask to cover + "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 mask to cover // bytes 4 & 5 "movq %%mm0, %%mm2 \n\t" // mov updated Raws to mm2 "psllq _ShiftBpp, %%mm2 \n\t" // shift data to pos. correctly @@ -3159,7 +3159,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, // Avg for each Active byte // add 4th active group (Raw(x-bpp)/2) to average with _LBCarry - "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 tqmask to cover + "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 mask to cover // bytes 6 & 7 "movq %%mm0, %%mm2 \n\t" // mov updated Raws to mm2 "psllq _ShiftBpp, %%mm2 \n\t" // shift data to pos. correctly @@ -3467,7 +3467,7 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "xorl %%ecx, %%ecx \n\t" "addl $0xf, _dif \n\t" // add 7 + 8 to incr past tqalignment // boundary - "andl $0xfffffff8, _dif \n\t" // tqmask to tqalignment boundary + "andl $0xfffffff8, _dif \n\t" // mask to tqalignment boundary "subl %%edi, _dif \n\t" // subtract from start ==> value ebx // at tqalignment "jz paeth_go \n\t" @@ -3609,16 +3609,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -3627,9 +3627,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -3670,8 +3670,8 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm5, %%mm0 \n\t" // create tqmask pbv bytes < 0 - "pcmpgtw %%mm4, %%mm7 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm5, %%mm0 \n\t" // create mask pbv bytes < 0 + "pcmpgtw %%mm4, %%mm7 \n\t" // create mask pav bytes < 0 "pand %%mm5, %%mm0 \n\t" // only pbv bytes < 0 in mm0 "pand %%mm4, %%mm7 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm0, %%mm5 \n\t" @@ -3679,7 +3679,7 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm5 \n\t" "psubw %%mm7, %%mm4 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm0, %%mm6 \n\t" // test pa <= pb @@ -3687,9 +3687,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -3733,8 +3733,8 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" @@ -3742,7 +3742,7 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm0, %%mm6 \n\t" // test pa <= pb @@ -3750,9 +3750,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" "pandn %%mm1, %%mm0 \n\t" "pandn %%mm4, %%mm7 \n\t" @@ -3833,16 +3833,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -3851,9 +3851,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -3897,16 +3897,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -3915,9 +3915,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -3986,16 +3986,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -4004,9 +4004,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -4042,16 +4042,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -4060,9 +4060,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -4131,16 +4131,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -4149,9 +4149,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -4188,16 +4188,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -4206,9 +4206,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -4504,7 +4504,7 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "addl $0xf, _dif \n\t" // add 7 + 8 to incr past // tqalignment boundary "xorl %%ecx, %%ecx \n\t" - "andl $0xfffffff8, _dif \n\t" // tqmask to tqalignment boundary + "andl $0xfffffff8, _dif \n\t" // mask to tqalignment boundary "subl %%edi, _dif \n\t" // subtract from start ==> value "jz sub_go \n\t" // ecx at tqalignment @@ -4556,13 +4556,13 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "addl %%eax, %%edi \n\t" // rp = row + bpp "movq %%mm7, %%mm6 \n\t" "movl _dif, %%edx \n\t" - "psllq _ShiftBpp, %%mm6 \n\t" // move tqmask in mm6 to cover + "psllq _ShiftBpp, %%mm6 \n\t" // move mask in mm6 to cover // 3rd active byte group // prime the pump: load the first Raw(x-bpp) data set "movq -8(%%edi,%%edx,), %%mm1 \n\t" "sub_3lp: \n\t" // shift data for adding first - "psrlq _ShiftRem, %%mm1 \n\t" // bpp bytes (no need for tqmask; + "psrlq _ShiftRem, %%mm1 \n\t" // bpp bytes (no need for mask; // shift clears inactive bytes) // add 1st active group "movq (%%edi,%%edx,), %%mm0 \n\t" @@ -4571,13 +4571,13 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) // add 2nd active group "movq %%mm0, %%mm1 \n\t" // mov updated Raws to mm1 "psllq _ShiftBpp, %%mm1 \n\t" // shift data to pos. correctly - "pand %%mm7, %%mm1 \n\t" // tqmask to use 2nd active group + "pand %%mm7, %%mm1 \n\t" // mask to use 2nd active group "paddb %%mm1, %%mm0 \n\t" // add 3rd active group "movq %%mm0, %%mm1 \n\t" // mov updated Raws to mm1 "psllq _ShiftBpp, %%mm1 \n\t" // shift data to pos. correctly - "pand %%mm6, %%mm1 \n\t" // tqmask to use 3rd active group + "pand %%mm6, %%mm1 \n\t" // mask to use 3rd active group "addl $8, %%edx \n\t" "paddb %%mm1, %%mm0 \n\t" @@ -4651,7 +4651,7 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "movq -8(%%edi,%%edx,), %%mm1 \n\t" "sub_4lp: \n\t" // shift data for adding first - "psrlq _ShiftRem, %%mm1 \n\t" // bpp bytes (no need for tqmask; + "psrlq _ShiftRem, %%mm1 \n\t" // bpp bytes (no need for mask; // shift clears inactive bytes) "movq (%%edi,%%edx,), %%mm0 \n\t" "paddb %%mm1, %%mm0 \n\t" @@ -4693,19 +4693,19 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "movl _dif, %%edx \n\t" "movq %%mm7, %%mm6 \n\t" // preload "movl row, %%edi \n\t" - "psllq _ShiftBpp, %%mm6 \n\t" // move tqmask in mm6 to cover + "psllq _ShiftBpp, %%mm6 \n\t" // move mask in mm6 to cover // 3rd active byte group "movl %%edi, %%esi \n\t" // lp = row "movq %%mm6, %%mm5 \n\t" // preload "movl bpp, %%eax \n\t" "addl %%eax, %%edi \n\t" // rp = row + bpp - "psllq _ShiftBpp, %%mm5 \n\t" // move tqmask in mm5 to cover + "psllq _ShiftBpp, %%mm5 \n\t" // move mask in mm5 to cover // 4th active byte group // prime the pump: load the first Raw(x-bpp) data set "movq -8(%%edi,%%edx,), %%mm1 \n\t" "sub_2lp: \n\t" // shift data for adding first - "psrlq _ShiftRem, %%mm1 \n\t" // bpp bytes (no need for tqmask; + "psrlq _ShiftRem, %%mm1 \n\t" // bpp bytes (no need for mask; // shift clears inactive bytes) // add 1st active group "movq (%%edi,%%edx,), %%mm0 \n\t" @@ -4714,19 +4714,19 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) // add 2nd active group "movq %%mm0, %%mm1 \n\t" // mov updated Raws to mm1 "psllq _ShiftBpp, %%mm1 \n\t" // shift data to pos. correctly - "pand %%mm7, %%mm1 \n\t" // tqmask to use 2nd active group + "pand %%mm7, %%mm1 \n\t" // mask to use 2nd active group "paddb %%mm1, %%mm0 \n\t" // add 3rd active group "movq %%mm0, %%mm1 \n\t" // mov updated Raws to mm1 "psllq _ShiftBpp, %%mm1 \n\t" // shift data to pos. correctly - "pand %%mm6, %%mm1 \n\t" // tqmask to use 3rd active group + "pand %%mm6, %%mm1 \n\t" // mask to use 3rd active group "paddb %%mm1, %%mm0 \n\t" // add 4th active group "movq %%mm0, %%mm1 \n\t" // mov updated Raws to mm1 "psllq _ShiftBpp, %%mm1 \n\t" // shift data to pos. correctly - "pand %%mm5, %%mm1 \n\t" // tqmask to use 4th active group + "pand %%mm5, %%mm1 \n\t" // mask to use 4th active group "addl $8, %%edx \n\t" "paddb %%mm1, %%mm0 \n\t" "cmpl _MMXLength, %%edx \n\t" @@ -5359,7 +5359,7 @@ png_mmx_support(void) "incl %%eax \n\t" // ...increment eax to 1. This pair is // faster than the instruction "mov eax, 1" "cpuid \n\t" // get the CPU identification info again - "andl $0x800000, %%edx \n\t" // tqmask out all bits but MMX bit (23) + "andl $0x800000, %%edx \n\t" // mask out all bits but MMX bit (23) "cmpl $0, %%edx \n\t" // 0 = MMX not supported "jz 0f \n\t" // non-zero = yes, MMX IS supported diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngget.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngget.c index c1b113c98..f7f5c6702 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngget.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngget.c @@ -846,7 +846,7 @@ png_get_asm_flags (png_structp png_ptr) /* this function was added to libpng 1.2.0 and should exist by default */ png_uint_32 PNGAPI -png_get_asm_flagtqmask (int flag_select) +png_get_asm_flagmask (int flag_select) { png_uint_32 settable_asm_flags = 0; @@ -876,7 +876,7 @@ png_get_asm_flagtqmask (int flag_select) /* GRR: could add this: && defined(PNG_MMX_CODE_SUPPORTED) */ /* this function was added to libpng 1.2.0 */ png_uint_32 PNGAPI -png_get_mmx_flagtqmask (int flag_select, int *compilerID) +png_get_mmx_flagmask (int flag_select, int *compilerID) { png_uint_32 settable_mmx_flags = 0; diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c index 167215f9e..f5b52810d 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c @@ -518,7 +518,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette, * are not close reciprocals, otherwise it slows things down slightly, and * also needlessly introduces small errors. * - * We will turn off gamma transformation later if no semitranstqparent entries + * We will turn off gamma transformation later if no semitransparent entries * are present in the tRNS array for palette images. We can't do it here * because we don't necessarily have the tRNS chunk yet. */ @@ -550,9 +550,9 @@ png_set_expand(png_structp png_ptr) /* GRR 19990627: the following three functions currently are identical * to png_set_expand(). However, it is entirely reasonable that someone * might wish to expand an indexed image to RGB but *not* expand a single, - * fully transtqparent palette entry to a full alpha channel--perhaps instead + * fully transparent palette entry to a full alpha channel--perhaps instead * convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace - * the transtqparent color with a particular RGB value, or drop tRNS entirely. + * the transparent color with a particular RGB value, or drop tRNS entirely. * IOW, a future version of the library may make the transformations flag * a bit more fine-grained, with separate bits for each of these three * functions. @@ -1227,12 +1227,12 @@ From Andreas Dilger e-mail to png-implement, 26 March 1998: In most cases, the "simple transparency" should be done prior to doing gray-to-RGB, or you will have to test 3x as many bytes to check if a - pixel is transtqparent. You would also need to make sure that the + pixel is transparent. You would also need to make sure that the transparency information is upgraded to RGB. To summarize, the current flow is: - Gray + simple transparency -> compare 1 or 2 gray bytes and composite - with background "in place" if transtqparent, + with background "in place" if transparent, convert to RGB if necessary - Gray + alpha -> composite with gray background and remove alpha bytes, convert to RGB if necessary @@ -1240,7 +1240,7 @@ From Andreas Dilger e-mail to png-implement, 26 March 1998: To support RGB backgrounds for gray images we need: - Gray + simple transparency -> convert to RGB + simple transparency, compare 3 or 6 bytes and composite with background - "in place" if transtqparent (3x compare/pixel + "in place" if transparent (3x compare/pixel compared to doing composite with gray bkgrnd) - Gray + alpha -> convert to RGB + alpha, composite with background and remove alpha bytes (3x float operations/pixel @@ -1546,13 +1546,13 @@ png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits) png_bytep bp = row; png_uint_32 i; png_uint_32 istop = row_info->rowbytes; - png_byte tqmask = (png_byte)((((int)0xf0 >> shift[0]) & (int)0xf0) | + png_byte mask = (png_byte)((((int)0xf0 >> shift[0]) & (int)0xf0) | (png_byte)((int)0xf >> shift[0])); for (i = 0; i < istop; i++) { *bp >>= shift[0]; - *bp++ &= tqmask; + *bp++ &= mask; } break; } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c index 95df6f274..751b278cc 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c @@ -2237,19 +2237,19 @@ png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name) /* Combines the row recently read in with the existing pixels in the row. This routine takes care of alpha and transparency if requested. This routine also handles the two methods of progressive display - of interlaced images, depending on the tqmask value. - The tqmask value describes which pixels are to be combined with + of interlaced images, depending on the mask value. + The mask value describes which pixels are to be combined with the row. The pattern always repeats every 8 pixels, so just 8 bits are needed. A one indicates the pixel is to be combined, a zero indicates the pixel is to be skipped. This is in addition to any alpha or transparency value associated with the pixel. If - you want all pixels to be combined, pass 0xff (255) in tqmask. */ + you want all pixels to be combined, pass 0xff (255) in mask. */ #ifndef PNG_HAVE_ASSEMBLER_COMBINE_ROW void /* PRIVATE */ -png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) +png_combine_row(png_structp png_ptr, png_bytep row, int mask) { png_debug(1,"in png_combine_row\n"); - if (tqmask == 0xff) + if (mask == 0xff) { png_memcpy(row, png_ptr->row_buf + 1, (png_size_t)((png_ptr->width * @@ -2288,7 +2288,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < row_width; i++) { - if (m & tqmask) + if (m & mask) { int value; @@ -2343,7 +2343,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < row_width; i++) { - if (m & tqmask) + if (m & mask) { value = (*sp >> shift) & 0x03; *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); @@ -2394,7 +2394,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < row_width; i++) { - if (m & tqmask) + if (m & mask) { value = (*sp >> shift) & 0xf; *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); @@ -2428,7 +2428,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < row_width; i++) { - if (m & tqmask) + if (m & mask) { png_memcpy(dp, sp, pixel_bytes); } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngset.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngset.c index 86805b1be..e082798e9 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngset.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngset.c @@ -282,7 +282,7 @@ png_set_IHDR(png_structp png_ptr, png_infop info_ptr, * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and * 2. Libpng did not read a PNG signature (this filter_method is only * used in PNG datastreams that are embedded in MNG datastreams) and - * 3. The application called png_permit_mng_features with a tqmask that + * 3. The application called png_permit_mng_features with a mask that * included PNG_FLAG_MNG_FILTER_64 and * 4. The filter_method is 64 and * 5. The color_type is RGB or RGBA @@ -1097,10 +1097,10 @@ png_set_compression_buffer_size(png_structp png_ptr, png_uint_32 size) } void PNGAPI -png_set_invalid(png_structp png_ptr, png_infop info_ptr, int tqmask) +png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask) { if (png_ptr && info_ptr) - info_ptr->valid &= ~(tqmask); + info_ptr->valid &= ~(mask); } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngvcrd.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngvcrd.c index 53ddb87f0..1221a604c 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngvcrd.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngvcrd.c @@ -71,7 +71,7 @@ png_mmx_support(void) _asm _emit 0x0f //CPUID instruction _asm _emit 0xa2 - and edx, 0x00800000 //tqmask out all bits but mmx bit(24) + and edx, 0x00800000 //mask out all bits but mmx bit(24) cmp edx, 0 // 0 = mmx not supported jz NOT_SUPPORTED // non-zero = Yes, mmx IS supported @@ -94,19 +94,19 @@ NOT_SUPPORTED: /* Combines the row recently read in with the previous row. This routine takes care of alpha and transparency if requested. This routine also handles the two methods of progressive display - of interlaced images, depending on the tqmask value. - The tqmask value describes which pixels are to be combined with + of interlaced images, depending on the mask value. + The mask value describes which pixels are to be combined with the row. The pattern always repeats every 8 pixels, so just 8 bits are needed. A one indicates the pixel is to be combined; a zero indicates the pixel is to be skipped. This is in addition to any alpha or transparency value associated with the pixel. If - you want all pixels to be combined, pass 0xff (255) in tqmask. */ + you want all pixels to be combined, pass 0xff (255) in mask. */ /* Use this routine for x86 platform - uses faster MMX routine if machine supports MMX */ void /* PRIVATE */ -png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) +png_combine_row(png_structp png_ptr, png_bytep row, int mask) { #ifdef PNG_USE_LOCAL_ARRAYS const int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; @@ -120,12 +120,12 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) png_mmx_support(); } - if (tqmask == 0xff) + if (mask == 0xff) { png_memcpy(row, png_ptr->row_buf + 1, (png_size_t)((png_ptr->width * png_ptr->row_info.pixel_depth + 7) >> 3)); } - /* GRR: add "else if (tqmask == 0)" case? + /* GRR: add "else if (mask == 0)" case? * or does png_combine_row() not even get called in that case? */ else { @@ -162,7 +162,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < png_ptr->width; i++) { - if (m & tqmask) + if (m & mask) { int value; @@ -220,7 +220,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < png_ptr->width; i++) { - if (m & tqmask) + if (m & mask) { value = (*sp >> shift) & 0x3; *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); @@ -274,7 +274,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < png_ptr->width; i++) { - if (m & tqmask) + if (m & mask) { value = (*sp >> shift) & 0xf; *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); @@ -303,9 +303,9 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) png_bytep dstptr; png_uint_32 len; int m; - int diff, untqmask; + int diff, unmask; - __int64 tqmask0=0x0102040810204080; + __int64 mask0=0x0102040810204080; if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) /* && mmx_supported */ ) @@ -313,19 +313,19 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) srcptr = png_ptr->row_buf + 1; dstptr = row; m = 0x80; - untqmask = ~tqmask; + unmask = ~mask; len = png_ptr->width &~7; //reduce to multiple of 8 diff = png_ptr->width & 7; //amount lost _asm { - movd mm7, untqmask //load bit pattern + movd mm7, unmask //load bit pattern psubb mm6,mm6 //zero mm6 punpcklbw mm7,mm7 punpcklwd mm7,mm7 punpckldq mm7,mm7 //fill register with 8 masks - movq mm0,tqmask0 + movq mm0,mask0 pand mm0,mm7 //nonzero if keep byte pcmpeqb mm0,mm6 //zeros->1s, v versa @@ -355,7 +355,7 @@ mainloop8end: cmp ecx,0 jz end8 - mov edx,tqmask + mov edx,mask sal edx,24 //make low byte the high byte secondloop8: @@ -404,9 +404,9 @@ end8: png_bytep srcptr; png_bytep dstptr; png_uint_32 len; - int untqmask, diff; - __int64 tqmask1=0x0101020204040808, - tqmask0=0x1010202040408080; + int unmask, diff; + __int64 mask1=0x0101020204040808, + mask0=0x1010202040408080; if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) /* && mmx_supported */ ) @@ -414,19 +414,19 @@ end8: srcptr = png_ptr->row_buf + 1; dstptr = row; - untqmask = ~tqmask; + unmask = ~mask; len = (png_ptr->width)&~7; diff = (png_ptr->width)&7; _asm { - movd mm7, untqmask //load bit pattern + movd mm7, unmask //load bit pattern psubb mm6,mm6 //zero mm6 punpcklbw mm7,mm7 punpcklwd mm7,mm7 punpckldq mm7,mm7 //fill register with 8 masks - movq mm0,tqmask0 - movq mm1,tqmask1 + movq mm0,mask0 + movq mm1,mask1 pand mm0,mm7 pand mm1,mm7 @@ -468,7 +468,7 @@ mainloop16end: cmp ecx,0 jz end16 - mov edx,tqmask + mov edx,mask sal edx,24 //make low byte the high byte secondloop16: sal edx,1 //move high bit to CF @@ -516,16 +516,16 @@ end16: png_bytep srcptr; png_bytep dstptr; png_uint_32 len; - int untqmask, diff; + int unmask, diff; - __int64 tqmask2=0x0101010202020404, //24bpp - tqmask1=0x0408080810101020, - tqmask0=0x2020404040808080; + __int64 mask2=0x0101010202020404, //24bpp + mask1=0x0408080810101020, + mask0=0x2020404040808080; srcptr = png_ptr->row_buf + 1; dstptr = row; - untqmask = ~tqmask; + unmask = ~mask; len = (png_ptr->width)&~7; diff = (png_ptr->width)&7; @@ -534,15 +534,15 @@ end16: { _asm { - movd mm7, untqmask //load bit pattern + movd mm7, unmask //load bit pattern psubb mm6,mm6 //zero mm6 punpcklbw mm7,mm7 punpcklwd mm7,mm7 punpckldq mm7,mm7 //fill register with 8 masks - movq mm0,tqmask0 - movq mm1,tqmask1 - movq mm2,tqmask2 + movq mm0,mask0 + movq mm1,mask1 + movq mm2,mask2 pand mm0,mm7 pand mm1,mm7 @@ -595,7 +595,7 @@ mainloop24end: cmp ecx,0 jz end24 - mov edx,tqmask + mov edx,mask sal edx,24 //make low byte the high byte secondloop24: sal edx,1 //move high bit to CF @@ -647,17 +647,17 @@ end24: png_bytep srcptr; png_bytep dstptr; png_uint_32 len; - int untqmask, diff; + int unmask, diff; - __int64 tqmask3=0x0101010102020202, //32bpp - tqmask2=0x0404040408080808, - tqmask1=0x1010101020202020, - tqmask0=0x4040404080808080; + __int64 mask3=0x0101010102020202, //32bpp + mask2=0x0404040408080808, + mask1=0x1010101020202020, + mask0=0x4040404080808080; srcptr = png_ptr->row_buf + 1; dstptr = row; - untqmask = ~tqmask; + unmask = ~mask; len = (png_ptr->width)&~7; diff = (png_ptr->width)&7; @@ -666,16 +666,16 @@ end24: { _asm { - movd mm7, untqmask //load bit pattern + movd mm7, unmask //load bit pattern psubb mm6,mm6 //zero mm6 punpcklbw mm7,mm7 punpcklwd mm7,mm7 punpckldq mm7,mm7 //fill register with 8 masks - movq mm0,tqmask0 - movq mm1,tqmask1 - movq mm2,tqmask2 - movq mm3,tqmask3 + movq mm0,mask0 + movq mm1,mask1 + movq mm2,mask2 + movq mm3,mask3 pand mm0,mm7 pand mm1,mm7 @@ -738,7 +738,7 @@ mainloop32end: cmp ecx,0 jz end32 - mov edx,tqmask + mov edx,mask sal edx,24 //make low byte the high byte secondloop32: sal edx,1 //move high bit to CF @@ -787,14 +787,14 @@ end32: png_bytep srcptr; png_bytep dstptr; png_uint_32 len; - int untqmask, diff; + int unmask, diff; - __int64 tqmask5=0x0101010101010202, - tqmask4=0x0202020204040404, - tqmask3=0x0404080808080808, - tqmask2=0x1010101010102020, - tqmask1=0x2020202040404040, - tqmask0=0x4040808080808080; + __int64 mask5=0x0101010101010202, + mask4=0x0202020204040404, + mask3=0x0404080808080808, + mask2=0x1010101010102020, + mask1=0x2020202040404040, + mask0=0x4040808080808080; if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) /* && mmx_supported */ ) @@ -802,23 +802,23 @@ end32: srcptr = png_ptr->row_buf + 1; dstptr = row; - untqmask = ~tqmask; + unmask = ~mask; len = (png_ptr->width)&~7; diff = (png_ptr->width)&7; _asm { - movd mm7, untqmask //load bit pattern + movd mm7, unmask //load bit pattern psubb mm6,mm6 //zero mm6 punpcklbw mm7,mm7 punpcklwd mm7,mm7 punpckldq mm7,mm7 //fill register with 8 masks - movq mm0,tqmask0 - movq mm1,tqmask1 - movq mm2,tqmask2 - movq mm3,tqmask3 - movq mm4,tqmask4 - movq mm5,tqmask5 + movq mm0,mask0 + movq mm1,mask1 + movq mm2,mask2 + movq mm3,mask3 + movq mm4,mask4 + movq mm5,mask5 pand mm0,mm7 pand mm1,mm7 @@ -895,7 +895,7 @@ mainloop48end: cmp ecx,0 jz end48 - mov edx,tqmask + mov edx,mask sal edx,24 //make low byte the high byte secondloop48: @@ -966,7 +966,7 @@ end48: break; } } /* end switch (png_ptr->row_info.pixel_depth) */ - } /* end if (non-trivial tqmask) */ + } /* end if (non-trivial mask) */ } /* end png_combine_row() */ @@ -1931,7 +1931,7 @@ davgrlp: mov diff, edi // take start of row add diff, ebx // add bpp add diff, 0xf // add 7 + 8 to incr past tqalignment boundary - and diff, 0xfffffff8 // tqmask to tqalignment boundary + and diff, 0xfffffff8 // mask to tqalignment boundary sub diff, edi // subtract from start ==> value ebx at tqalignment jz davggo // fix tqalignment @@ -1999,7 +1999,7 @@ davg3lp: paddb mm0, mm2 // add (Raw/2) + LBCarrys to Avg for each Active // byte // Add 2nd active group (Raw(x-bpp)/2) to Average with LBCarry - psllq mm6, ShiftBpp // shift the mm6 tqmask to cover bytes 3-5 + psllq mm6, ShiftBpp // shift the mm6 mask to cover bytes 3-5 movq mm2, mm0 // mov updated Raws to mm2 psllq mm2, ShiftBpp // shift data to position correctly movq mm1, mm3 // now use mm1 for getting LBCarrys @@ -2013,7 +2013,7 @@ davg3lp: // byte // Add 3rd active group (Raw(x-bpp)/2) to Average with LBCarry - psllq mm6, ShiftBpp // shift the mm6 tqmask to cover the last two + psllq mm6, ShiftBpp // shift the mm6 mask to cover the last two // bytes movq mm2, mm0 // mov updated Raws to mm2 psllq mm2, ShiftBpp // shift data to position correctly @@ -2060,7 +2060,7 @@ davg3lp: mov esi, prev_row // esi ==> Prior(x) movq mm6, mm7 movq mm5, LBCarryMask - psllq mm6, ShiftBpp // Create tqmask for 2nd active group + psllq mm6, ShiftBpp // Create mask for 2nd active group // PRIME the pump (load the first Raw(x-bpp) data set movq mm2, [edi + ebx - 8] // Load previous aligned 8 bytes // (we correct position in loop below) @@ -2144,7 +2144,7 @@ davg2lp: pand mm2, mm6 // Leave only Active Group 1 bytes to add to Avg paddb mm0, mm2 // add (Raw/2) + LBCarrys to Avg for each Active byte // Add 2nd active group (Raw(x-bpp)/2) to Average with LBCarry - psllq mm6, ShiftBpp // shift the mm6 tqmask to cover bytes 2 & 3 + psllq mm6, ShiftBpp // shift the mm6 mask to cover bytes 2 & 3 movq mm2, mm0 // mov updated Raws to mm2 psllq mm2, ShiftBpp // shift data to position correctly movq mm1, mm3 // now use mm1 for getting LBCarrys @@ -2157,7 +2157,7 @@ davg2lp: paddb mm0, mm2 // add (Raw/2) + LBCarrys to Avg for each Active byte // Add rdd active group (Raw(x-bpp)/2) to Average with LBCarry - psllq mm6, ShiftBpp // shift the mm6 tqmask to cover bytes 4 & 5 + psllq mm6, ShiftBpp // shift the mm6 mask to cover bytes 4 & 5 movq mm2, mm0 // mov updated Raws to mm2 psllq mm2, ShiftBpp // shift data to position correctly // Data only needs to be shifted once here to @@ -2172,7 +2172,7 @@ davg2lp: paddb mm0, mm2 // add (Raw/2) + LBCarrys to Avg for each Active byte // Add 4th active group (Raw(x-bpp)/2) to Average with LBCarry - psllq mm6, ShiftBpp // shift the mm6 tqmask to cover bytes 6 & 7 + psllq mm6, ShiftBpp // shift the mm6 mask to cover bytes 6 & 7 movq mm2, mm0 // mov updated Raws to mm2 psllq mm2, ShiftBpp // shift data to position correctly // Data only needs to be shifted once here to @@ -2365,7 +2365,7 @@ dpthrlp: add diff, ebx // add bpp xor ecx, ecx add diff, 0xf // add 7 + 8 to incr past tqalignment boundary - and diff, 0xfffffff8 // tqmask to tqalignment boundary + and diff, 0xfffffff8 // mask to tqalignment boundary sub diff, edi // subtract from start ==> value ebx at tqalignment jz dpthgo // fix tqalignment @@ -2478,16 +2478,16 @@ dpth3lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -2496,9 +2496,9 @@ dpth3lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -2538,8 +2538,8 @@ dpth3lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm5 // Create tqmask pbv bytes < 0 - pcmpgtw mm7, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm5 // Create mask pbv bytes < 0 + pcmpgtw mm7, mm4 // Create mask pav bytes < 0 pand mm0, mm5 // Only pbv bytes < 0 in mm0 pand mm7, mm4 // Only pav bytes < 0 in mm7 psubw mm5, mm0 @@ -2547,7 +2547,7 @@ dpth3lp: psubw mm5, mm0 psubw mm4, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm6, mm0 // test pa <= pb @@ -2555,9 +2555,9 @@ dpth3lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -2600,8 +2600,8 @@ dpth3lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 pand mm0, mm4 // Only pav bytes < 0 in mm7 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 @@ -2609,7 +2609,7 @@ dpth3lp: psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm6, mm0 // test pa <= pb @@ -2617,9 +2617,9 @@ dpth3lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 pandn mm0, mm1 pandn mm7, mm4 @@ -2686,16 +2686,16 @@ dpth6lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -2704,9 +2704,9 @@ dpth6lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -2750,16 +2750,16 @@ dpth6lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -2768,9 +2768,9 @@ dpth6lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -2826,16 +2826,16 @@ dpth4lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -2844,9 +2844,9 @@ dpth4lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -2882,16 +2882,16 @@ dpth4lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -2900,9 +2900,9 @@ dpth4lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -2957,16 +2957,16 @@ dpth8lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -2975,9 +2975,9 @@ dpth8lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -3014,16 +3014,16 @@ dpth8lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -3032,9 +3032,9 @@ dpth8lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -3245,7 +3245,7 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) add diff, 0xf // add 7 + 8 to incr past // tqalignment boundary xor ebx, ebx - and diff, 0xfffffff8 // tqmask to tqalignment boundary + and diff, 0xfffffff8 // mask to tqalignment boundary sub diff, edi // subtract from start ==> value // ebx at tqalignment jz dsubgo @@ -3280,25 +3280,25 @@ dsubgo: add edi, bpp // rp = row + bpp movq mm6, mm7 mov ebx, diff - psllq mm6, ShiftBpp // Move tqmask in mm6 to cover 3rd active + psllq mm6, ShiftBpp // Move mask in mm6 to cover 3rd active // byte group // PRIME the pump (load the first Raw(x-bpp) data set movq mm1, [edi+ebx-8] dsub3lp: psrlq mm1, ShiftRem // Shift data for adding 1st bpp bytes - // no need for tqmask; shift clears inactive bytes + // no need for mask; shift clears inactive bytes // Add 1st active group movq mm0, [edi+ebx] paddb mm0, mm1 // Add 2nd active group movq mm1, mm0 // mov updated Raws to mm1 psllq mm1, ShiftBpp // shift data to position correctly - pand mm1, mm7 // tqmask to use only 2nd active group + pand mm1, mm7 // mask to use only 2nd active group paddb mm0, mm1 // Add 3rd active group movq mm1, mm0 // mov updated Raws to mm1 psllq mm1, ShiftBpp // shift data to position correctly - pand mm1, mm6 // tqmask to use only 3rd active group + pand mm1, mm6 // mask to use only 3rd active group add ebx, 8 paddb mm0, mm1 cmp ebx, MMXLength @@ -3359,13 +3359,13 @@ dsub1end: movq mm1, [edi+ebx-8] dsub4lp: psrlq mm1, ShiftRem // Shift data for adding 1st bpp bytes - // no need for tqmask; shift clears inactive bytes + // no need for mask; shift clears inactive bytes movq mm0, [edi+ebx] paddb mm0, mm1 // Add 2nd active group movq mm1, mm0 // mov updated Raws to mm1 psllq mm1, ShiftBpp // shift data to position correctly - // there is no need for any tqmask + // there is no need for any mask // since shift clears inactive bits/bytes add ebx, 8 paddb mm0, mm1 @@ -3387,36 +3387,36 @@ dsub4lp: mov ebx, diff movq mm6, mm7 mov edi, row - psllq mm6, ShiftBpp // Move tqmask in mm6 to cover 3rd active + psllq mm6, ShiftBpp // Move mask in mm6 to cover 3rd active // byte group mov esi, edi // lp = row movq mm5, mm6 add edi, bpp // rp = row + bpp - psllq mm5, ShiftBpp // Move tqmask in mm5 to cover 4th active + psllq mm5, ShiftBpp // Move mask in mm5 to cover 4th active // byte group // PRIME the pump (load the first Raw(x-bpp) data set movq mm1, [edi+ebx-8] dsub2lp: // Add 1st active group psrlq mm1, ShiftRem // Shift data for adding 1st bpp bytes - // no need for tqmask; shift clears inactive + // no need for mask; shift clears inactive // bytes movq mm0, [edi+ebx] paddb mm0, mm1 // Add 2nd active group movq mm1, mm0 // mov updated Raws to mm1 psllq mm1, ShiftBpp // shift data to position correctly - pand mm1, mm7 // tqmask to use only 2nd active group + pand mm1, mm7 // mask to use only 2nd active group paddb mm0, mm1 // Add 3rd active group movq mm1, mm0 // mov updated Raws to mm1 psllq mm1, ShiftBpp // shift data to position correctly - pand mm1, mm6 // tqmask to use only 3rd active group + pand mm1, mm6 // mask to use only 3rd active group paddb mm0, mm1 // Add 4th active group movq mm1, mm0 // mov updated Raws to mm1 psllq mm1, ShiftBpp // shift data to position correctly - pand mm1, mm5 // tqmask to use only 4th active group + pand mm1, mm5 // mask to use only 4th active group add ebx, 8 paddb mm0, mm1 cmp ebx, MMXLength diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c index a8a9365a9..eb84b9930 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c @@ -866,7 +866,7 @@ png_write_row(png_structp png_ptr, png_bytep row) * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and * 2. Libpng did not write a PNG signature (this filter_method is only * used in PNG datastreams that are embedded in MNG datastreams) and - * 3. The application called png_permit_mng_features with a tqmask that + * 3. The application called png_permit_mng_features with a mask that * included PNG_FLAG_MNG_FILTER_64 and * 4. The filter_method is 64 and * 5. The color_type is RGB or RGBA diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwtran.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwtran.c index 582c10d51..c28da116b 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwtran.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwtran.c @@ -98,31 +98,31 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth) case 1: { png_bytep sp, dp; - int tqmask, v; + int mask, v; png_uint_32 i; png_uint_32 row_width = row_info->width; sp = row; dp = row; - tqmask = 0x80; + mask = 0x80; v = 0; for (i = 0; i < row_width; i++) { if (*sp != 0) - v |= tqmask; + v |= mask; sp++; - if (tqmask > 1) - tqmask >>= 1; + if (mask > 1) + mask >>= 1; else { - tqmask = 0x80; + mask = 0x80; *dp = (png_byte)v; dp++; v = 0; } } - if (tqmask != 0x80) + if (mask != 0x80) *dp = (png_byte)v; break; } @@ -253,15 +253,15 @@ png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth) { png_bytep bp = row; png_uint_32 i; - png_byte tqmask; + png_byte mask; png_uint_32 row_bytes = row_info->rowbytes; if (bit_depth->gray == 1 && row_info->bit_depth == 2) - tqmask = 0x55; + mask = 0x55; else if (row_info->bit_depth == 4 && bit_depth->gray == 3) - tqmask = 0x11; + mask = 0x11; else - tqmask = 0xff; + mask = 0xff; for (i = 0; i < row_bytes; i++, bp++) { @@ -275,7 +275,7 @@ png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth) if (j > 0) *bp |= (png_byte)((v << j) & 0xff); else - *bp |= (png_byte)((v >> (-j)) & tqmask); + *bp |= (png_byte)((v >> (-j)) & mask); } } } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c index edcf82863..d640179a7 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c @@ -427,7 +427,7 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height, * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and * 2. Libpng did not write a PNG signature (this filter_method is only * used in PNG datastreams that are embedded in MNG datastreams) and - * 3. The application called png_permit_mng_features with a tqmask that + * 3. The application called png_permit_mng_features with a mask that * included PNG_FLAG_MNG_FILTER_64 and * 4. The filter_method is 64 and * 5. The color_type is RGB or RGBA @@ -1007,7 +1007,7 @@ png_write_tRNS(png_structp png_ptr, png_bytep trans, png_color_16p tran, { if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette) { - png_warning(png_ptr,"Invalid number of transtqparent colors specified"); + png_warning(png_ptr,"Invalid number of transparent colors specified"); return; } /* write the chunk out as it is */ diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/png32ms.def b/experimental/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/png32ms.def index ae6abdda5..c99537143 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/png32ms.def +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/png32ms.def @@ -202,8 +202,8 @@ EXPORTS png_permit_mng_features @184 ; MMX support png_mmx_support @185 - png_get_mmx_flagtqmask @186 - png_get_asm_flagtqmask @187 + png_get_mmx_flagmask @186 + png_get_asm_flagmask @187 png_get_asm_flags @188 png_get_mmx_bitdepth_threshold @189 png_get_mmx_rowbytes_threshold @190 diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngdef.pas b/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngdef.pas index 2ac50c872..6e2068317 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngdef.pas +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngdef.pas @@ -513,7 +513,7 @@ procedure png_set_hIST(png_ptr: png_structp; info_ptr: png_infop; function png_set_interlace_handling(png_ptr: png_structp): int; stdcall; procedure png_set_invalid(png_ptr: png_structp; info_ptr:png_infop; - tqmask: int); + mask: int); stdcall; procedure png_set_invert_alpha(png_ptr: png_structp); stdcall; diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngos2.def b/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngos2.def index 8d3c68cf5..3c4a3c8d9 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngos2.def +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngos2.def @@ -188,8 +188,8 @@ EXPORTS png_mmx_support png_permit_empty_plte png_permit_mng_features - png_get_mmx_flagtqmask - png_get_asm_flagtqmask + png_get_mmx_flagmask + png_get_asm_flagmask png_get_asm_flags png_get_mmx_bitdepth_threshold png_get_mmx_rowbytes_threshold diff --git a/experimental/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c b/experimental/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c index a01ca6453..702e29b96 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c @@ -1088,7 +1088,7 @@ { FT_Error error; FT_UShort class, new_class, index; - FT_UShort byte, bits, tqmask; + FT_UShort byte, bits, mask; FT_UShort array_index, glyph_index, count; TTO_ClassRangeRecord* gcrr; @@ -1157,9 +1157,9 @@ if ( !class ) { bits = new_class << ( 16 - ( glyph_index % 4 + 1 ) * 4 ); - tqmask = ~( 0x000F << ( 16 - ( glyph_index % 4 + 1 ) * 4 ) ); + mask = ~( 0x000F << ( 16 - ( glyph_index % 4 + 1 ) * 4 ) ); - ngc[array_index][glyph_index / 4] &= tqmask; + ngc[array_index][glyph_index / 4] &= mask; ngc[array_index][glyph_index / 4] |= bits; } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c b/experimental/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c index fbf60b9e7..47d015c7e 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c @@ -229,7 +229,7 @@ /* There is a subtle difference in the specs between a `table' and a `record' -- offsets for tqdevice tables in ValueRecords are taken from - the tqparent table and not the tqparent record. */ + the parent table and not the parent record. */ static FT_Error Load_ValueRecord( TTO_ValueRecord* vr, FT_UShort format, diff --git a/experimental/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.c b/experimental/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.c index f45e778d3..75f66be5f 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.c @@ -1479,37 +1479,37 @@ | | byte 1 byte 2 - 00: (byte >> 14) & tqmask - 11: (byte >> 12) & tqmask + 00: (byte >> 14) & mask + 11: (byte >> 12) & mask ... - tqmask = 0x0003 + mask = 0x0003 | | format = 2: 0000111122223333|4444555566667777|... | | byte 1 byte 2 - 0000: (byte >> 12) & tqmask - 1111: (byte >> 8) & tqmask + 0000: (byte >> 12) & mask + 1111: (byte >> 8) & mask ... - tqmask = 0x000F + mask = 0x000F | | format = 3: 0000000011111111|2222222233333333|... | | byte 1 byte 2 - 00000000: (byte >> 8) & tqmask - 11111111: (byte >> 0) & tqmask + 00000000: (byte >> 8) & mask + 11111111: (byte >> 0) & mask .... - tqmask = 0x00FF */ + mask = 0x00FF */ FT_Error Get_Device( TTO_Device* d, FT_UShort size, FT_Short* value ) { - FT_UShort byte, bits, tqmask, f, s; + FT_UShort byte, bits, mask, f, s; f = d->DeltaFormat; @@ -1519,14 +1519,14 @@ s = size - d->StartSize; byte = d->DeltaValue[s >> ( 4 - f )]; bits = byte >> ( 16 - ( ( s % ( 1 << ( 4 - f ) ) + 1 ) << f ) ); - tqmask = 0xFFFF >> ( 16 - ( 1 << f ) ); + mask = 0xFFFF >> ( 16 - ( 1 << f ) ); - *value = (FT_Short)( bits & tqmask ); + *value = (FT_Short)( bits & mask ); /* conversion to a signed value */ - if ( *value >= ( ( tqmask + 1 ) >> 1 ) ) - *value -= tqmask + 1; + if ( *value >= ( ( mask + 1 ) >> 1 ) ) + *value -= mask + 1; return TT_Err_Ok; } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/btree.c b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/btree.c index c7143e095..3ff88f6b2 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/btree.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/btree.c @@ -313,9 +313,9 @@ struct FreelistInfo { ** page to hold as many as two more cells than it might otherwise hold. ** The extra two entries in apCell[] are an allowance for this situation. ** -** The pParent field points back to the tqparent page. This allows us to +** The pParent field points back to the parent page. This allows us to ** walk up the BTree from any leaf to the root. Care must be taken to -** unref() the tqparent page pointer when this page is no longer referenced. +** unref() the parent page pointer when this page is no longer referenced. ** The pageDestructor() routine handles that chore. */ struct MemPage { @@ -326,7 +326,7 @@ struct MemPage { u8 isInit; /* True if auxiliary data is initialized */ u8 idxShift; /* True if apCell[] indices have changed */ u8 isOverfull; /* Some apCell[] points outside u.aDisk[] */ - MemPage *pParent; /* The tqparent of this page. NULL for root */ + MemPage *pParent; /* The parent of this page. NULL for root */ int idxParent; /* Index in pParent->apCell[] of this node */ int nFree; /* Number of free bytes in u.aDisk[] */ int nCell; /* Number of entries on this page */ @@ -567,8 +567,8 @@ static void freeSpace(Btree *pBt, MemPage *pPage, int start, int size){ ** Initialize the auxiliary information for a disk block. ** ** The pParent parameter must be a pointer to the MemPage which -** is the tqparent of the page being initialized. The root of the -** BTree (usually page 2) has no tqparent and so for that page, +** is the parent of the page being initialized. The root of the +** BTree (usually page 2) has no parent and so for that page, ** pParent==NULL. ** ** Return STQLITE_OK on success. If we see that the page does @@ -1409,7 +1409,7 @@ static int moveToChild(BtCursor *pCur, int newPgno){ } /* -** Move the cursor up to the tqparent page. +** Move the cursor up to the parent page. ** ** pCur->idx is set to the cell index that contains the pointer ** to the page we are coming from. If we are coming from the @@ -1446,7 +1446,7 @@ static void moveToParent(BtCursor *pCur){ }else{ /* The MemPage.idxShift flag indicates that cell indices might have ** changed since idxParent was set and hence idxParent might be out - ** of date. So recompute the tqparent cell index by scanning all cells + ** of date. So recompute the parent cell index by scanning all cells ** and locating the one that points to the child we just came from. */ int i; @@ -1993,9 +1993,9 @@ static void reparentPage(Pager *pPager, Pgno pgno, MemPage *pNewParent,int idx){ } /* -** Retqparent all tqchildren of the given page to be the given page. +** Reparent all tqchildren of the given page to be the given page. ** In other words, for every child of pPage, invoke reparentPage() -** to make sure that each child knows that pPage is its tqparent. +** to make sure that each child knows that pPage is its parent. ** ** This routine gets called after you memcpy() one page into ** another. @@ -2136,7 +2136,7 @@ static void copyPage(MemPage *pTo, MemPage *pFrom){ ** of pPage so that all pages have about the same amount of free space. ** Usually one sibling on either side of pPage is used in the balancing, ** though both siblings might come from one side if pPage is the first -** or last child of its tqparent. If pPage has fewer than two siblings +** or last child of its parent. If pPage has fewer than two siblings ** (something which can only happen if pPage is the root page or a ** child of root) then all available siblings participate in the balancing. ** @@ -2163,16 +2163,16 @@ static void copyPage(MemPage *pTo, MemPage *pFrom){ ** if the page is overfull. Part of the job of this routine is to ** make sure all Cells for pPage once again fit in pPage->u.aDisk[]. ** -** In the course of balancing the siblings of pPage, the tqparent of pPage +** In the course of balancing the siblings of pPage, the parent of pPage ** might become overfull or underfull. If that happens, then this routine -** is called recursively on the tqparent. +** is called recursively on the parent. ** ** If this routine fails for any reason, it might leave the database ** in a corrupted state. So if this routine fails, the database should ** be rolled back. */ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){ - MemPage *pParent; /* The tqparent of pPage */ + MemPage *pParent; /* The parent of pPage */ int nCell; /* Number of cells in apCell[] */ int nOld; /* Number of pages in apOld[] */ int nNew; /* Number of pages in apNew[] */ @@ -2210,8 +2210,8 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){ } /* - ** Find the tqparent of the page to be balanceed. - ** If there is no tqparent, it means this page is the root page and + ** Find the parent of the page to be balanceed. + ** If there is no parent, it means this page is the root page and ** special rules apply. */ pParent = pPage->pParent; @@ -2286,7 +2286,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){ assert( pParent->isInit ); /* - ** Find the Cell in the tqparent page whose h.leftChild points back + ** Find the Cell in the parent page whose h.leftChild points back ** to pPage. The "idx" variable is the index of that cell. If pPage ** is the rightmost child of pParent then set idx to pParent->nCell */ @@ -2542,7 +2542,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){ } /* - ** Retqparent tqchildren of all cells. + ** Reparent tqchildren of all cells. */ for(i=0; i<nNew; i++){ reparentChildPages(pBt, apNew[i]); @@ -2550,7 +2550,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){ reparentChildPages(pBt, pParent); /* - ** balance the tqparent page. + ** balance the parent page. */ rc = balance(pBt, pParent, pCur); diff --git a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/btree_rb.c b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/btree_rb.c index fd81df24a..e952b7ae1 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/btree_rb.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/btree_rb.c @@ -123,7 +123,7 @@ struct BtRbNode { int nData; void *pData; u8 isBlack; /* true for a black node, 0 for a red node */ - BtRbNode *pParent; /* Nodes tqparent node, NULL for the tree head */ + BtRbNode *pParent; /* Nodes parent node, NULL for the tree head */ BtRbNode *pLeft; /* Nodes left child, or NULL */ BtRbNode *pRight; /* Nodes right child, or NULL */ @@ -329,7 +329,7 @@ static void check_redblack_tree(BtRbTree * tree, char ** msg) { BtRbNode *pNode; - /* 0 -> came from tqparent + /* 0 -> came from parent * 1 -> came from left * 2 -> came from right */ int prev_step = 0; @@ -400,34 +400,34 @@ static void check_redblack_tree(BtRbTree * tree, char ** msg) /* * Node pX has just been inserted into pTree (by code in sqliteRbtreeInsert()). - * It is possible that pX is a red node with a red tqparent, which is a violation + * It is possible that pX is a red node with a red parent, which is a violation * of the red-black tree properties. This function performs rotations and * color changes to rebalance the tree */ static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX) { /* In the first iteration of this loop, pX points to the red node just - * inserted in the tree. If the tqparent of pX exists (pX is not the root + * inserted in the tree. If the parent of pX exists (pX is not the root * node) and is red, then the properties of the red-black tree are * violated. * * At the start of any subsequent iterations, pX points to a red node - * with a red tqparent. In all other respects the tree is a legal red-black + * with a red parent. In all other respects the tree is a legal red-black * binary tree. */ while( pX != pTree->pHead && !pX->pParent->isBlack ){ BtRbNode *pUncle; - BtRbNode *pGrandtqparent; + BtRbNode *pGrandparent; - /* Grandtqparent of pX must exist and must be black. */ - pGrandtqparent = pX->pParent->pParent; - assert( pGrandtqparent ); - assert( pGrandtqparent->isBlack ); + /* Grandparent of pX must exist and must be black. */ + pGrandparent = pX->pParent->pParent; + assert( pGrandparent ); + assert( pGrandparent->isBlack ); /* Uncle of pX may or may not exist. */ - if( pX->pParent == pGrandtqparent->pLeft ) - pUncle = pGrandtqparent->pRight; + if( pX->pParent == pGrandparent->pLeft ) + pUncle = pGrandparent->pRight; else - pUncle = pGrandtqparent->pLeft; + pUncle = pGrandparent->pLeft; /* If the uncle of pX exists and is red, we do the following: * | | @@ -438,16 +438,16 @@ static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX) * X(r) X(r) * * BEFORE AFTER - * pX is then set to G. If the tqparent of G is red, then the while loop + * pX is then set to G. If the parent of G is red, then the while loop * will run again. */ if( pUncle && !pUncle->isBlack ){ - pGrandtqparent->isBlack = 0; + pGrandparent->isBlack = 0; pUncle->isBlack = 1; pX->pParent->isBlack = 1; - pX = pGrandtqparent; + pX = pGrandparent; }else{ - if( pX->pParent == pGrandtqparent->pLeft ){ + if( pX->pParent == pGrandparent->pLeft ){ if( pX == pX->pParent->pRight ){ /* If pX is a right-child, do the following transform, essentially * to change pX into a left-child: @@ -474,10 +474,10 @@ static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX) * * BEFORE AFTER */ - assert( pGrandtqparent == pX->pParent->pParent ); - pGrandtqparent->isBlack = 0; + assert( pGrandparent == pX->pParent->pParent ); + pGrandparent->isBlack = 0; pX->pParent->isBlack = 1; - rightRotate( pTree, pGrandtqparent ); + rightRotate( pTree, pGrandparent ); }else{ /* This code is symetric to the illustrated case above. */ @@ -485,10 +485,10 @@ static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX) pX = pX->pParent; rightRotate(pTree, pX); } - assert( pGrandtqparent == pX->pParent->pParent ); - pGrandtqparent->isBlack = 0; + assert( pGrandparent == pX->pParent->pParent ); + pGrandparent->isBlack = 0; pX->pParent->isBlack = 1; - leftRotate( pTree, pGrandtqparent ); + leftRotate( pTree, pGrandparent ); } } } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/func.c b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/func.c index 8d78e127f..529b169a3 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/func.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/func.c @@ -32,10 +32,10 @@ static void minmaxFunc(sqlite_func *context, int argc, const char **argv){ const char *zBest; int i; int (*xCompare)(const char*, const char*); - int tqmask; /* 0 for min() or 0xffffffff for max() */ + int mask; /* 0 for min() or 0xffffffff for max() */ if( argc==0 ) return; - tqmask = (int)sqlite_user_data(context); + mask = (int)sqlite_user_data(context); zBest = argv[0]; if( zBest==0 ) return; if( argv[1][0]=='n' ){ @@ -45,7 +45,7 @@ static void minmaxFunc(sqlite_func *context, int argc, const char **argv){ } for(i=2; i<argc; i+=2){ if( argv[i]==0 ) return; - if( (xCompare(argv[i], zBest)^tqmask)<0 ){ + if( (xCompare(argv[i], zBest)^mask)<0 ){ zBest = argv[i]; } } @@ -514,7 +514,7 @@ struct MinMaxCtx { static void minmaxStep(sqlite_func *context, int argc, const char **argv){ MinMaxCtx *p; int (*xCompare)(const char*, const char*); - int tqmask; /* 0 for min() or 0xffffffff for max() */ + int mask; /* 0 for min() or 0xffffffff for max() */ assert( argc==2 ); if( argv[1][0]=='n' ){ @@ -522,10 +522,10 @@ static void minmaxStep(sqlite_func *context, int argc, const char **argv){ }else{ xCompare = strcmp; } - tqmask = (int)sqlite_user_data(context); + mask = (int)sqlite_user_data(context); p = sqlite_aggregate_context(context, sizeof(*p)); if( p==0 || argc<1 || argv[0]==0 ) return; - if( p->z==0 || (xCompare(argv[0],p->z)^tqmask)<0 ){ + if( p->z==0 || (xCompare(argv[0],p->z)^mask)<0 ){ int len; if( !p->zBuf[0] ){ sqliteFree(p->z); diff --git a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/parse.c b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/parse.c index 7ead48af6..5ecb220af 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/parse.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/parse.c @@ -97,7 +97,7 @@ typedef union { IdList* yy320; ExprList* yy322; int yy372; - struct {int value; int tqmask;} yy407; + struct {int value; int mask;} yy407; int yy441; } YYMINORTYPE; #define YYSTACKDEPTH 100 @@ -2218,33 +2218,33 @@ static void yy_reduce( break; case 62: #line 207 "parse.y" -{ yygotominor.yy372 = (yymsp[-1].minor.yy372 & yymsp[0].minor.yy407.tqmask) | yymsp[0].minor.yy407.value; } +{ yygotominor.yy372 = (yymsp[-1].minor.yy372 & yymsp[0].minor.yy407.mask) | yymsp[0].minor.yy407.value; } #line 2222 "parse.c" break; case 63: #line 209 "parse.y" -{ yygotominor.yy407.value = 0; yygotominor.yy407.tqmask = 0x000000; } +{ yygotominor.yy407.value = 0; yygotominor.yy407.mask = 0x000000; } #line 2227 "parse.c" /* No destructor defined for MATCH */ /* No destructor defined for nm */ break; case 64: #line 210 "parse.y" -{ yygotominor.yy407.value = yymsp[0].minor.yy372; yygotominor.yy407.tqmask = 0x0000ff; } +{ yygotominor.yy407.value = yymsp[0].minor.yy372; yygotominor.yy407.mask = 0x0000ff; } #line 2234 "parse.c" /* No destructor defined for ON */ /* No destructor defined for DELETE */ break; case 65: #line 211 "parse.y" -{ yygotominor.yy407.value = yymsp[0].minor.yy372<<8; yygotominor.yy407.tqmask = 0x00ff00; } +{ yygotominor.yy407.value = yymsp[0].minor.yy372<<8; yygotominor.yy407.mask = 0x00ff00; } #line 2241 "parse.c" /* No destructor defined for ON */ /* No destructor defined for UPDATE */ break; case 66: #line 212 "parse.y" -{ yygotominor.yy407.value = yymsp[0].minor.yy372<<16; yygotominor.yy407.tqmask = 0xff0000; } +{ yygotominor.yy407.value = yymsp[0].minor.yy372<<16; yygotominor.yy407.mask = 0xff0000; } #line 2248 "parse.c" /* No destructor defined for ON */ /* No destructor defined for INSERT */ diff --git a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/pragma.c b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/pragma.c index 28f83904a..653476664 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/pragma.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/pragma.c @@ -91,7 +91,7 @@ static int getTempStore(char *z){ static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){ static const struct { const char *zName; /* Name of the pragma */ - int tqmask; /* Mask for the db->flags value */ + int mask; /* Mask for the db->flags value */ } aPragma[] = { { "vdbe_trace", STQLITE_VdbeTrace }, { "full_column_names", STQLITE_FullColNames }, @@ -108,13 +108,13 @@ static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){ if( strcmp(zLeft,zRight)==0 && (v = sqliteGetVdbe(pParse))!=0 ){ sqliteVdbeOp3(v, OP_ColumnName, 0, 1, aPragma[i].zName, P3_STATIC); sqliteVdbeOp3(v, OP_ColumnName, 1, 0, "boolean", P3_STATIC); - sqliteVdbeCode(v, OP_Integer, (db->flags & aPragma[i].tqmask)!=0, 0, + sqliteVdbeCode(v, OP_Integer, (db->flags & aPragma[i].mask)!=0, 0, OP_Callback, 1, 0, 0); }else if( getBoolean(zRight) ){ - db->flags |= aPragma[i].tqmask; + db->flags |= aPragma[i].mask; }else{ - db->flags &= ~aPragma[i].tqmask; + db->flags &= ~aPragma[i].mask; } return 1; } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/select.c b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/select.c index 21416aad2..d29c4a58c 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/select.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/select.c @@ -1618,7 +1618,7 @@ substExprList(ExprList *pList, int iTable, ExprList *pEList){ */ static int flattenSubquery( Parse *pParse, /* The parsing context */ - Select *p, /* The tqparent or outer SELECT statement */ + Select *p, /* The parent or outer SELECT statement */ int iFrom, /* Index in p->pSrc->a[] of the inner subquery */ int isAgg, /* True if outer SELECT uses aggregate functions */ int subqueryIsAgg /* True if the subquery uses aggregate functions */ @@ -1957,8 +1957,8 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){ ** ** The pParent, parentTab, and *pParentAgg fields are filled in if this ** SELECT is a subquery. This routine may try to combine this SELECT -** with its tqparent to form a single flat query. In so doing, it might -** change the tqparent query from a non-aggregate to an aggregate query. +** with its parent to form a single flat query. In so doing, it might +** change the parent query from a non-aggregate to an aggregate query. ** For that reason, the pParentAgg flag is passed as a pointer, so it ** can be changed. ** @@ -2198,7 +2198,7 @@ int sqliteSelect( isDistinct = p->isDistinct; } - /* Check to see if this is a subquery that can be "flattened" into its tqparent. + /* Check to see if this is a subquery that can be "flattened" into its parent. ** If flattening is a possiblity, do so and return immediately. */ if( pParent && pParentAgg && @@ -2379,7 +2379,7 @@ int sqliteSelect( } /* If this was a subquery, we have now converted the subquery into a - ** temporary table. So delete the subquery structure from the tqparent + ** temporary table. So delete the subquery structure from the parent ** to prevent this subquery from being evaluated again and to force the ** the use of the temporary table. */ diff --git a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/sqliteInt.h b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/sqliteInt.h index aea82717e..3f713cd1c 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/sqliteInt.h +++ b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/sqliteInt.h @@ -1049,9 +1049,9 @@ struct TriggerStep { * * struct TriggerStack has a "pNext" member, to allow linked lists to be * constructed. When coding nested triggers (triggers fired by other triggers) - * each nested trigger stores its tqparent trigger's TriggerStack as the "pNext" + * each nested trigger stores its parent trigger's TriggerStack as the "pNext" * pointer. Once the nested trigger has been coded, the pNext value is restored - * to the pTriggerStack member of the Parse stucture and coding of the tqparent + * to the pTriggerStack member of the Parse stucture and coding of the parent * trigger continues. * * Before a nested trigger is coded, the linked list pointed to by the diff --git a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/where.c b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/where.c index 3ab7eca90..c849d1c4d 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/sqlite/where.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/sqlite/where.c @@ -29,9 +29,9 @@ struct ExprInfo { ** p->pLeft is not the column of any table */ short int idxRight; /* p->pRight is a column in this table number. -1 if ** p->pRight is not the column of any table */ - unsigned prereqLeft; /* Bittqmask of tables referenced by p->pLeft */ - unsigned prereqRight; /* Bittqmask of tables referenced by p->pRight */ - unsigned prereqAll; /* Bittqmask of tables referenced by p */ + unsigned prereqLeft; /* Bitmask of tables referenced by p->pLeft */ + unsigned prereqRight; /* Bitmask of tables referenced by p->pRight */ + unsigned prereqAll; /* Bitmask of tables referenced by p */ }; /* @@ -81,12 +81,12 @@ static int exprSplit(int nSlot, ExprInfo *aSlot, Expr *pExpr){ } /* -** Initialize an expression tqmask set +** Initialize an expression mask set */ #define initMaskSet(P) memset(P, 0, sizeof(*P)) /* -** Return the bittqmask for the given cursor. Assign a new bittqmask +** Return the bitmask for the given cursor. Assign a new bitmask ** if this is the first time the cursor has been seen. */ static int getMask(ExprMaskSet *pMaskSet, int iCursor){ @@ -103,13 +103,13 @@ static int getMask(ExprMaskSet *pMaskSet, int iCursor){ } /* -** Destroy an expression tqmask set +** Destroy an expression mask set */ #define freeMaskSet(P) /* NO-OP */ /* ** This routine walks (recursively) an expression tree and generates -** a bittqmask indicating which tables are used in that expression +** a bitmask indicating which tables are used in that expression ** tree. ** ** In order for this routine to work, the calling function must have @@ -120,24 +120,24 @@ static int getMask(ExprMaskSet *pMaskSet, int iCursor){ ** the VDBE cursor number of the table. */ static int exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){ - unsigned int tqmask = 0; + unsigned int mask = 0; if( p==0 ) return 0; if( p->op==TK_COLUMN ){ return getMask(pMaskSet, p->iTable); } if( p->pRight ){ - tqmask = exprTableUsage(pMaskSet, p->pRight); + mask = exprTableUsage(pMaskSet, p->pRight); } if( p->pLeft ){ - tqmask |= exprTableUsage(pMaskSet, p->pLeft); + mask |= exprTableUsage(pMaskSet, p->pLeft); } if( p->pList ){ int i; for(i=0; i<p->pList->nExpr; i++){ - tqmask |= exprTableUsage(pMaskSet, p->pList->a[i].pExpr); + mask |= exprTableUsage(pMaskSet, p->pList->a[i].pExpr); } } - return tqmask; + return mask; } /* @@ -360,7 +360,7 @@ WhereInfo *sqliteWhereBegin( int nExpr; /* Number of subexpressions in the WHERE clause */ int loopMask; /* One bit set for each outer loop */ int haveKey; /* True if KEY is on the stack */ - ExprMaskSet maskSet; /* The expression tqmask set */ + ExprMaskSet maskSet; /* The expression mask set */ int iDirectEq[32]; /* Term of the form ROWID==X for the N-th table */ int iDirectLt[32]; /* Term of the form ROWID<X or ROWID<=X */ int iDirectGt[32]; /* Term of the form ROWID>X or ROWID>=X */ @@ -417,16 +417,16 @@ WhereInfo *sqliteWhereBegin( if( pParse->trigStack ){ int x; if( (x = pParse->trigStack->newIdx) >= 0 ){ - int tqmask = ~getMask(&maskSet, x); - aExpr[i].prereqRight &= tqmask; - aExpr[i].prereqLeft &= tqmask; - aExpr[i].prereqAll &= tqmask; + int mask = ~getMask(&maskSet, x); + aExpr[i].prereqRight &= mask; + aExpr[i].prereqLeft &= mask; + aExpr[i].prereqAll &= mask; } if( (x = pParse->trigStack->oldIdx) >= 0 ){ - int tqmask = ~getMask(&maskSet, x); - aExpr[i].prereqRight &= tqmask; - aExpr[i].prereqLeft &= tqmask; - aExpr[i].prereqAll &= tqmask; + int mask = ~getMask(&maskSet, x); + aExpr[i].prereqRight &= mask; + aExpr[i].prereqLeft &= mask; + aExpr[i].prereqAll &= mask; } } } @@ -445,13 +445,13 @@ WhereInfo *sqliteWhereBegin( ** ** Actually, if there are more than 32 tables in the join, only the ** first 32 tables are candidates for indices. This is (again) due - ** to the limit of 32 bits in an integer bittqmask. + ** to the limit of 32 bits in an integer bitmask. */ loopMask = 0; for(i=0; i<pTabList->nSrc && i<ARRAYSIZE(iDirectEq); i++){ int j; int iCur = pTabList->a[i].iCursor; /* The cursor for this table */ - int tqmask = getMask(&maskSet, iCur); /* Cursor tqmask for this table */ + int mask = getMask(&maskSet, iCur); /* Cursor mask for this table */ Table *pTab = pTabList->a[i].pTab; Index *pIdx; Index *pBestIdx = 0; @@ -493,7 +493,7 @@ WhereInfo *sqliteWhereBegin( } } if( iDirectEq[i]>=0 ){ - loopMask |= tqmask; + loopMask |= mask; pWInfo->a[i].pIdx = 0; continue; } @@ -620,7 +620,7 @@ WhereInfo *sqliteWhereBegin( pWInfo->a[i].pIdx = pBestIdx; pWInfo->a[i].score = bestScore; pWInfo->a[i].bRev = 0; - loopMask |= tqmask; + loopMask |= mask; if( pBestIdx ){ pWInfo->a[i].iCur = pParse->nTab++; pWInfo->peakNTab = pParse->nTab; diff --git a/experimental/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog b/experimental/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog index 808c5f6b6..d60b6d377 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog +++ b/experimental/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog @@ -383,7 +383,7 @@ Changes in 1.1.0 (24 Feb 98) Changes in 1.0.9 (17 Feb 1998) - added gzputs and gzgets functions - do not clear eof flag in gzseek (Mark Diekhans) -- fix gzseek for files in transtqparent mode (Mark Diekhans) +- fix gzseek for files in transparent mode (Mark Diekhans) - do not assume that vsprintf returns the number of bytes written (Jens Krinke) - replace EXPORT with ZEXPORT to avoid conflict with other programs - added compress2 in zconf.h, zlib.def, zlib.dnt @@ -729,7 +729,7 @@ Changes in 0.61 (12 April 95) Changes in 0.6 (11 April 95) - added minigzip.c - added gzdopen to reopen a file descriptor as gzFile -- added transtqparent reading of non-gziped files in gzread. +- added transparent reading of non-gziped files in gzread. - fixed bug in gzread (don't read crc as data) - fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose). - don't allocate big arrays in the stack (for MSDOS) diff --git a/experimental/tqtinterface/qt4/src/3rdparty/zlib/deflate.c b/experimental/tqtinterface/qt4/src/3rdparty/zlib/deflate.c index 87d2da14e..c7f75a3ec 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/zlib/deflate.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/zlib/deflate.c @@ -873,7 +873,7 @@ local uInt longest_match(s, cur_match) * we prevent matches with the string of window index 0. */ Posf *prev = s->prev; - uInt wtqmask = s->w_mask; + uInt wmask = s->w_mask; #ifdef UNALIGNED_OK /* Compare two bytes at a time. Note: this is not always beneficial. @@ -988,7 +988,7 @@ local uInt longest_match(s, cur_match) scan_end = scan[best_len]; #endif } - } while ((cur_match = prev[cur_match & wtqmask]) > limit + } while ((cur_match = prev[cur_match & wmask]) > limit && --chain_length != 0); if ((uInt)best_len <= s->lookahead) return (uInt)best_len; diff --git a/experimental/tqtinterface/qt4/src/3rdparty/zlib/gzio.c b/experimental/tqtinterface/qt4/src/3rdparty/zlib/gzio.c index 4b56f3165..03a4cc6b5 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/zlib/gzio.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/zlib/gzio.c @@ -63,7 +63,7 @@ typedef struct gz_stream { uLong crc; /* crc32 of uncompressed data */ char *msg; /* error message */ char *path; /* path name for debugging only */ - int transtqparent; /* 1 if input file is not a .gz file */ + int transparent; /* 1 if input file is not a .gz file */ char mode; /* 'w' or 'r' */ z_off_t start; /* start of compressed data in file (header skipped) */ z_off_t in; /* bytes into deflate or inflate */ @@ -122,7 +122,7 @@ local gzFile gz_open (path, mode, fd) s->back = EOF; s->crc = crc32(0L, Z_NULL, 0); s->msg = NULL; - s->transtqparent = 0; + s->transparent = 0; s->path = (char*)ALLOC(strlen(path)+1); if (s->path == NULL) { @@ -278,7 +278,7 @@ local int get_byte(s) /* =========================================================================== Check the gzip header of a gz_stream opened for reading. Set the stream - mode to transtqparent if the gzip magic header is not present; set s->err + mode to transparent if the gzip magic header is not present; set s->err to Z_DATA_ERROR if the magic header is present but the rest of the header is incorrect. IN assertion: the stream s has already been created sucessfully; @@ -305,7 +305,7 @@ local void check_header(s) s->stream.avail_in += len; s->stream.next_in = s->inbuf; if (s->stream.avail_in < 2) { - s->transtqparent = s->stream.avail_in; + s->transparent = s->stream.avail_in; return; } } @@ -313,7 +313,7 @@ local void check_header(s) /* Peek ahead to check the gzip magic header */ if (s->stream.next_in[0] != gz_magic[0] || s->stream.next_in[1] != gz_magic[1]) { - s->transtqparent = 1; + s->transparent = 1; return; } s->stream.avail_in -= 2; @@ -423,7 +423,7 @@ int TQ_ZEXPORT gzread (file, buf, len) while (s->stream.avail_out != 0) { - if (s->transtqparent) { + if (s->transparent) { /* Copy first the lookahead bytes: */ uInt n = s->stream.avail_in; if (n > s->stream.avail_out) n = s->stream.avail_out; @@ -811,7 +811,7 @@ z_off_t ZEXPORT gzseek (file, offset, whence) } if (offset < 0) return -1L; - if (s->transtqparent) { + if (s->transparent) { /* map to fseek */ s->back = EOF; s->stream.avail_in = 0; @@ -867,7 +867,7 @@ int ZEXPORT gzrewind (file) s->stream.avail_in = 0; s->stream.next_in = s->inbuf; s->crc = crc32(0L, Z_NULL, 0); - if (!s->transtqparent) (void)inflateReset(&s->stream); + if (!s->transparent) (void)inflateReset(&s->stream); s->in = 0; s->out = 0; return fseek(s->file, s->start, SEEK_SET); diff --git a/experimental/tqtinterface/qt4/src/3rdparty/zlib/infback.c b/experimental/tqtinterface/qt4/src/3rdparty/zlib/infback.c index 8b2f43156..262f97c73 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/zlib/infback.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/zlib/infback.c @@ -253,7 +253,7 @@ void FAR *out_desc; unsigned copy; /* number of stored or match bytes to copy */ unsigned char FAR *from; /* where to copy match bytes from */ code this; /* current decoding table entry */ - code last; /* tqparent table entry */ + code last; /* parent table entry */ unsigned len; /* length to copy for repeats, bits to drop */ int ret; /* return code */ static const unsigned short order[19] = /* permutation of code lengths */ diff --git a/experimental/tqtinterface/qt4/src/3rdparty/zlib/inffast.c b/experimental/tqtinterface/qt4/src/3rdparty/zlib/inffast.c index 8f0930a67..8c02a178d 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/zlib/inffast.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/zlib/inffast.c @@ -82,8 +82,8 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ unsigned bits; /* local strm->bits */ code const FAR *lcode; /* local strm->lencode */ code const FAR *dcode; /* local strm->distcode */ - unsigned ltqmask; /* tqmask for first level of length codes */ - unsigned dtqmask; /* tqmask for first level of distance codes */ + unsigned lmask; /* mask for first level of length codes */ + unsigned dmask; /* mask for first level of distance codes */ code this; /* retrieved table entry */ unsigned op; /* code bits, operation, extra bits, or */ /* window position, window bytes to copy */ @@ -106,8 +106,8 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ bits = state->bits; lcode = state->lencode; dcode = state->distcode; - ltqmask = (1U << state->lenbits) - 1; - dtqmask = (1U << state->distbits) - 1; + lmask = (1U << state->lenbits) - 1; + dmask = (1U << state->distbits) - 1; /* decode literals and length/distances until end-of-block or not enough input data or output space */ @@ -118,7 +118,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ hold += (unsigned long)(PUP(in)) << bits; bits += 8; } - this = lcode[hold & ltqmask]; + this = lcode[hold & lmask]; dolen: op = (unsigned)(this.bits); hold >>= op; @@ -149,7 +149,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ hold += (unsigned long)(PUP(in)) << bits; bits += 8; } - this = dcode[hold & dtqmask]; + this = dcode[hold & dmask]; dodist: op = (unsigned)(this.bits); hold >>= op; diff --git a/experimental/tqtinterface/qt4/src/3rdparty/zlib/inflate.c b/experimental/tqtinterface/qt4/src/3rdparty/zlib/inflate.c index 09a5e1ef7..c6d38266d 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/zlib/inflate.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/zlib/inflate.c @@ -546,7 +546,7 @@ int flush; unsigned copy; /* number of stored or match bytes to copy */ unsigned char FAR *from; /* where to copy match bytes from */ code this; /* current decoding table entry */ - code last; /* tqparent table entry */ + code last; /* parent table entry */ unsigned len; /* length to copy for repeats, bits to drop */ int ret; /* return code */ #ifdef GUNZIP diff --git a/experimental/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c b/experimental/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c index 0eb643c93..509461d92 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c @@ -49,7 +49,7 @@ unsigned short FAR *work; unsigned incr; /* for incrementing code, index */ unsigned fill; /* index for replicating entries */ unsigned low; /* low bits for current root entry */ - unsigned tqmask; /* tqmask for low root bits */ + unsigned mask; /* mask for low root bits */ code this; /* table entry for duplication */ code FAR *next; /* next available space in table */ const unsigned short FAR *base; /* base value table to use */ @@ -206,7 +206,7 @@ unsigned short FAR *work; drop = 0; /* current bits to drop from code for index */ low = (unsigned)(-1); /* trigger new sub-table when len > root */ used = 1U << root; /* use root table entries */ - tqmask = used - 1; /* tqmask for comparing low */ + mask = used - 1; /* mask for comparing low */ /* check available table space */ if (type == LENS && used >= ENOUGH - MAXD) @@ -256,7 +256,7 @@ unsigned short FAR *work; } /* create new sub-table if needed */ - if (len > root && (huff & tqmask) != low) { + if (len > root && (huff & mask) != low) { /* if first time, transition to sub-tables */ if (drop == 0) drop = root; @@ -280,7 +280,7 @@ unsigned short FAR *work; return 1; /* point entry in root table to sub-table */ - low = huff & tqmask; + low = huff & mask; (*table)[low].op = (unsigned char)curr; (*table)[low].bits = (unsigned char)root; (*table)[low].val = (unsigned short)(next - *table); @@ -299,7 +299,7 @@ unsigned short FAR *work; this.val = (unsigned short)0; while (huff != 0) { /* when done with sub-table, drop back to root table */ - if (drop != 0 && (huff & tqmask) != low) { + if (drop != 0 && (huff & mask) != low) { drop = 0; len = root; next = *table; diff --git a/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.cpp b/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.cpp index 8442e1472..104ff600f 100644 --- a/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.cpp +++ b/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.cpp @@ -557,12 +557,12 @@ static int xPosToCursorPos( const TQString &s, const TQFontMetrics &fm, } /* - Constructs a new, empty, TQtMultiLineEdit with tqparent \a tqparent and + Constructs a new, empty, TQtMultiLineEdit with parent \a parent and called \a name. */ -TQtMultiLineEdit::TQtMultiLineEdit( TQWidget *tqparent , const char *name ) - :TQtTableView( tqparent, name, WStaticContents | WRepaintNoErase ) +TQtMultiLineEdit::TQtMultiLineEdit( TQWidget *parent , const char *name ) + :TQtTableView( parent, name, WStaticContents | WRepaintNoErase ) { d = new TQtMultiLineData; TQFontMetrics fm( font() ); diff --git a/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.h b/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.h index ef50a184d..99604ed15 100644 --- a/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.h +++ b/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.h @@ -52,7 +52,7 @@ class TQtMultiLineEdit : public TQtTableView Q_PROPERTY( int length READ length ) public: - TQtMultiLineEdit( TQWidget *tqparent=0, const char *name=0 ); + TQtMultiLineEdit( TQWidget *parent=0, const char *name=0 ); ~TQtMultiLineEdit(); TQString textLine( int line ) const; diff --git a/experimental/tqtinterface/qt4/src/attic/qttableview.cpp b/experimental/tqtinterface/qt4/src/attic/qttableview.cpp index 34499aae1..d0005f061 100644 --- a/experimental/tqtinterface/qt4/src/attic/qttableview.cpp +++ b/experimental/tqtinterface/qt4/src/attic/qttableview.cpp @@ -43,8 +43,8 @@ public: void paintEvent( TQPaintEvent * ); }; -TQCornerSquare::TQCornerSquare( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +TQCornerSquare::TQCornerSquare( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { } @@ -123,7 +123,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * ) /* - Constructs a table view. The \a tqparent, \a name and \f arguments + Constructs a table view. The \a parent, \a name and \f arguments are passed to the TQFrame constructor. The \link setTableFlags() table flags\endlink are all cleared (set to 0). @@ -142,8 +142,8 @@ void TQCornerSquare::paintEvent( TQPaintEvent * ) */ -TQtTableView::TQtTableView( TQWidget *tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f ) +TQtTableView::TQtTableView( TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f ) { nRows = nCols = 0; // zero rows/cols xCellOffs = yCellOffs = 0; // zero offset diff --git a/experimental/tqtinterface/qt4/src/attic/qttableview.h b/experimental/tqtinterface/qt4/src/attic/qttableview.h index b8e7c5604..68b1437c1 100644 --- a/experimental/tqtinterface/qt4/src/attic/qttableview.h +++ b/experimental/tqtinterface/qt4/src/attic/qttableview.h @@ -37,7 +37,7 @@ public: void tqrepaint( const TQRect &, bool erase=TRUE ); protected: - TQtTableView( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); + TQtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 ); ~TQtTableView(); int numRows() const; diff --git a/experimental/tqtinterface/qt4/src/canvas/tqcanvas.cpp b/experimental/tqtinterface/qt4/src/canvas/tqcanvas.cpp index a82760296..7ce0e14f7 100644 --- a/experimental/tqtinterface/qt4/src/canvas/tqcanvas.cpp +++ b/experimental/tqtinterface/qt4/src/canvas/tqcanvas.cpp @@ -618,14 +618,14 @@ void TQCanvas::init(int w, int h, int chunksze, int mxclusters) } /*! - Create a TQCanvas with no size. \a tqparent and \a name are passed to + Create a TQCanvas with no size. \a parent and \a name are passed to the TQObject superclass. \warning You \e must call resize() at some time after creation to be able to use the canvas. */ -TQCanvas::TQCanvas( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +TQCanvas::TQCanvas( TQObject* parent, const char* name ) + : TQObject( parent, name ) { init(0,0); } @@ -2890,8 +2890,8 @@ void TQCanvasPixmap::init(const TQPixmap& pixmap, int hx, int hy) (TQPixmap&)*this = pixmap; hotx = hx; hoty = hy; - if( pixmap.tqmask() ) { - TQImage i = tqmask()->convertToImage(); + if( pixmap.mask() ) { + TQImage i = mask()->convertToImage(); collision_mask = new TQImage(i); } else collision_mask = 0; @@ -2955,7 +2955,7 @@ TQCanvasPixmap::~TQCanvasPixmap() image(). The number of pixmaps in the array is returned by count(). - TQCanvasSprite uses an image's tqmask for collision detection. You + TQCanvasSprite uses an image's mask for collision detection. You can change this by reading in a separate set of image masks using readCollisionMasks(). @@ -3101,13 +3101,13 @@ bool TQCanvasPixmapArray::readPixmaps( const TQString& filenamepattern, /*! Reads new collision masks for the array. - By default, TQCanvasSprite uses the image tqmask of a sprite to + By default, TQCanvasSprite uses the image mask of a sprite to detect collisions. Use this function to set your own collision image masks. If count() is 1 \a filename must specify a real filename to read - the tqmask from. If count() is greater than 1, the \a filename must - contain a "%1" that will get replaced by the number of the tqmask to + the mask from. If count() is greater than 1, the \a filename must + contain a "%1" that will get replaced by the number of the mask to be loaded, just like TQCanvasPixmapArray::readPixmaps(). All collision masks must be 1-bit images or this function call @@ -3356,7 +3356,7 @@ TQCanvasPixmap* TQCanvasSprite::imageAdvanced() const /*! Returns the bounding rectangle for the image in the sprite's current frame. This assumes that the images are tightly cropped - (i.e. do not have transtqparent pixels all along a side). + (i.e. do not have transparent pixels all along a side). */ TQRect TQCanvasSprite::boundingRect() const { @@ -3524,13 +3524,13 @@ void TQCanvasSprite::draw(TQPainter& painter) */ /*! - Constructs a TQCanvasView with tqparent \a tqparent, and name \a name, + Constructs a TQCanvasView with parent \a parent, and name \a name, using the widget flags \a f. The canvas view is not associated with a canvas, so you must to call setCanvas() to view a canvas. */ -TQCanvasView::TQCanvasView(TQWidget* tqparent, const char* name, WFlags f) : - TQScrollView(tqparent,name,(WFlags)(f|TQt::WResizeNoErase|TQt::WStaticContents)) +TQCanvasView::TQCanvasView(TQWidget* parent, const char* name, WFlags f) : + TQScrollView(parent,name,(WFlags)(f|TQt::WResizeNoErase|TQt::WStaticContents)) { d = new TQCanvasViewData; viewing = 0; @@ -3541,11 +3541,11 @@ TQCanvasView::TQCanvasView(TQWidget* tqparent, const char* name, WFlags f) : /*! \overload - Constructs a TQCanvasView which views canvas \a canvas, with tqparent - \a tqparent, and name \a name, using the widget flags \a f. + Constructs a TQCanvasView which views canvas \a canvas, with parent + \a parent, and name \a name, using the widget flags \a f. */ -TQCanvasView::TQCanvasView(TQCanvas* canvas, TQWidget* tqparent, const char* name, WFlags f) : - TQScrollView(tqparent,name,(WFlags)(f|TQt::WResizeNoErase|TQt::WStaticContents)) +TQCanvasView::TQCanvasView(TQCanvas* canvas, TQWidget* parent, const char* name, WFlags f) : + TQScrollView(parent,name,(WFlags)(f|TQt::WResizeNoErase|TQt::WStaticContents)) { d = new TQCanvasViewData; viewing = 0; diff --git a/experimental/tqtinterface/qt4/src/canvas/tqcanvas.h b/experimental/tqtinterface/qt4/src/canvas/tqcanvas.h index 2aaba6e64..49a2b2031 100644 --- a/experimental/tqtinterface/qt4/src/canvas/tqcanvas.h +++ b/experimental/tqtinterface/qt4/src/canvas/tqcanvas.h @@ -221,7 +221,7 @@ class TQM_EXPORT_CANVAS TQCanvas : public TQObject Q_OBJECT TQ_OBJECT public: - TQCanvas( TQObject* tqparent = 0, const char* name = 0 ); + TQCanvas( TQObject* parent = 0, const char* name = 0 ); TQCanvas(int w, int h); TQCanvas( TQPixmap p, int h, int v, int tilewidth, int tileheight ); @@ -368,8 +368,8 @@ class TQM_EXPORT_CANVAS TQCanvasView : public TQScrollView TQ_OBJECT public: - TQCanvasView(TQWidget* tqparent=0, const char* name=0, WFlags f=0); - TQCanvasView(TQCanvas* viewing, TQWidget* tqparent=0, const char* name=0, WFlags f=0); + TQCanvasView(TQWidget* parent=0, const char* name=0, WFlags f=0); + TQCanvasView(TQCanvas* viewing, TQWidget* parent=0, const char* name=0, WFlags f=0); ~TQCanvasView(); TQCanvas* canvas() const diff --git a/experimental/tqtinterface/qt4/src/codecs/tqbig5codec.cpp b/experimental/tqtinterface/qt4/src/codecs/tqbig5codec.cpp index be0d14c7f..af60fdc5a 100644 --- a/experimental/tqtinterface/qt4/src/codecs/tqbig5codec.cpp +++ b/experimental/tqtinterface/qt4/src/codecs/tqbig5codec.cpp @@ -3846,7 +3846,7 @@ static int qt_Big5hkscsToUnicode(const uchar *s, uint *pwc) typedef struct { ushort index; /* index into big table */ - ushort used; /* bittqmask of used entries */ + ushort used; /* bitmask of used entries */ } Summary16; /* UCS4 to big5hkscs convert table */ diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqcolordialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqcolordialog.cpp index cd1347694..d99c63f4b 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqcolordialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqcolordialog.cpp @@ -59,8 +59,8 @@ #include "tqpopupmenu.h" #ifdef TQ_WS_MAC -TQRgb macGetRgba( TQRgb initial, bool *ok, TQWidget *tqparent, const char* name ); -TQColor macGetColor( const TQColor& initial, TQWidget *tqparent, const char *name ); +TQRgb macGetRgba( TQRgb initial, bool *ok, TQWidget *parent, const char* name ); +TQColor macGetColor( const TQColor& initial, TQWidget *parent, const char *name ); #endif //////////// TQWellArray BEGIN @@ -75,7 +75,7 @@ class TQWellArray : public TQGridView Q_PROPERTY( int selectedRow READ selectedRow ) public: - TQWellArray( TQWidget* tqparent=0, const char* name=0, bool popup = FALSE ); + TQWellArray( TQWidget* parent=0, const char* name=0, bool popup = FALSE ); ~TQWellArray() {} TQString cellContent( int row, int col ) const; @@ -142,8 +142,8 @@ struct TQWellArrayData { \ingroup advanced */ -TQWellArray::TQWellArray( TQWidget *tqparent, const char * name, bool popup ) - : TQGridView( tqparent, name, +TQWellArray::TQWellArray( TQWidget *parent, const char * name, bool popup ) + : TQGridView( parent, name, (popup ? (WFlags)(WStyle_Customize|TQt::WStyle_Tool|TQt::WStyle_NoBorder) : (WFlags)0 ) ) { d = 0; @@ -517,8 +517,8 @@ static inline void rgb2hsv( TQRgb rgb, int&h, int&s, int&v ) class TQColorWell : public TQWellArray { public: - TQColorWell( TQWidget *tqparent, int r, int c, TQRgb *vals ) - :TQWellArray( tqparent, "" ), values( vals ), mousePressed( FALSE ), oldCurrent( -1, -1 ) + TQColorWell( TQWidget *parent, int r, int c, TQRgb *vals ) + :TQWellArray( parent, "" ), values( vals ), mousePressed( FALSE ), oldCurrent( -1, -1 ) { setNumRows(r), setNumCols(c); tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); } protected: @@ -632,7 +632,7 @@ class TQColorPicker : public TQFrame Q_OBJECT TQ_OBJECT public: - TQColorPicker(TQWidget* tqparent=0, const char* name=0); + TQColorPicker(TQWidget* parent=0, const char* name=0); ~TQColorPicker(); public Q_SLOTS: @@ -667,7 +667,7 @@ class TQColorLuminancePicker : public TQWidget Q_OBJECT TQ_OBJECT public: - TQColorLuminancePicker(TQWidget* tqparent=0, const char* name=0); + TQColorLuminancePicker(TQWidget* parent=0, const char* name=0); ~TQColorLuminancePicker(); public Q_SLOTS: @@ -708,9 +708,9 @@ int TQColorLuminancePicker::val2y( int v ) return coff + (255-v)*d/255; } -TQColorLuminancePicker::TQColorLuminancePicker(TQWidget* tqparent, +TQColorLuminancePicker::TQColorLuminancePicker(TQWidget* parent, const char* name) - :TQWidget( tqparent, name ) + :TQWidget( parent, name ) { hue = 100; val = 100; sat = 100; pix = 0; @@ -800,8 +800,8 @@ int TQColorPicker::satPt( const TQPoint &pt ) void TQColorPicker::setCol( const TQPoint &pt ) { setCol( huePt(pt), satPt(pt) ); } -TQColorPicker::TQColorPicker(TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name ) +TQColorPicker::TQColorPicker(TQWidget* parent, const char* name ) + : TQFrame( parent, name ) { hue = 0; sat = 0; setCol( 150, 255 ); @@ -879,8 +879,8 @@ class TQColIntValidator: public TQIntValidator { public: TQColIntValidator( int bottom, int top, - TQWidget * tqparent, const char *name = 0 ) - :TQIntValidator( bottom, top, TQT_TQOBJECT(tqparent), name ) {} + TQWidget * parent, const char *name = 0 ) + :TQIntValidator( bottom, top, TQT_TQOBJECT(parent), name ) {} TQValidator::State validate( TQString &, int & ) const; }; @@ -908,8 +908,8 @@ TQValidator::State TQColIntValidator::validate( TQString &s, int &pos ) const class TQColNumLineEdit : public TQLineEdit { public: - TQColNumLineEdit( TQWidget *tqparent, const char* name=0 ) - : TQLineEdit( tqparent, name ) { setMaxLength( 3 );} + TQColNumLineEdit( TQWidget *parent, const char* name=0 ) + : TQLineEdit( parent, name ) { setMaxLength( 3 );} TQSize tqsizeHint() const { return TQSize( fontMetrics().width( "999" ) + 2 * ( margin() + frameWidth() ), TQLineEdit::tqsizeHint().height() ); } @@ -930,7 +930,7 @@ class TQColorShower : public TQWidget Q_OBJECT TQ_OBJECT public: - TQColorShower( TQWidget *tqparent, const char *name=0 ); + TQColorShower( TQWidget *parent, const char *name=0 ); //things that don't emit Q_SIGNALS void setHsv( int h, int s, int v ); @@ -972,7 +972,7 @@ class TQColorShowLabel : public TQFrame TQ_OBJECT public: - TQColorShowLabel( TQWidget *tqparent ) : TQFrame( tqparent, "qt_colorshow_lbl" ) { + TQColorShowLabel( TQWidget *parent ) : TQFrame( parent, "qt_colorshow_lbl" ) { setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); setBackgroundMode( TQt::PaletteBackground ); setAcceptDrops( TRUE ); @@ -1075,8 +1075,8 @@ void TQColorShowLabel::mouseReleaseEvent( TQMouseEvent * ) mousePressed = FALSE; } -TQColorShower::TQColorShower( TQWidget *tqparent, const char *name ) - :TQWidget( tqparent, name) +TQColorShower::TQColorShower( TQWidget *parent, const char *name ) + :TQWidget( parent, name) { curCol = tqRgb( -1, -1, -1 ); TQColIntValidator *val256 = new TQColIntValidator( 0, 255, this ); @@ -1447,15 +1447,15 @@ void TQColorDialogPrivate::addCustom() */ /*! - Constructs a default color dialog with tqparent \a tqparent and called + Constructs a default color dialog with parent \a parent and called \a name. If \a modal is TRUE the dialog will be modal. Use setColor() to set an initial value. \sa getColor() */ -TQColorDialog::TQColorDialog(TQWidget* tqparent, const char* name, bool modal) : - TQDialog(tqparent, name, modal, (WFlags)( TQt::WType_Dialog | WStyle_Customize | TQt::WStyle_Title | +TQColorDialog::TQColorDialog(TQWidget* parent, const char* name, bool modal) : + TQDialog(parent, name, modal, (WFlags)( TQt::WType_Dialog | WStyle_Customize | TQt::WStyle_Title | TQt::WStyle_DialogBorder | TQt::WStyle_SysMenu ) ) { setSizeGripEnabled( FALSE ); @@ -1478,21 +1478,21 @@ TQColorDialog::TQColorDialog(TQWidget* tqparent, const char* name, bool modal) : /*! Pops up a modal color dialog, lets the user choose a color, and returns that color. The color is initially set to \a initial. The - dialog is a child of \a tqparent and is called \a name. It returns + dialog is a child of \a parent and is called \a name. It returns an invalid (see TQColor::isValid()) color if the user cancels the dialog. All colors allocated by the dialog will be deallocated before this function returns. */ -TQColor TQColorDialog::getColor( const TQColor& initial, TQWidget *tqparent, +TQColor TQColorDialog::getColor( const TQColor& initial, TQWidget *parent, const char *name ) { #if defined(TQ_WS_MAC) - return macGetColor(initial, tqparent, name); + return macGetColor(initial, parent, name); #endif int allocContext = TQColor::enterAllocContext(); - TQColorDialog *dlg = new TQColorDialog( tqparent, name, TRUE ); //modal + TQColorDialog *dlg = new TQColorDialog( parent, name, TRUE ); //modal #ifndef TQT_NO_WIDGET_TOPEXTRA dlg->setCaption( TQColorDialog::tr( "Select color" ) ); #endif @@ -1512,7 +1512,7 @@ TQColor TQColorDialog::getColor( const TQColor& initial, TQWidget *tqparent, /*! Pops up a modal color dialog to allow the user to choose a color and an alpha channel (transparency) value. The color+alpha is - initially set to \a initial. The dialog is a child of \a tqparent + initially set to \a initial. The dialog is a child of \a parent and called \a name. If \a ok is non-null, \e *\a ok is set to TRUE if the user clicked @@ -1522,14 +1522,14 @@ TQColor TQColorDialog::getColor( const TQColor& initial, TQWidget *tqparent, */ TQRgb TQColorDialog::getRgba( TQRgb initial, bool *ok, - TQWidget *tqparent, const char* name ) + TQWidget *parent, const char* name ) { #if defined(TQ_WS_MAC) - return macGetRgba(initial, ok, tqparent, name); + return macGetRgba(initial, ok, parent, name); #endif int allocContext = TQColor::enterAllocContext(); - TQColorDialog *dlg = new TQColorDialog( tqparent, name, TRUE ); //modal + TQColorDialog *dlg = new TQColorDialog( parent, name, TRUE ); //modal TQ_CHECK_PTR( dlg ); #ifndef TQT_NO_WIDGET_TOPEXTRA diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqcolordialog.h b/experimental/tqtinterface/qt4/src/dialogs/tqcolordialog.h index 46f5bdc11..eaffc379c 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqcolordialog.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqcolordialog.h @@ -54,9 +54,9 @@ class TQ_EXPORT TQColorDialog : public TQDialog TQ_OBJECT public: - static TQColor getColor( const TQColor& init = Qt::white, TQWidget* tqparent=0, const char* name=0 ); + static TQColor getColor( const TQColor& init = Qt::white, TQWidget* parent=0, const char* name=0 ); static TQRgb getRgba( TQRgb, bool* ok = 0, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); static int customCount(); static TQRgb customColor( int ); @@ -65,7 +65,7 @@ public: private: ~TQColorDialog(); - TQColorDialog( TQWidget* tqparent=0, const char* name=0, bool modal=FALSE ); + TQColorDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE ); void setColor( const TQColor& ); TQColor color() const; diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqdialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqdialog.cpp index 31341cafe..bbb0ad54d 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqdialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqdialog.cpp @@ -75,11 +75,11 @@ buttons\endlink. TQDialogs can also have a TQSizeGrip in their lower-right corner, using setSizeGripEnabled(). - Note that TQDialog uses the tqparent widget slightly differently from + Note that TQDialog uses the parent widget slightly differently from other classes in TQt. A dialog is always a top-level widget, but if - it has a tqparent, its default location is centered on top of the - tqparent's top-level widget (if it is not top-level itself). It will - also share the tqparent's taskbar entry. + it has a parent, its default location is centered on top of the + parent's top-level widget (if it is not top-level itself). It will + also share the parent's taskbar entry. \target modal \section1 Modal Dialogs @@ -234,11 +234,11 @@ public: }; /*! - Constructs a dialog called \a name, with tqparent \a tqparent. + Constructs a dialog called \a name, with parent \a parent. - A dialog is always a top-level widget, but if it has a tqparent, its - default location is centered on top of the tqparent. It will also - share the tqparent's taskbar entry. + A dialog is always a top-level widget, but if it has a parent, its + default location is centered on top of the parent. It will also + share the parent's taskbar entry. The widget flags \a f are passed on to the TQWidget constructor. If, for example, you don't want a What's This button in the titlebar @@ -253,8 +253,8 @@ public: \sa TQWidget::setWFlags() TQt::WidgetFlags */ -TQDialog::TQDialog( TQWidget *tqparent, const char *name, bool modal, WFlags f ) - : TQWidget( tqparent, name, +TQDialog::TQDialog( TQWidget *parent, const char *name, bool modal, WFlags f ) + : TQWidget( parent, name, (WFlags)((modal ? (WFlags)(f|TQt::WShowModal) : f) | TQt::WType_Dialog )), rescode(0), did_move(0), has_relpos(0), did_resize(0), in_loop(0) { diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqdialog.h b/experimental/tqtinterface/qt4/src/dialogs/tqdialog.h index 972fc1df9..8320704c3 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqdialog.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqdialog.h @@ -61,7 +61,7 @@ friend class TQPushButton; Q_PROPERTY( bool modal READ isModal WRITE setModal ) public: - TQ_EXPLICIT TQDialog( TQWidget* tqparent=0, const char* name=0, bool modal=FALSE, + TQ_EXPLICIT TQDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE, WFlags f=0 ); ~TQDialog(); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqerrormessage.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqerrormessage.cpp index 86c50dc62..3b5cf4bbe 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqerrormessage.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqerrormessage.cpp @@ -59,8 +59,8 @@ class TQErrorMessageTextView : public TQTextView { public: - TQErrorMessageTextView( TQWidget *tqparent, const char *name ) - : TQTextView( tqparent, name ) { } + TQErrorMessageTextView( TQWidget *parent, const char *name ) + : TQTextView( parent, name ) { } virtual TQSize tqminimumSizeHint() const; virtual TQSize tqsizeHint() const; @@ -153,12 +153,12 @@ void jump( TQtMsgType t, const char * m ) /*! Constructs and installs an error handler window. - The tqparent \a tqparent and name \a name are passed on to the TQDialog + The parent \a parent and name \a name are passed on to the TQDialog constructor. */ -TQErrorMessage::TQErrorMessage( TQWidget * tqparent, const char * name ) - : TQDialog( tqparent, name ) +TQErrorMessage::TQErrorMessage( TQWidget * parent, const char * name ) + : TQDialog( parent, name ) { TQGridLayout * grid = new TQGridLayout( this, 3, 2, 11, 6 ); icon = new TQLabel( this, "qt_icon_lbl" ); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqerrormessage.h b/experimental/tqtinterface/qt4/src/dialogs/tqerrormessage.h index 6809ba462..8513c5e54 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqerrormessage.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqerrormessage.h @@ -58,7 +58,7 @@ class TQ_EXPORT TQErrorMessage: public TQDialog { Q_OBJECT TQ_OBJECT public: - TQErrorMessage( TQWidget* tqparent, const char* name=0 ); + TQErrorMessage( TQWidget* parent, const char* name=0 ); ~TQErrorMessage(); static TQErrorMessage * qtHandler(); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqfiledialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqfiledialog.cpp index 424ac7e8e..d2763bf36 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqfiledialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqfiledialog.cpp @@ -551,7 +551,7 @@ static void resolveLibs() class TQWindowsIconProvider : public TQFileIconProvider { public: - TQWindowsIconProvider( TQObject *tqparent=0, const char *name=0 ); + TQWindowsIconProvider( TQObject *parent=0, const char *name=0 ); ~TQWindowsIconProvider(); const TQPixmap * pixmap( const TQFileInfo &fi ); @@ -629,8 +629,8 @@ class TQRenameEdit : public TQLineEdit TQ_OBJECT public: - TQRenameEdit( TQWidget *tqparent ) - : TQLineEdit( tqparent, "qt_rename_edit" ), doRenameAlreadyEmitted(FALSE) + TQRenameEdit( TQWidget *parent ) + : TQLineEdit( parent, "qt_rename_edit" ), doRenameAlreadyEmitted(FALSE) { connect( this, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); } @@ -658,7 +658,7 @@ class TQFileListBox : public TQListBox TQ_OBJECT private: - TQFileListBox( TQWidget *tqparent, TQFileDialog *d ); + TQFileListBox( TQWidget *parent, TQFileDialog *d ); void clear(); void show(); @@ -709,7 +709,7 @@ class TQFileDialogTQFileListView : public TQListView TQ_OBJECT public: - TQFileDialogTQFileListView( TQWidget *tqparent, TQFileDialog *d ); + TQFileDialogTQFileListView( TQWidget *parent, TQFileDialog *d ); void clear(); void startRename( bool check = TRUE ); @@ -771,7 +771,7 @@ class TQFDProgressAnimation : public TQWidget TQ_OBJECT public: - TQFDProgressAnimation( TQWidget *tqparent ); + TQFDProgressAnimation( TQWidget *parent ); void start(); private Q_SLOTS: @@ -786,8 +786,8 @@ private: }; -TQFDProgressAnimation::TQFDProgressAnimation( TQWidget *tqparent ) - : TQWidget( tqparent, "qt_progressanimation" ) +TQFDProgressAnimation::TQFDProgressAnimation( TQWidget *parent ) + : TQWidget( parent, "qt_progressanimation" ) { setFixedSize( 300, 50 ); step = -1; @@ -846,7 +846,7 @@ class TQFDProgressDialog : public TQDialog TQ_OBJECT public: - TQFDProgressDialog( TQWidget *tqparent, const TQString &fn, int steps ); + TQFDProgressDialog( TQWidget *parent, const TQString &fn, int steps ); void setReadProgress( int p ); void setWriteProgress( int p ); @@ -863,8 +863,8 @@ private: }; -TQFDProgressDialog::TQFDProgressDialog( TQWidget *tqparent, const TQString &fn, int steps ) - : TQDialog( tqparent, "", TRUE ) +TQFDProgressDialog::TQFDProgressDialog( TQWidget *parent, const TQString &fn, int steps ) + : TQDialog( parent, "", TRUE ) { #ifndef TQT_NO_WIDGET_TOPEXTRA setCaption( TQFileDialog::tr( "Copy or Move a File" ) ); @@ -955,16 +955,16 @@ public: struct File: public TQListViewItem { File( TQFileDialogPrivate * dlgp, - const TQUrlInfo * fi, TQListViewItem * tqparent ) - : TQListViewItem( tqparent, dlgp->last ), info( *fi ), d(dlgp), i( 0 ), hasMimePixmap( FALSE ) + const TQUrlInfo * fi, TQListViewItem * parent ) + : TQListViewItem( parent, dlgp->last ), info( *fi ), d(dlgp), i( 0 ), hasMimePixmap( FALSE ) { setup(); dlgp->last = this; } File( TQFileDialogPrivate * dlgp, - const TQUrlInfo * fi, TQListView * tqparent ) - : TQListViewItem( tqparent, dlgp->last ), info( *fi ), d(dlgp), i( 0 ), hasMimePixmap( FALSE ) + const TQUrlInfo * fi, TQListView * parent ) + : TQListViewItem( parent, dlgp->last ), info( *fi ), d(dlgp), i( 0 ), hasMimePixmap( FALSE ) { setup(); dlgp->last = this; } File( TQFileDialogPrivate * dlgp, - const TQUrlInfo * fi, TQListView * tqparent, TQListViewItem * after ) - : TQListViewItem( tqparent, after ), info( *fi ), d(dlgp), i( 0 ), hasMimePixmap( FALSE ) + const TQUrlInfo * fi, TQListView * parent, TQListViewItem * after ) + : TQListViewItem( parent, after ), info( *fi ), d(dlgp), i( 0 ), hasMimePixmap( FALSE ) { setup(); if ( !nextSibling() ) dlgp->last = this; } ~File(); @@ -1171,8 +1171,8 @@ void TQRenameEdit::slotReturnPressed() * ************************************************************************/ -TQFileListBox::TQFileListBox( TQWidget *tqparent, TQFileDialog *dlg ) - : TQListBox( tqparent, "filelistbox" ), filedialog( dlg ), +TQFileListBox::TQFileListBox( TQWidget *parent, TQFileDialog *dlg ) + : TQListBox( parent, "filelistbox" ), filedialog( dlg ), renaming( FALSE ), renameItem( 0 ), mousePressed( FALSE ), firstMousePressEvent( TRUE ) { @@ -1572,8 +1572,8 @@ void TQFileListBox::contentsMoved( int, int ) * ************************************************************************/ -TQFileDialogTQFileListView::TQFileDialogTQFileListView( TQWidget *tqparent, TQFileDialog *dlg ) - : TQListView( tqparent, "qt_filedlg_listview" ), renaming( FALSE ), renameItem( 0 ), +TQFileDialogTQFileListView::TQFileDialogTQFileListView( TQWidget *parent, TQFileDialog *dlg ) + : TQListView( parent, "qt_filedlg_listview" ), renaming( FALSE ), renameItem( 0 ), filedialog( dlg ), mousePressed( FALSE ), firstMousePressEvent( TRUE ) { @@ -2189,7 +2189,7 @@ static TQStringList makeFiltersList( const TQString &filter ) In the above example, a modal TQFileDialog is created using a static function. The startup directory is set to "/home". The file filter - is set to "Images (*.png *.xpm *.jpg)". The tqparent of the file dialog + is set to "Images (*.png *.xpm *.jpg)". The parent of the file dialog is set to \e this and it is given the identification name - "open file dialog". The caption at the top of file dialog is set to "Choose a file". If you want to use multiple filters, separate each one with @@ -2275,7 +2275,7 @@ static TQStringList makeFiltersList( const TQString &filter ) class Preview : public TQLabel, public TQFilePreview { public: - Preview( TQWidget *tqparent=0 ) : TQLabel( tqparent ) {} + Preview( TQWidget *parent=0 ) : TQLabel( parent ) {} void previewUrl( const TQUrl &u ) { @@ -2386,13 +2386,13 @@ extern const char qt_file_dialog_filter_reg_exp[] = "([a-zA-Z0-9 ]*)\\(([a-zA-Z0-9_.*? +;#\\[\\]]*)\\)$"; /*! - Constructs a file dialog called \a name, with the tqparent, \a tqparent. + Constructs a file dialog called \a name, with the parent, \a parent. If \a modal is TRUE then the file dialog is modal; otherwise it is modeless. */ -TQFileDialog::TQFileDialog( TQWidget *tqparent, const char *name, bool modal ) - : TQDialog( tqparent, name, modal, +TQFileDialog::TQFileDialog( TQWidget *parent, const char *name, bool modal ) + : TQDialog( parent, name, modal, (modal ? (WFlags)(WStyle_Customize | TQt::WStyle_DialogBorder | TQt::WStyle_Title | TQt::WStyle_SysMenu) : (WFlags)0) ) { @@ -2406,7 +2406,7 @@ TQFileDialog::TQFileDialog( TQWidget *tqparent, const char *name, bool modal ) /*! - Constructs a file dialog called \a name with the tqparent, \a tqparent. + Constructs a file dialog called \a name with the parent, \a parent. If \a modal is TRUE then the file dialog is modal; otherwise it is modeless. @@ -2418,8 +2418,8 @@ TQFileDialog::TQFileDialog( TQWidget *tqparent, const char *name, bool modal ) */ TQFileDialog::TQFileDialog( const TQString& dirName, const TQString & filter, - TQWidget *tqparent, const char *name, bool modal ) - : TQDialog( tqparent, name, modal, + TQWidget *parent, const char *name, bool modal ) + : TQDialog( parent, name, modal, (modal ? (WFlags)(WStyle_Customize | TQt::WStyle_DialogBorder | TQt::WStyle_Title | TQt::WStyle_SysMenu) : (WFlags)0) ) { @@ -2615,7 +2615,7 @@ void TQFileDialog::init() #endif d->goBack->setIconSet( *goBackIcon ); - d->cdToParent = new TQToolButton( this, "cd to tqparent" ); + d->cdToParent = new TQToolButton( this, "cd to parent" ); d->cdToParent->setFocusPolicy( Qt::TabFocus ); #ifndef TQT_NO_TOOLTIP TQToolTip::add( d->cdToParent, tr( "One directory up" ) ); @@ -2995,17 +2995,17 @@ void TQFileDialog::setSelectedFilter( int n ) /*! Sets the current filter selected in the file dialog to the first - one that contains the text \a tqmask. + one that contains the text \a mask. */ -void TQFileDialog::setSelectedFilter( const TQString& tqmask ) +void TQFileDialog::setSelectedFilter( const TQString& mask ) { int n; for ( n = 0; n < d->types->count(); n++ ) { - if ( d->types->text( n ).contains( tqmask, FALSE ) ) { + if ( d->types->text( n ).contains( mask, FALSE ) ) { d->types->setCurrentItem( n ); - TQString f = tqmask; + TQString f = mask; TQRegExp r( TQString::tqfromLatin1(qt_file_dialog_filter_reg_exp) ); int index = r.search( f ); if ( index >= 0 ) @@ -3423,8 +3423,8 @@ bool TQ_EXPORT qt_use_native_dialogs = TRUE; \endcode The function creates a modal file dialog called \a name, with - tqparent, \a tqparent. If a tqparent is not 0, the dialog will be shown - centered over the tqparent. + parent, \a parent. If a parent is not 0, the dialog will be shown + centered over the parent. The file dialog's working directory will be set to \a startWith. If \a startWith includes a file name, the file will be selected. The filter @@ -3439,8 +3439,8 @@ bool TQ_EXPORT qt_use_native_dialogs = TRUE; file dialog and not a TQFileDialog, unless the style of the application is set to something other than the native style (Note that on Windows the dialog will spin a blocking modal event loop that will not dispatch any - TQTimers and if tqparent is not 0 then it will position the dialog just under - the tqparent's titlebar). + TQTimers and if parent is not 0 then it will position the dialog just under + the parent's titlebar). Under Unix/X11, the normal behavior of the file dialog is to resolve and follow symlinks. For example, if /usr/tmp is a symlink to /var/tmp, @@ -3453,7 +3453,7 @@ bool TQ_EXPORT qt_use_native_dialogs = TRUE; TQString TQFileDialog::getOpenFileName( const TQString & startWith, const TQString& filter, - TQWidget *tqparent, const char* name, + TQWidget *parent, const char* name, const TQString& caption, TQString *selectedFilter, bool resolveSymlinks ) @@ -3497,16 +3497,16 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith, #if defined(TQ_WS_WIN) if ( qt_use_native_dialogs && tqApp->tqstyle().tqstyleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) return winGetOpenFileName( initialSelection, filter, workingDirectory, - tqparent, name, caption, selectedFilter ); + parent, name, caption, selectedFilter ); #elif defined(TQ_WS_MAC) if (qt_use_native_dialogs && (tqApp->tqstyle().inherits(TQMAC_DEFAULT_STYLE) || tqApp->tqstyle().inherits("TQMacStyle"))) return qt_mac_precomposeFileName(macGetOpenFileNames(filter, startWith.isEmpty() ? 0 : workingDirectory, - tqparent, name, caption, selectedFilter, FALSE).first()); + parent, name, caption, selectedFilter, FALSE).first()); #endif - TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, tqparent, name ? name : "qt_filedlg_gofn", TRUE ); + TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, parent, name ? name : "qt_filedlg_gofn", TRUE ); TQ_CHECK_PTR( dlg ); #ifndef TQT_NO_WIDGET_TOPEXTRA @@ -3540,9 +3540,9 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith, This is a convenience static function that will return a file name selected by the user. The file does not have to exist. - It creates a modal file dialog called \a name, with tqparent, \a tqparent. - If a tqparent is not 0, the dialog will be shown centered over the - tqparent. + It creates a modal file dialog called \a name, with parent, \a parent. + If a parent is not 0, the dialog will be shown centered over the + parent. \code TQString s = TQFileDialog::getSaveFileName( @@ -3566,8 +3566,8 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith, file dialog and not a TQFileDialog, unless the style of the application is set to something other than the native style. (Note that on Windows the dialog will spin a blocking modal event loop that will not dispatch any - TQTimers and if tqparent is not 0 then it will position the dialog just under - the tqparent's titlebar. + TQTimers and if parent is not 0 then it will position the dialog just under + the parent's titlebar. Under Unix/X11, the normal behavior of the file dialog is to resolve and follow symlinks. For example, if /usr/tmp is a symlink to /var/tmp, @@ -3580,7 +3580,7 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith, TQString TQFileDialog::getSaveFileName( const TQString & startWith, const TQString& filter, - TQWidget *tqparent, const char* name, + TQWidget *parent, const char* name, const TQString& caption, TQString *selectedFilter, bool resolveSymlinks) @@ -3618,16 +3618,16 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith, #if defined(TQ_WS_WIN) if ( qt_use_native_dialogs && tqApp->tqstyle().tqstyleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) return winGetSaveFileName( initialSelection, filter, workingDirectory, - tqparent, name, caption, selectedFilter ); + parent, name, caption, selectedFilter ); #elif defined(TQ_WS_MAC) if (qt_use_native_dialogs && (tqApp->tqstyle().inherits(TQMAC_DEFAULT_STYLE) || tqApp->tqstyle().inherits("TQMacStyle"))) return qt_mac_precomposeFileName(macGetSaveFileName(initialSelection, filter, - startWith.isEmpty() ? 0 : workingDirectory, tqparent, name, + startWith.isEmpty() ? 0 : workingDirectory, parent, name, caption, selectedFilter)); #endif - TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, tqparent, name ? name : "qt_filedlg_gsfn", TRUE ); + TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, parent, name ? name : "qt_filedlg_gsfn", TRUE ); TQ_CHECK_PTR( dlg ); #ifndef TQT_NO_WIDGET_TOPEXTRA @@ -4461,8 +4461,8 @@ void TQFileDialog::createdDirectory( const TQUrlInfo &info, TQNetworkOperation * \endcode This function creates a modal file dialog called \a name, with - tqparent, \a tqparent. If tqparent is not 0, the dialog will be shown - centered over the tqparent. + parent, \a parent. If parent is not 0, the dialog will be shown + centered over the parent. The dialog's working directory is set to \a dir, and the caption is set to \a caption. Either of these may be TQString::null in which case @@ -4484,14 +4484,14 @@ void TQFileDialog::createdDirectory( const TQUrlInfo &info, TQNetworkOperation * file dialog and not a TQFileDialog, unless the style of the application is set to something other than the native style. (Note that on Windows the dialog will spin a blocking modal event loop that will not dispatch any - TQTimers and if tqparent is not 0 then it will position the dialog just under - the tqparent's titlebar). + TQTimers and if parent is not 0 then it will position the dialog just under + the parent's titlebar). \sa getOpenFileName(), getOpenFileNames(), getSaveFileName() */ TQString TQFileDialog::getExistingDirectory( const TQString & dir, - TQWidget *tqparent, + TQWidget *parent, const char* name, const TQString& caption, bool dirOnly, @@ -4514,7 +4514,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, } else initialDir = TQString::null; if ( qt_use_native_dialogs && tqApp->tqstyle().tqstyleHint( TQStyle::SH_GUIStyle ) == WindowsStyle && dirOnly ) - return winGetExistingDirectory( initialDir, tqparent, name, caption ); + return winGetExistingDirectory( initialDir, parent, name, caption ); #endif #if defined(TQ_WS_MAC) TQString *initialDir = 0; @@ -4525,11 +4525,11 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, } if( qt_use_native_dialogs && (tqApp->tqstyle().inherits(TQMAC_DEFAULT_STYLE) || tqApp->tqstyle().inherits("TQMacStyle"))) - return qt_mac_precomposeFileName(macGetOpenFileNames("", initialDir, tqparent, name, + return qt_mac_precomposeFileName(macGetOpenFileNames("", initialDir, parent, name, caption, 0, FALSE, TRUE).first()); #endif - TQFileDialog *dlg = new TQFileDialog( tqparent, name ? name : "qt_filedlg_ged", TRUE ); + TQFileDialog *dlg = new TQFileDialog( parent, name ? name : "qt_filedlg_ged", TRUE ); TQ_CHECK_PTR( dlg ); #ifndef TQT_NO_WIDGET_TOPEXTRA @@ -4784,8 +4784,8 @@ TQFileDialog::PreviewMode TQFileDialog::previewMode() const The button \a b is placed underneath the Cancel pushbutton. \code - MyFileDialog::MyFileDialog( TQWidget* tqparent, const char* name ) : - TQFileDialog( tqparent, name ) + MyFileDialog::MyFileDialog( TQWidget* parent, const char* name ) : + TQFileDialog( parent, name ) { TQLabel* label = new TQLabel( "Added widgets", this ); TQLineEdit* lineedit = new TQLineEdit( this ); @@ -4972,11 +4972,11 @@ void TQFileDialog::keyPressEvent( TQKeyEvent * ke ) /*! Constructs an empty file icon provider called \a name, with the - tqparent \a tqparent. + parent \a parent. */ -TQFileIconProvider::TQFileIconProvider( TQObject * tqparent, const char* name ) - : TQObject( tqparent, name ) +TQFileIconProvider::TQFileIconProvider( TQObject * parent, const char* name ) + : TQObject( parent, name ) { // nothing necessary } @@ -5081,8 +5081,8 @@ static void initPixmap( TQPixmap &pm ) } -TQWindowsIconProvider::TQWindowsIconProvider( TQObject *tqparent, const char *name ) - : TQFileIconProvider( tqparent, name ) +TQWindowsIconProvider::TQWindowsIconProvider( TQObject *parent, const char *name ) + : TQFileIconProvider( parent, name ) { pixw = GetSystemMetrics( SM_CXSMICON ); pixh = GetSystemMetrics( SM_CYSMICON ); @@ -5600,8 +5600,8 @@ void TQFileDialog::modeButtonsDestroyed() \endcode This function creates a modal file dialog called \a name, with - tqparent \a tqparent. If \a tqparent is not 0, the dialog will be shown - centered over the tqparent. + parent \a parent. If \a parent is not 0, the dialog will be shown + centered over the parent. The file dialog's working directory will be set to \a dir. If \a dir includes a file name, the file will be selected. The filter @@ -5616,8 +5616,8 @@ void TQFileDialog::modeButtonsDestroyed() file dialog and not a TQFileDialog, unless the style of the application is set to something other than the native style. (Note that on Windows the dialog will spin a blocking modal event loop that will not dispatch any - TQTimers and if tqparent is not 0 then it will position the dialog just under - the tqparent's titlebar). + TQTimers and if parent is not 0 then it will position the dialog just under + the parent's titlebar). Under Unix/X11, the normal behavior of the file dialog is to resolve and follow symlinks. For example, if /usr/tmp is a symlink to /var/tmp, @@ -5641,7 +5641,7 @@ void TQFileDialog::modeButtonsDestroyed() TQStringList TQFileDialog::getOpenFileNames( const TQString & filter, const TQString& dir, - TQWidget *tqparent, + TQWidget *parent, const char* name, const TQString& caption, TQString *selectedFilter, @@ -5671,11 +5671,11 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter, #if defined(TQ_WS_WIN) if ( qt_use_native_dialogs && tqApp->tqstyle().tqstyleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) - return winGetOpenFileNames( filter, workingDirectory, tqparent, name, caption, selectedFilter ); + return winGetOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter ); #elif defined(TQ_WS_MAC) if (qt_use_native_dialogs && (tqApp->tqstyle().inherits(TQMAC_DEFAULT_STYLE) || tqApp->tqstyle().inherits("TQMacStyle"))) { - TQStringList sl = macGetOpenFileNames(filter, dir.isEmpty() ? 0 : workingDirectory, tqparent, + TQStringList sl = macGetOpenFileNames(filter, dir.isEmpty() ? 0 : workingDirectory, parent, name, caption, selectedFilter); TQStringList::iterator it = sl.begin(); while (it != sl.end()) { @@ -5686,7 +5686,7 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter, } #endif - TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, tqparent, name ? name : "qt_filedlg_gofns", TRUE ); + TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, parent, name ? name : "qt_filedlg_gofns", TRUE ); TQ_CHECK_PTR( dlg ); #ifndef TQT_NO_WIDGET_TOPEXTRA @@ -6144,7 +6144,7 @@ void TQFileDialog::setContentsPreviewEnabled( bool contents ) class Preview : public TQLabel, public TQFilePreview { public: - Preview( TQWidget *tqparent=0 ) : TQLabel( tqparent ) {} + Preview( TQWidget *parent=0 ) : TQLabel( parent ) {} void previewUrl( const TQUrl &u ) { @@ -6204,7 +6204,7 @@ void TQFileDialog::setInfoPreview( TQWidget *w, TQFilePreview *preview ) class Preview : public TQLabel, public TQFilePreview { public: - Preview( TQWidget *tqparent=0 ) : TQLabel( tqparent ) {} + Preview( TQWidget *parent=0 ) : TQLabel( parent ) {} void previewUrl( const TQUrl &u ) { diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqfiledialog.h b/experimental/tqtinterface/qt4/src/dialogs/tqfiledialog.h index eef857e6e..4af062736 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqfiledialog.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqfiledialog.h @@ -72,7 +72,7 @@ class TQ_EXPORT TQFileIconProvider : public TQObject Q_OBJECT TQ_OBJECT public: - TQFileIconProvider( TQObject * tqparent = 0, const char* name = 0 ); + TQFileIconProvider( TQObject * parent = 0, const char* name = 0 ); virtual const TQPixmap * pixmap( const TQFileInfo & ); private: // Disabled copy constructor and operator= @@ -110,33 +110,33 @@ class TQ_EXPORT TQFileDialog : public TQDialog public: TQFileDialog( const TQString& dirName, const TQString& filter = TQString::null, - TQWidget* tqparent=0, const char* name=0, bool modal = FALSE ); - TQFileDialog( TQWidget* tqparent=0, const char* name=0, bool modal = FALSE ); + TQWidget* parent=0, const char* name=0, bool modal = FALSE ); + TQFileDialog( TQWidget* parent=0, const char* name=0, bool modal = FALSE ); ~TQFileDialog(); // recommended static functions static TQString getOpenFileName( const TQString &initially = TQString::null, const TQString &filter = TQString::null, - TQWidget *tqparent = 0, const char* name = 0, + TQWidget *parent = 0, const char* name = 0, const TQString &caption = TQString::null, TQString *selectedFilter = 0, bool resolveSymlinks = TRUE); static TQString getSaveFileName( const TQString &initially = TQString::null, const TQString &filter = TQString::null, - TQWidget *tqparent = 0, const char* name = 0, + TQWidget *parent = 0, const char* name = 0, const TQString &caption = TQString::null, TQString *selectedFilter = 0, bool resolveSymlinks = TRUE); static TQString getExistingDirectory( const TQString &dir = TQString::null, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char* name = 0, const TQString &caption = TQString::null, bool dirOnly = TRUE, bool resolveSymlinks = TRUE); static TQStringList getOpenFileNames( const TQString &filter= TQString::null, const TQString &dir = TQString::null, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char* name = 0, const TQString &caption = TQString::null, TQString *selectedFilter = 0, @@ -304,25 +304,25 @@ private: static TQString winGetOpenFileName( const TQString &initialSelection, const TQString &filter, TQString* workingDirectory, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char* name = 0, const TQString& caption = TQString::null, TQString* selectedFilter = 0 ); static TQString winGetSaveFileName( const TQString &initialSelection, const TQString &filter, TQString* workingDirectory, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char* name = 0, const TQString& caption = TQString::null, TQString* selectedFilter = 0 ); static TQStringList winGetOpenFileNames( const TQString &filter, TQString* workingDirectory, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char* name = 0, const TQString& caption = TQString::null, TQString* selectedFilter = 0 ); static TQString winGetExistingDirectory( const TQString &initialDirectory, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = 0, const TQString& caption = TQString::null); static TQString resolveLinkFile( const TQString& linkfile ); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqfontdialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqfontdialog.cpp index 5a10f0420..deed5d575 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqfontdialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqfontdialog.cpp @@ -146,15 +146,15 @@ public: Use setFont() to set the initial font attributes. - The \a tqparent, \a name, \a modal and \a f parameters are passed to + The \a parent, \a name, \a modal and \a f parameters are passed to the TQDialog constructor. \sa getFont() */ -TQFontDialog::TQFontDialog( TQWidget *tqparent, const char *name, +TQFontDialog::TQFontDialog( TQWidget *parent, const char *name, bool modal, WFlags f ) - : TQDialog( tqparent, name, modal, f ) + : TQDialog( parent, name, modal, f ) { setSizeGripEnabled( TRUE ); d = new TQFontDialogPrivate; @@ -321,7 +321,7 @@ TQFontDialog::~TQFontDialog() If the user clicks OK, the selected font is returned. If the user clicks Cancel, the \a initial font is returned. - The dialog is called \a name, with the tqparent \a tqparent. + The dialog is called \a name, with the parent \a parent. \a initial is the initially selected font. If the \a ok parameter is not-null, \e *\a ok is set to TRUE if the user clicked OK, and set to FALSE if the user clicked Cancel. @@ -349,9 +349,9 @@ TQFontDialog::~TQFontDialog() used, and if they click Cancel the original font is used. */ TQFont TQFontDialog::getFont( bool *ok, const TQFont &initial, - TQWidget *tqparent, const char* name) + TQWidget *parent, const char* name) { - return getFont( ok, &initial, tqparent, name ); + return getFont( ok, &initial, parent, name ); } /*! @@ -362,7 +362,7 @@ TQFont TQFontDialog::getFont( bool *ok, const TQFont &initial, If the user clicks OK, the selected font is returned. If the user clicks Cancel, the TQt default font is returned. - The dialog is called \a name, with tqparent \a tqparent. + The dialog is called \a name, with parent \a parent. If the \a ok parameter is not-null, \e *\a ok is set to TRUE if the user clicked OK, and FALSE if the user clicked Cancel. @@ -382,19 +382,19 @@ TQFont TQFontDialog::getFont( bool *ok, const TQFont &initial, \endcode */ -TQFont TQFontDialog::getFont( bool *ok, TQWidget *tqparent,const char* name) +TQFont TQFontDialog::getFont( bool *ok, TQWidget *parent,const char* name) { - return getFont( ok, 0, tqparent, name ); + return getFont( ok, 0, parent, name ); } TQFont TQFontDialog::getFont( bool *ok, const TQFont *def, - TQWidget *tqparent, const char* name) + TQWidget *parent, const char* name) { TQFont result; if ( def ) result = *def; - TQFontDialog *dlg = new TQFontDialog( tqparent, name, TRUE ); + TQFontDialog *dlg = new TQFontDialog( parent, name, TRUE ); dlg->setFont( ( def ? *def : TQFont() ) ); #ifndef TQT_NO_WIDGET_TOPEXTRA diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqfontdialog.h b/experimental/tqtinterface/qt4/src/dialogs/tqfontdialog.h index 2862fe53d..6dc0b7fef 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqfontdialog.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqfontdialog.h @@ -69,14 +69,14 @@ class TQ_EXPORT TQFontDialog: public TQDialog public: static TQFont getFont( bool *ok, const TQFont &def, - TQWidget* tqparent=0, const char* name=0); - static TQFont getFont( bool *ok, TQWidget* tqparent=0, const char* name=0); + TQWidget* parent=0, const char* name=0); + static TQFont getFont( bool *ok, TQWidget* parent=0, const char* name=0); private: static TQFont getFont( bool *ok, const TQFont *def, - TQWidget* tqparent=0, const char* name=0); + TQWidget* parent=0, const char* name=0); - TQFontDialog( TQWidget* tqparent=0, const char* name=0, bool modal=FALSE, + TQFontDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE, WFlags f=0 ); ~TQFontDialog(); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqinputdialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqinputdialog.cpp index 951826baf..a9ae81f7e 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqinputdialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqinputdialog.cpp @@ -116,17 +116,17 @@ public: /*! Constructs the dialog. The \a label is the text which is shown to the user - (it should tell the user what they are expected to enter). The \a tqparent - is the dialog's tqparent widget. The widget is called \a name. If \a + (it should tell the user what they are expected to enter). The \a parent + is the dialog's parent widget. The widget is called \a name. If \a modal is TRUE (the default) the dialog will be modal. The \a type parameter is used to specify which type of dialog to construct. \sa getText(), getInteger(), getDouble(), getItem() */ -TQInputDialog::TQInputDialog( const TQString &label, TQWidget* tqparent, +TQInputDialog::TQInputDialog( const TQString &label, TQWidget* parent, const char* name, bool modal, Type type ) - : TQDialog( tqparent, name, modal ) + : TQDialog( parent, name, modal ) { d = new TQInputDialogPrivate; d->lineEdit = 0; @@ -275,7 +275,7 @@ TQInputDialog::~TQInputDialog() placed in the line edit. The \a mode is the echo mode the line edit will use. If \a ok is not-null \e *\a ok will be set to TRUE if the user pressed OK and to FALSE if the user pressed Cancel. The - dialog's tqparent is \a tqparent; the dialog is called \a name. The + dialog's parent is \a parent; the dialog is called \a name. The dialog will be modal. This function returns the text which has been entered in the line @@ -298,9 +298,9 @@ TQInputDialog::~TQInputDialog() TQString TQInputDialog::getText( const TQString &caption, const TQString &label, TQLineEdit::EchoMode mode, const TQString &text, - bool *ok, TQWidget *tqparent, const char *name ) + bool *ok, TQWidget *parent, const char *name ) { - TQInputDialog *dlg = new TQInputDialog( label, tqparent, + TQInputDialog *dlg = new TQInputDialog( label, parent, name ? name : "qt_inputdlg_gettext", TRUE, LineEdit ); @@ -334,7 +334,7 @@ TQString TQInputDialog::getText( const TQString &caption, const TQString &label, If \a ok is not-null *\a ok will be set to TRUE if the user pressed OK and to FALSE if the user pressed Cancel. The dialog's - tqparent is \a tqparent; the dialog is called \a name. The dialog will + parent is \a parent; the dialog is called \a name. The dialog will be modal. This function returns the integer which has been entered by the user. @@ -356,9 +356,9 @@ TQString TQInputDialog::getText( const TQString &caption, const TQString &label, int TQInputDialog::getInteger( const TQString &caption, const TQString &label, int value, int minValue, int maxValue, int step, bool *ok, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) { - TQInputDialog *dlg = new TQInputDialog( label, tqparent, + TQInputDialog *dlg = new TQInputDialog( label, parent, name ? name : "qt_inputdlg_getint", TRUE, SpinBox ); #ifndef TQT_NO_WIDGET_TOPEXTRA @@ -391,7 +391,7 @@ int TQInputDialog::getInteger( const TQString &caption, const TQString &label, If \a ok is not-null \e *\a ok will be set to TRUE if the user pressed OK and to FALSE if the user pressed Cancel. The dialog's - tqparent is \a tqparent; the dialog is called \a name. The dialog will + parent is \a parent; the dialog is called \a name. The dialog will be modal. This function returns the floating point number which has been @@ -414,10 +414,10 @@ int TQInputDialog::getInteger( const TQString &caption, const TQString &label, double TQInputDialog::getDouble( const TQString &caption, const TQString &label, double value, double minValue, double maxValue, - int decimals, bool *ok, TQWidget *tqparent, + int decimals, bool *ok, TQWidget *parent, const char *name ) { - TQInputDialog dlg( label, tqparent, + TQInputDialog dlg( label, parent, name ? name : "qt_inputdlg_getdbl", TRUE, LineEdit ); #ifndef TQT_NO_WIDGET_TOPEXTRA dlg.setCaption( caption ); @@ -444,7 +444,7 @@ double TQInputDialog::getDouble( const TQString &caption, const TQString &label, If \a ok is not-null \e *\a ok will be set to TRUE if the user pressed OK and to FALSE if the user pressed Cancel. The dialog's - tqparent is \a tqparent; the dialog is called \a name. The dialog will + parent is \a parent; the dialog is called \a name. The dialog will be modal. This function returns the text of the current item, or if \a @@ -469,9 +469,9 @@ double TQInputDialog::getDouble( const TQString &caption, const TQString &label, TQString TQInputDialog::getItem( const TQString &caption, const TQString &label, const TQStringList &list, int current, bool editable, - bool *ok, TQWidget *tqparent, const char *name ) + bool *ok, TQWidget *parent, const char *name ) { - TQInputDialog *dlg = new TQInputDialog( label, tqparent, name ? name : "qt_inputdlg_getitem", TRUE, editable ? EditableComboBox : ComboBox ); + TQInputDialog *dlg = new TQInputDialog( label, parent, name ? name : "qt_inputdlg_getitem", TRUE, editable ? EditableComboBox : ComboBox ); #ifndef TQT_NO_WIDGET_TOPEXTRA dlg->setCaption( caption ); #endif diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqinputdialog.h b/experimental/tqtinterface/qt4/src/dialogs/tqinputdialog.h index 8b7be7123..38aac9b68 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqinputdialog.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqinputdialog.h @@ -61,7 +61,7 @@ class TQ_EXPORT TQInputDialog : public TQDialog private: enum Type { LineEdit, SpinBox, ComboBox, EditableComboBox }; - TQInputDialog( const TQString &label, TQWidget* tqparent=0, const char* name=0, + TQInputDialog( const TQString &label, TQWidget* parent=0, const char* name=0, bool modal = TRUE, Type type = LineEdit ); //### 4.0: widget flag! ~TQInputDialog(); @@ -76,16 +76,16 @@ private: public: //### 4.0: widget flag! static TQString getText( const TQString &caption, const TQString &label, TQLineEdit::EchoMode echo = TQLineEdit::Normal, - const TQString &text = TQString::null, bool *ok = 0, TQWidget *tqparent = 0, const char *name = 0 ); + const TQString &text = TQString::null, bool *ok = 0, TQWidget *parent = 0, const char *name = 0 ); static int getInteger( const TQString &caption, const TQString &label, int value = 0, int minValue = -2147483647, int maxValue = 2147483647, - int step = 1, bool *ok = 0, TQWidget *tqparent = 0, const char *name = 0 ); + int step = 1, bool *ok = 0, TQWidget *parent = 0, const char *name = 0 ); static double getDouble( const TQString &caption, const TQString &label, double value = 0, double minValue = -2147483647, double maxValue = 2147483647, - int decimals = 1, bool *ok = 0, TQWidget *tqparent = 0, const char *name = 0 ); + int decimals = 1, bool *ok = 0, TQWidget *parent = 0, const char *name = 0 ); static TQString getItem( const TQString &caption, const TQString &label, const TQStringList &list, int current = 0, bool editable = TRUE, - bool *ok = 0, TQWidget *tqparent = 0, const char *name = 0 ); + bool *ok = 0, TQWidget *parent = 0, const char *name = 0 ); private Q_SLOTS: void textChanged( const TQString &s ); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqmessagebox.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqmessagebox.cpp index 878a618f9..a31c21875 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqmessagebox.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqmessagebox.cpp @@ -63,7 +63,7 @@ class TQMessageBoxLabel : public TQLabel { TQ_OBJECT public: - TQMessageBoxLabel( TQWidget* tqparent ) : TQLabel( tqparent, "messageBoxText") + TQMessageBoxLabel( TQWidget* parent ) : TQLabel( parent, "messageBoxText") { tqsetAlignment( TQt::AlignAuto|TQt::ExpandTabs ); } @@ -1404,8 +1404,8 @@ static char * qtlogo_xpm[] = { struct TQMessageBoxData { - TQMessageBoxData(TQMessageBox* tqparent) : - iconLabel( tqparent, "icon" ) + TQMessageBoxData(TQMessageBox* parent) : + iconLabel( parent, "icon" ) { } @@ -1447,16 +1447,16 @@ const char * mb_texts[] = { Constructs a message box with no text and a button with the label "OK". - If \a tqparent is 0, the message box becomes an application-global - modal dialog box. If \a tqparent is a widget, the message box - becomes modal relative to \a tqparent. + If \a parent is 0, the message box becomes an application-global + modal dialog box. If \a parent is a widget, the message box + becomes modal relative to \a parent. - The \a tqparent and \a name arguments are passed to the TQDialog + The \a parent and \a name arguments are passed to the TQDialog constructor. */ -TQMessageBox::TQMessageBox( TQWidget *tqparent, const char *name ) - : TQDialog( tqparent, name, TRUE, (WFlags)(WStyle_Customize | TQt::WStyle_DialogBorder | TQt::WStyle_Title | TQt::WStyle_SysMenu) ) +TQMessageBox::TQMessageBox( TQWidget *parent, const char *name ) + : TQDialog( parent, name, TRUE, (WFlags)(WStyle_Customize | TQt::WStyle_DialogBorder | TQt::WStyle_Title | TQt::WStyle_SysMenu) ) { init( Ok, 0, 0 ); } @@ -1514,14 +1514,14 @@ TQMessageBox::TQMessageBox( TQWidget *tqparent, const char *name ) // try again \endcode - If \a tqparent is 0, the message box becomes an application-global - modal dialog box. If \a tqparent is a widget, the message box - becomes modal relative to \a tqparent. + If \a parent is 0, the message box becomes an application-global + modal dialog box. If \a parent is a widget, the message box + becomes modal relative to \a parent. If \a modal is TRUE the message box is modal; otherwise it is modeless. - The \a tqparent, \a name, \a modal, and \a f arguments are passed to + The \a parent, \a name, \a modal, and \a f arguments are passed to the TQDialog constructor. \sa setCaption(), setText(), setIcon() @@ -1530,9 +1530,9 @@ TQMessageBox::TQMessageBox( TQWidget *tqparent, const char *name ) TQMessageBox::TQMessageBox( const TQString& caption, const TQString &text, Icon icon, int button0, int button1, int button2, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal, WFlags f ) - : TQDialog( tqparent, name, modal, (WFlags)(f | (WFlags)WStyle_Customize | TQt::WStyle_DialogBorder | TQt::WStyle_Title | TQt::WStyle_SysMenu) ) + : TQDialog( parent, name, modal, (WFlags)(f | (WFlags)WStyle_Customize | TQt::WStyle_DialogBorder | TQt::WStyle_Title | TQt::WStyle_SysMenu) ) { init( button0, button1, button2 ); #ifndef TQT_NO_WIDGET_TOPEXTRA @@ -2076,20 +2076,20 @@ void TQMessageBox::closeEvent( TQCloseEvent *e ) Returns the identity (TQMessageBox::Ok, or TQMessageBox::No, etc.) of the button that was clicked. - If \a tqparent is 0, the message box becomes an application-global - modal dialog box. If \a tqparent is a widget, the message box - becomes modal relative to \a tqparent. + If \a parent is 0, the message box becomes an application-global + modal dialog box. If \a parent is a widget, the message box + becomes modal relative to \a parent. \sa question(), warning(), critical() */ -int TQMessageBox::information( TQWidget *tqparent, +int TQMessageBox::information( TQWidget *parent, const TQString& caption, const TQString& text, int button0, int button1, int button2 ) { TQMessageBox *mb = new TQMessageBox( caption, text, Information, button0, button1, button2, - tqparent, "qt_msgbox_information", TRUE, + parent, "qt_msgbox_information", TRUE, (WFlags)TQt::WDestructiveClose); TQ_CHECK_PTR( mb ); return mb->exec(); @@ -2123,20 +2123,20 @@ int TQMessageBox::information( TQWidget *tqparent, Returns the identity (TQMessageBox::Yes, or TQMessageBox::No, etc.) of the button that was clicked. - If \a tqparent is 0, the message box becomes an application-global - modal dialog box. If \a tqparent is a widget, the message box - becomes modal relative to \a tqparent. + If \a parent is 0, the message box becomes an application-global + modal dialog box. If \a parent is a widget, the message box + becomes modal relative to \a parent. \sa information(), warning(), critical() */ -int TQMessageBox::question( TQWidget *tqparent, +int TQMessageBox::question( TQWidget *parent, const TQString& caption, const TQString& text, int button0, int button1, int button2 ) { TQMessageBox *mb = new TQMessageBox( caption, text, Question, button0, button1, button2, - tqparent, "qt_msgbox_information", TRUE, + parent, "qt_msgbox_information", TRUE, (WFlags)TQt::WDestructiveClose); TQ_CHECK_PTR( mb ); return mb->exec(); @@ -2171,20 +2171,20 @@ int TQMessageBox::question( TQWidget *tqparent, Returns the identity (TQMessageBox::Ok, or TQMessageBox::No, etc.) of the button that was clicked. - If \a tqparent is 0, the message box becomes an application-global - modal dialog box. If \a tqparent is a widget, the message box - becomes modal relative to \a tqparent. + If \a parent is 0, the message box becomes an application-global + modal dialog box. If \a parent is a widget, the message box + becomes modal relative to \a parent. \sa information(), question(), critical() */ -int TQMessageBox::warning( TQWidget *tqparent, +int TQMessageBox::warning( TQWidget *parent, const TQString& caption, const TQString& text, int button0, int button1, int button2 ) { TQMessageBox *mb = new TQMessageBox( caption, text, Warning, button0, button1, button2, - tqparent, "qt_msgbox_warning", TRUE, + parent, "qt_msgbox_warning", TRUE, (WFlags)TQt::WDestructiveClose); TQ_CHECK_PTR( mb ); return mb->exec(); @@ -2219,20 +2219,20 @@ int TQMessageBox::warning( TQWidget *tqparent, Returns the identity (TQMessageBox::Ok, or TQMessageBox::No, etc.) of the button that was clicked. - If \a tqparent is 0, the message box becomes an application-global - modal dialog box. If \a tqparent is a widget, the message box - becomes modal relative to \a tqparent. + If \a parent is 0, the message box becomes an application-global + modal dialog box. If \a parent is a widget, the message box + becomes modal relative to \a parent. \sa information(), question(), warning() */ -int TQMessageBox::critical( TQWidget *tqparent, +int TQMessageBox::critical( TQWidget *parent, const TQString& caption, const TQString& text, int button0, int button1, int button2 ) { TQMessageBox *mb = new TQMessageBox( caption, text, Critical, button0, button1, button2, - tqparent, "qt_msgbox_critical", TRUE, + parent, "qt_msgbox_critical", TRUE, (WFlags)TQt::WDestructiveClose); TQ_CHECK_PTR( mb ); return mb->exec(); @@ -2241,12 +2241,12 @@ int TQMessageBox::critical( TQWidget *tqparent, /*! Displays a simple about box with caption \a caption and text \a - text. The about box's tqparent is \a tqparent. + text. The about box's parent is \a parent. about() looks for a suitable icon in four locations: \list 1 - \i It prefers \link TQWidget::icon() tqparent->icon() \endlink if that exists. - \i If not, it tries the top-level widget containing \a tqparent. + \i It prefers \link TQWidget::icon() parent->icon() \endlink if that exists. + \i If not, it tries the top-level widget containing \a parent. \i If that fails, it tries the \link TQApplication::mainWidget() main widget. \endlink \i As a last resort it uses the Information icon. @@ -2257,21 +2257,21 @@ int TQMessageBox::critical( TQWidget *tqparent, \sa TQWidget::icon() TQApplication::mainWidget() */ -void TQMessageBox::about( TQWidget *tqparent, const TQString &caption, +void TQMessageBox::about( TQWidget *parent, const TQString &caption, const TQString& text ) { TQMessageBox *mb = new TQMessageBox( caption, text, Information, Ok + Default, 0, 0, - tqparent, "qt_msgbox_simple_about_box", TRUE, + parent, "qt_msgbox_simple_about_box", TRUE, (WFlags)TQt::WDestructiveClose); TQ_CHECK_PTR( mb ); #ifndef TQT_NO_WIDGET_TOPEXTRA - const TQPixmap *pm = tqparent ? tqparent->icon() : 0; + const TQPixmap *pm = parent ? parent->icon() : 0; if ( pm && !pm->isNull() ) mb->setIconPixmap( *pm ); else { - pm = tqparent ? tqparent->tqtopLevelWidget()->icon() : 0; + pm = parent ? parent->tqtopLevelWidget()->icon() : 0; if ( pm && !pm->isNull() ) mb->setIconPixmap( *pm ); else { @@ -2297,7 +2297,7 @@ void TQMessageBox::styleChanged( TQStyle& ) } -static int textBox( TQWidget *tqparent, TQMessageBox::Icon severity, +static int textBox( TQWidget *parent, TQMessageBox::Icon severity, const TQString& caption, const TQString& text, const TQString& button0Text, const TQString& button1Text, @@ -2320,7 +2320,7 @@ static int textBox( TQWidget *tqparent, TQMessageBox::Icon severity, TQMessageBox *mb = new TQMessageBox( caption, text, severity, b[0], b[1], b[2], - tqparent, "qt_msgbox_information", TRUE, + parent, "qt_msgbox_information", TRUE, (WFlags)TQt::WDestructiveClose); TQ_CHECK_PTR( mb ); if ( button0Text.isEmpty() ) @@ -2358,9 +2358,9 @@ static int textBox( TQWidget *tqparent, TQMessageBox::Icon severity, supply 0, 1 or 2 to make pressing Escape equivalent to clicking the relevant button. - If \a tqparent is 0, the message box becomes an application-global - modal dialog box. If \a tqparent is a widget, the message box - becomes modal relative to \a tqparent. + If \a parent is 0, the message box becomes an application-global + modal dialog box. If \a parent is a widget, the message box + becomes modal relative to \a parent. Note: If you do not specify an Escape button then if the Escape button is pressed then -1 will be returned. It is suggested that @@ -2369,7 +2369,7 @@ static int textBox( TQWidget *tqparent, TQMessageBox::Icon severity, \sa question(), warning(), critical() */ -int TQMessageBox::information( TQWidget *tqparent, const TQString &caption, +int TQMessageBox::information( TQWidget *parent, const TQString &caption, const TQString& text, const TQString& button0Text, const TQString& button1Text, @@ -2377,7 +2377,7 @@ int TQMessageBox::information( TQWidget *tqparent, const TQString &caption, int defaultButtonNumber, int escapeButtonNumber ) { - return textBox( tqparent, Information, caption, text, + return textBox( parent, Information, caption, text, button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); } @@ -2401,9 +2401,9 @@ int TQMessageBox::information( TQWidget *tqparent, const TQString &caption, supply 0, 1 or 2 to make pressing Escape equivalent to clicking the relevant button. - If \a tqparent is 0, the message box becomes an application-global - modal dialog box. If \a tqparent is a widget, the message box - becomes modal relative to \a tqparent. + If \a parent is 0, the message box becomes an application-global + modal dialog box. If \a parent is a widget, the message box + becomes modal relative to \a parent. Note: If you do not specify an Escape button then if the Escape button is pressed then -1 will be returned. It is suggested that @@ -2411,7 +2411,7 @@ int TQMessageBox::information( TQWidget *tqparent, const TQString &caption, \sa information(), warning(), critical() */ -int TQMessageBox::question( TQWidget *tqparent, const TQString &caption, +int TQMessageBox::question( TQWidget *parent, const TQString &caption, const TQString& text, const TQString& button0Text, const TQString& button1Text, @@ -2419,7 +2419,7 @@ int TQMessageBox::question( TQWidget *tqparent, const TQString &caption, int defaultButtonNumber, int escapeButtonNumber ) { - return textBox( tqparent, Question, caption, text, + return textBox( parent, Question, caption, text, button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); } @@ -2444,9 +2444,9 @@ int TQMessageBox::question( TQWidget *tqparent, const TQString &caption, supply 0, 1, or 2 to make pressing Escape equivalent to clicking the relevant button. - If \a tqparent is 0, the message box becomes an application-global - modal dialog box. If \a tqparent is a widget, the message box - becomes modal relative to \a tqparent. + If \a parent is 0, the message box becomes an application-global + modal dialog box. If \a parent is a widget, the message box + becomes modal relative to \a parent. Note: If you do not specify an Escape button then if the Escape button is pressed then -1 will be returned. It is suggested that @@ -2455,7 +2455,7 @@ int TQMessageBox::question( TQWidget *tqparent, const TQString &caption, \sa information(), question(), critical() */ -int TQMessageBox::warning( TQWidget *tqparent, const TQString &caption, +int TQMessageBox::warning( TQWidget *parent, const TQString &caption, const TQString& text, const TQString& button0Text, const TQString& button1Text, @@ -2463,7 +2463,7 @@ int TQMessageBox::warning( TQWidget *tqparent, const TQString &caption, int defaultButtonNumber, int escapeButtonNumber ) { - return textBox( tqparent, Warning, caption, text, + return textBox( parent, Warning, caption, text, button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); } @@ -2488,14 +2488,14 @@ int TQMessageBox::warning( TQWidget *tqparent, const TQString &caption, supply 0, 1, or 2 to make pressing Escape equivalent to clicking the relevant button. - If \a tqparent is 0, the message box becomes an application-global - modal dialog box. If \a tqparent is a widget, the message box - becomes modal relative to \a tqparent. + If \a parent is 0, the message box becomes an application-global + modal dialog box. If \a parent is a widget, the message box + becomes modal relative to \a parent. \sa information(), question(), warning() */ -int TQMessageBox::critical( TQWidget *tqparent, const TQString &caption, +int TQMessageBox::critical( TQWidget *parent, const TQString &caption, const TQString& text, const TQString& button0Text, const TQString& button1Text, @@ -2503,7 +2503,7 @@ int TQMessageBox::critical( TQWidget *tqparent, const TQString &caption, int defaultButtonNumber, int escapeButtonNumber ) { - return textBox( tqparent, Critical, caption, text, + return textBox( parent, Critical, caption, text, button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); } @@ -2511,7 +2511,7 @@ int TQMessageBox::critical( TQWidget *tqparent, const TQString &caption, /*! Displays a simple message box about TQt, with caption \a caption - and centered over \a tqparent (if \a tqparent is not 0). The message + and centered over \a parent (if \a parent is not 0). The message includes the version number of TQt being used by the application. This is useful for inclusion in the Help menu of an application. @@ -2522,9 +2522,9 @@ int TQMessageBox::critical( TQWidget *tqparent, const TQString &caption, \sa TQApplication::aboutTQt() */ -void TQMessageBox::aboutTQt( TQWidget *tqparent, const TQString &caption ) +void TQMessageBox::aboutTQt( TQWidget *parent, const TQString &caption ) { - TQMessageBox *mb = new TQMessageBox( tqparent, "qt_msgbox_about_qt" ); + TQMessageBox *mb = new TQMessageBox( parent, "qt_msgbox_about_qt" ); TQ_CHECK_PTR( mb ); mb->setWFlags( TQt::WDestructiveClose ); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqmessagebox.h b/experimental/tqtinterface/qt4/src/dialogs/tqmessagebox.h index c56781439..f9b0ac9b0 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqmessagebox.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqmessagebox.h @@ -65,10 +65,10 @@ public: enum Icon { NoIcon = 0, Information = 1, Warning = 2, Critical = 3, Question = 4 }; - TQMessageBox( TQWidget* tqparent=0, const char* name=0 ); + TQMessageBox( TQWidget* parent=0, const char* name=0 ); TQMessageBox( const TQString& caption, const TQString &text, Icon icon, int button0, int button1, int button2, - TQWidget* tqparent=0, const char* name=0, bool modal=TRUE, + TQWidget* parent=0, const char* name=0, bool modal=TRUE, WFlags f=(WFlags)TQt::WStyle_DialogBorder ); ~TQMessageBox(); @@ -76,10 +76,10 @@ public: Retry = 6, Ignore = 7, YesAll = 8, NoAll = 9, ButtonMask = 0xff, Default = 0x100, Escape = 0x200, FlagMask = 0x300 }; - static int information( TQWidget *tqparent, const TQString &caption, + static int information( TQWidget *parent, const TQString &caption, const TQString& text, int button0, int button1=0, int button2=0 ); - static int information( TQWidget *tqparent, const TQString &caption, + static int information( TQWidget *parent, const TQString &caption, const TQString& text, const TQString& button0Text = TQString::null, const TQString& button1Text = TQString::null, @@ -87,10 +87,10 @@ public: int defaultButtonNumber = 0, int escapeButtonNumber = -1 ); - static int question( TQWidget *tqparent, const TQString &caption, + static int question( TQWidget *parent, const TQString &caption, const TQString& text, int button0, int button1=0, int button2=0 ); - static int question( TQWidget *tqparent, const TQString &caption, + static int question( TQWidget *parent, const TQString &caption, const TQString& text, const TQString& button0Text = TQString::null, const TQString& button1Text = TQString::null, @@ -98,10 +98,10 @@ public: int defaultButtonNumber = 0, int escapeButtonNumber = -1 ); - static int warning( TQWidget *tqparent, const TQString &caption, + static int warning( TQWidget *parent, const TQString &caption, const TQString& text, int button0, int button1, int button2=0 ); - static int warning( TQWidget *tqparent, const TQString &caption, + static int warning( TQWidget *parent, const TQString &caption, const TQString& text, const TQString& button0Text = TQString::null, const TQString& button1Text = TQString::null, @@ -109,10 +109,10 @@ public: int defaultButtonNumber = 0, int escapeButtonNumber = -1 ); - static int critical( TQWidget *tqparent, const TQString &caption, + static int critical( TQWidget *parent, const TQString &caption, const TQString& text, int button0, int button1, int button2=0 ); - static int critical( TQWidget *tqparent, const TQString &caption, + static int critical( TQWidget *parent, const TQString &caption, const TQString& text, const TQString& button0Text = TQString::null, const TQString& button1Text = TQString::null, @@ -120,18 +120,18 @@ public: int defaultButtonNumber = 0, int escapeButtonNumber = -1 ); - static void about( TQWidget *tqparent, const TQString &caption, + static void about( TQWidget *parent, const TQString &caption, const TQString& text ); - static void aboutTQt( TQWidget *tqparent, + static void aboutTQt( TQWidget *parent, const TQString& caption=TQString::null ); /* OBSOLETE */ static int message( const TQString &caption, const TQString& text, const TQString& buttonText=TQString::null, - TQWidget *tqparent=0, const char * =0 ) { - return TQMessageBox::information( tqparent, caption, text, + TQWidget *parent=0, const char * =0 ) { + return TQMessageBox::information( parent, caption, text, buttonText.isEmpty() ? tqtr("OK") : buttonText ) == 0; } @@ -141,8 +141,8 @@ public: const TQString& text, const TQString& yesButtonText=TQString::null, const TQString& noButtonText=TQString::null, - TQWidget *tqparent=0, const char * = 0 ) { - return TQMessageBox::information( tqparent, caption, text, + TQWidget *parent=0, const char * = 0 ) { + return TQMessageBox::information( parent, caption, text, yesButtonText.isEmpty() ? tqtr("OK") : yesButtonText, noButtonText ) == 0; diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqprintdialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqprintdialog.cpp index d4f247268..2050c822d 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqprintdialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqprintdialog.cpp @@ -93,8 +93,8 @@ class TQPrintDialogSpinBox : public TQSpinBox { public: - TQPrintDialogSpinBox(int min, int max, int steps, TQWidget *tqparent, const char *name) - : TQSpinBox(min, max, steps, tqparent, name) + TQPrintDialogSpinBox(int min, int max, int steps, TQWidget *parent, const char *name) + : TQSpinBox(min, max, steps, parent, name) {} void interpretText() @@ -856,11 +856,11 @@ static void qpd_cleanup_globaldialog() /*! Constructs a new modal printer dialog that configures \a prn and is a - child of \a tqparent named \a name. + child of \a parent named \a name. */ -TQPrintDialog::TQPrintDialog( TQPrinter *prn, TQWidget *tqparent, const char *name ) - : TQDialog( tqparent, name, TRUE ) +TQPrintDialog::TQPrintDialog( TQPrinter *prn, TQWidget *parent, const char *name ) + : TQDialog( parent, name, TRUE ) { d = new TQPrintDialogPrivate; d->numCopies = 1; diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqprintdialog.h b/experimental/tqtinterface/qt4/src/dialogs/tqprintdialog.h index b1d8014ca..48c89ef56 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqprintdialog.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqprintdialog.h @@ -56,7 +56,7 @@ class TQ_EXPORT TQPrintDialog : public TQDialog Q_OBJECT TQ_OBJECT public: - TQPrintDialog( TQPrinter *, TQWidget* tqparent=0, const char* name=0 ); + TQPrintDialog( TQPrinter *, TQWidget* parent=0, const char* name=0 ); ~TQPrintDialog(); static bool getPrinterSetup( TQPrinter *, TQWidget* = 0 ); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp index 74bf69fe9..6e5da3f60 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp @@ -68,10 +68,10 @@ static const int spacing = 4; class TQProgressDialogData { public: - TQProgressDialogData( TQProgressDialog* that, TQWidget* tqparent, + TQProgressDialogData( TQProgressDialog* that, TQWidget* parent, const TQString& labelText, int totalSteps ) : - creator( tqparent ), + creator( parent ), label( new TQLabel(labelText,that,"label") ), cancel( 0 ), bar( new TQProgressBar(totalSteps,that,"bar") ), @@ -163,8 +163,8 @@ progress.setProgress( numFiles ); canceled() signal to a slot that stops the operation, and call \l setProgress() at intervals. For example: \code -Operation::Operation( TQObject *tqparent = 0 ) - : TQObject( tqparent ), steps( 0 ) +Operation::Operation( TQObject *parent = 0 ) + : TQObject( parent ), steps( 0 ) { pd = new TQProgressDialog( "Operation in progress.", "Cancel", 100 ); connect( pd, TQT_SIGNAL(canceled()), this, TQT_SLOT(cancel()) ); @@ -236,7 +236,7 @@ TQProgressBar *TQProgressDialog::bar() const \i The total number of steps is 100. \endlist - The \a creator argument is the widget to use as the dialog's tqparent. + The \a creator argument is the widget to use as the dialog's parent. The \a name, \a modal, and the widget flags, \a f, are passed to the TQDialog::TQDialog() constructor. If \a modal is FALSE (the default), you must have an event loop proceeding for any redrawing @@ -269,7 +269,7 @@ TQProgressDialog::TQProgressDialog( TQWidget *creator, const char *name, processed call setProgress(1), setProgress(2), etc., finally calling setProgress(50) after examining the last file. - The \a creator argument is the widget to use as the dialog's tqparent. + The \a creator argument is the widget to use as the dialog's parent. The \a name, \a modal, and widget flags, \a f, are passed to the TQDialog::TQDialog() constructor. If \a modal is FALSE (the default), you will must have an event loop proceeding for any redrawing of diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.h b/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.h index 96ed191f9..6c5dbe7ff 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.h @@ -67,10 +67,10 @@ class TQ_EXPORT TQProgressDialog : public TQDialog Q_PROPERTY( TQString labelText READ labelText WRITE setLabelText ) public: - TQProgressDialog( TQWidget* tqparent=0, const char* name=0, bool modal=FALSE, + TQProgressDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE, WFlags f=0 ); TQProgressDialog( const TQString& labelText, const TQString &cancelButtonText, - int totalSteps, TQWidget* tqparent=0, const char* name=0, + int totalSteps, TQWidget* parent=0, const char* name=0, bool modal=FALSE, WFlags f=0 ); ~TQProgressDialog(); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqsemimodal.h b/experimental/tqtinterface/qt4/src/dialogs/tqsemimodal.h index fafa0af51..d114b905d 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqsemimodal.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqsemimodal.h @@ -52,8 +52,8 @@ class TQ_EXPORT TQSemiModal : public TQDialog Q_OBJECT TQ_OBJECT public: - TQSemiModal( TQWidget* tqparent=0, const char* name=0, bool modal=FALSE, WFlags f=0 ) - : TQDialog( tqparent, name, modal, f ) { } + TQSemiModal( TQWidget* parent=0, const char* name=0, bool modal=FALSE, WFlags f=0 ) + : TQDialog( parent, name, modal, f ) { } private: // Disabled copy constructor and operator= #if defined(TQ_DISABLE_COPY) diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqtabdialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqtabdialog.cpp index 66b9a6413..fd91293df 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqtabdialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqtabdialog.cpp @@ -178,13 +178,13 @@ TQTabDialogPrivate::TQTabDialogPrivate() /*! Constructs a TQTabDialog with only an OK button. - The \a tqparent, \a name, \a modal and widget flag, \a f, arguments + The \a parent, \a name, \a modal and widget flag, \a f, arguments are passed on to the TQDialog constructor. */ -TQTabDialog::TQTabDialog( TQWidget *tqparent, const char *name, bool modal, +TQTabDialog::TQTabDialog( TQWidget *parent, const char *name, bool modal, WFlags f ) - : TQDialog( tqparent, name, modal, f ) + : TQDialog( parent, name, modal, f ) { d = new TQTabDialogPrivate; TQ_CHECK_PTR( d ); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqtabdialog.h b/experimental/tqtinterface/qt4/src/dialogs/tqtabdialog.h index d485dfea0..6e98d166a 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqtabdialog.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqtabdialog.h @@ -57,7 +57,7 @@ class TQ_EXPORT TQTabDialog : public TQDialog Q_OBJECT TQ_OBJECT public: - TQTabDialog( TQWidget* tqparent=0, const char* name=0, bool modal=FALSE, + TQTabDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE, WFlags f=0 ); ~TQTabDialog(); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqwizard.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqwizard.cpp index 93c317389..4e3f59262 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqwizard.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqwizard.cpp @@ -157,13 +157,13 @@ public: /*! - Constructs an empty wizard dialog. The \a tqparent, \a name, \a + Constructs an empty wizard dialog. The \a parent, \a name, \a modal and \a f arguments are passed to the TQDialog constructor. */ -TQWizard::TQWizard( TQWidget *tqparent, const char *name, bool modal, +TQWizard::TQWizard( TQWidget *parent, const char *name, bool modal, WFlags f ) - : TQDialog( tqparent, name, modal, f ) + : TQDialog( parent, name, modal, f ) { d = new TQWizardPrivate(); d->current = 0; // not quite true, but... diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqwizard.h b/experimental/tqtinterface/qt4/src/dialogs/tqwizard.h index 89f69f8e2..f3a5fadf2 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqwizard.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqwizard.h @@ -58,7 +58,7 @@ class TQ_EXPORT TQWizard : public TQDialog Q_PROPERTY( TQFont titleFont READ titleFont WRITE setTitleFont ) public: - TQWizard( TQWidget* tqparent=0, const char* name=0, bool modal=FALSE, + TQWizard( TQWidget* parent=0, const char* name=0, bool modal=FALSE, WFlags f=0 ); ~TQWizard(); diff --git a/experimental/tqtinterface/qt4/src/iconview/tqiconview.cpp b/experimental/tqtinterface/qt4/src/iconview/tqiconview.cpp index d1e1e14f7..586e5ff57 100644 --- a/experimental/tqtinterface/qt4/src/iconview/tqiconview.cpp +++ b/experimental/tqtinterface/qt4/src/iconview/tqiconview.cpp @@ -380,7 +380,7 @@ static int cmpIconViewItems( const void *n1, const void *n2 ) class TQIconViewToolTip : public TQToolTip { public: - TQIconViewToolTip( TQWidget *tqparent, TQIconView *iv ); + TQIconViewToolTip( TQWidget *parent, TQIconView *iv ); void maybeTip( const TQPoint &pos ); @@ -388,8 +388,8 @@ private: TQIconView *view; }; -TQIconViewToolTip::TQIconViewToolTip( TQWidget *tqparent, TQIconView *iv ) - : TQToolTip( tqparent ), view( iv ) +TQIconViewToolTip::TQIconViewToolTip( TQWidget *parent, TQIconView *iv ) + : TQToolTip( parent ), view( iv ) { } @@ -431,7 +431,7 @@ class TQIconViewItemLineEdit : public TQTextEdit friend class TQIconViewItem; public: - TQIconViewItemLineEdit( const TQString &text, TQWidget *tqparent, TQIconViewItem *theItem, const char* name=0 ); + TQIconViewItemLineEdit( const TQString &text, TQWidget *parent, TQIconViewItem *theItem, const char* name=0 ); protected: void keyPressEvent( TQKeyEvent *e ); @@ -448,9 +448,9 @@ private: }; -TQIconViewItemLineEdit::TQIconViewItemLineEdit( const TQString &text, TQWidget *tqparent, +TQIconViewItemLineEdit::TQIconViewItemLineEdit( const TQString &text, TQWidget *parent, TQIconViewItem *theItem, const char *name ) - : TQTextEdit( tqparent, name ), item( theItem ), startText( text ) + : TQTextEdit( parent, name ), item( theItem ), startText( text ) { setFrameStyle( TQFrame::Plain | TQFrame::Box ); setLineWidth( 1 ); @@ -874,24 +874,24 @@ void TQIconDragData::setTextRect( const TQRect &r ) */ /*! - Constructs a TQIconViewItem and inserts it into icon view \a tqparent + Constructs a TQIconViewItem and inserts it into icon view \a parent with no text and a default icon. */ -TQIconViewItem::TQIconViewItem( TQIconView *tqparent ) - : view( tqparent ), itemText(), itemIcon( unknown_icon ) +TQIconViewItem::TQIconViewItem( TQIconView *parent ) + : view( parent ), itemText(), itemIcon( unknown_icon ) { init(); } /*! Constructs a TQIconViewItem and inserts it into the icon view \a - tqparent with no text and a default icon, after the icon view item + parent with no text and a default icon, after the icon view item \a after. */ -TQIconViewItem::TQIconViewItem( TQIconView *tqparent, TQIconViewItem *after ) - : view( tqparent ), itemText(), itemIcon( unknown_icon ), +TQIconViewItem::TQIconViewItem( TQIconView *parent, TQIconViewItem *after ) + : view( parent ), itemText(), itemIcon( unknown_icon ), prev( 0 ), next( 0 ) { init( after ); @@ -899,36 +899,36 @@ TQIconViewItem::TQIconViewItem( TQIconView *tqparent, TQIconViewItem *after ) /*! Constructs an icon view item and inserts it into the icon view \a - tqparent using \a text as the text and a default icon. + parent using \a text as the text and a default icon. */ -TQIconViewItem::TQIconViewItem( TQIconView *tqparent, const TQString &text ) - : view( tqparent ), itemText( text ), itemIcon( unknown_icon ) +TQIconViewItem::TQIconViewItem( TQIconView *parent, const TQString &text ) + : view( parent ), itemText( text ), itemIcon( unknown_icon ) { init( 0 ); } /*! Constructs an icon view item and inserts it into the icon view \a - tqparent using \a text as the text and a default icon, after the + parent using \a text as the text and a default icon, after the icon view item \a after. */ -TQIconViewItem::TQIconViewItem( TQIconView *tqparent, TQIconViewItem *after, +TQIconViewItem::TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text ) - : view( tqparent ), itemText( text ), itemIcon( unknown_icon ) + : view( parent ), itemText( text ), itemIcon( unknown_icon ) { init( after ); } /*! Constructs an icon view item and inserts it into the icon view \a - tqparent using \a text as the text and \a icon as the icon. + parent using \a text as the text and \a icon as the icon. */ -TQIconViewItem::TQIconViewItem( TQIconView *tqparent, const TQString &text, +TQIconViewItem::TQIconViewItem( TQIconView *parent, const TQString &text, const TQPixmap &icon ) - : view( tqparent ), + : view( parent ), itemText( text ), itemIcon( new TQPixmap( icon ) ) { init( 0 ); @@ -937,41 +937,41 @@ TQIconViewItem::TQIconViewItem( TQIconView *tqparent, const TQString &text, /*! Constructs an icon view item and inserts it into the icon view \a - tqparent using \a text as the text and \a icon as the icon, after + parent using \a text as the text and \a icon as the icon, after the icon view item \a after. \sa setPixmap() */ -TQIconViewItem::TQIconViewItem( TQIconView *tqparent, TQIconViewItem *after, +TQIconViewItem::TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPixmap &icon ) - : view( tqparent ), itemText( text ), itemIcon( new TQPixmap( icon ) ) + : view( parent ), itemText( text ), itemIcon( new TQPixmap( icon ) ) { init( after ); } /*! Constructs an icon view item and inserts it into the icon view \a - tqparent using \a text as the text and \a picture as the icon. + parent using \a text as the text and \a picture as the icon. */ #ifndef TQT_NO_PICTURE -TQIconViewItem::TQIconViewItem( TQIconView *tqparent, const TQString &text, +TQIconViewItem::TQIconViewItem( TQIconView *parent, const TQString &text, const TQPicture &picture ) - : view( tqparent ), itemText( text ), itemIcon( 0 ) + : view( parent ), itemText( text ), itemIcon( 0 ) { init( 0, new TQPicture( picture ) ); } /*! Constructs an icon view item and inserts it into the icon view \a - tqparent using \a text as the text and \a picture as the icon, after + parent using \a text as the text and \a picture as the icon, after the icon view item \a after. */ -TQIconViewItem::TQIconViewItem( TQIconView *tqparent, TQIconViewItem *after, +TQIconViewItem::TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPicture &picture ) - : view( tqparent ), itemText( text ), itemIcon( 0 ) + : view( parent ), itemText( text ), itemIcon( 0 ) { init( after, new TQPicture( picture ) ); } @@ -1015,7 +1015,7 @@ void TQIconViewItem::init( TQIconViewItem *after } /*! - Destroys the icon view item and tells the tqparent icon view that + Destroys the icon view item and tells the parent icon view that the item has been destroyed. */ @@ -1400,7 +1400,7 @@ bool TQIconViewItem::dropEnabled() const } /*! - Returns a pointer to this item's icon view tqparent. + Returns a pointer to this item's icon view parent. */ TQIconView *TQIconViewItem::iconView() const @@ -2066,13 +2066,13 @@ void TQIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg ) TQPixmap *pix = pixmap() ? pixmap() : unknown_icon; if ( pix && !pix->isNull() ) { TQPixmap *buffer = get_qiv_buffer_pixmap( pix->size() ); - TQBitmap tqmask = view->tqmask( pix ); + TQBitmap mask = view->mask( pix ); TQPainter p2( buffer ); p2.fillRect( pix->rect(), white ); p2.drawPixmap( 0, 0, *pix ); p2.end(); - buffer->setMask( tqmask ); + buffer->setMask( mask ); p2.begin( buffer ); #if defined(TQ_WS_X11) p2.fillRect( pix->rect(), TQBrush( cg.highlight(), Qt::Dense4Pattern) ); @@ -2317,7 +2317,7 @@ void TQIconViewItem::checkRect() The simplest way to create a TQIconView is to create a TQIconView object and create some TQIconViewItems with the TQIconView as their - tqparent, set the icon view's tqgeometry and show it. + parent, set the icon view's tqgeometry and show it. For example: \code TQIconView *iv = new TQIconView( this ); @@ -2768,12 +2768,12 @@ void TQIconViewItem::checkRect() */ /*! - Constructs an empty icon view called \a name, with tqparent \a - tqparent and using the widget flags \a f. + Constructs an empty icon view called \a name, with parent \a + parent and using the widget flags \a f. */ -TQIconView::TQIconView( TQWidget *tqparent, const char *name, WFlags f ) - : TQScrollView( tqparent, name, (WFlags)(TQt::WStaticContents | TQt::WNoAutoErase | f) ) +TQIconView::TQIconView( TQWidget *parent, const char *name, WFlags f ) + : TQScrollView( parent, name, (WFlags)(TQt::WStaticContents | TQt::WNoAutoErase | f) ) { if ( !unknown_icon ) { unknown_icon = new TQPixmap( (const char **)unknown_xpm ); @@ -6439,7 +6439,7 @@ void TQIconView::handleItemChange( TQIconViewItem *old, bool shift, } } -TQBitmap TQIconView::tqmask( TQPixmap *pix ) const +TQBitmap TQIconView::mask( TQPixmap *pix ) const { TQPixmap m; if ( d->maskCache.find( TQT_TQSTRING(TQString::number( pix->serialNumber() )), m ) ) diff --git a/experimental/tqtinterface/qt4/src/iconview/tqiconview.h b/experimental/tqtinterface/qt4/src/iconview/tqiconview.h index 2ef747292..2cbd9a3ad 100644 --- a/experimental/tqtinterface/qt4/src/iconview/tqiconview.h +++ b/experimental/tqtinterface/qt4/src/iconview/tqiconview.h @@ -130,15 +130,15 @@ class TQM_EXPORT_ICONVIEW TQIconViewItem : public TQt friend class TQIconViewItemLineEdit; public: - TQIconViewItem( TQIconView *tqparent ); - TQIconViewItem( TQIconView *tqparent, TQIconViewItem *after ); - TQIconViewItem( TQIconView *tqparent, const TQString &text ); - TQIconViewItem( TQIconView *tqparent, TQIconViewItem *after, const TQString &text ); - TQIconViewItem( TQIconView *tqparent, const TQString &text, const TQPixmap &icon ); - TQIconViewItem( TQIconView *tqparent, TQIconViewItem *after, const TQString &text, const TQPixmap &icon ); + TQIconViewItem( TQIconView *parent ); + TQIconViewItem( TQIconView *parent, TQIconViewItem *after ); + TQIconViewItem( TQIconView *parent, const TQString &text ); + TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text ); + TQIconViewItem( TQIconView *parent, const TQString &text, const TQPixmap &icon ); + TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPixmap &icon ); #ifndef TQT_NO_PICTURE - TQIconViewItem( TQIconView *tqparent, const TQString &text, const TQPicture &picture ); - TQIconViewItem( TQIconView *tqparent, TQIconViewItem *after, const TQString &text, const TQPicture &picture ); + TQIconViewItem( TQIconView *parent, const TQString &text, const TQPicture &picture ); + TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPicture &picture ); #endif virtual ~TQIconViewItem(); @@ -318,7 +318,7 @@ public: Right }; - TQIconView( TQWidget* tqparent=0, const char* name=0, WFlags f = 0 ); + TQIconView( TQWidget* parent=0, const char* name=0, WFlags f = 0 ); virtual ~TQIconView(); virtual void insertItem( TQIconViewItem *item, TQIconViewItem *after = 0L ); @@ -504,7 +504,7 @@ private: bool neighbourItem( Direction dir, const TQPoint &relativeTo, const TQIconViewItem *item ) const; - TQBitmap tqmask( TQPixmap *pix ) const; + TQBitmap mask( TQPixmap *pix ) const; TQIconViewPrivate *d; diff --git a/experimental/tqtinterface/qt4/src/kernel/qpsprinter.ps b/experimental/tqtinterface/qt4/src/kernel/qpsprinter.ps index 9ea2dc093..527501672 100644 --- a/experimental/tqtinterface/qt4/src/kernel/qpsprinter.ps +++ b/experimental/tqtinterface/qt4/src/kernel/qpsprinter.ps @@ -45,7 +45,7 @@ /Cx 0 d % current x position /Cy 0 d % current y position /WFi false d % winding fill -/OMo false d % opaque mode (not transtqparent) +/OMo false d % opaque mode (not transparent) /BCol [ 1 1 1 ] d % brush color /PCol [ 0 0 0 ] d % pen color @@ -252,13 +252,13 @@ % general image drawing routine, used from the postscript driver % -% Draws images with and without tqmask with 1, 8 and 24(rgb) bits depth. +% Draws images with and without mask with 1, 8 and 24(rgb) bits depth. % -% width height matrix image 1|8|24 tqmask|false x y di +% width height matrix image 1|8|24 mask|false x y di % % width and height specify the width/height of the image, % matrix a transformation matrix, image a procedure holding the image data -% (same for tqmask) and x/y an additional translation. +% (same for mask) and x/y an additional translation. % % ### should move the translation into the matrix!!! /di @@ -266,7 +266,7 @@ gsave translate 1 index 1 eq { % bitmap - false eq { % no tqmask, draw solid background + false eq { % no mask, draw solid background pop true 3 1 roll % width height false matrix image 4 index @@ -274,17 +274,17 @@ false 4 index 4 index - imagetqmask + imagemask BkCol SC - imagetqmask + imagemask } { pop false 3 1 roll % width height false matrix image - imagetqmask + imagemask } ifelse } { dup false ne { - % have a tqmask, see if we can use it + % have a mask, see if we can use it /languagelevel where { pop languagelevel 3 ge @@ -294,9 +294,9 @@ } ifelse { - % languagelevel3, we can use image tqmask and dicts + % languagelevel3, we can use image mask and dicts - % store the image tqmask + % store the image mask /ma exch d % select colorspace according to 8|24 bit depth and set the decode array /dc 8 eq { @@ -325,7 +325,7 @@ /BitsPerComponent 8 d /Decode dc d end d - % the tqmask dictionary + % the mask dictionary /md 7 dict dup begin /ImageType 1 d @@ -345,7 +345,7 @@ end image } { - pop % no tqmask or can't use it, get rid of it + pop % no mask or can't use it, get rid of it 8 % width height image 8|24 8 matrix 4 1 roll 8 eq { % grayscale diff --git a/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp b/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp index 6954cb3d4..6be7f97b2 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp @@ -745,7 +745,7 @@ bool TQWidgetItem::isEmpty() const /*! Constructs a new top-level TQLayout called \a name, with main - widget \a tqparent. \a tqparent may not be 0. + widget \a parent. \a parent may not be 0. The \a margin is the number of pixels between the edge of the widget and the managed tqchildren. The \a spacing sets the value of @@ -756,20 +756,20 @@ bool TQWidgetItem::isEmpty() const There can be only one top-level tqlayout for a widget. It is returned by TQWidget::tqlayout() */ -TQLayout::TQLayout( QWidget *tqparent, int margin, int spacing, const char *name ) - : TQObject( tqparent, name ) +TQLayout::TQLayout( QWidget *parent, int margin, int spacing, const char *name ) + : TQObject( parent, name ) { init(); - if ( tqparent ) { - if ( tqparent->tqlayout() ) { + if ( parent ) { + if ( parent->tqlayout() ) { qWarning( "TQLayout \"%s\" added to %s \"%s\", which already has a" - " tqlayout", TQObject::name(), tqparent->className(), - tqparent->name() ); - tqparent->removeChild( this ); + " tqlayout", TQObject::name(), parent->className(), + parent->name() ); + parent->removeChild( this ); } else { topLevel = TRUE; - tqparent->installEventFilter( this ); - setWidgetLayout( tqparent, this ); + parent->installEventFilter( this ); + setWidgetLayout( parent, this ); } } outsideBorder = margin; @@ -816,7 +816,7 @@ TQLayout::TQLayout( QLayout *parentLayout, int spacing, const char *name ) /*! Constructs a new child TQLayout called \a name. If \a spacing is - -1, this TQLayout inherits its tqparent's spacing(); otherwise the + -1, this TQLayout inherits its parent's spacing(); otherwise the value of \a spacing is used. This tqlayout has to be inserted into another tqlayout before tqgeometry @@ -920,22 +920,22 @@ void TQLayout::setSpacing( int spacing ) } /*! - Returns the main widget (tqparent widget) of this tqlayout, or 0 if + Returns the main widget (parent widget) of this tqlayout, or 0 if this tqlayout is a sub-tqlayout that is not yet inserted. */ TQWidget *TQLayout::mainWidget() { if ( !topLevel ) { - if ( tqparent() ) { - TQLayout *parentLayout = ::tqqt_cast<TQLayout*>(tqparent()); + if ( parent() ) { + TQLayout *parentLayout = ::tqqt_cast<TQLayout*>(parent()); TQ_ASSERT(parentLayout); return parentLayout->mainWidget(); } else { return 0; } } else { - TQ_ASSERT(tqparent() && tqparent()->isWidgetType()); - return (TQWidget*)tqparent(); + TQ_ASSERT(parent() && parent()->isWidgetType()); + return (TQWidget*)parent(); } } @@ -997,7 +997,7 @@ static bool removeWidgetRecursively( TQLayoutItem *lay, TQWidget *w ) /*! \reimp - Performs child widget tqlayout when the tqparent widget is resized. + Performs child widget tqlayout when the parent widget is resized. Also handles removal of widgets and child layouts. \a e is the event the occurred on object \a o. */ @@ -1098,7 +1098,7 @@ void TQLayout::childEvent( TQChildEvent *e ) int TQLayout::totalHeightForWidth( int w ) const { if ( topLevel ) { - TQWidget *mw = (TQWidget*)tqparent(); + TQWidget *mw = (TQWidget*)parent(); if ( mw && !mw->testWState(WState_Polished) ) { mw->polish(); } @@ -1118,7 +1118,7 @@ int TQLayout::totalHeightForWidth( int w ) const TQSize TQLayout::totalMinimumSize() const { if ( topLevel ) { - TQWidget *mw = (TQWidget*)tqparent(); + TQWidget *mw = (TQWidget*)parent(); if ( mw && !mw->testWState(WState_Polished) ) mw->polish(); } @@ -1139,7 +1139,7 @@ TQSize TQLayout::totalMinimumSize() const TQSize TQLayout::totalSizeHint() const { if ( topLevel ) { - TQWidget *mw = (TQWidget*)tqparent(); + TQWidget *mw = (TQWidget*)parent(); if ( mw && !mw->testWState(WState_Polished) ) mw->polish(); } @@ -1162,7 +1162,7 @@ TQSize TQLayout::totalSizeHint() const TQSize TQLayout::totalMaximumSize() const { if ( topLevel ) { - TQWidget *mw = (TQWidget*)tqparent(); + TQWidget *mw = (TQWidget*)parent(); if ( mw && !mw->testWState(WState_Polished) ) { mw->polish(); } @@ -1193,11 +1193,11 @@ TQLayout::~TQLayout() { /* This function may be called during the TQObject destructor, - when the tqparent no longer is a TQWidget. + when the parent no longer is a TQWidget. */ - if ( isTopLevel() && tqparent() && tqparent()->isWidgetType() && - ((TQWidget*)tqparent())->tqlayout() == this ) - setWidgetLayout( (TQWidget*)tqparent(), 0 ); + if ( isTopLevel() && parent() && parent()->isWidgetType() && + ((TQWidget*)parent())->tqlayout() == this ) + setWidgetLayout( (TQWidget*)parent(), 0 ); } /*! @@ -1217,9 +1217,9 @@ void TQLayout::deleteAllItems() */ void TQLayout::addChildLayout( TQLayout *l ) { - if ( l->tqparent() ) { + if ( l->parent() ) { #if defined(TQT_CHECK_NULL) - qWarning( "TQLayout::addChildLayout: tqlayout already has a tqparent" ); + qWarning( "TQLayout::addChildLayout: tqlayout already has a parent" ); #endif return; } @@ -2089,14 +2089,14 @@ bool TQLayout::isEnabled() const return enabled; } -void TQLayout::propagateSpacing( TQLayout *tqparent ) +void TQLayout::propagateSpacing( TQLayout *parent ) { - TQLayoutIterator it = tqparent->iterator(); + TQLayoutIterator it = parent->iterator(); TQLayoutItem *child; while ( (child = it.current()) ) { TQLayout *childLayout = child->tqlayout(); if ( childLayout && childLayout->insideSpacing < 0 ) { - childLayout->insideSpacing = tqparent->insideSpacing; + childLayout->insideSpacing = parent->insideSpacing; propagateSpacing( childLayout ); } ++it; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqaccel.cpp b/experimental/tqtinterface/qt4/src/kernel/tqaccel.cpp index 96a3470f4..0e5d66c76 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqaccel.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqaccel.cpp @@ -1060,9 +1060,9 @@ QT_END_NAMESPACE TQGroupBox, TQLabel (with TQLabel::setBuddy()), TQMenuBar and TQTabBar. Example: \code - TQPushButton p( "&Exit", tqparent ); // automatic shortcut ALT+Key_E - TQPopupMenu *fileMenu = new fileMenu( tqparent ); - fileMenu->insertItem( "Undo", tqparent, TQT_SLOT(undo()), CTRL+Key_Z ); + TQPushButton p( "&Exit", parent ); // automatic shortcut ALT+Key_E + TQPopupMenu *fileMenu = new fileMenu( parent ); + fileMenu->insertItem( "Undo", parent, TQT_SLOT(undo()), CTRL+Key_Z ); \endcode A TQAccel contains a list of accelerator items that can be @@ -1103,7 +1103,7 @@ QT_END_NAMESPACE The function setWhatsThis() specifies a help text that appears when the user presses an accelerator key in What's This mode. - The accelerator will be deleted when \e tqparent is deleted, + The accelerator will be deleted when \e parent is deleted, and will consume relevant key events until then. Please note that the accelerator @@ -1151,7 +1151,7 @@ public: bool enabled; TQGuardedPtr<TQWidget> watch; bool ignorewhatsthis; - TQAccel* tqparent; + TQAccel* parent; void activate( TQAccelItem* item ); void activateAmbiguously( TQAccelItem* item ); @@ -1215,7 +1215,7 @@ bool TQAccelManager::correctSubWindow( TQWidget* w, TQAccelPrivate* d ) { TQWidget* tlw = w->tqtopLevelWidget(); TQWidget* wtlw = d->watch->tqtopLevelWidget(); - /* if we live in a floating dock window, keep our tqparent's + /* if we live in a floating dock window, keep our parent's * accelerators working */ #ifndef TQT_NO_MAINWINDOW if ( tlw->isDialog() && tlw->parentWidget() && ::tqqt_cast<TQDockWindow*>(tlw) ) // [FIXME] Can I safely use the TQT_TQOBJECT macro here? @@ -1503,7 +1503,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) #ifndef TQT_NO_STATUSBAR if ( maintqStatusBar && !lastitem->signal && - !(lastaccel->tqparent->tqreceivers( "activatedAmbiguously(int)" )) ) + !(lastaccel->parent->tqreceivers( "activatedAmbiguously(int)" )) ) maintqStatusBar->message( message, 2000 ); #endif lastaccel->activateAmbiguously( lastitem ); @@ -1514,7 +1514,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) #ifndef TQT_NO_STATUSBAR if ( maintqStatusBar && !firstitem->signal && - !(firstaccel->tqparent->tqreceivers( "activatedAmbiguously(int)" )) ) + !(firstaccel->parent->tqreceivers( "activatedAmbiguously(int)" )) ) maintqStatusBar->message( message, 2000 ); #endif firstaccel->activateAmbiguously( firstitem ); @@ -1524,7 +1524,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) } TQAccelPrivate::TQAccelPrivate( TQAccel* p ) - : tqparent( p ) + : parent( p ) { TQAccelManager::self()->registerAccel( this ); aitems.setAutoDelete( TRUE ); @@ -1553,55 +1553,55 @@ static TQAccelItem *find_key( TQAccelList &list, const TQKeySequence &key ) } /*! - Constructs a TQAccel object called \a name, with tqparent \a tqparent. - The accelerator operates on \a tqparent. + Constructs a TQAccel object called \a name, with parent \a parent. + The accelerator operates on \a parent. */ -TQAccel::TQAccel( TQWidget *tqparent, const char *name ) - : TQObject( TQT_TQOBJECT(tqparent), name ) +TQAccel::TQAccel( TQWidget *parent, const char *name ) + : TQObject( TQT_TQOBJECT(parent), name ) { d = new TQAccelPrivate( this ); d->enabled = TRUE; - d->watch = tqparent; + d->watch = parent; #if defined(TQT_CHECK_NULL) if ( !d->watch ) - qWarning( "TQAccel: An accelerator must have a tqparent or a watch widget" ); + qWarning( "TQAccel: An accelerator must have a parent or a watch widget" ); #endif } /*! Constructs a TQAccel object called \a name, that operates on \a - watch, and is a child of \a tqparent. + watch, and is a child of \a parent. This constructor is not needed for normal application programming. */ -TQAccel::TQAccel( TQWidget* watch, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +TQAccel::TQAccel( TQWidget* watch, TQObject *parent, const char *name ) + : TQObject( parent, name ) { d = new TQAccelPrivate( this ); d->enabled = TRUE; d->watch = watch; #if defined(TQT_CHECK_NULL) if ( !d->watch ) - qWarning( "TQAccel: An accelerator must have a tqparent or a watch widget" ); + qWarning( "TQAccel: An accelerator must have a parent or a watch widget" ); #endif } /*! Constructs a TQAccel object called \a name, that operates on \a - watch, and is a child of \a tqparent. + watch, and is a child of \a parent. This constructor is not needed for normal application programming. */ -TQAccel::TQAccel( TQWidget* watch, TQWidget *tqparent, const char *name ) - : TQObject( TQT_TQOBJECT(tqparent), name ) +TQAccel::TQAccel( TQWidget* watch, TQWidget *parent, const char *name ) + : TQObject( TQT_TQOBJECT(parent), name ) { d = new TQAccelPrivate( this ); d->enabled = TRUE; d->watch = watch; #if defined(TQT_CHECK_NULL) if ( !d->watch ) - qWarning( "TQAccel: An accelerator must have a tqparent or a watch widget" ); + qWarning( "TQAccel: An accelerator must have a parent or a watch widget" ); #endif } @@ -1843,7 +1843,7 @@ void TQAccelPrivate::activate( TQAccelItem* item ) if ( item->signal ) item->signal->activate(); else - emit tqparent->activated( item->id ); + emit parent->activated( item->id ); } void TQAccelPrivate::activateAmbiguously( TQAccelItem* item ) @@ -1851,7 +1851,7 @@ void TQAccelPrivate::activateAmbiguously( TQAccelItem* item ) if ( item->signal ) item->signal->activate(); else - emit tqparent->activatedAmbiguously( item->id ); + emit parent->activatedAmbiguously( item->id ); } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqaccel.h b/experimental/tqtinterface/qt4/src/kernel/tqaccel.h index 1726aca4b..d8740d08c 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqaccel.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqaccel.h @@ -173,9 +173,9 @@ class TQ_EXPORT TQAccel : public TQObject // accelerator class Q_OBJECT TQ_OBJECT public: - TQAccel( TQWidget *tqparent, const char *name=0 ); - TQAccel( TQWidget* watch, TQObject *tqparent, const char *name=0 ); - TQAccel( TQWidget* watch, TQWidget *tqparent, const char *name=0 ); + TQAccel( TQWidget *parent, const char *name=0 ); + TQAccel( TQWidget* watch, TQObject *parent, const char *name=0 ); + TQAccel( TQWidget* watch, TQWidget *parent, const char *name=0 ); ~TQAccel(); bool isEnabled() const; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqaccessible.cpp b/experimental/tqtinterface/qt4/src/kernel/tqaccessible.cpp index 8d7e588a2..118e1c10c 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqaccessible.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqaccessible.cpp @@ -362,7 +362,7 @@ void AccessibleCache::removeObject(TQObject *object) The function uses the \link TQObject::className() classname \endlink of \a object to find a suitable implementation. If no implementation for the object's class is available the function - tries to find an implementation for the object's tqparent class. + tries to find an implementation for the object's parent class. This function is called to answer an accessibility client's request for object information. You should never need to call this @@ -466,7 +466,7 @@ bool TQAccessible::isActive() \fn TQRESULT TQAccessibleInterface::queryParent( TQAccessibleInterface **iface ) const Sets \a iface to point to the implementation of the - TQAccessibleInterface for the tqparent object, or to 0 if there is + TQAccessibleInterface for the parent object, or to 0 if there is no such implementation or object. All objects provide this information. diff --git a/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp b/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp index 0e3b55cdc..d2cc4a2bd 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp @@ -545,7 +545,7 @@ TQ_EXPORT bool qt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) { if ( !top || modal == top ) // don't block event return TRUE; - TQWidget * p = widget->parentWidget(); // Check if the active modal widget is a tqparent of our widget + TQWidget * p = widget->parentWidget(); // Check if the active modal widget is a parent of our widget while ( p ) { if ( p == top ) return TRUE; @@ -1397,22 +1397,22 @@ static TQVFuncList *postRList = 0; // list of post routines long before the TQApplication destructor is called, for example. For modules and libraries, using a reference-counted initialization - manager or TQt' tqparent-child delete mechanism may be better. Here is - an example of a private class which uses the tqparent-child mechanism + manager or TQt' parent-child delete mechanism may be better. Here is + an example of a private class which uses the parent-child mechanism to call a cleanup function at the right time: \code class MyPrivateInitStuff: public TQObject { private: - MyPrivateInitStuff( TQObject * tqparent ): TQObject( tqparent) { + MyPrivateInitStuff( TQObject * parent ): TQObject( parent) { // initialization goes here } MyPrivateInitStuff * p; public: - static MyPrivateInitStuff * initStuff( TQObject * tqparent ) { + static MyPrivateInitStuff * initStuff( TQObject * parent ) { if ( !p ) - p = new MyPrivateInitStuff( tqparent ); + p = new MyPrivateInitStuff( parent ); return p; } @@ -1422,7 +1422,7 @@ static TQVFuncList *postRList = 0; // list of post routines } \endcode - By selecting the right tqparent widget/object, this can often be made + By selecting the right parent widget/object, this can often be made to clean up the module's data at the exact right moment. */ @@ -2920,7 +2920,7 @@ void TQApplication::setFont( const TQFont &font, bool informWidgets, // make sure the application font is complete app_font->detach(); - app_font->d->tqmask = TQFontPrivate::Complete; + app_font->d->mask = TQFontPrivate::Complete; all = app_fonts != 0; delete app_fonts; @@ -3226,7 +3226,7 @@ void TQApplication::aboutTQt() Returns the value that is returned from the receiver's event handler. For certain types of events (e.g. mouse and key events), - the event will be propagated to the receiver's tqparent and so on up to + the event will be propagated to the receiver's parent and so on up to the top-level object if the receiver is not interested in the event (i.e., it returns FALSE). @@ -4656,7 +4656,7 @@ TQ_EXPORT bool qt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) { if ( !top || modal == top ) // don't block event return TRUE; - TQWidget * p = widget->parentWidget(); // Check if the active modal widget is a tqparent of our widget + TQWidget * p = widget->parentWidget(); // Check if the active modal widget is a parent of our widget while ( p ) { if ( p == top ) return TRUE; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp index 64a270475..f4e3bad23 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp @@ -332,7 +332,7 @@ static int xsync_errorbase; // modifier masks for alt/meta - detected when the application starts static long qt_alt_mask = 0; static long qt_meta_mask = 0; -// modifier tqmask to remove mode switch from modifiers that have alt/meta set +// modifier mask to remove mode switch from modifiers that have alt/meta set // this problem manifests itself on HP/UX 10.20 at least, and without it // modifiers do not work at all... static long qt_mode_switch_remove_mask = 0; @@ -2909,7 +2909,7 @@ TQ_EXPORT bool qt_use_xrender = FALSE; // modifier masks for alt/meta - detected when the application starts static long qt_alt_mask = 0; static long qt_meta_mask = 0; -// modifier tqmask to remove mode switch from modifiers that have alt/meta set +// modifier mask to remove mode switch from modifiers that have alt/meta set // this problem manifests itself on HP/UX 10.20 at least, and without it // modifiers do not work at all... static long qt_mode_switch_remove_mask = 0; @@ -5301,7 +5301,7 @@ void TQApplication::setMainWidget( TQWidget *mainWidget ) if ( mainWidget && mainWidget->parentWidget() && ! mainWidget->parentWidget()->isDesktop() ) qWarning( "TQApplication::setMainWidget(): New main widget (%s/%s) " - "has a tqparent!", + "has a parent!", mainWidget->className(), mainWidget->name() ); #endif main_widget = mainWidget; @@ -5531,7 +5531,7 @@ Window qt_x11_findClientWindow( Window win, Atom property, bool leaf ) int format, i; ulong nitems, after; uchar *data; - Window root, tqparent, target=0, *tqchildren=0; + Window root, parent, target=0, *tqchildren=0; uint ntqchildren; if ( XGetWindowProperty( appDpy, win, property, 0, 0, FALSE, AnyPropertyType, &type, &format, &nitems, &after, &data ) == Success ) { @@ -5540,7 +5540,7 @@ Window qt_x11_findClientWindow( Window win, Atom property, bool leaf ) if ( type ) return win; } - if ( !XQueryTree(appDpy,win,&root,&tqparent,&tqchildren,&ntqchildren) ) { + if ( !XQueryTree(appDpy,win,&root,&parent,&tqchildren,&ntqchildren) ) { if ( tqchildren ) XFree( (char *)tqchildren ); return 0; @@ -6251,17 +6251,17 @@ int TQApplication::x11ProcessEvent( XEvent* event ) ReparentNotify, event ) ) ; // skip old reparent events - if ( event->xreparent.tqparent == TQPaintDevice::x11AppRootWindow() ) { + if ( event->xreparent.parent == TQPaintDevice::x11AppRootWindow() ) { if ( widget->isTopLevel() ) { - widget->topData()->parentWinId = event->xreparent.tqparent; + widget->topData()->parentWinId = event->xreparent.parent; if ( qt_deferred_map_contains( widget ) ) { qt_deferred_map_take( widget ); XMapWindow( appDpy, widget->winId() ); } } } else - // store the tqparent. Useful for many things, embedding for instance. - widget->topData()->parentWinId = event->xreparent.tqparent; + // store the parent. Useful for many things, embedding for instance. + widget->topData()->parentWinId = event->xreparent.parent; if ( widget->isTopLevel() ) { // the widget frame strut should also be invalidated widget->topData()->fleft = widget->topData()->fright = @@ -6269,9 +6269,9 @@ int TQApplication::x11ProcessEvent( XEvent* event ) if ( qt_focus_model != FocusModel_Unknown ) { // toplevel reparented... - TQWidget *newtqparent = TQWidget::find( event->xreparent.tqparent ); - if ( ! newtqparent || newtqparent->isDesktop() ) { - // we dont' know about the new tqparent (or we've been + TQWidget *newparent = TQWidget::find( event->xreparent.parent ); + if ( ! newparent || newparent->isDesktop() ) { + // we dont' know about the new parent (or we've been // reparented to root), perhaps a window manager // has been (re)started? reset the focus model to unknown qt_focus_model = FocusModel_Unknown; @@ -6350,8 +6350,8 @@ bool TQApplication::x11EventFilter( XEvent * ) /***************************************************************************** Modal widgets; Since Xlib has little support for this we roll our own modal widget mechanism. - A modal widget without a tqparent becomes application-modal. - A modal widget with a tqparent becomes modal to its tqparent and grandparents.. + A modal widget without a parent becomes application-modal. + A modal widget with a parent becomes modal to its parent and grandparents.. qt_enter_modal() Enters modal state @@ -7238,7 +7238,7 @@ bool TQETWidget::translatePropertyEvent(const XEvent *event) // WM_STATE property (ICCCM 4.1.3.1) XDeleteProperty(appDpy, winId(), qt_wm_state); - // set the tqparent id to zero, so that show() will + // set the parent id to zero, so that show() will // work again topData()->parentWinId = 0; // map the window if we were waiting for a diff --git a/experimental/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp b/experimental/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp index 8c6ba7471..6c8121edd 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp @@ -762,7 +762,7 @@ void TQGIFFormat::disposePrevious( TQImage& img, TQImageConsumer* consumer ) break; case RestoreBackground: if (trans_index>=0) { - // Easy: we use the transtqparent color + // Easy: we use the transparent color fillRect(img, l, t, r-l+1, b-t+1, TQ_TRANSPARENT); } else if (bgcol>=0) { // Easy: we use the bgcol given @@ -944,7 +944,7 @@ int TQGIFFormat::decode(TQImage& img, TQImageConsumer* consumer, frame++; if ( frame == 0 ) { if ( left || top || width<swidth || height<sheight ) { - // Not full-size image - erase with bg or transtqparent + // Not full-size image - erase with bg or transparent if ( trans_index >= 0 ) { fillRect(img, 0, 0, swidth, sheight, color(trans_index)); if (consumer) consumer->changed(TQRect(0,0,swidth,sheight)); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqbitmap.cpp b/experimental/tqtinterface/qt4/src/kernel/tqbitmap.cpp index 3e2ee39f0..e44b37e61 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqbitmap.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqbitmap.cpp @@ -128,8 +128,8 @@ void TQBitmap::resize_helper(const QSize s) } // Mask too.... - if (!mask().isNull()) { - TQBitmap m = mask(); + if (!QBitmap::mask().isNull()) { + TQBitmap m = QBitmap::mask(); if (m.size() != QSize(w,h)) { TQBitmap pmr(QSize(w, h)); pmr.fill(Qt::color0); @@ -153,8 +153,8 @@ void TQBitmap::resize_helper(const QSize s) } // This is the only correct way to return a pointer to an object returned by another function -const TQBitmap *TQBitmap::tqmask() const { - const QBitmap& ptrRef = mask(); +const TQBitmap *TQBitmap::mask() const { + const QBitmap& ptrRef = QBitmap::mask(); if (ptrRef.isNull() == true) { return 0; } @@ -196,7 +196,7 @@ TQBitmap &TQBitmap::operator=( const TQImage &image ) using the TQColor objects \c TQt::color0 and \c TQt::color1. Painting with \c color0 sets the bitmap bits to 0, and painting with \c color1 sets the bits to 1. For a bitmap, 0-bits indicate - background (or transtqparent) and 1-bits indicate foreground (or + background (or transparent) and 1-bits indicate foreground (or opaque). Using the \c black and \c white TQColor objects make no sense because the TQColor::pixel() value is not necessarily 0 for black and 1 for white. diff --git a/experimental/tqtinterface/qt4/src/kernel/tqbitmap.h b/experimental/tqtinterface/qt4/src/kernel/tqbitmap.h index e4a2fd9ad..74b8cff21 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqbitmap.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqbitmap.h @@ -75,7 +75,7 @@ public: bool convertFromImage(const QImage &img, int flags = Qt::AutoColor); TQBitmap xForm(const QMatrix &matrix) const; - const TQBitmap *tqmask() const; + const TQBitmap *mask() const; private: void resize_helper(const QSize s); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqclipboard.cpp b/experimental/tqtinterface/qt4/src/kernel/tqclipboard.cpp index 4c2b3415a..045e1f62b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqclipboard.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqclipboard.cpp @@ -336,8 +336,8 @@ void TQClipboard::setData(QMimeSource *source, Mode mode) more than one object to represent it is almost certainly an error. */ -TQClipboard::TQClipboard( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +TQClipboard::TQClipboard( TQObject *parent, const char *name ) + : TQObject( parent, name ) { // nothing } @@ -583,7 +583,7 @@ void TQClipboard::setImage( const TQImage &image ) contain a pixmap. Note that this can lose information. For example, if the image is 24-bit and the display is 8-bit, the result is converted to 8 bits, and if the image has an alpha - channel, the result just has a tqmask. + channel, the result just has a mask. The \a mode argument is used to control which part of the system clipboard is used. If \a mode is TQClipboard::Clipboard, the @@ -695,7 +695,7 @@ TQMimeSource *TQClipboard::data() const The TQDragObject subclasses are reasonable objects to put into the clipboard (but do not try to call TQDragObject::drag() on the same object). Any TQDragObject placed in the clipboard should have a - tqparent of 0. Do not put TQDragMoveEvent or TQDropEvent subclasses in + parent of 0. Do not put TQDragMoveEvent or TQDropEvent subclasses in the clipboard, as they do not belong to the event handler which receives them. diff --git a/experimental/tqtinterface/qt4/src/kernel/tqclipboard.h b/experimental/tqtinterface/qt4/src/kernel/tqclipboard.h index 8e49f8d9d..783300612 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqclipboard.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqclipboard.h @@ -66,7 +66,7 @@ class TQClipboardPrivate; class TQ_EXPORT TQClipboard : public QClipboard, virtual public TQt { public: -// TQClipboard( TQT_BASE_OBJECT_NAME *tqparent=0, const char *name=0 ) : QClipboard( tqparent ) { setObjectName(QString::fromAscii(name)); } +// TQClipboard( TQT_BASE_OBJECT_NAME *parent=0, const char *name=0 ) : QClipboard( parent ) { setObjectName(QString::fromAscii(name)); } TQMimeSource *data(Mode mode = Clipboard) const; void setData(QMimeSource*, Mode mode = Clipboard); @@ -86,7 +86,7 @@ class TQ_EXPORT TQClipboard : public TQObject Q_OBJECT TQ_OBJECT private: - TQClipboard( TQObject *tqparent=0, const char *name=0 ); + TQClipboard( TQObject *parent=0, const char *name=0 ); ~TQClipboard(); public: diff --git a/experimental/tqtinterface/qt4/src/kernel/tqcolor.cpp b/experimental/tqtinterface/qt4/src/kernel/tqcolor.cpp index f6fcce61c..e307663f7 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqcolor.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqcolor.cpp @@ -223,7 +223,7 @@ void TQColor::initGlobalColors() The colors \c color0 (zero pixel value) and \c color1 (non-zero pixel value) are special colors for drawing in \link TQBitmap bitmaps\endlink. Painting with \c color0 sets the bitmap bits to 0 - (transtqparent, i.e. background), and painting with \c color1 sets the + (transparent, i.e. background), and painting with \c color1 sets the bits to 1 (opaque, i.e. foreground). The TQColor class has an efficient, dynamic color allocation diff --git a/experimental/tqtinterface/qt4/src/kernel/tqcursor.cpp b/experimental/tqtinterface/qt4/src/kernel/tqcursor.cpp index 16e74cf59..3be2c23c7 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqcursor.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqcursor.cpp @@ -64,7 +64,7 @@ of the mouse cursor. TQt has a number of standard cursor tqshapes, but you can also make - custom cursor tqshapes based on a TQBitmap, a tqmask and a hotspot. + custom cursor tqshapes based on a TQBitmap, a mask and a hotspot. To associate a cursor with a widget, use TQWidget::setCursor(). To associate a cursor with all widgets (normally for a short period @@ -75,7 +75,7 @@ of the predefined cursors defined in the \l tqCursorShape enum. If you want to create a cursor with your own bitmap, either use - the TQCursor constructor which takes a bitmap and a tqmask or the + the TQCursor constructor which takes a bitmap and a mask or the constructor which takes a pixmap as arguments. To set or get the position of the mouse cursor use the static @@ -165,7 +165,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQCursor &c ) s << (TQ_INT16)c.tqshape(); // write tqshape id to stream if ( c.tqshape() == TQt::BitmapCursor ) { // bitmap cursor #if !defined(TQT_NO_IMAGEIO) - s << *c.bitmap() << *c.tqmask(); + s << *c.bitmap() << *c.mask(); s << c.hotSpot(); #else qWarning("No Image Cursor I/O"); @@ -205,7 +205,7 @@ TQDataStream &operator>>( TQDataStream &s, TQCursor &c ) /*! Constructs a custom pixmap cursor. - \a pixmap is the image. It is usual to give it a tqmask (set using + \a pixmap is the image. It is usual to give it a mask (set using TQPixmap::setMask()). \a hotX and \a hotY define the cursor's hot spot. @@ -229,13 +229,13 @@ TQCursor::TQCursor( const TQPixmap &pixmap, int hotX, int hotY ) TQBitmap bm; bm.convertFromImage( img, TQt::ThresholdDither|TQt::AvoidDither ); TQBitmap bmm; - if ( bm.tqmask() ) { - bmm = *bm.tqmask(); + if ( bm.mask() ) { + bmm = *bm.mask(); TQBitmap nullBm; bm.setMask( nullBm ); } - else if ( pixmap.tqmask() ) { - TQImage mimg = pixmap.tqmask()->convertToImage(). + else if ( pixmap.mask() ) { + TQImage mimg = pixmap.mask()->convertToImage(). convertDepth( 8, TQt::ThresholdDither|TQt::AvoidDither ); bmm.convertFromImage( mimg, TQt::ThresholdDither|TQt::AvoidDither ); } @@ -253,18 +253,18 @@ TQCursor::TQCursor( const TQPixmap &pixmap, int hotX, int hotY ) Constructs a custom bitmap cursor. \a bitmap and - \a tqmask make up the bitmap. + \a mask make up the bitmap. \a hotX and \a hotY define the cursor's hot spot. If \a hotX is negative, it is set to the \c{bitmap().width()/2}. If \a hotY is negative, it is set to the \c{bitmap().height()/2}. - The cursor \a bitmap (B) and \a tqmask (M) bits are combined like this: + The cursor \a bitmap (B) and \a mask (M) bits are combined like this: \list \i B=1 and M=1 gives black. \i B=0 and M=1 gives white. - \i B=0 and M=0 gives transtqparent. + \i B=0 and M=0 gives transparent. \i B=1 and M=0 gives an undefined result. \endlist @@ -279,10 +279,10 @@ TQCursor::TQCursor( const TQPixmap &pixmap, int hotX, int hotY ) \sa TQBitmap::TQBitmap(), TQBitmap::setMask() */ -TQCursor::TQCursor( const TQBitmap &bitmap, const TQBitmap &tqmask, +TQCursor::TQCursor( const TQBitmap &bitmap, const TQBitmap &mask, int hotX, int hotY ) { - setBitmap(bitmap,tqmask,hotX,hotY); + setBitmap(bitmap,mask,hotX,hotY); } #endif // USE_QT4 diff --git a/experimental/tqtinterface/qt4/src/kernel/tqcursor.h b/experimental/tqtinterface/qt4/src/kernel/tqcursor.h index 1c1d4c12a..135a44f63 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqcursor.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqcursor.h @@ -64,7 +64,7 @@ public: TQCursor() : QCursor() {} TQCursor( int tqshape ) : QCursor( tqshape ) {} TQCursor( Qt::CursorShape shape ) : QCursor( shape ) {} - TQCursor( const QBitmap &bitmap, const QBitmap &tqmask, int hotX=-1, int hotY=-1 ) : QCursor( bitmap, tqmask, hotX, hotY ) {} + TQCursor( const QBitmap &bitmap, const QBitmap &mask, int hotX=-1, int hotY=-1 ) : QCursor( bitmap, mask, hotX, hotY ) {} TQCursor( const QPixmap &pixmap, int hotX=-1, int hotY=-1 ) : QCursor( pixmap, hotX, hotY ) {} TQCursor( const QCursor & c ) : QCursor( c ) {} @@ -106,7 +106,7 @@ class TQ_EXPORT TQCursor : public TQt public: TQCursor(); // create default arrow cursor TQCursor( int tqshape ); - TQCursor( const TQBitmap &bitmap, const TQBitmap &tqmask, + TQCursor( const TQBitmap &bitmap, const TQBitmap &mask, int hotX=-1, int hotY=-1 ); TQCursor( const TQPixmap &pixmap, int hotX=-1, int hotY=-1 ); @@ -118,7 +118,7 @@ public: void setShape( int ); const TQBitmap *bitmap() const; - const TQBitmap *tqmask() const; + const TQBitmap *mask() const; TQPoint hotSpot() const; #if defined(TQ_WS_WIN) @@ -144,7 +144,7 @@ public: static int x11Screen(); #endif private: - void setBitmap( const TQBitmap &bitmap, const TQBitmap &tqmask, + void setBitmap( const TQBitmap &bitmap, const TQBitmap &mask, int hotX, int hotY ); void update() const; TQCursorData *data; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp index aac333607..4b9bd069d 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp @@ -404,13 +404,13 @@ TQCursor::TQCursor( HANDLE cursor ) -void TQCursor::setBitmap( const TQBitmap &bitmap, const TQBitmap &tqmask, +void TQCursor::setBitmap( const TQBitmap &bitmap, const TQBitmap &mask, int hotX, int hotY ) { if ( !initialized ) initialize(); - if ( bitmap.depth() != 1 || tqmask.depth() != 1 || - bitmap.size() != tqmask.size() ) { + if ( bitmap.depth() != 1 || mask.depth() != 1 || + bitmap.size() != mask.size() ) { #if defined(TQT_CHECK_NULL) qWarning( "TQCursor: Cannot create bitmap cursor; invalid bitmap(s)" ); #endif @@ -422,7 +422,7 @@ void TQCursor::setBitmap( const TQBitmap &bitmap, const TQBitmap &tqmask, data = new TQCursorData; TQ_CHECK_PTR( data ); data->bm = new TQBitmap( bitmap ); - data->bmm = new TQBitmap( tqmask ); + data->bmm = new TQBitmap( mask ); data->hcurs = 0; data->ctqshape = BitmapCursor; data->hx = hotX >= 0 ? hotX : bitmap.width()/2; @@ -526,11 +526,11 @@ const TQBitmap *TQCursor::bitmap() const } /*! - Returns the cursor bitmap tqmask, or 0 if it is one of the standard + Returns the cursor bitmap mask, or 0 if it is one of the standard cursors. */ -const TQBitmap *TQCursor::tqmask() const +const TQBitmap *TQCursor::mask() const { if ( !initialized ) initialize(); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp index 471df7008..6292a07a5 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp @@ -270,7 +270,7 @@ public: void setPixmap(TQPixmap pm, TQPoint hot) { - int bmser = pm.tqmask() ? pm.tqmask()->serialNumber() : 0; + int bmser = pm.mask() ? pm.mask()->serialNumber() : 0; if( oldpmser == pm.serialNumber() && oldbmser == bmser && oldhot == hot ) return; @@ -283,17 +283,17 @@ public: // of finding this pixmap, and therefore there won't be needed any (slow) search for the window // using findRealWindow() if( hotspot_in ) { - TQBitmap tqmask = pm.tqmask() ? *pm.tqmask() : TQBitmap( pm.width(), pm.height()); - if( !pm.tqmask()) - tqmask.fill( TQt::color1 ); - TQPainter p( &tqmask ); + TQBitmap mask = pm.mask() ? *pm.mask() : TQBitmap( pm.width(), pm.height()); + if( !pm.mask()) + mask.fill( TQt::color1 ); + TQPainter p( &mask ); p.setPen( TQt::color0 ); p.drawPoint( hot.x(), hot.y()); p.end(); - pm.setMask( tqmask ); - setMask( tqmask ); - } else if ( pm.tqmask() ) { - setMask( *pm.tqmask() ); + pm.setMask( mask ); + setMask( mask ); + } else if ( pm.mask() ) { + setMask( *pm.mask() ); } else { clearMask(); } @@ -913,10 +913,10 @@ void TQDragManager::timerEvent( TQTimerEvent* e ) if( need_modifiers_check ) { Window root, child; int root_x, root_y, win_x, win_y; - unsigned int tqmask; + unsigned int mask; XQueryPointer( qt_xdisplay(), qt_xrootwin( qt_xdnd_current_screen ), - &root, &child, &root_x, &root_y, &win_x, &win_y, &tqmask ); - if( updateMode( (ButtonState)qt_x11_translateButtonState( tqmask ))) + &root, &child, &root_x, &root_y, &win_x, &win_y, &mask ); + if( updateMode( (ButtonState)qt_x11_translateButtonState( mask ))) qt_xdnd_source_sameanswer = TQRect(); // force move } need_modifiers_check = TRUE; @@ -1737,7 +1737,7 @@ const char* TQDropEvent::format( int n ) const bool TQDragManager::drag( TQDragObject * o, TQDragObject::DragMode mode ) { - if ( object == o || !o || !o->tqparent() ) + if ( object == o || !o || !o->parent() ) return FALSE; if ( object ) { @@ -1781,7 +1781,7 @@ bool TQDragManager::drag( TQDragObject * o, TQDragObject::DragMode mode ) object = o; updatePixmap(); - dragSource = (TQWidget *)(object->tqparent()); + dragSource = (TQWidget *)(object->parent()); qt_xdnd_deco->x11SetWindowTransient( dragSource->tqtopLevelWidget()); tqApp->installEventFilter( this ); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqdragobject.cpp b/experimental/tqtinterface/qt4/src/kernel/tqdragobject.cpp index 579eab8cf..c062bfd89 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqdragobject.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqdragobject.cpp @@ -2136,8 +2136,8 @@ bool TQDragObject::drag( DragMode mode ) TQWidget * TQDragObject::source() { - if ( tqparent() && tqparent()->isWidgetType() ) - return (TQWidget *)tqparent(); + if ( parent() && parent()->isWidgetType() ) + return (TQWidget *)parent(); else return 0; } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqdrawutil.cpp b/experimental/tqtinterface/qt4/src/kernel/tqdrawutil.cpp index 07e2bb4ba..b220e5863 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqdrawutil.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqdrawutil.cpp @@ -621,27 +621,27 @@ void qDrawItem( TQPainter *p, TQt::GUIStyle gs, x += w - pm.width(); if ( !enabled ) { - if ( pm.tqmask() ) { // pixmap with a tqmask - if ( !pm.selfMask() ) { // tqmask is not pixmap itself - TQPixmap pmm( *pm.tqmask() ); + if ( pm.mask() ) { // pixmap with a mask + if ( !pm.selfMask() ) { // mask is not pixmap itself + TQPixmap pmm( *pm.mask() ); pmm.setMask( *((TQBitmap *)&pmm) ); pm = pmm; } - } else if ( pm.depth() == 1 ) { // monochrome pixmap, no tqmask + } else if ( pm.depth() == 1 ) { // monochrome pixmap, no mask pm.setMask( *((TQBitmap *)&pm) ); #ifndef TQT_NO_IMAGE_HEURISTIC_MASK - } else { // color pixmap, no tqmask + } else { // color pixmap, no mask TQString k; k.sprintf( "$qt-drawitem-%x", pm.serialNumber() ); - TQPixmap *tqmask = TQPixmapCache::find(k); + TQPixmap *mask = TQPixmapCache::find(k); bool del=FALSE; - if ( !tqmask ) { - tqmask = new TQPixmap( pm.createHeuristicMask() ); - tqmask->setMask( *((TQBitmap*)tqmask) ); - del = !TQPixmapCache::insert( k, tqmask ); + if ( !mask ) { + mask = new TQPixmap( pm.createHeuristicMask() ); + mask->setMask( *((TQBitmap*)mask) ); + del = !TQPixmapCache::insert( k, mask ); } - pm = *tqmask; - if (del) delete tqmask; + pm = *mask; + if (del) delete mask; #endif } if ( gs == TQt::WindowsStyle ) { diff --git a/experimental/tqtinterface/qt4/src/kernel/tqdropsite.h b/experimental/tqtinterface/qt4/src/kernel/tqdropsite.h index cd650fae0..5beb6fdd6 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqdropsite.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqdropsite.h @@ -51,7 +51,7 @@ class TQWidget; class TQ_EXPORT TQDropSite { public: - TQDropSite( TQWidget* tqparent ); + TQDropSite( TQWidget* parent ); virtual ~TQDropSite(); }; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqevent.cpp b/experimental/tqtinterface/qt4/src/kernel/tqevent.cpp index 6b9f90b5d..eebcf5074 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqevent.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqevent.cpp @@ -235,9 +235,9 @@ TQCustomEvent::TQCustomEvent( int type ) \value AltButton an Alt key on the keyboard is also pressed. \value MetaButton a Meta key on the keyboard is also pressed. \value Keypad a keypad button is pressed. - \value KeyButtonMask a tqmask for ShiftButton, ControlButton, + \value KeyButtonMask a mask for ShiftButton, ControlButton, AltButton and MetaButton. - \value MouseButtonMask a tqmask for LeftButton, RightButton and MidButton. + \value MouseButtonMask a mask for LeftButton, RightButton and MidButton. */ /*! @@ -286,10 +286,10 @@ TQCustomEvent::TQCustomEvent( int type ) \value WindowDeactivate Window was deactivated. \value CaptionChange Widget's caption changed. \value IconChange Widget's icon changed. - \value ParentFontChange Font of the tqparent widget changed. + \value ParentFontChange Font of the parent widget changed. \value ApplicationFontChange Default application font changed. \value PaletteChange Palette of the widget changed. - \value ParentPaletteChange Palette of the tqparent widget changed. + \value ParentPaletteChange Palette of the parent widget changed. \value ApplicationPaletteChange Default application palette changed. \value Clipboard Clipboard contents have changed. \value SockAct Socket activated, used to implement \l{TQSocketNotifier}. @@ -309,7 +309,7 @@ TQCustomEvent::TQCustomEvent( int type ) \value Quit Reserved. \value Create Reserved. \value Destroy Reserved. - \value Retqparent Reserved. + \value Reparent Reserved. \value Speech Reserved for speech input. \value TabletMove A Wacom Tablet Move Event. \value Style Internal use only @@ -403,7 +403,7 @@ TQCustomEvent::TQCustomEvent( int type ) A mouse event contains a special accept flag that indicates whether the receiver wants the event. You should call TQMouseEvent::ignore() if the mouse event is not handled by your - widget. A mouse event is propagated up the tqparent widget chain + widget. A mouse event is propagated up the parent widget chain until a widget accepts it with TQMouseEvent::accept() or an event filter consumes it. @@ -595,7 +595,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const Setting the accept parameter indicates that the receiver of the event wants the mouse event. Unwanted mouse events are sent to the - tqparent widget. + parent widget. The accept flag is set by default. @@ -610,7 +610,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const Clearing the accept parameter indicates that the event receiver does not want the mouse event. Unwanted mouse events are sent to - the tqparent widget. + the parent widget. The accept flag is set by default. @@ -632,7 +632,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const A wheel event contains a special accept flag that indicates whether the receiver wants the event. You should call TQWheelEvent::accept() if you handle the wheel event; otherwise it - will be sent to the tqparent widget. + will be sent to the parent widget. The TQWidget::setEnable() function can be used to enable or disable mouse and keyboard events for a widget. @@ -783,7 +783,7 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio Setting the accept parameter indicates that the receiver of the event wants the wheel event. Unwanted wheel events are sent to the - tqparent widget. + parent widget. The accept flag is set by default. @@ -797,7 +797,7 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio Clearing the accept parameter indicates that the event receiver does not want the wheel event. Unwanted wheel events are sent to - the tqparent widget. The accept flag is set by default. + the parent widget. The accept flag is set by default. \sa accept() */ @@ -813,7 +813,7 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio \value META the Meta keys. \value CTRL the Ctrl keys. \value ALT the normal Alt keys, but not e.g. AltGr. - \value MODIFIER_MASK is a tqmask of Shift, Ctrl, Alt and Meta. + \value MODIFIER_MASK is a mask of Shift, Ctrl, Alt and Meta. \value UNICODE_ACCEL the accelerator is specified as a Unicode code point, not as a TQt Key. */ @@ -830,7 +830,7 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio A key event contains a special accept flag that indicates whether the receiver wants the key event. You should call TQKeyEvent::ignore() if the key press or release event is not handled by your widget. A key event is - propagated up the tqparent widget chain until a widget accepts it with + propagated up the parent widget chain until a widget accepts it with TQKeyEvent::accept() or an event filter consumes it. Key events for multi media keys are ignored by default. You should call TQKeyEvent::accept() if your widget handles those events. @@ -951,7 +951,7 @@ TQt::ButtonState TQKeyEvent::stateAfter() const Setting the accept parameter indicates that the receiver of the event wants the key event. Unwanted key events are sent to the - tqparent widget. + parent widget. The accept flag is set by default. @@ -985,7 +985,7 @@ TQt::ButtonState TQKeyEvent::stateAfter() const Clearing the accept parameter indicates that the event receiver does not want the key event. Unwanted key events are sent to the - tqparent widget. + parent widget. The accept flag is set by default. @@ -1473,7 +1473,7 @@ void TQFocusEvent::resetReason() \ingroup events Move events are sent to widgets that have been moved to a new position - relative to their tqparent. + relative to their parent. The event handler TQWidget::moveEvent() receives move events. @@ -1835,7 +1835,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s Setting the consume flag indicates that the receiver of this event does not want the event to be propagated further (i.e. not sent to - tqparent classes.) + parent classes.) The consumed flag is not set by default. @@ -2063,7 +2063,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s A tablet event contains a special accept flag that indicates whether the receiver wants the event. You should call TQTabletEvent::accept() if you handle the tablet event; otherwise - it will be sent to the tqparent widget. + it will be sent to the parent widget. The TQWidget::setEnabled() function can be used to enable or disable mouse and keyboard events for a widget. @@ -2083,7 +2083,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s \value NoDevice No tqdevice, or an unknown tqdevice. \value Puck A Puck (a tqdevice that is similar to a flat mouse with - a transtqparent circle with cross-hairs). + a transparent circle with cross-hairs). \value Stylus A Stylus (the narrow end of the pen). \value Eraser An Eraser (the broad end of the pen). \omit @@ -2252,7 +2252,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP Setting the accept flag indicates that the receiver of the event wants the tablet event. Unwanted tablet events are sent to the - tqparent widget. + parent widget. The accept flag is set by default. @@ -2266,7 +2266,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP Clearing the accept flag indicates that the event receiver does not want the tablet event. Unwanted tablet events are sent to the - tqparent widget. + parent widget. The accept flag is set by default. diff --git a/experimental/tqtinterface/qt4/src/kernel/tqevent.h b/experimental/tqtinterface/qt4/src/kernel/tqevent.h index 143c766f6..9dc10ad4a 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqevent.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqevent.h @@ -417,13 +417,13 @@ public: Hide = 18, // widget is hidden Close = 19, // request to close widget Quit = 20, // request to quit application - Retqparent = 21, // widget has been reparented + Reparent = 21, // widget has been reparented ShowMinimized = 22, // widget is shown minimized ShowNormal = 23, // widget is shown normal WindowActivate = 24, // window was activated WindowDeactivate = 25, // window was deactivated - ShowToParent = 26, // widget is shown to tqparent - HideToParent = 27, // widget is hidden to tqparent + ShowToParent = 26, // widget is shown to parent + HideToParent = 27, // widget is hidden to parent ShowMaximized = 28, // widget is shown maximized ShowFullScreen = 29, // widget is shown full-screen Accel = 30, // accelerator event @@ -431,9 +431,9 @@ public: AccelAvailable = 32, // accelerator available event CaptionChange = 33, // caption changed IconChange = 34, // icon changed - ParentFontChange = 35, // tqparent font changed + ParentFontChange = 35, // parent font changed ApplicationFontChange = 36, // application font changed - ParentPaletteChange = 37, // tqparent palette changed + ParentPaletteChange = 37, // parent palette changed ApplicationPaletteChange = 38, // application palette changed PaletteChange = 39, // widget palette changed Clipboard = 40, // internal clipboard event diff --git a/experimental/tqtinterface/qt4/src/kernel/tqeventloop.cpp b/experimental/tqtinterface/qt4/src/kernel/tqeventloop.cpp index 704fc4388..57dfca1cb 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqeventloop.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqeventloop.cpp @@ -94,10 +94,10 @@ by calling TQApplication::eventLoop(). To create your own event loop object create it before you instantiate the TQApplication object. - The \a tqparent and \a name arguments are passed on to the TQObject constructor. + The \a parent and \a name arguments are passed on to the TQObject constructor. */ -TQEventLoop::TQEventLoop( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +TQEventLoop::TQEventLoop( TQObject *parent, const char *name ) + : TQObject( parent, name ) { #if defined(TQT_CHECK_STATE) if ( TQApplication::eventloop ) diff --git a/experimental/tqtinterface/qt4/src/kernel/tqeventloop.h b/experimental/tqtinterface/qt4/src/kernel/tqeventloop.h index d837a75d9..3ec45cf70 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqeventloop.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqeventloop.h @@ -63,7 +63,7 @@ class TQ_EXPORT TQEventLoop : public TQObject TQ_OBJECT public: - TQEventLoop( TQObject *tqparent = 0, const char *name = 0 ); + TQEventLoop( TQObject *parent = 0, const char *name = 0 ); ~TQEventLoop(); enum ProcessEvents { diff --git a/experimental/tqtinterface/qt4/src/kernel/tqfont.cpp b/experimental/tqtinterface/qt4/src/kernel/tqfont.cpp index 5570afd9e..e054114c8 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqfont.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqfont.cpp @@ -151,7 +151,7 @@ bool TQFontDef::operator==( const TQFontDef &other ) const TQFontPrivate::TQFontPrivate() : engineData( 0 ), painttqdevice( 0 ), rawMode( FALSE ), underline( FALSE ), overline( FALSE ), strikeOut( FALSE ), - tqmask( 0 ) + mask( 0 ) { #ifdef TQ_WS_X11 screen = TQPaintDevice::x11AppScreen(); @@ -164,7 +164,7 @@ TQFontPrivate::TQFontPrivate( const TQFontPrivate &other ) : TQShared(), request( other.request ), engineData( 0 ), painttqdevice( other.painttqdevice ), screen( other.screen ), rawMode( other.rawMode ), underline( other.underline ), overline( other.overline ), - strikeOut( other.strikeOut ), tqmask( other.tqmask ) + strikeOut( other.strikeOut ), mask( other.mask ) { } @@ -181,42 +181,42 @@ void TQFontPrivate::resolve( const TQFontPrivate *other ) TQ_ASSERT( other != 0 ); #endif - if ( ( tqmask & Complete ) == Complete ) return; + if ( ( mask & Complete ) == Complete ) return; // assign the unset-bits with the set-bits of the other font def - if ( ! ( tqmask & Family ) ) + if ( ! ( mask & Family ) ) request.family = other->request.family; - if ( ! ( tqmask & Size ) ) { + if ( ! ( mask & Size ) ) { request.pointSize = other->request.pointSize; request.pixelSize = other->request.pixelSize; } - if ( ! ( tqmask & StyleHint ) ) + if ( ! ( mask & StyleHint ) ) request.tqstyleHint = other->request.tqstyleHint; - if ( ! ( tqmask & StyleStrategy ) ) + if ( ! ( mask & StyleStrategy ) ) request.styleStrategy = other->request.styleStrategy; - if ( ! ( tqmask & Weight ) ) + if ( ! ( mask & Weight ) ) request.weight = other->request.weight; - if ( ! ( tqmask & Italic ) ) + if ( ! ( mask & Italic ) ) request.italic = other->request.italic; - if ( ! ( tqmask & FixedPitch ) ) + if ( ! ( mask & FixedPitch ) ) request.fixedPitch = other->request.fixedPitch; - if ( ! ( tqmask & Stretch ) ) + if ( ! ( mask & Stretch ) ) request.stretch = other->request.stretch; - if ( ! ( tqmask & Underline ) ) + if ( ! ( mask & Underline ) ) underline = other->underline; - if ( ! ( tqmask & Overline ) ) + if ( ! ( mask & Overline ) ) overline = other->overline; - if ( ! ( tqmask & StrikeOut ) ) + if ( ! ( mask & StrikeOut ) ) strikeOut = other->strikeOut; } @@ -578,12 +578,12 @@ void TQFont::detach() /* if this font is a copy of the application default font, set the - fontdef tqmask to zero to indicate that *nothing* has been + fontdef mask to zero to indicate that *nothing* has been explicitly set by the programmer. */ const TQFont appfont = TQApplication::font(); if ( old_d == appfont.d ) - d->tqmask = 0; + d->mask = 0; if ( old_d->deref() ) delete old_d; @@ -624,18 +624,18 @@ TQFont::TQFont( const TQString &family, int pointSize, int weight, bool italic ) d = new TQFontPrivate; TQ_CHECK_PTR( d ); - d->tqmask = TQFontPrivate::Family; + d->mask = TQFontPrivate::Family; if (pointSize <= 0) { pointSize = 12; } else { - d->tqmask |= TQFontPrivate::Size; + d->mask |= TQFontPrivate::Size; } if (weight < 0) { weight = Normal; } else { - d->tqmask |= TQFontPrivate::Weight | TQFontPrivate::Italic; + d->mask |= TQFontPrivate::Weight | TQFontPrivate::Italic; } d->request.family = family; @@ -713,7 +713,7 @@ void TQFont::setFamily( const TQString &family ) d->request.addStyle = TQString::null; #endif // TQ_WS_X11 - d->tqmask |= TQFontPrivate::Family; + d->mask |= TQFontPrivate::Family; } /*! @@ -762,7 +762,7 @@ void TQFont::setPointSize( int pointSize ) d->request.pointSize = pointSize * 10; d->request.pixelSize = -1; - d->tqmask |= TQFontPrivate::Size; + d->mask |= TQFontPrivate::Size; } /*! @@ -786,7 +786,7 @@ void TQFont::setPointSizeFloat( float pointSize ) d->request.pointSize = tqRound(pointSize * 10.0); d->request.pixelSize = -1; - d->tqmask |= TQFontPrivate::Size; + d->mask |= TQFontPrivate::Size; } /*! @@ -823,7 +823,7 @@ void TQFont::setPixelSize( int pixelSize ) d->request.pixelSize = pixelSize; d->request.pointSize = -1; - d->tqmask |= TQFontPrivate::Size; + d->mask |= TQFontPrivate::Size; } /*! @@ -869,7 +869,7 @@ void TQFont::setItalic( bool enable ) detach(); d->request.italic = enable; - d->tqmask |= TQFontPrivate::Italic; + d->mask |= TQFontPrivate::Italic; } /*! @@ -919,7 +919,7 @@ void TQFont::setWeight( int weight ) detach(); d->request.weight = weight; - d->tqmask |= TQFontPrivate::Weight; + d->mask |= TQFontPrivate::Weight; } /*! @@ -964,7 +964,7 @@ void TQFont::setUnderline( bool enable ) detach(); d->underline = enable; - d->tqmask |= TQFontPrivate::Underline; + d->mask |= TQFontPrivate::Underline; } /*! @@ -987,7 +987,7 @@ void TQFont::setOverline( bool enable ) detach(); d->overline = enable; - d->tqmask |= TQFontPrivate::Overline; + d->mask |= TQFontPrivate::Overline; } /*! @@ -1011,7 +1011,7 @@ void TQFont::setStrikeOut( bool enable ) detach(); d->strikeOut = enable; - d->tqmask |= TQFontPrivate::StrikeOut; + d->mask |= TQFontPrivate::StrikeOut; } /*! @@ -1036,7 +1036,7 @@ void TQFont::setFixedPitch( bool enable ) d->request.fixedPitch = enable; d->request.ignorePitch = FALSE; - d->tqmask |= TQFontPrivate::FixedPitch; + d->mask |= TQFontPrivate::FixedPitch; } /*! @@ -1138,15 +1138,15 @@ void TQFont::setStyleHint( StyleHint hint, StyleStrategy strategy ) { detach(); - if ( ( d->tqmask & ( TQFontPrivate::StyleHint | TQFontPrivate::StyleStrategy ) ) && + if ( ( d->mask & ( TQFontPrivate::StyleHint | TQFontPrivate::StyleStrategy ) ) && (StyleHint) d->request.tqstyleHint == hint && (StyleStrategy) d->request.styleStrategy == strategy ) return; d->request.tqstyleHint = hint; d->request.styleStrategy = strategy; - d->tqmask |= TQFontPrivate::StyleHint; - d->tqmask |= TQFontPrivate::StyleStrategy; + d->mask |= TQFontPrivate::StyleHint; + d->mask |= TQFontPrivate::StyleStrategy; #if defined(TQ_WS_X11) d->request.addStyle = TQString::null; @@ -1162,12 +1162,12 @@ void TQFont::setStyleStrategy( StyleStrategy s ) { detach(); - if ( ( d->tqmask & TQFontPrivate::StyleStrategy ) && + if ( ( d->mask & TQFontPrivate::StyleStrategy ) && s == (StyleStrategy)d->request.styleStrategy ) return; d->request.styleStrategy = s; - d->tqmask |= TQFontPrivate::StyleStrategy; + d->mask |= TQFontPrivate::StyleStrategy; } @@ -1229,12 +1229,12 @@ void TQFont::setStretch( int factor ) detach(); - if ( ( d->tqmask & TQFontPrivate::Stretch ) && + if ( ( d->mask & TQFontPrivate::Stretch ) && d->request.stretch == (uint)factor ) return; d->request.stretch = (uint)factor; - d->tqmask |= TQFontPrivate::Stretch; + d->mask |= TQFontPrivate::Stretch; } /*! @@ -1341,7 +1341,7 @@ bool TQFont::rawMode() const */ TQFont TQFont::resolve( const TQFont &other ) const { - if ( *this == other && d->tqmask == other.d->tqmask ) + if ( *this == other && d->mask == other.d->mask ) return *this; TQFont font( *this ); @@ -1349,12 +1349,12 @@ TQFont TQFont::resolve( const TQFont &other ) const /* if this font is a copy of the application default font, set the - fontdef tqmask to zero to indicate that *nothing* has been + fontdef mask to zero to indicate that *nothing* has been explicitly set by the programmer. */ const TQFont appfont = TQApplication::font(); if ( d == appfont.d ) - font.d->tqmask = 0; + font.d->mask = 0; font.d->resolve( other.d ); @@ -1782,7 +1782,7 @@ TQDataStream &operator>>( TQDataStream &s, TQFont &font ) if (font.d->deref()) delete font.d; font.d = new TQFontPrivate; - font.d->tqmask = TQFontPrivate::Complete; + font.d->mask = TQFontPrivate::Complete; TQ_INT16 pointSize, pixelSize = -1; TQ_UINT8 tqstyleHint, styleStrategy = TQFont::PreferDefault, charSet, weight, bits; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqfont_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqfont_x11.cpp index fda292f4b..55e0bee89 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqfont_x11.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqfont_x11.cpp @@ -535,7 +535,7 @@ void TQFont::setRawName( const TQString &name ) setFamily( name ); setRawMode( TRUE ); } else { - d->tqmask = TQFontPrivate::Complete; + d->mask = TQFontPrivate::Complete; } } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqfontdata_p.h b/experimental/tqtinterface/qt4/src/kernel/tqfontdata_p.h index 36b709ff8..28fc990e3 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqfontdata_p.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqfontdata_p.h @@ -187,7 +187,7 @@ public: Complete = 0x07ff }; - uint tqmask; + uint mask; void resolve( const TQFontPrivate *other ); }; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqiconset.cpp b/experimental/tqtinterface/qt4/src/kernel/tqiconset.cpp index 09a1126c1..95656c05e 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqiconset.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqiconset.cpp @@ -794,11 +794,11 @@ TQPixmap *TQIconSet::createScaled( Size size, const TQPixmap *suppliedPix ) cons img = img.smoothScale( imgSize ); TQPixmap *pixmap = new TQPixmap( img ); - if ( !pixmap->tqmask() ) { - TQBitmap tqmask; - tqmask.convertFromImage( img.createHeuristicMask(), + if ( !pixmap->mask() ) { + TQBitmap mask; + mask.convertFromImage( img.createHeuristicMask(), TQt::MonoOnly | TQt::ThresholdDither ); - pixmap->setMask( tqmask ); + pixmap->setMask( mask ); } return pixmap; } @@ -816,8 +816,8 @@ TQPixmap *TQIconSet::createDisabled( Size size, State state ) const TQImage img; TQPixmap *pixmap = 0; TQBitmap normalMask; - if ( normalPix.tqmask() ) { - normalMask = *normalPix.tqmask(); + if ( normalPix.mask() ) { + normalMask = *normalPix.mask(); } else { img = normalPix.convertToImage(); normalMask.convertFromImage( img.createHeuristicMask(), @@ -837,16 +837,16 @@ TQPixmap *TQIconSet::createDisabled( Size size, State state ) const painter.drawPixmap( 0, 0, normalMask ); painter.end(); - if ( !normalMask.tqmask() ) + if ( !normalMask.mask() ) normalMask.setMask( normalMask ); - TQBitmap tqmask( pixmap->size() ); - tqmask.fill( TQt::color0 ); - painter.begin( &tqmask ); + TQBitmap mask( pixmap->size() ); + mask.fill( TQt::color0 ); + painter.begin( &mask ); painter.drawPixmap( 0, 0, normalMask ); painter.drawPixmap( 1, 1, normalMask ); painter.end(); - pixmap->setMask( tqmask ); + pixmap->setMask( mask ); return pixmap; } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqimage.cpp b/experimental/tqtinterface/qt4/src/kernel/tqimage.cpp index 2a99fc929..3483e2a56 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqimage.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqimage.cpp @@ -1606,12 +1606,12 @@ TQDataStream &operator<<( TQDataStream &s, const BMP_INFOHDR &bi ) } static -int calc_shift(int tqmask) +int calc_shift(int mask) { int result = 0; - while (!(tqmask & 1)) { + while (!(mask & 1)) { result++; - tqmask >>= 1; + mask >>= 1; } return result; } @@ -4224,10 +4224,10 @@ void TQImage::setNumColors( int numColors ) contain the alpha component. The alpha component specifies the transparency of a pixel. 0 means - completely transtqparent and 255 means opaque. The alpha component + completely transparent and 255 means opaque. The alpha component is ignored if you do not enable alpha buffer mode. - The alpha buffer is used to set a tqmask when a TQImage is translated + The alpha buffer is used to set a mask when a TQImage is translated to a TQPixmap. \sa hasAlphaBuffer() createAlphaMask() @@ -4430,7 +4430,7 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl const int tablesize = 997; // prime TQRgbMap table[tablesize]; int pix=0; - TQRgb atqmask = src->hasAlphaBuffer() ? 0xffffffff : 0x00ffffff; + TQRgb amask = src->hasAlphaBuffer() ? 0xffffffff : 0x00ffffff; if ( src->hasAlphaBuffer() ) dst->setAlphaBuffer(TRUE); @@ -4441,10 +4441,10 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl // Almost same code as pixel insertion below while ( palette_count-- > 0 ) { // Find in table... - int hash = (*p & atqmask) % tablesize; + int hash = (*p & amask) % tablesize; for (;;) { if ( table[hash].used() ) { - if ( table[hash].rgb == (*p & atqmask) ) { + if ( table[hash].rgb == (*p & amask) ) { // Found previous insertion - use it break; } else { @@ -4455,9 +4455,9 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl // Cannot be in table TQ_ASSERT ( pix != 256 ); // too many colors // Insert into table at this unused position - dst->setColor( pix, (*p & atqmask) ); + dst->setColor( pix, (*p & amask) ); table[hash].pix = pix++; - table[hash].rgb = *p & atqmask; + table[hash].rgb = *p & amask; break; } } @@ -4474,10 +4474,10 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl x = src->width(); while ( x-- ) { // Find in table... - int hash = (*p & atqmask) % tablesize; + int hash = (*p & amask) % tablesize; for (;;) { if ( table[hash].used() ) { - if ( table[hash].rgb == (*p & atqmask) ) { + if ( table[hash].rgb == (*p & amask) ) { // Found previous insertion - use it break; } else { @@ -4493,9 +4493,9 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl y = src->height(); } else { // Insert into table at this unused position - dst->setColor( pix, (*p & atqmask) ); + dst->setColor( pix, (*p & amask) ); table[hash].pix = pix++; - table[hash].rgb = (*p & atqmask); + table[hash].rgb = (*p & amask); } break; } @@ -4548,7 +4548,7 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl for ( gc=0; gc<=MAX_G; gc++ ) for ( bc=0; bc<=MAX_B; bc++ ) { dst->setColor( INDEXOF(rc,gc,bc), - (atqmask&0xff000000) + (amask&0xff000000) | tqRgb( rc*255/MAX_R, gc*255/MAX_G, bc*255/MAX_B ) ); } @@ -4679,12 +4679,12 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl #ifndef TQT_NO_IMAGE_DITHER_TO_1 if ( src->hasAlphaBuffer() ) { const int trans = 216; - dst->setColor(trans, 0x00000000); // transtqparent - TQImage tqmask = src->createAlphaMask(conversion_flags); + dst->setColor(trans, 0x00000000); // transparent + TQImage mask = src->createAlphaMask(conversion_flags); uchar* m; for ( y=0; y < src->height(); y++ ) { uchar bit = 0x80; - m = tqmask.scanLine(y); + m = mask.scanLine(y); b = dst->scanLine(y); int w = src->width(); for ( x = 0; x<w; x++ ) { @@ -5045,7 +5045,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst, if ( fromalpha ) { while ( p < end ) { if ( (*p++ >> 24) >= 128 ) - *m |= 1 << bit; // Set tqmask "on" + *m |= 1 << bit; // Set mask "on" if ( bit == 0 ) { m++; bit = 7; @@ -5077,7 +5077,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst, int bit = 7; while ( p < end ) { if ( gray[*p++] < 128 ) - *m |= 1 << bit; // Set tqmask "on"/ pixel "black" + *m |= 1 << bit; // Set mask "on"/ pixel "black" if ( bit == 0 ) { m++; bit = 7; @@ -6040,7 +6040,7 @@ TQImage TQImage::xForm( const TQWMatrix &matrix ) const break; case 8: if ( dImage.data->ncols < 256 ) { - // colors are left in the color table, so pick that one as transtqparent + // colors are left in the color table, so pick that one as transparent dImage.setNumColors( dImage.data->ncols+1 ); dImage.setColor( dImage.data->ncols-1, 0x00 ); memset( dImage.bits(), dImage.data->ncols-1, dImage.numBytes() ); @@ -6069,7 +6069,7 @@ TQImage TQImage::xForm( const TQWMatrix &matrix ) const #endif /*! - Builds and returns a 1-bpp tqmask from the alpha buffer in this + Builds and returns a 1-bpp mask from the alpha buffer in this image. Returns a \link isNull() null\endlink image if \link setAlphaBuffer() alpha buffer mode\endlink is disabled. @@ -6099,15 +6099,15 @@ TQImage TQImage::createAlphaMask( int conversion_flags ) const .createAlphaMask( conversion_flags ); } - TQImage tqmask1; - dither_to_1( this, &tqmask1, conversion_flags, TRUE ); - return tqmask1; + TQImage mask1; + dither_to_1( this, &mask1, conversion_flags, TRUE ); + return mask1; } #endif #ifndef TQT_NO_IMAGE_HEURISTIC_MASK /*! - Creates and returns a 1-bpp heuristic tqmask for this image. It + Creates and returns a 1-bpp heuristic mask for this image. It works by selecting a color from one of the corners, then chipping away pixels of that color starting at all the edges. @@ -6118,8 +6118,8 @@ TQImage TQImage::createAlphaMask( int conversion_flags ) const The returned image has little-endian bit order, which you can convert to big-endianness using convertBitOrder(). - If \a clipTight is TRUE the tqmask is just large enough to cover the - pixels; otherwise, the tqmask is larger than the data pixels. + If \a clipTight is TRUE the mask is just large enough to cover the + pixels; otherwise, the mask is larger than the data pixels. This function disregards the \link hasAlphaBuffer() alpha buffer \endlink. @@ -7644,12 +7644,12 @@ TQDataStream &operator<<( TQDataStream &s, const BMP_INFOHDR &bi ) } static -int calc_shift(int tqmask) +int calc_shift(int mask) { int result = 0; - while (!(tqmask & 1)) { + while (!(mask & 1)) { result++; - tqmask >>= 1; + mask >>= 1; } return result; } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.cpp b/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.cpp index 79d95424a..d6e7d750c 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.cpp @@ -298,8 +298,8 @@ public: holderWidget is set immediately after this constructor has been returned on the X11 platform. */ -TQInputContext::TQInputContext( TQObject *tqparent ) - : TQObject( tqparent ) +TQInputContext::TQInputContext( TQObject *parent ) + : TQObject( parent ) { d = new TQInputContextPrivate; } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h b/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h index 14a1a7e25..b8fb6604d 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h @@ -67,7 +67,7 @@ class TQInputContext : public TQObject Q_OBJECT TQ_OBJECT public: - TQInputContext( TQObject *tqparent = 0 ); + TQInputContext( TQObject *parent = 0 ); virtual ~TQInputContext(); virtual TQString identifierName(); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp b/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp index 9c3132a03..f42cf8ef3 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp @@ -63,7 +63,7 @@ int menuBarHeightForWidth( QWidget *menubar_w, int w ) return 0; } -TQLayout::TQLayout( QWidget *tqparent, int margin, int spacing, const char *name ) : QLayout( tqparent ), autoNewChild(false) +TQLayout::TQLayout( QWidget *parent, int margin, int spacing, const char *name ) : QLayout( parent ), autoNewChild(false) { setObjectName(QString::fromAscii(name)); setMargin(margin); @@ -71,8 +71,8 @@ TQLayout::TQLayout( QWidget *tqparent, int margin, int spacing, const char *name setSpacing(margin); else setSpacing(spacing); - if ( tqparent ) tqparent->installEventFilter( this ); - TQT_TQOBJECT_REQUIRED_INITIALIZATION(tqparent) + if ( parent ) parent->installEventFilter( this ); + TQT_TQOBJECT_REQUIRED_INITIALIZATION(parent) } TQLayout::TQLayout( QLayout *parentLayout, int spacing, const char *name ) : QLayout(), autoNewChild(false) @@ -497,7 +497,7 @@ void TQLayout::mouseDoubleClickEvent( TQMouseEvent *e ) If you reimplement this handler, it is very important that you \link TQWheelEvent ignore()\endlink the event if you do not handle - it, so that the widget's tqparent can interpret it. + it, so that the widget's parent can interpret it. The default implementation ignores the event. @@ -517,7 +517,7 @@ void TQLayout::wheelEvent( TQWheelEvent *e ) If you reimplement this handler, it is very important that you \link TQTabletEvent ignore()\endlink the event if you do not handle - it, so that the widget's tqparent can interpret it. + it, so that the widget's parent can interpret it. The default implementation ignores the event. @@ -539,10 +539,10 @@ void TQLayout::tabletEvent( TQTabletEvent *e ) If you reimplement this handler, it is very important that you explicitly \link TQKeyEvent::ignore() ignore\endlink the event - if you do not understand it, so that the widget's tqparent can + if you do not understand it, so that the widget's parent can interpret it; otherwise, the event will be implicitly accepted. Although top-level widgets are able to choose whether to accept - or ignore unknown events because they have no tqparent widgets that + or ignore unknown events because they have no parent widgets that could otherwise handle them, it is good practice to explicitly ignore events to make widgets as reusable as possible. @@ -568,7 +568,7 @@ void TQLayout::keyPressEvent( TQKeyEvent * ) If you reimplement this handler, it is very important that you \link TQKeyEvent ignore()\endlink the release if you do not - understand it, so that the widget's tqparent can interpret it. + understand it, so that the widget's parent can interpret it. The default implementation ignores the event. @@ -1003,7 +1003,7 @@ void TQGridLayout::mouseDoubleClickEvent( TQMouseEvent *e ) If you reimplement this handler, it is very important that you \link TQWheelEvent ignore()\endlink the event if you do not handle - it, so that the widget's tqparent can interpret it. + it, so that the widget's parent can interpret it. The default implementation ignores the event. @@ -1023,7 +1023,7 @@ void TQGridLayout::wheelEvent( TQWheelEvent *e ) If you reimplement this handler, it is very important that you \link TQTabletEvent ignore()\endlink the event if you do not handle - it, so that the widget's tqparent can interpret it. + it, so that the widget's parent can interpret it. The default implementation ignores the event. @@ -1045,10 +1045,10 @@ void TQGridLayout::tabletEvent( TQTabletEvent *e ) If you reimplement this handler, it is very important that you explicitly \link TQKeyEvent::ignore() ignore\endlink the event - if you do not understand it, so that the widget's tqparent can + if you do not understand it, so that the widget's parent can interpret it; otherwise, the event will be implicitly accepted. Although top-level widgets are able to choose whether to accept - or ignore unknown events because they have no tqparent widgets that + or ignore unknown events because they have no parent widgets that could otherwise handle them, it is good practice to explicitly ignore events to make widgets as reusable as possible. @@ -1074,7 +1074,7 @@ void TQGridLayout::keyPressEvent( TQKeyEvent * ) If you reimplement this handler, it is very important that you \link TQKeyEvent ignore()\endlink the release if you do not - understand it, so that the widget's tqparent can interpret it. + understand it, so that the widget's parent can interpret it. The default implementation ignores the event. @@ -2277,7 +2277,7 @@ inline TQGridLayoutDataIterator::TQGridLayoutDataIterator( TQGridLayoutData *d ) \ingroup appearance \mainclass - TQGridLayout takes the space made available to it (by its tqparent + TQGridLayout takes the space made available to it (by its parent tqlayout or by the mainWidget()), divides it up into rows and columns, and puts each widget it manages into the correct cell. @@ -2321,7 +2321,7 @@ inline TQGridLayoutDataIterator::TQGridLayoutDataIterator( TQGridLayoutData *d ) If the TQGridLayout is not the top-level tqlayout (i.e. does not manage all of the widget's area and tqchildren), you must add it to - its tqparent tqlayout when you create it, but before you do anything + its parent tqlayout when you create it, but before you do anything with it. The normal way to add a tqlayout is by calling parentLayout-\>addLayout(). @@ -2388,16 +2388,16 @@ static bool checkWidget( TQLayout *l, TQWidget *w ) /*! Constructs a new TQGridLayout with \a nRows rows, \a nCols columns - and tqparent widget, \a tqparent. \a tqparent may not be 0. The grid + and parent widget, \a parent. \a parent may not be 0. The grid tqlayout is called \a name. \a margin is the number of pixels between the edge of the widget and its managed tqchildren. \a space is the default number of pixels between cells. If \a space is -1, the value of \a margin is used. */ -TQGridLayout::TQGridLayout( TQWidget *tqparent, int nRows, int nCols, int margin, +TQGridLayout::TQGridLayout( TQWidget *parent, int nRows, int nCols, int margin, int space, const char *name ) - : TQLayout( tqparent, margin, space, name ) + : TQLayout( parent, margin, space, name ) { init( nRows, nCols ); } @@ -2405,7 +2405,7 @@ TQGridLayout::TQGridLayout( TQWidget *tqparent, int nRows, int nCols, int margin /*! Constructs a new grid that is placed inside \a parentLayout with \a nRows rows and \a nCols columns. If \a spacing is -1, this - TQGridLayout inherits its tqparent's spacing(); otherwise \a spacing + TQGridLayout inherits its parent's spacing(); otherwise \a spacing is used. The grid tqlayout is called \a name. This grid is placed according to \a parentLayout's default @@ -2420,7 +2420,7 @@ TQGridLayout::TQGridLayout( TQLayout *parentLayout, int nRows, int nCols, /*! Constructs a new grid with \a nRows rows and \a nCols columns. If - \a spacing is -1, this TQGridLayout inherits its tqparent's + \a spacing is -1, this TQGridLayout inherits its parent's spacing(); otherwise \a spacing is used. The grid tqlayout is called \a name. @@ -2691,9 +2691,9 @@ void TQGridLayout::addMultiCellWidget( TQWidget *w, int fromRow, int toRow, \a tqlayout becomes a child of the grid tqlayout. - When a tqlayout is constructed with another tqlayout as its tqparent, + When a tqlayout is constructed with another tqlayout as its parent, you don't need to call addLayout(); the child tqlayout is - automatically added to the tqparent tqlayout as it is constructed. + automatically added to the parent tqlayout as it is constructed. \sa addMultiCellLayout() */ @@ -3046,7 +3046,7 @@ private: \ingroup geomanagement \ingroup appearance - TQBoxLayout takes the space it gets (from its tqparent tqlayout or from + TQBoxLayout takes the space it gets (from its parent tqlayout or from the mainWidget()), divides it up into a row of boxes, and makes each managed widget fill one box. @@ -3071,7 +3071,7 @@ private: If the TQBoxLayout is not the top-level tqlayout (i.e. it is not managing all of the widget's area and tqchildren), you must add it - to its tqparent tqlayout before you can do anything with it. The + to its parent tqlayout before you can do anything with it. The normal way to add a tqlayout is by calling parentLayout-\>addLayout(). @@ -3107,7 +3107,7 @@ private: \endlist The margin defaults to 0. The spacing defaults to the same as the - margin width for a top-level tqlayout, or to the same as the tqparent + margin width for a top-level tqlayout, or to the same as the parent tqlayout. Both are parameters to the constructor. To remove a widget from a tqlayout, call remove(). Calling @@ -3140,7 +3140,7 @@ static inline bool horz( TQBoxLayout::Direction dir ) /*! Constructs a new TQBoxLayout with direction \a d and main widget \a - tqparent. \a tqparent may not be 0. + parent. \a parent may not be 0. The \a margin is the number of pixels between the edge of the widget and its managed tqchildren. The \a spacing is the default @@ -3151,9 +3151,9 @@ static inline bool horz( TQBoxLayout::Direction dir ) \sa direction() */ -TQBoxLayout::TQBoxLayout( TQWidget *tqparent, Direction d, +TQBoxLayout::TQBoxLayout( TQWidget *parent, Direction d, int margin, int spacing, const char *name ) - : TQLayout( tqparent, margin, spacing, name ) + : TQLayout( parent, margin, spacing, name ) { data = new TQBoxLayoutData; dir = d; @@ -3166,7 +3166,7 @@ TQBoxLayout::TQBoxLayout( TQWidget *tqparent, Direction d, The \a spacing is the default number of pixels between neighboring tqchildren. If \a spacing is -1, the tqlayout will inherit its - tqparent's spacing(). + parent's spacing(). */ TQBoxLayout::TQBoxLayout( TQLayout *parentLayout, Direction d, int spacing, const char *name ) @@ -3180,7 +3180,7 @@ TQBoxLayout::TQBoxLayout( TQLayout *parentLayout, Direction d, int spacing, /*! Constructs a new TQBoxLayout called \a name, with direction \a d. - If \a spacing is -1, the tqlayout will inherit its tqparent's + If \a spacing is -1, the tqlayout will inherit its parent's spacing(); otherwise \a spacing is used. You must insert this box into another tqlayout. @@ -3606,9 +3606,9 @@ void TQBoxLayout::addWidget( TQWidget *widget, int stretch, Adds \a tqlayout to the end of the box, with serial stretch factor \a stretch. - When a tqlayout is constructed with another tqlayout as its tqparent, + When a tqlayout is constructed with another tqlayout as its parent, you don't need to call addLayout(); the child tqlayout is - automatically added to the tqparent tqlayout as it is constructed. + automatically added to the parent tqlayout as it is constructed. \sa insertLayout(), setAutoAdd(), addWidget(), addSpacing() */ @@ -3920,16 +3920,16 @@ void TQBoxLayout::calcHfw( int w ) /*! Constructs a new top-level horizontal box called \a name, with - tqparent \a tqparent. + parent \a parent. The \a margin is the number of pixels between the edge of the widget and its managed tqchildren. The \a spacing is the default number of pixels between neighboring tqchildren. If \a spacing is -1 the value of \a margin is used for \a spacing. */ -TQHBoxLayout::TQHBoxLayout( TQWidget *tqparent, int margin, +TQHBoxLayout::TQHBoxLayout( TQWidget *parent, int margin, int spacing, const char *name ) - : TQBoxLayout( tqparent, LeftToRight, margin, spacing, name ) + : TQBoxLayout( parent, LeftToRight, margin, spacing, name ) { } @@ -3939,7 +3939,7 @@ TQHBoxLayout::TQHBoxLayout( TQWidget *tqparent, int margin, The \a spacing is the default number of pixels between neighboring tqchildren. If \a spacing is -1, this TQHBoxLayout will inherit its - tqparent's spacing(). + parent's spacing(). */ TQHBoxLayout::TQHBoxLayout( TQLayout *parentLayout, int spacing, const char *name ) @@ -3953,7 +3953,7 @@ TQHBoxLayout::TQHBoxLayout( TQLayout *parentLayout, int spacing, The \a spacing is the default number of pixels between neighboring tqchildren. If \a spacing is -1, this TQHBoxLayout will inherit its - tqparent's spacing(). + parent's spacing(). */ TQHBoxLayout::TQHBoxLayout( int spacing, const char *name ) : TQBoxLayout( LeftToRight, spacing, name ) @@ -3995,16 +3995,16 @@ TQHBoxLayout::~TQHBoxLayout() /*! Constructs a new top-level vertical box called \a name, with - tqparent \a tqparent. + parent \a parent. The \a margin is the number of pixels between the edge of the widget and its managed tqchildren. The \a spacing is the default number of pixels between neighboring tqchildren. If \a spacing is -1 the value of \a margin is used for \a spacing. */ -TQVBoxLayout::TQVBoxLayout( TQWidget *tqparent, int margin, int spacing, +TQVBoxLayout::TQVBoxLayout( TQWidget *parent, int margin, int spacing, const char *name ) - : TQBoxLayout( tqparent, TopToBottom, margin, spacing, name ) + : TQBoxLayout( parent, TopToBottom, margin, spacing, name ) { } @@ -4015,7 +4015,7 @@ TQVBoxLayout::TQVBoxLayout( TQWidget *tqparent, int margin, int spacing, The \a spacing is the default number of pixels between neighboring tqchildren. If \a spacing is -1, this TQVBoxLayout will inherit its - tqparent's spacing(). + parent's spacing(). */ TQVBoxLayout::TQVBoxLayout( TQLayout *parentLayout, int spacing, const char *name ) @@ -4029,7 +4029,7 @@ TQVBoxLayout::TQVBoxLayout( TQLayout *parentLayout, int spacing, The \a spacing is the default number of pixels between neighboring tqchildren. If \a spacing is -1, this TQVBoxLayout will inherit its - tqparent's spacing(). + parent's spacing(). */ TQVBoxLayout::TQVBoxLayout( int spacing, const char *name ) : TQBoxLayout( TopToBottom, spacing, name ) diff --git a/experimental/tqtinterface/qt4/src/kernel/tqlayout.h b/experimental/tqtinterface/qt4/src/kernel/tqlayout.h index 38dd33e2b..0778bc186 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqlayout.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqlayout.h @@ -363,7 +363,7 @@ public: Auto = QLayout::SetDefaultConstraint }; - TQLayout( QWidget *tqparent, int margin = 0, int spacing = -1, const char *name = 0 ); + TQLayout( QWidget *parent, int margin = 0, int spacing = -1, const char *name = 0 ); TQLayout( QLayout *parentLayout, int spacing = -1, const char *name = 0 ); TQLayout( int spacing = -1, const char *name = 0 ); virtual TQ_SPExpandData expandingDirections() const; @@ -547,7 +547,7 @@ public: // ### TQt 4.0: put 'Auto' first in enum enum ResizeMode { FreeResize, Minimum, Fixed, Auto }; - TQLayout( TQWidget *tqparent, int margin = 0, int spacing = -1, + TQLayout( TQWidget *parent, int margin = 0, int spacing = -1, const char *name = 0 ); TQLayout( TQLayout *parentLayout, int spacing = -1, const char *name = 0 ); TQLayout( int spacing = -1, const char *name = 0 ); @@ -686,14 +686,14 @@ class TQ_EXPORT TQGridLayout : public QGridLayout, virtual public TQt Q_OBJECT TQ_OBJECT public: - TQGridLayout( TQWidget *tqparent, int nRows = 1, int nCols = 1, int border = 0, int spacing = -1, const char *name = 0 ) : QGridLayout( tqparent ), autoNewChild(false) + TQGridLayout( TQWidget *parent, int nRows = 1, int nCols = 1, int border = 0, int spacing = -1, const char *name = 0 ) : QGridLayout( parent ), autoNewChild(false) { expand(nRows, nCols); setMargin(border); setSpacing(spacing < 0 ? border : spacing); setObjectName(QString::fromAscii(name)); - if ( tqparent ) tqparent->installEventFilter( this ); - TQT_TQOBJECT_REQUIRED_INITIALIZATION(tqparent) + if ( parent ) parent->installEventFilter( this ); + TQT_TQOBJECT_REQUIRED_INITIALIZATION(parent) } TQGridLayout( int nRows = 1, int nCols = 1, int spacing = -1, const char *name = 0 ) : QGridLayout(), autoNewChild(false) { @@ -948,7 +948,7 @@ class TQ_EXPORT TQGridLayout : public TQLayout Q_OBJECT TQ_OBJECT public: - TQGridLayout( TQWidget *tqparent, int nRows = 1, int nCols = 1, int border = 0, + TQGridLayout( TQWidget *parent, int nRows = 1, int nCols = 1, int border = 0, int spacing = -1, const char *name = 0 ); TQGridLayout( int nRows = 1, int nCols = 1, int spacing = -1, const char *name = 0 ); @@ -1037,7 +1037,7 @@ public: enum Direction { LeftToRight, RightToLeft, TopToBottom, BottomToTop, Down = TopToBottom, Up = BottomToTop }; - TQBoxLayout( TQWidget *tqparent, Direction, int border = 0, int spacing = -1, + TQBoxLayout( TQWidget *parent, Direction, int border = 0, int spacing = -1, const char *name = 0 ); TQBoxLayout( TQLayout *parentLayout, Direction, int spacing = -1, const char *name = 0 ); @@ -1107,7 +1107,7 @@ class TQ_EXPORT TQHBoxLayout : public TQBoxLayout Q_OBJECT TQ_OBJECT public: - TQHBoxLayout( TQWidget *tqparent, int border = 0, + TQHBoxLayout( TQWidget *parent, int border = 0, int spacing = -1, const char *name = 0 ); TQHBoxLayout( TQLayout *parentLayout, int spacing = -1, const char *name = 0 ); @@ -1127,7 +1127,7 @@ class TQ_EXPORT TQVBoxLayout : public TQBoxLayout Q_OBJECT TQ_OBJECT public: - TQVBoxLayout( TQWidget *tqparent, int border = 0, + TQVBoxLayout( TQWidget *parent, int border = 0, int spacing = -1, const char *name = 0 ); TQVBoxLayout( TQLayout *parentLayout, int spacing = -1, const char *name = 0 ); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.cpp b/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.cpp index 6b2b17f65..0476c8b6a 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.cpp @@ -206,8 +206,8 @@ bool TQMetaProperty::stdSet() const // if ( !testFlags( Override ) || testFlags( Writable ) ) // return testFlags( StdSet ); // const TQMetaObject* mo = (*meta); -// const TQMetaProperty* tqparent = mo->resolveProperty( this ); -// return tqparent ? tqparent->stdSet() : FALSE; +// const TQMetaProperty* parent = mo->resolveProperty( this ); +// return parent ? parent->stdSet() : FALSE; // [FIXME] printf("[WARNING] bool TQMetaProperty::stdSet() const unimplemented\n\r"); @@ -1182,7 +1182,7 @@ int TQMetaObject::indexOfProperty( const TQMetaProperty* prop, bool super ) cons /*!\internal - Returns the tqparent property of property \a p or 0, if the property + Returns the parent property of property \a p or 0, if the property cannot be resolved. \a p has to be contained in this meta object @@ -1535,8 +1535,8 @@ bool TQMetaProperty::writable() const if ( !testFlags( Override ) || testFlags( Writable ) ) return testFlags( Writable ); const TQMetaObject* mo = (*meta); - const TQMetaProperty* tqparent = mo->resolveProperty( this ); - return tqparent ? tqparent->writable() : FALSE; + const TQMetaProperty* parent = mo->resolveProperty( this ); + return parent ? parent->writable() : FALSE; } /*!\internal @@ -1546,8 +1546,8 @@ bool TQMetaProperty::stdSet() const if ( !testFlags( Override ) || testFlags( Writable ) ) return testFlags( StdSet ); const TQMetaObject* mo = (*meta); - const TQMetaProperty* tqparent = mo->resolveProperty( this ); - return tqparent ? tqparent->stdSet() : FALSE; + const TQMetaProperty* parent = mo->resolveProperty( this ); + return parent ? parent->stdSet() : FALSE; } /*!\internal @@ -1577,8 +1577,8 @@ bool TQMetaProperty::isValid() const if ( !testFlags( Override ) || testFlags( Readable ) ) return testFlags( Readable ); const TQMetaObject* mo = (*meta); - const TQMetaProperty* tqparent = mo->resolveProperty( this ); - return tqparent ? tqparent->isValid() : FALSE; + const TQMetaProperty* parent = mo->resolveProperty( this ); + return parent ? parent->isValid() : FALSE; } bool TQMetaProperty::isSetType() const @@ -1659,8 +1659,8 @@ bool TQMetaProperty::designable( TQObject* o ) const } if ( testFlags( DesignableOverride ) ) { const TQMetaObject* mo = (*meta); - const TQMetaProperty* tqparent = mo->resolveProperty( this ); - return tqparent ? tqparent->designable() : FALSE; + const TQMetaProperty* parent = mo->resolveProperty( this ); + return parent ? parent->designable() : FALSE; } return !testFlags( NotDesignable ); } @@ -1680,8 +1680,8 @@ bool TQMetaProperty::scriptable( TQObject* o ) const } if ( testFlags( ScriptableOverride ) ) { const TQMetaObject* mo = (*meta); - const TQMetaProperty* tqparent = mo->resolveProperty( this ); - return tqparent ? tqparent->scriptable() : FALSE; + const TQMetaProperty* parent = mo->resolveProperty( this ); + return parent ? parent->scriptable() : FALSE; } return !testFlags( NotScriptable ); } @@ -1703,8 +1703,8 @@ bool TQMetaProperty::stored( TQObject* o ) const } if ( testFlags( StoredOverride ) ) { const TQMetaObject* mo = (*meta); - const TQMetaProperty* tqparent = mo->resolveProperty( this ); - return tqparent ? tqparent->stored() : FALSE; + const TQMetaProperty* parent = mo->resolveProperty( this ); + return parent ? parent->stored() : FALSE; } return !testFlags( NotStored ); } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqmovie.cpp b/experimental/tqtinterface/qt4/src/kernel/tqmovie.cpp index 87a339c1c..68d3a5c69 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqmovie.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqmovie.cpp @@ -203,7 +203,7 @@ public: TQDataPump *pump; TQDataSource *source; TQPixmap mypixmap; - TQBitmap mytqmask; + TQBitmap mymask; TQColor bg; int error; @@ -388,12 +388,12 @@ void TQMoviePrivate::updatePixmapFromImage(const TQPoint& off, } else { if (gimg.hasAlphaBuffer()) { // Resize to size of image - if (mytqmask.isNull()) { - mytqmask.resize(gimg.width(), gimg.height()); - mytqmask.fill( TQt::color1 ); + if (mymask.isNull()) { + mymask.resize(gimg.width(), gimg.height()); + mymask.fill( TQt::color1 ); } } - mypixmap.setMask(TQBitmap()); // Remove reference to my tqmask + mypixmap.setMask(TQBitmap()); // Remove reference to my mask copyBlt( &mypixmap, area.left(), area.top(), &lines, off.x(), off.y(), area.width(), area.height() ); } @@ -786,8 +786,8 @@ TQMovie& TQMovie::operator=(const TQMovie& movie) /*! Sets the background color of the pixmap to \a c. If the background - color isValid(), the pixmap will never have a tqmask because the - background color will be used in transtqparent regions of the image. + color isValid(), the pixmap will never have a mask because the + background color will be used in transparent regions of the image. \sa backgroundColor() */ diff --git a/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp b/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp index 4f465d1aa..6c93075d2 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp @@ -73,9 +73,9 @@ public: */ -TQObject::TQObject( TQT_BASE_OBJECT_NAME *tqparent, const char *name ) : TQT_BASE_OBJECT_NAME ( tqparent ) { +TQObject::TQObject( TQT_BASE_OBJECT_NAME *parent, const char *name ) : TQT_BASE_OBJECT_NAME ( parent ) { setObjectName(QString::fromAscii(name)); - TQT_TQOBJECT_REQUIRED_INITIALIZATION(tqparent) + TQT_TQOBJECT_REQUIRED_INITIALIZATION(parent) } const char * TQObject::name(const char *defaultName) const { @@ -166,7 +166,7 @@ const TQObjectList TQObject::objectTreesListObject() { return TQObjectList(); } -TQObject *TQObject::tqparent() const { +TQObject *TQObject::parent() const { return static_cast<TQObject*>(parent()); } @@ -675,7 +675,7 @@ static void objSearch( TQObjectList *result, without notice (as soon as the user closes a window you may have dangling pointers, for example). - \sa child() childrenListObject(), tqparent(), inherits(), name(), TQRegExp + \sa child() childrenListObject(), parent(), inherits(), name(), TQRegExp */ TQObjectList *TQObject::queryList( const char *inheritsClass, @@ -851,7 +851,7 @@ void TQObject::customEvent( TQCustomEvent * ) class MyMainWindow : public TQMainWindow { public: - MyMainWindow( TQWidget *tqparent = 0, const char *name = 0 ); + MyMainWindow( TQWidget *parent = 0, const char *name = 0 ); protected: bool eventFilter( TQObject *obj, TQEvent *ev ); @@ -860,8 +860,8 @@ void TQObject::customEvent( TQCustomEvent * ) TQTextEdit *textEdit; }; - MyMainWindow::MyMainWindow( TQWidget *tqparent, const char *name ) - : TQMainWindow( tqparent, name ) + MyMainWindow::MyMainWindow( TQWidget *parent, const char *name ) + : TQMainWindow( parent, name ) { textEdit = new TQTextEdit( this ); setCentralWidget( textEdit ); @@ -879,7 +879,7 @@ void TQObject::customEvent( TQCustomEvent * ) return FALSE; } } else { - // pass the event on to the tqparent class + // pass the event on to the parent class return TQMainWindow::eventFilter( obj, ev ); } } @@ -906,7 +906,7 @@ bool TQObject::eventFilter( TQObject * /* watched */, TQEvent * /* e */ ) \relates TQObject Returns a pointer to the object named \a name that inherits \a - type and with a given \a tqparent. + type and with a given \a parent. Returns 0 if there is no such child. @@ -918,10 +918,10 @@ bool TQObject::eventFilter( TQObject * /* watched */, TQEvent * /* e */ ) \endcode */ -void *qt_find_obj_child( TQObject *tqparent, const char *type, const char *name ) +void *qt_find_obj_child( TQObject *parent, const char *type, const char *name ) { - if ( !tqparent->childrenListObject().isEmpty() ) { - TQObjectListIt it( tqparent->childrenListObject() ); + if ( !parent->childrenListObject().isEmpty() ) { + TQObjectListIt it( parent->childrenListObject() ); TQObject *obj; while ( (obj = it.current()) ) { ++it; @@ -1099,9 +1099,9 @@ public: possible to track connections. TQObjects organize themselves in object trees. When you create a - TQObject with another object as tqparent, the object will - automatically do an insertChild() on the tqparent and thus show up - in the tqparent's childrenListObject() list. The tqparent takes ownership of the + TQObject with another object as parent, the object will + automatically do an insertChild() on the parent and thus show up + in the parent's childrenListObject() list. The parent takes ownership of the object i.e. it will automatically delete its tqchildren in its destructor. You can look for an object by name and optionally type using child() or queryList(), and get the list of tree roots using @@ -1216,7 +1216,7 @@ static void removeObjFromList( TQObjectList *objList, const TQObject *obj, \relates TQObject Returns a pointer to the object named \a name that inherits \a - type and with a given \a tqparent. + type and with a given \a parent. Returns 0 if there is no such child. @@ -1228,10 +1228,10 @@ static void removeObjFromList( TQObjectList *objList, const TQObject *obj, \endcode */ -void *qt_find_obj_child( TQObject *tqparent, const char *type, const char *name ) +void *qt_find_obj_child( TQObject *parent, const char *type, const char *name ) { - if ( !tqparent->childrenListObject().isEmpty() ) { - TQObjectListIt it( tqparent->childrenListObject() ); + if ( !parent->childrenListObject().isEmpty() ) { + TQObjectListIt it( parent->childrenListObject() ); TQObject *obj; while ( (obj = it.current()) ) { ++it; @@ -1340,15 +1340,15 @@ static void remove_tree( TQObject* obj ) *****************************************************************************/ /*! - Constructs an object called \a name with tqparent object, \a tqparent. + Constructs an object called \a name with parent object, \a parent. - The tqparent of an object may be viewed as the object's owner. For - instance, a \link TQDialog dialog box\endlink is the tqparent of the + The parent of an object may be viewed as the object's owner. For + instance, a \link TQDialog dialog box\endlink is the parent of the "OK" and "Cancel" buttons it contains. - The destructor of a tqparent object destroys all child objects. + The destructor of a parent object destroys all child objects. - Setting \a tqparent to 0 constructs an object with no tqparent. If the + Setting \a parent to 0 constructs an object with no parent. If the object is a widget, it will become a top-level window. The object name is some text that can be used to identify a @@ -1357,10 +1357,10 @@ static void remove_tree( TQObject* obj ) object by name (and type) using child(). To find several objects use queryList(). - \sa tqparent(), name(), child(), queryList() + \sa parent(), name(), child(), queryList() */ -TQObject::TQObject( TQObject *tqparent, const char *name ) +TQObject::TQObject( TQObject *parent, const char *name ) : isSignal( FALSE ), // assume not a signal object isWidget( FALSE ), // assume not a widget object @@ -1369,7 +1369,7 @@ TQObject::TQObject( TQObject *tqparent, const char *name ) wasDeleted( FALSE ), // double-delete catcher isTree( FALSE ), // no tree yet objname( name ? qstrdup(name) : 0 ), // set object name - parentObj( 0 ), // no tqparent yet. It is set by insertChild() + parentObj( 0 ), // no parent yet. It is set by insertChild() childObjects( 0 ), // no tqchildren yet connections( 0 ), // no connections yet senderObjects( 0 ), // no Q_SIGNALS connected yet @@ -1380,8 +1380,8 @@ TQObject::TQObject( TQObject *tqparent, const char *name ) if ( !metaObj ) // will create object dict (void) staticMetaObject(); - if ( tqparent ) { // add object to tqparent - tqparent->insertChild( this ); + if ( parent ) { // add object to parent + parent->insertChild( this ); } else { insert_tree( this ); isTree = TRUE; @@ -1397,7 +1397,7 @@ TQObject::TQObject( TQObject *tqparent, const char *name ) \warning All child objects are deleted. If any of these objects are on the stack or global, sooner or later your program will crash. We do not recommend holding pointers to child objects from - outside the tqparent. If you still do, the TQObject::destroyed() + outside the parent. If you still do, the TQObject::destroyed() signal gives you an opportunity to detect when an object is destroyed. @@ -1431,7 +1431,7 @@ TQObject::~TQObject() remove_tree( this ); // remove from global root list isTree = FALSE; } - if ( parentObj ) // remove it from tqparent object + if ( parentObj ) // remove it from parent object parentObj->removeChild( this ); register TQObject *obj; if ( senderObjects ) { // disconnect from senders @@ -1810,7 +1810,7 @@ void TQObject::customEvent( TQCustomEvent * ) class MyMainWindow : public TQMainWindow { public: - MyMainWindow( TQWidget *tqparent = 0, const char *name = 0 ); + MyMainWindow( TQWidget *parent = 0, const char *name = 0 ); protected: bool eventFilter( TQObject *obj, TQEvent *ev ); @@ -1819,8 +1819,8 @@ void TQObject::customEvent( TQCustomEvent * ) TQTextEdit *textEdit; }; - MyMainWindow::MyMainWindow( TQWidget *tqparent, const char *name ) - : TQMainWindow( tqparent, name ) + MyMainWindow::MyMainWindow( TQWidget *parent, const char *name ) + : TQMainWindow( parent, name ) { textEdit = new TQTextEdit( this ); setCentralWidget( textEdit ); @@ -1838,7 +1838,7 @@ void TQObject::customEvent( TQCustomEvent * ) return FALSE; } } else { - // pass the event on to the tqparent class + // pass the event on to the parent class return TQMainWindow::eventFilter( obj, ev ); } } @@ -1938,14 +1938,14 @@ void TQObject::blockSignals( bool block ) { TQ_OBJECT public: - MyObject( TQObject *tqparent = 0, const char *name = 0 ); + MyObject( TQObject *parent = 0, const char *name = 0 ); protected: void timerEvent( TQTimerEvent * ); }; - MyObject::MyObject( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) + MyObject::MyObject( TQObject *parent, const char *name ) + : TQObject( parent, name ) { startTimer( 50 ); // 50-millisecond timer startTimer( 1000 ); // 1-second timer @@ -2043,9 +2043,9 @@ static void objSearch( TQObjectList *result, } /*! - \fn TQObject *TQObject::tqparent() const + \fn TQObject *TQObject::parent() const - Returns a pointer to the tqparent object. + Returns a pointer to the parent object. \sa childrenListObject() */ @@ -2070,7 +2070,7 @@ static void objSearch( TQObjectList *result, in the list, and a widget that is lowered becomes the first object in the list. - \sa child(), queryList(), tqparent(), insertChild(), removeChild() + \sa child(), queryList(), parent(), insertChild(), removeChild() */ @@ -2085,7 +2085,7 @@ static void objSearch( TQObjectList *result, first\endlink object in the list and the first root object added is the \link TQPtrList::last() last\endlink object in the list. - \sa childrenListObject(), tqparent(), insertChild(), removeChild() + \sa childrenListObject(), parent(), insertChild(), removeChild() */ const TQObjectList *TQObject::objectTrees() { @@ -2140,7 +2140,7 @@ const TQObjectList *TQObject::objectTrees() without notice (as soon as the user closes a window you may have dangling pointers, for example). - \sa child() childrenListObject(), tqparent(), inherits(), name(), TQRegExp + \sa child() childrenListObject(), parent(), inherits(), name(), TQRegExp */ TQObjectList *TQObject::queryList( const char *inheritsClass, @@ -2220,7 +2220,7 @@ TQConnectionList *TQObject::tqreceivers( int signal ) const \warning This function cannot be used to make one widget the child widget of another widget. Child widgets can only be created by - setting the tqparent widget in the constructor or by calling + setting the parent widget in the constructor or by calling TQWidget::reparent(). \sa removeChild(), TQWidget::reparent() @@ -2262,7 +2262,7 @@ void TQObject::insertChild( TQObject *obj ) Removes the child object \a obj from the list of tqchildren. \warning This function will not remove a child widget from the - screen. It will only remove it from the tqparent widget's list of + screen. It will only remove it from the parent widget's list of tqchildren. \sa insertChild(), TQWidget::reparent() diff --git a/experimental/tqtinterface/qt4/src/kernel/tqobject.h b/experimental/tqtinterface/qt4/src/kernel/tqobject.h index 347cafe8d..7e5be4a07 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqobject.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqobject.h @@ -93,9 +93,9 @@ class TQObject: public QObject, virtual public TQt Q_OBJECT TQ_OBJECT public: - TQObject( TQT_BASE_OBJECT_NAME *tqparent=0, const char *name=0 ); + TQObject( TQT_BASE_OBJECT_NAME *parent=0, const char *name=0 ); - TQObject *tqparent() const; + TQObject *parent() const; TQObjectList childrenListObject(); const TQObjectList childrenListObject() const; const char *tqname() const; @@ -223,7 +223,7 @@ class TQ_EXPORT TQObject: public TQt Q_PROPERTY( TQCString name READ name WRITE setName ) public: - TQObject( TQObject *tqparent=0, const char *name=0 ); + TQObject( TQObject *parent=0, const char *name=0 ); virtual ~TQObject(); #ifdef TQ_TQDOC @@ -308,7 +308,7 @@ Q_SIGNALS: void destroyed( TQObject* obj ); public: - TQObject *tqparent() const { return parentObj; } + TQObject *parent() const { return parentObj; } public Q_SLOTS: void deleteLater(); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqobjectdefs.h b/experimental/tqtinterface/qt4/src/kernel/tqobjectdefs.h index c87689897..454019a3c 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqobjectdefs.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqobjectdefs.h @@ -248,8 +248,8 @@ class TQObjectListIt; class TQMemberDict; TQ_EXPORT void *qt_find_obj_child( TQObject *, const char *, const char * ); -#define TQ_CHILD(tqparent,type,name) \ - ((type*)qt_find_obj_child(tqparent,#type,name)) +#define TQ_CHILD(parent,type,name) \ + ((type*)qt_find_obj_child(parent,#type,name)) TQ_EXPORT void *qt_inheritedBy( TQMetaObject *super, const TQObject *cls ); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpaintdevice_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpaintdevice_x11.cpp index fd4cc0b36..de0695f5f 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpaintdevice_x11.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqpaintdevice_x11.cpp @@ -248,7 +248,7 @@ int TQPaintDevice::x11AppDpiY(int screen) TQt::RasterOp documentation defines all the possible values. If \a ignoreMask is FALSE (the default) and \a src is a - masked TQPixmap, the entire blit is masked by \a{src}->tqmask(). + masked TQPixmap, the entire blit is masked by \a{src}->mask(). If \a src, \a dst, \a sw or \a sh is 0, bitBlt() does nothing. If \a sw or \a sh is negative bitBlt() copies starting at \a sx (and @@ -311,11 +311,11 @@ printf("[WARNING] bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevic // sw != pm->width() || sh != pm->height() || ignoreMask ) { // TQPixmap *tmp = new TQPixmap( sw, sh, pm->depth() ); // bitBlt( tmp, 0, 0, pm, sx, sy, sw, sh, TQt::CopyROP, TRUE ); -// if ( pm->tqmask() && !ignoreMask ) { -// TQBitmap tqmask( sw, sh ); -// bitBlt( &tqmask, 0, 0, pm->tqmask(), sx, sy, sw, sh, +// if ( pm->mask() && !ignoreMask ) { +// TQBitmap mask( sw, sh ); +// bitBlt( &mask, 0, 0, pm->mask(), sx, sy, sw, sh, // TQt::CopyROP, TRUE ); -// tmp->setMask( tqmask ); +// tmp->setMask( mask ); // } // pm = tmp; // } else { @@ -389,18 +389,18 @@ printf("[WARNING] bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevic // bool include_inferiors = FALSE; // bool graphics_exposure = FALSE; // TQPixmap *src_pm; -// TQBitmap *tqmask; +// TQBitmap *mask; // // if ( ts == TQInternal::Pixmap ) { // src_pm = (TQPixmap*)src; // if ( src_pm->x11Screen() != dst->x11Screen() ) // src_pm->x11SetScreen( dst->x11Screen() ); // mono_src = src_pm->depth() == 1; -// tqmask = ignoreMask ? 0 : src_pm->data->tqmask; +// mask = ignoreMask ? 0 : src_pm->data->mask; // } else { // src_pm = 0; // mono_src = FALSE; -// tqmask = 0; +// mask = 0; // include_inferiors = ((TQWidget*)src)->testWFlags(TQt::WPaintUnclipped); // graphics_exposure = td == TQInternal::Widget; // } @@ -430,25 +430,25 @@ printf("[WARNING] bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevic // alpha->x11RenderHandle() && // dst->x11RenderHandle()) { // XRenderPictureAttributes pattr; -// ulong pictqmask = 0; +// ulong picmask = 0; // if (include_inferiors) { // pattr.subwindow_mode = IncludeInferiors; -// pictqmask |= CPSubwindowMode; +// picmask |= CPSubwindowMode; // } // if (graphics_exposure) { // pattr.graphics_exposures = TRUE; -// pictqmask |= CPGraphicsExposure; +// picmask |= CPGraphicsExposure; // } -// if (pictqmask) -// XRenderChangePicture(dpy, dst->x11RenderHandle(), pictqmask, &pattr); +// if (picmask) +// XRenderChangePicture(dpy, dst->x11RenderHandle(), picmask, &pattr); // XRenderComposite(dpy, PictOpOver, src->x11RenderHandle(), // alpha->x11RenderHandle(), dst->x11RenderHandle(), // sx, sy, sx, sy, dx, dy, sw, sh); // // restore attributes // pattr.subwindow_mode = ClipByChildren; // pattr.graphics_exposures = FALSE; -// if (pictqmask) -// XRenderChangePicture(dpy, dst->x11RenderHandle(), pictqmask, &pattr); +// if (picmask) +// XRenderChangePicture(dpy, dst->x11RenderHandle(), picmask, &pattr); // return; // } // } @@ -456,25 +456,25 @@ printf("[WARNING] bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevic // // GC gc; // -// if ( tqmask && !mono_src ) { // fast masked blt +// if ( mask && !mono_src ) { // fast masked blt // bool temp_gc = FALSE; -// if ( tqmask->data->maskgc ) { -// gc = (GC)tqmask->data->maskgc; // we have a premade tqmask GC +// if ( mask->data->maskgc ) { +// gc = (GC)mask->data->maskgc; // we have a premade mask GC // } else { // if ( FALSE && src_pm->optimization() == TQPixmap::NormalOptim ) { // #### cache disabled // // Compete for the global cache // gc = cache_mask_gc( dpy, dst->handle(), -// tqmask->data->ser_no, -// tqmask->handle() ); +// mask->data->ser_no, +// mask->handle() ); // } else { -// // Create a new tqmask GC. If BestOptim, we store the tqmask GC -// // with the tqmask (not at the pixmap). This way, many pixmaps -// // which have a common tqmask will be optimized at no extra cost. +// // Create a new mask GC. If BestOptim, we store the mask GC +// // with the mask (not at the pixmap). This way, many pixmaps +// // which have a common mask will be optimized at no extra cost. // gc = XCreateGC( dpy, dst->handle(), 0, 0 ); // XSetGraphicsExposures( dpy, gc, False ); -// XSetClipMask( dpy, gc, tqmask->handle() ); +// XSetClipMask( dpy, gc, mask->handle() ); // if ( src_pm->optimization() == TQPixmap::BestOptim ) { -// tqmask->data->maskgc = gc; +// mask->data->maskgc = gc; // } else { // temp_gc = TRUE; // } @@ -509,14 +509,14 @@ printf("[WARNING] bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevic // XCopyArea( dpy, src->handle(), dst->handle(), gc, sx, sy, sw, sh, dx, dy ); // } else if ( mono_src ) { // src is bitmap // XGCValues gcvals; -// ulong valtqmask = GCBackground | GCForeground | GCFillStyle | +// ulong valmask = GCBackground | GCForeground | GCFillStyle | // GCStipple | GCTileStipXOrigin | GCTileStipYOrigin; // if ( td == TQInternal::Widget ) { // set GC colors // TQWidget *w = (TQWidget *)dst; // gcvals.background = w->backgroundColor().pixel( dst->x11Screen() ); // gcvals.foreground = w->foregroundColor().pixel( dst->x11Screen() ); // if ( include_inferiors ) { -// valtqmask |= GCSubwindowMode; +// valmask |= GCSubwindowMode; // gcvals.subwindow_mode = IncludeInferiors; // } // } else if ( mono_dst ) { @@ -532,31 +532,31 @@ printf("[WARNING] bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevic // gcvals.ts_x_origin = dx - sx; // gcvals.ts_y_origin = dy - sy; // -// bool cliptqmask = FALSE; -// if ( tqmask ) { +// bool clipmask = FALSE; +// if ( mask ) { // if ( ((TQPixmap*)src)->data->selfmask ) { // gcvals.fill_style = FillStippled; // } else { -// XSetClipMask( dpy, gc, tqmask->handle() ); +// XSetClipMask( dpy, gc, mask->handle() ); // XSetClipOrigin( dpy, gc, dx-sx, dy-sy ); -// cliptqmask = TRUE; +// clipmask = TRUE; // } // } // -// XChangeGC( dpy, gc, valtqmask, &gcvals ); +// XChangeGC( dpy, gc, valmask, &gcvals ); // XFillRectangle( dpy,dst->handle(), gc, dx, dy, sw, sh ); // -// valtqmask = GCFillStyle | GCTileStipXOrigin | GCTileStipYOrigin; +// valmask = GCFillStyle | GCTileStipXOrigin | GCTileStipYOrigin; // gcvals.fill_style = FillSolid; // gcvals.ts_x_origin = 0; // gcvals.ts_y_origin = 0; // if ( include_inferiors ) { -// valtqmask |= GCSubwindowMode; +// valmask |= GCSubwindowMode; // gcvals.subwindow_mode = ClipByChildren; // } -// XChangeGC( dpy, gc, valtqmask, &gcvals ); +// XChangeGC( dpy, gc, valmask, &gcvals ); // -// if ( cliptqmask ) { +// if ( clipmask ) { // XSetClipOrigin( dpy, gc, 0, 0 ); // XSetClipMask( dpy, gc, None ); // } @@ -1355,7 +1355,7 @@ static void cleanup_mask_gc() } } -static GC cache_mask_gc( Display *dpy, Drawable hd, int mask_no, Pixmap tqmask ) +static GC cache_mask_gc( Display *dpy, Drawable hd, int mask_no, Pixmap mask ) { if ( !init_mask_gc ) { // first time initialization init_mask_gc = TRUE; @@ -1369,7 +1369,7 @@ static GC cache_mask_gc( Display *dpy, Drawable hd, int mask_no, Pixmap tqmask ) p->gc = XCreateGC( dpy, hd, 0, 0 ); XSetGraphicsExposures( dpy, p->gc, False ); } - XSetClipMask( dpy, p->gc, tqmask ); + XSetClipMask( dpy, p->gc, mask ); p->mask_no = mask_no; } return p->gc; @@ -1390,7 +1390,7 @@ static GC cache_mask_gc( Display *dpy, Drawable hd, int mask_no, Pixmap tqmask ) TQt::RasterOp documentation defines all the possible values. If \a ignoreMask is FALSE (the default) and \a src is a - masked TQPixmap, the entire blit is masked by \a{src}->tqmask(). + masked TQPixmap, the entire blit is masked by \a{src}->mask(). If \a src, \a dst, \a sw or \a sh is 0, bitBlt() does nothing. If \a sw or \a sh is negative bitBlt() copies starting at \a sx (and @@ -1450,11 +1450,11 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, sw != pm->width() || sh != pm->height() || ignoreMask ) { TQPixmap *tmp = new TQPixmap( sw, sh, pm->depth() ); bitBlt( tmp, 0, 0, pm, sx, sy, sw, sh, TQt::CopyROP, TRUE ); - if ( pm->tqmask() && !ignoreMask ) { - TQBitmap tqmask( sw, sh ); - bitBlt( &tqmask, 0, 0, pm->tqmask(), sx, sy, sw, sh, + if ( pm->mask() && !ignoreMask ) { + TQBitmap mask( sw, sh ); + bitBlt( &mask, 0, 0, pm->mask(), sx, sy, sw, sh, TQt::CopyROP, TRUE ); - tmp->setMask( tqmask ); + tmp->setMask( mask ); } pm = tmp; } else { @@ -1528,18 +1528,18 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, bool include_inferiors = FALSE; bool graphics_exposure = FALSE; TQPixmap *src_pm; - TQBitmap *tqmask; + TQBitmap *mask; if ( ts == TQInternal::Pixmap ) { src_pm = (TQPixmap*)src; if ( src_pm->x11Screen() != dst->x11Screen() ) src_pm->x11SetScreen( dst->x11Screen() ); mono_src = src_pm->depth() == 1; - tqmask = ignoreMask ? 0 : src_pm->data->tqmask; + mask = ignoreMask ? 0 : src_pm->data->mask; } else { src_pm = 0; mono_src = FALSE; - tqmask = 0; + mask = 0; include_inferiors = ((TQWidget*)src)->testWFlags(TQt::WPaintUnclipped); graphics_exposure = td == TQInternal::Widget; } @@ -1569,25 +1569,25 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, alpha->x11RenderHandle() && dst->x11RenderHandle()) { XRenderPictureAttributes pattr; - ulong pictqmask = 0; + ulong picmask = 0; if (include_inferiors) { pattr.subwindow_mode = IncludeInferiors; - pictqmask |= CPSubwindowMode; + picmask |= CPSubwindowMode; } if (graphics_exposure) { pattr.graphics_exposures = TRUE; - pictqmask |= CPGraphicsExposure; + picmask |= CPGraphicsExposure; } - if (pictqmask) - XRenderChangePicture(dpy, dst->x11RenderHandle(), pictqmask, &pattr); + if (picmask) + XRenderChangePicture(dpy, dst->x11RenderHandle(), picmask, &pattr); XRenderComposite(dpy, PictOpOver, src->x11RenderHandle(), alpha->x11RenderHandle(), dst->x11RenderHandle(), sx, sy, sx, sy, dx, dy, sw, sh); // restore attributes pattr.subwindow_mode = ClipByChildren; pattr.graphics_exposures = FALSE; - if (pictqmask) - XRenderChangePicture(dpy, dst->x11RenderHandle(), pictqmask, &pattr); + if (picmask) + XRenderChangePicture(dpy, dst->x11RenderHandle(), picmask, &pattr); return; } } @@ -1595,25 +1595,25 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, GC gc; - if ( tqmask && !mono_src ) { // fast masked blt + if ( mask && !mono_src ) { // fast masked blt bool temp_gc = FALSE; - if ( tqmask->data->maskgc ) { - gc = (GC)tqmask->data->maskgc; // we have a premade tqmask GC + if ( mask->data->maskgc ) { + gc = (GC)mask->data->maskgc; // we have a premade mask GC } else { if ( FALSE && src_pm->optimization() == TQPixmap::NormalOptim ) { // #### cache disabled // Compete for the global cache gc = cache_mask_gc( dpy, dst->handle(), - tqmask->data->ser_no, - tqmask->handle() ); + mask->data->ser_no, + mask->handle() ); } else { - // Create a new tqmask GC. If BestOptim, we store the tqmask GC - // with the tqmask (not at the pixmap). This way, many pixmaps - // which have a common tqmask will be optimized at no extra cost. + // Create a new mask GC. If BestOptim, we store the mask GC + // with the mask (not at the pixmap). This way, many pixmaps + // which have a common mask will be optimized at no extra cost. gc = XCreateGC( dpy, dst->handle(), 0, 0 ); XSetGraphicsExposures( dpy, gc, False ); - XSetClipMask( dpy, gc, tqmask->handle() ); + XSetClipMask( dpy, gc, mask->handle() ); if ( src_pm->optimization() == TQPixmap::BestOptim ) { - tqmask->data->maskgc = gc; + mask->data->maskgc = gc; } else { temp_gc = TRUE; } @@ -1648,14 +1648,14 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, XCopyArea( dpy, src->handle(), dst->handle(), gc, sx, sy, sw, sh, dx, dy ); } else if ( mono_src ) { // src is bitmap XGCValues gcvals; - ulong valtqmask = GCBackground | GCForeground | GCFillStyle | + ulong valmask = GCBackground | GCForeground | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin; if ( td == TQInternal::Widget ) { // set GC colors TQWidget *w = (TQWidget *)dst; gcvals.background = w->backgroundColor().pixel( dst->x11Screen() ); gcvals.foreground = w->foregroundColor().pixel( dst->x11Screen() ); if ( include_inferiors ) { - valtqmask |= GCSubwindowMode; + valmask |= GCSubwindowMode; gcvals.subwindow_mode = IncludeInferiors; } } else if ( mono_dst ) { @@ -1671,31 +1671,31 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, gcvals.ts_x_origin = dx - sx; gcvals.ts_y_origin = dy - sy; - bool cliptqmask = FALSE; - if ( tqmask ) { + bool clipmask = FALSE; + if ( mask ) { if ( ((TQPixmap*)src)->data->selfmask ) { gcvals.fill_style = FillStippled; } else { - XSetClipMask( dpy, gc, tqmask->handle() ); + XSetClipMask( dpy, gc, mask->handle() ); XSetClipOrigin( dpy, gc, dx-sx, dy-sy ); - cliptqmask = TRUE; + clipmask = TRUE; } } - XChangeGC( dpy, gc, valtqmask, &gcvals ); + XChangeGC( dpy, gc, valmask, &gcvals ); XFillRectangle( dpy,dst->handle(), gc, dx, dy, sw, sh ); - valtqmask = GCFillStyle | GCTileStipXOrigin | GCTileStipYOrigin; + valmask = GCFillStyle | GCTileStipXOrigin | GCTileStipYOrigin; gcvals.fill_style = FillSolid; gcvals.ts_x_origin = 0; gcvals.ts_y_origin = 0; if ( include_inferiors ) { - valtqmask |= GCSubwindowMode; + valmask |= GCSubwindowMode; gcvals.subwindow_mode = ClipByChildren; } - XChangeGC( dpy, gc, valtqmask, &gcvals ); + XChangeGC( dpy, gc, valmask, &gcvals ); - if ( cliptqmask ) { + if ( clipmask ) { XSetClipOrigin( dpy, gc, 0, 0 ); XSetClipMask( dpy, gc, None ); } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpainter.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpainter.cpp index 6d481280c..0ed8c1554 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpainter.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqpainter.cpp @@ -1528,7 +1528,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; \i pen() is the currently set pen; the color or stipple that's used for drawing lines or boundaries. - \i backgroundMode() is \c Opaque or \c Transtqparent, i.e. whether + \i backgroundMode() is \c Opaque or \c Transparent, i.e. whether backgroundColor() is used or not. \i backgroundColor() only applies when backgroundMode() is Opaque @@ -1821,7 +1821,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; \value DashDotDotLine one dash, two dots, one dash, two dots. - \value MPenStyle tqmask of the pen styles. + \value MPenStyle mask of the pen styles. \img pen-styles.png Pen Styles */ @@ -1837,7 +1837,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; \value SquareCap a square line end that covers the end point and extends beyond it with half the line width. \value RoundCap a rounded line end. - \value MPenCapStyle tqmask of the pen cap styles. + \value MPenCapStyle mask of the pen cap styles. \img pen-cap-styles.png Pen Cap Styles */ @@ -1853,7 +1853,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; meet at an angle, and this area is filled. \value BevelJoin The triangular notch between the two lines is filled. \value RoundJoin A circular arc between the two lines is filled. - \value MPenJoinStyle tqmask of the pen join styles. + \value MPenJoinStyle mask of the pen join styles. \img pen-join-styles.png Pen Join Styles */ @@ -5203,7 +5203,7 @@ TQBrush TQBrush::copy() const \row \i CustomPattern \i set when a pixmap pattern is being used. \endtable - On Windows, dense and custom patterns cannot be transtqparent. + On Windows, dense and custom patterns cannot be transparent. See the \link #details Detailed Description\endlink for a picture of all the styles. diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp index 05d5c76ad..7e68625f9 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp @@ -1474,7 +1474,7 @@ void TQPainter::flush() The background color is the color that is filled in when drawing opaque text, stippled lines and bitmaps. The background color has - no effect in transtqparent background mode (which is the default). + no effect in transparent background mode (which is the default). \sa backgroundColor() setBackgroundMode() BackgroundMode */ @@ -1504,7 +1504,7 @@ void TQPainter::setBackgroundColor( const TQColor &c ) Sets the background mode of the painter to \a m, which must be either \c TransparentMode (the default) or \c OpaqueMode. - Transtqparent mode draws stippled lines and text without setting the + Transparent mode draws stippled lines and text without setting the background pixels. Opaque mode fills these space with the current background color. @@ -2736,7 +2736,7 @@ void TQPainter::drawCubicBezier( const TQPointArray &a, int index ) The default, (-1, -1), means all the way to the bottom right of the pixmap. - Currently the tqmask of the pixmap or it's alpha channel are ignored + Currently the mask of the pixmap or it's alpha channel are ignored when painting on a TQPrinter. \sa bitBlt(), TQPixmap::setMask() @@ -2786,11 +2786,11 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap, sw != pixmap.width() || sh != pixmap.height() ) { TQPixmap tmp( sw, sh, pixmap.depth() ); bitBlt( &tmp, 0, 0, &pixmap, sx, sy, sw, sh, CopyROP, TRUE ); - if ( pixmap.tqmask() ) { - TQBitmap tqmask( sw, sh ); - bitBlt( &tqmask, 0, 0, pixmap.tqmask(), sx, sy, sw, sh, + if ( pixmap.mask() ) { + TQBitmap mask( sw, sh ); + bitBlt( &mask, 0, 0, pixmap.mask(), sx, sy, sw, sh, CopyROP, TRUE ); - tmp.setMask( tqmask ); + tmp.setMask( mask ); } drawPixmap( x, y, tmp ); return; @@ -2809,7 +2809,7 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap, dx(), dy() ); mat = TQPixmap::trueMatrix( mat, sw, sh ); TQPixmap pm = pixmap.xForm( mat ); - if ( !pm.tqmask() && txop == TxRotShear ) { + if ( !pm.mask() && txop == TxRotShear ) { TQBitmap bm_clip( sw, sh, 1 ); bm_clip.fill( color1 ); pm.setMask( bm_clip.xForm(mat) ); @@ -2827,10 +2827,10 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap, map( x, y, &x, &y ); } - TQBitmap *tqmask = (TQBitmap *)pixmap.tqmask(); + TQBitmap *mask = (TQBitmap *)pixmap.mask(); bool mono = pixmap.depth() == 1; - if ( tqmask && !hasClipping() && pdev != paintEventDevice ) { + if ( mask && !hasClipping() && pdev != paintEventDevice ) { if ( mono ) { // needs GCs pen color bool selfmask = pixmap.data->selfmask; if ( selfmask ) { @@ -2839,7 +2839,7 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap, } else { XSetFillStyle( dpy, gc, FillOpaqueStippled ); XSetStipple( dpy, gc, pixmap.handle() ); - XSetClipMask( dpy, gc, tqmask->handle() ); + XSetClipMask( dpy, gc, mask->handle() ); XSetClipOrigin( dpy, gc, x-sx, y-sy ); } XSetTSOrigin( dpy, gc, x-sx, y-sy ); @@ -2861,9 +2861,9 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap, TQRegion rgn = crgn; - if ( tqmask ) { // pixmap has clip tqmask + if ( mask ) { // pixmap has clip mask // Implies that clipping is on, either explicit or implicit - // Create a new tqmask that combines the tqmask with the clip region + // Create a new mask that combines the mask with the clip region if ( pdev == paintEventDevice && paintEventClipRegion ) { if ( hasClipping() ) @@ -2883,15 +2883,15 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap, XRectangle *rects = (XRectangle *)qt_getClipRects( rgn, num ); XSetClipRectangles( dpy, cgc, -x, -y, rects, num, YXBanded ); XSetFillStyle( dpy, cgc, FillOpaqueStippled ); - XSetStipple( dpy, cgc, tqmask->handle() ); + XSetStipple( dpy, cgc, mask->handle() ); XSetTSOrigin( dpy, cgc, -sx, -sy ); XFillRectangle( dpy, comb->handle(), cgc, 0, 0, sw, sh ); XSetTSOrigin( dpy, cgc, 0, 0 ); // restore cgc XSetFillStyle( dpy, cgc, FillSolid ); XSetClipMask( dpy, cgc, None ); - tqmask = comb; // it's deleted below + mask = comb; // it's deleted below - XSetClipMask( dpy, gc, tqmask->handle() ); + XSetClipMask( dpy, gc, mask->handle() ); XSetClipOrigin( dpy, gc, x, y ); } @@ -2920,10 +2920,10 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap, } } - if ( tqmask ) { // restore clipping + if ( mask ) { // restore clipping XSetClipOrigin( dpy, gc, 0, 0 ); XSetRegion( dpy, gc, rgn.handle() ); - delete tqmask; // delete comb, created above + delete mask; // delete comb, created above } } @@ -3010,11 +3010,11 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h, - not an external tqdevice - not scale or rotshear - not mono pixmap - - no tqmask + - no mask */ - TQBitmap *tqmask = (TQBitmap *)pixmap.tqmask(); + TQBitmap *mask = (TQBitmap *)pixmap.mask(); if ( !testf(ExtDev) && txop <= TxTranslate && pixmap.depth() > 1 && - tqmask == 0 ) { + mask == 0 ) { if ( txop == TxTranslate ) map( x, y, &x, &y ); @@ -3074,10 +3074,10 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h, } TQPixmap tile( tw, th, pixmap.depth(), TQPixmap::NormalOptim ); fillTile( &tile, pixmap ); - if ( tqmask ) { - TQBitmap tiletqmask( tw, th, TQPixmap::NormalOptim ); - fillTile( &tiletqmask, *tqmask ); - tile.setMask( tiletqmask ); + if ( mask ) { + TQBitmap tilemask( tw, th, TQPixmap::NormalOptim ); + fillTile( &tilemask, *mask ); + tile.setMask( tilemask ); } drawTile( this, x, y, w, h, tile, sx, sy ); } else { diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpixmap.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpixmap.cpp index 8fb53805b..0e0cfeec1 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpixmap.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqpixmap.cpp @@ -60,7 +60,7 @@ #define VERIFY_TQPIXMAP_OBJECT_FUNCTION(x) \ if (!dynamic_cast<const TQPixmap*>(static_cast<const QPixmap*>(this))) { \ - printf("[WARNING] An attempt was made to access the TQPixmap::tqmask method from an object not of type TQPixmap [possibly QPixmap]\n\r\tThis may indicate creation and subsequent [illegal] downcasting of a QPixmap object to a TQPixmap object within your application\n\r\tNo pixmap was returned\n\r"); \ + printf("[WARNING] An attempt was made to access the TQPixmap::mask method from an object not of type TQPixmap [possibly QPixmap]\n\r\tThis may indicate creation and subsequent [illegal] downcasting of a QPixmap object to a TQPixmap object within your application\n\r\tNo pixmap was returned\n\r"); \ return x; \ } @@ -201,12 +201,12 @@ TQt::HANDLE TQPixmap::x11AppRootWindow( int screen ) { return QX11Info::appRootWindow(screen); } -const TQBitmap *TQPixmap::tqmask() const { +const TQBitmap *TQPixmap::mask() const { // HACK // Make absolutely sure that this is a TQPixmap object! VERIFY_TQPIXMAP_OBJECT_FUNCTION(0) - const QBitmap& ptrRef = mask(); + const QBitmap& ptrRef = QPixmap::mask(); if (ptrRef.isNull() == true) { return 0; } @@ -241,8 +241,8 @@ void TQPixmap::resize_helper(const QSize s) } // Mask too.... - if (!mask().isNull()) { - TQBitmap m = mask(); + if (!QPixmap::mask().isNull()) { + TQBitmap m = QPixmap::mask(); if (m.size() != QSize(w,h)) { TQBitmap pmr(QSize(w, h)); pmr.fill(Qt::color0); @@ -466,8 +466,8 @@ TQBitmap TQPixmap::createHeuristicMask( bool clipTight ) const { You can retrieve the width(), height(), depth() and size() of a pixmap. The enclosing rectangle is given by rect(). Pixmaps can be filled with fill() and resized with resize(). You can create and - set a tqmask with createHeuristicMask() and setMask(). Use - selfMask() to see if the pixmap is identical to its tqmask. + set a mask with createHeuristicMask() and setMask(). Use + selfMask() to see if the pixmap is identical to its mask. In addition to loading a pixmap from file using load() you can also loadFromData(). You can control optimization with @@ -1047,11 +1047,11 @@ void TQPixmap::resize( int w, int h ) qWarning("TQPixmap::resize: TODO: resize alpha data"); else #endif // TQ_WS_X11 - if ( data->tqmask ) { // resize tqmask as well - if ( data->selfmask ) { // preserve self-tqmask + if ( data->mask ) { // resize mask as well + if ( data->selfmask ) { // preserve self-mask pm.setMask( *((TQBitmap*)&pm) ); - } else { // independent tqmask - TQBitmap m = *data->tqmask; + } else { // independent mask + TQBitmap m = *data->mask; m.resize( w, h ); pm.setMask( m ); } @@ -1061,53 +1061,53 @@ void TQPixmap::resize( int w, int h ) /*! - \fn const TQBitmap *TQPixmap::tqmask() const + \fn const TQBitmap *TQPixmap::mask() const - Returns the tqmask bitmap, or 0 if no tqmask has been set. + Returns the mask bitmap, or 0 if no mask has been set. \sa setMask(), TQBitmap, hasAlpha() */ /*! - Sets a tqmask bitmap. + Sets a mask bitmap. - The \a newtqmask bitmap defines the clip tqmask for this pixmap. Every - pixel in \a newtqmask corresponds to a pixel in this pixmap. Pixel - value 1 means opaque and pixel value 0 means transtqparent. The tqmask + The \a newmask bitmap defines the clip mask for this pixmap. Every + pixel in \a newmask corresponds to a pixel in this pixmap. Pixel + value 1 means opaque and pixel value 0 means transparent. The mask must have the same size as this pixmap. - \warning Setting the tqmask on a pixmap will cause any alpha channel + \warning Setting the mask on a pixmap will cause any alpha channel data to be cleared. For example: \code TQPixmap alpha( "image-with-alpha.png" ); TQPixmap alphacopy = alpha; - alphacopy.setMask( *alphacopy.tqmask() ); + alphacopy.setMask( *alphacopy.mask() ); \endcode Now, alpha and alphacopy are visually different. - Setting a \link isNull() null\endlink tqmask resets the tqmask. + Setting a \link isNull() null\endlink mask resets the mask. - \sa tqmask(), createHeuristicMask(), TQBitmap + \sa mask(), createHeuristicMask(), TQBitmap */ -void TQPixmap::setMask( const TQBitmap &newtqmask ) +void TQPixmap::setMask( const TQBitmap &newmask ) { - const TQPixmap *tmp = &newtqmask; // dec cxx bug + const TQPixmap *tmp = &newmask; // dec cxx bug if ( (data == tmp->data) || - ( newtqmask.handle() && newtqmask.handle() == handle() ) ) { + ( newmask.handle() && newmask.handle() == handle() ) ) { TQPixmap m = tmp->copy( TRUE ); setMask( *((TQBitmap*)&m) ); - data->selfmask = TRUE; // tqmask == pixmap + data->selfmask = TRUE; // mask == pixmap return; } - if ( newtqmask.isNull() ) { // reset the tqmask - if (data->tqmask) { + if ( newmask.isNull() ) { // reset the mask + if (data->mask) { detach(); data->selfmask = FALSE; - delete data->tqmask; - data->tqmask = 0; + delete data->mask; + data->mask = 0; } return; } @@ -1115,48 +1115,48 @@ void TQPixmap::setMask( const TQBitmap &newtqmask ) detach(); data->selfmask = FALSE; - if ( newtqmask.width() != width() || newtqmask.height() != height() ) { + if ( newmask.width() != width() || newmask.height() != height() ) { #if defined(TQT_CHECK_RANGE) - qWarning( "TQPixmap::setMask: The pixmap and the tqmask must have " + qWarning( "TQPixmap::setMask: The pixmap and the mask must have " "the same size" ); #endif return; } #if defined(TQ_WS_MAC) || (defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)) - // when setting the tqmask, we get rid of the alpha channel completely + // when setting the mask, we get rid of the alpha channel completely delete data->alphapm; data->alphapm = 0; #endif // TQ_WS_X11 && !TQT_NO_XFTFREETYPE - delete data->tqmask; + delete data->mask; TQBitmap* newmaskcopy; - if ( newtqmask.tqmask() ) + if ( newmask.mask() ) newmaskcopy = (TQBitmap*)new TQPixmap( tmp->copy( TRUE ) ); else - newmaskcopy = new TQBitmap( newtqmask ); + newmaskcopy = new TQBitmap( newmask ); #ifdef TQ_WS_X11 newmaskcopy->x11SetScreen( x11Screen() ); #endif - data->tqmask = newmaskcopy; + data->mask = newmaskcopy; } /*! \fn bool TQPixmap::selfMask() const - Returns TRUE if the pixmap's tqmask is identical to the pixmap + Returns TRUE if the pixmap's mask is identical to the pixmap itself; otherwise returns FALSE. - \sa tqmask() + \sa mask() */ #ifndef TQT_NO_IMAGE_HEURISTIC_MASK /*! - Creates and returns a heuristic tqmask for this pixmap. It works by + Creates and returns a heuristic mask for this pixmap. It works by selecting a color from one of the corners and then chipping away pixels of that color, starting at all the edges. - The tqmask may not be perfect but it should be reasonable, so you + The mask may not be perfect but it should be reasonable, so you can do things such as the following: \code pm->setMask( pm->createHeuristicMask() ); @@ -1166,8 +1166,8 @@ void TQPixmap::setMask( const TQBitmap &newtqmask ) TQImage, non-trivial computations and a transformation back to a TQBitmap. - If \a clipTight is TRUE the tqmask is just large enough to cover the - pixels; otherwise, the tqmask is larger than the data pixels. + If \a clipTight is TRUE the mask is just large enough to cover the + pixels; otherwise, the mask is larger than the data pixels. \sa TQImage::createHeuristicMask() */ @@ -1505,7 +1505,7 @@ static TQPixmap grabChildWidgets( TQWidget * w ) ((TQWidget *)child)->tqgeometry().intersects( w->rect() ) ) { // those conditions aren't quite right, it's possible // to have a grandchild completely outside its - // grandtqparent, but partially inside its tqparent. no + // grandparent, but partially inside its parent. no // point in optimizing for that. // make sure to evaluate pos() first - who knows what diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpixmap.h b/experimental/tqtinterface/qt4/src/kernel/tqpixmap.h index 13a0a2c34..a48970697 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpixmap.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqpixmap.h @@ -99,7 +99,7 @@ public: TQBitmap createHeuristicMask( bool clipTight = TRUE ) const; #endif - const TQBitmap *tqmask() const; + const TQBitmap *mask() const; TQImage convertToImage() const; bool selfMask() const; @@ -237,7 +237,7 @@ public: void resize( int width, int height ); void resize( const TQSize & ); - const TQBitmap *tqmask() const; + const TQBitmap *mask() const; void setMask( const TQBitmap & ); bool selfMask() const; bool hasAlpha() const; @@ -340,7 +340,7 @@ protected: uint mcp : 1; #endif int ser_no; - TQBitmap *tqmask; + TQBitmap *mask; #if defined(TQ_WS_WIN) TQPixmap *maskpm; union { @@ -425,9 +425,9 @@ inline void TQPixmap::resize( const TQSize &s ) resize( s.width(), s.height() ); } -inline const TQBitmap *TQPixmap::tqmask() const +inline const TQBitmap *TQPixmap::mask() const { - return data->tqmask; + return data->mask; } inline bool TQPixmap::selfMask() const diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp index 37bb0ee09..1caf3a352 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp @@ -482,7 +482,7 @@ void TQPixmap::init( int w, int h, int d, bool bitmap, Optimization optim ) void TQPixmap::deref() { if ( data && data->deref() ) { // last reference lost - delete data->tqmask; + delete data->mask; delete data->alphapm; if ( data->ximage ) qSafeXDestroyImage( (XImage*)data->ximage ); @@ -617,8 +617,8 @@ int TQPixmap::defaultDepth() Sets pixmap drawing optimization for this pixmap. The \a optimization setting affects pixmap operations, in - particular drawing of transtqparent pixmaps (bitBlt() a pixmap with - a tqmask set) and pixmap transformations (the xForm() function). + particular drawing of transparent pixmaps (bitBlt() a pixmap with + a mask set) and pixmap transformations (the xForm() function). Pixmap optimization involves keeping intermediate results in a cache buffer and using the cache to speed up bitBlt() and xForm(). @@ -781,7 +781,7 @@ TQImage TQPixmap::convertToImage() const return image; } - const TQPixmap* msk = tqmask(); + const TQPixmap* msk = mask(); const TQPixmap *alf = data->alphapm; TQImage alpha; @@ -1032,7 +1032,7 @@ TQImage TQPixmap::convertToImage() const image.setColor( trans, 0x00000000 ); } else { image.setNumColors( ncols ); // create color table - // oh dear... no spare "transtqparent" pixel. + // oh dear... no spare "transparent" pixel. // use first pixel in image (as good as any). trans = image.scanLine( i )[0]; } @@ -1128,9 +1128,9 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) if ( w >= 32768 || h >= 32768 ) return FALSE; - // get rid of the tqmask - delete data->tqmask; - data->tqmask = 0; + // get rid of the mask + delete data->mask; + data->mask = 0; // get rid of alpha pixmap delete data->alphapm; @@ -1404,18 +1404,18 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) ? g << green_shift : g >> -green_shift; \ b = blue_shift > 0 \ ? b << blue_shift : b >> -blue_shift; \ - pixel = (r & red_tqmask)|(g & green_tqmask) | (b & blue_tqmask) \ + pixel = (r & red_mask)|(g & green_mask) | (b & blue_mask) \ | ~(blue_mask | green_mask | red_mask); \ } -// optimized case - no d8 case, shift only once instead of twice, tqmask only once instead of twice, +// optimized case - no d8 case, shift only once instead of twice, mask only once instead of twice, // use direct values instead of variables, and use only one statement // (*p >> 16), (*p >> 8 ) and (*p) are tqRed(),tqGreen() and tqBlue() without masking // shifts have to be passed including the shift operator (e.g. '>>3'), because of the direction -#define GET_PIXEL_OPT(red_shift,green_shift,blue_shift,red_tqmask,green_tqmask,blue_tqmask) \ - int pixel = ((( *p >> 16 ) red_shift ) & red_tqmask ) \ - | ((( *p >> 8 ) green_shift ) & green_tqmask ) \ - | ((( *p ) blue_shift ) & blue_tqmask ); \ +#define GET_PIXEL_OPT(red_shift,green_shift,blue_shift,red_mask,green_mask,blue_mask) \ + int pixel = ((( *p >> 16 ) red_shift ) & red_mask ) \ + | ((( *p >> 8 ) green_shift ) & green_mask ) \ + | ((( *p ) blue_shift ) & blue_mask ); \ ++p; @@ -1443,7 +1443,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) // again, optimized case // can't be optimized that much :( -#define GET_PIXEL_DITHER_TC_OPT(red_shift,green_shift,blue_shift,red_tqmask,green_tqmask,blue_tqmask, \ +#define GET_PIXEL_DITHER_TC_OPT(red_shift,green_shift,blue_shift,red_mask,green_mask,blue_mask, \ rbits,gbits,bbits) \ const int thres = D[x%16][y%16]; \ int r = tqRed ( *p ); \ @@ -1458,9 +1458,9 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) if ( b <= (255-(1<<(8-bbits))) && ((b<<bbits) & 255) \ > thres) \ b += (1<<(8-bbits)); \ - int pixel = (( r red_shift ) & red_tqmask ) \ - | (( g green_shift ) & green_tqmask ) \ - | (( b blue_shift ) & blue_tqmask ); + int pixel = (( r red_shift ) & red_mask ) \ + | (( g green_shift ) & green_mask ) \ + | (( b blue_shift ) & blue_mask ); #define CYCLE(body) \ for ( uint y=0; y<h; y++ ) { \ @@ -1841,7 +1841,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) setMask( m ); #ifndef TQT_NO_XFTFREETYPE - // does this image have an alphamap (and not just a 1bpp tqmask)? + // does this image have an alphamap (and not just a 1bpp mask)? bool alphamap = image.depth() == 32; if (image.depth() == 8) { const TQRgb * const rgb = image.colorTable(); @@ -2221,11 +2221,11 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const TQPixmap pm( w, h, dptr, TQImage::systemBitOrder() != TQImage::BigEndian ); pm.data->bitmap = data->bitmap; free( dptr ); - if ( data->tqmask ) { - if ( data->selfmask ) // pixmap == tqmask + if ( data->mask ) { + if ( data->selfmask ) // pixmap == mask pm.setMask( *((TQBitmap*)(&pm)) ); else - pm.setMask( data->tqmask->xForm(matrix) ); + pm.setMask( data->mask->xForm(matrix) ); } return pm; } else { // color pixmap @@ -2246,8 +2246,8 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const } #endif - if ( data->tqmask ) // xform tqmask, too - pm.setMask( data->tqmask->xForm(matrix) ); + if ( data->mask ) // xform mask, too + pm.setMask( data->mask->xForm(matrix) ); #ifndef TQT_NO_XFTFREETYPE if ( qt_use_xrender && qt_has_xft && data->alphapm ) { // xform the alpha channel @@ -2359,23 +2359,23 @@ void TQPixmap::x11SetScreen( int screen ) } /*! - Returns TRUE this pixmap has an alpha channel or a tqmask. + Returns TRUE this pixmap has an alpha channel or a mask. - \sa hasAlphaChannel() tqmask() + \sa hasAlphaChannel() mask() */ bool TQPixmap::hasAlpha() const { - return data->alphapm || data->tqmask; + return data->alphapm || data->mask; } /*! Returns TRUE if the pixmap has an alpha channel; otherwise it returns FALSE. - NOTE: If the pixmap has a tqmask but not alpha channel, this + NOTE: If the pixmap has a mask but not alpha channel, this function returns FALSE. - \sa hasAlpha() tqmask() + \sa hasAlpha() mask() */ bool TQPixmap::hasAlphaChannel() const { @@ -2386,7 +2386,7 @@ bool TQPixmap::hasAlphaChannel() const \relates TQPixmap Copies a block of pixels from \a src to \a dst. The alpha channel - and tqmask data (if any) is also copied from \a src. NOTE: \a src + and mask data (if any) is also copied from \a src. NOTE: \a src is \e not alpha blended or masked when copied to \a dst. Use bitBlt() or TQPainter::drawPixmap() to perform alpha blending or masked drawing. @@ -2416,17 +2416,17 @@ TQ_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, // copy pixel data bitBlt( dst, dx, dy, src, sx, sy, sw, sh, TQt::CopyROP, TRUE ); - // copy tqmask data - if ( src->data->tqmask ) { - if ( ! dst->data->tqmask ) { - dst->data->tqmask = new TQBitmap( dst->width(), dst->height() ); + // copy mask data + if ( src->data->mask ) { + if ( ! dst->data->mask ) { + dst->data->mask = new TQBitmap( dst->width(), dst->height() ); // new masks are fully opaque by default - dst->data->tqmask->fill( TQt::color1 ); + dst->data->mask->fill( TQt::color1 ); } - bitBlt( dst->data->tqmask, dx, dy, - src->data->tqmask, sx, sy, sw, sh, TQt::CopyROP, TRUE ); + bitBlt( dst->data->mask, dx, dy, + src->data->mask, sx, sy, sw, sh, TQt::CopyROP, TRUE ); } #ifndef TQT_NO_XFTFREETYPE diff --git a/experimental/tqtinterface/qt4/src/kernel/tqprinter.h b/experimental/tqtinterface/qt4/src/kernel/tqprinter.h index a719a95fb..e1e6cc5be 100755 --- a/experimental/tqtinterface/qt4/src/kernel/tqprinter.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqprinter.h @@ -203,7 +203,7 @@ public: bool abort(); bool aborted() const; - bool setup( TQWidget *tqparent = 0 ); + bool setup( TQWidget *parent = 0 ); PaperSource paperSource() const; virtual void setPaperSource( PaperSource ); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp b/experimental/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp index 047247949..80946867d 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp @@ -137,7 +137,7 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) // // // try to replace this process with "true" - this prevents // // global destructors from being called (that could possibly -// // do wrong things to the tqparent process) +// // do wrong things to the parent process) // (void)execlp("true", "true", (char *)0); // (void)execl("/bin/true", "true", (char *)0); // (void)execl("/usr/bin/true", "true", (char *)0); @@ -200,13 +200,13 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) // (void)execv( "/usr/bin/lpr", lprargs); // } // // if we couldn't exec anything, close the fd, -// // wait for a second so the tqparent process (the +// // wait for a second so the parent process (the // // child of the GUI process) has exited. then // // exit. // ::close( 0 ); // (void)::sleep( 1 ); // ::exit( 0 ); -// } else { // tqparent process +// } else { // parent process // ::close( fds[0] ); // pdrv = new TQPSPrinter( this, fds[1] ); // state = PST_ACTIVE; @@ -419,7 +419,7 @@ static void deleteGlobalPrinterDefaults() } /*! - Opens a printer setup dialog, with tqparent \a tqparent, and asks the + Opens a printer setup dialog, with parent \a parent, and asks the user to specify which printer they wish to use and what settings it should have. @@ -427,10 +427,10 @@ static void deleteGlobalPrinterDefaults() user canceled the operation. */ -bool TQPrinter::setup( TQWidget * tqparent ) +bool TQPrinter::setup( TQWidget * parent ) { #ifndef TQT_NO_PRINTDIALOG - bool result = TQPrintDialog::getPrinterSetup( this, tqparent ); + bool result = TQPrintDialog::getPrinterSetup( this, parent ); #else bool result = FALSE; #endif @@ -556,7 +556,7 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) // try to replace this process with "true" - this prevents // global destructors from being called (that could possibly - // do wrong things to the tqparent process) + // do wrong things to the parent process) (void)execlp("true", "true", (char *)0); (void)execl("/bin/true", "true", (char *)0); (void)execl("/usr/bin/true", "true", (char *)0); @@ -619,13 +619,13 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) (void)execv( "/usr/bin/lpr", lprargs); } // if we couldn't exec anything, close the fd, - // wait for a second so the tqparent process (the + // wait for a second so the parent process (the // child of the GUI process) has exited. then // exit. ::close( 0 ); (void)::sleep( 1 ); ::exit( 0 ); - } else { // tqparent process + } else { // parent process ::close( fds[0] ); pdrv = new TQPSPrinter( this, fds[1] ); state = PST_ACTIVE; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqprocess.cpp b/experimental/tqtinterface/qt4/src/kernel/tqprocess.cpp index c85e2debf..8249ff251 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqprocess.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqprocess.cpp @@ -219,13 +219,13 @@ */ /*! - Constructs a TQProcess object. The \a tqparent and \a name parameters + Constructs a TQProcess object. The \a parent and \a name parameters are passed to the TQObject constructor. \sa setArguments() addArgument() start() */ -TQProcess::TQProcess( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ), +TQProcess::TQProcess( TQObject *parent, const char *name ) + : TQObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ), wroteToStdinConnected( FALSE ), readStdoutCalled( FALSE ), readStderrCalled( FALSE ), comms( Stdin|Stdout|Stderr ) @@ -235,7 +235,7 @@ TQProcess::TQProcess( TQObject *tqparent, const char *name ) /*! Constructs a TQProcess with \a arg0 as the command to be executed. - The \a tqparent and \a name parameters are passed to the TQObject + The \a parent and \a name parameters are passed to the TQObject constructor. The process is not started. You must call start() or launch() to @@ -243,8 +243,8 @@ TQProcess::TQProcess( TQObject *tqparent, const char *name ) \sa setArguments() addArgument() start() */ -TQProcess::TQProcess( const TQString& arg0, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ), +TQProcess::TQProcess( const TQString& arg0, TQObject *parent, const char *name ) + : TQObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ), wroteToStdinConnected( FALSE ), readStdoutCalled( FALSE ), readStderrCalled( FALSE ), comms( Stdin|Stdout|Stderr ) @@ -257,7 +257,7 @@ TQProcess::TQProcess( const TQString& arg0, TQObject *tqparent, const char *name Constructs a TQProcess with \a args as the arguments of the process. The first element in the list is the command to be executed. The other elements in the list are the arguments to this - command. The \a tqparent and \a name parameters are passed to the + command. The \a parent and \a name parameters are passed to the TQObject constructor. The process is not started. You must call start() or launch() to @@ -265,8 +265,8 @@ TQProcess::TQProcess( const TQString& arg0, TQObject *tqparent, const char *name \sa setArguments() addArgument() start() */ -TQProcess::TQProcess( const TQStringList& args, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ), +TQProcess::TQProcess( const TQStringList& args, TQObject *parent, const char *name ) + : TQObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ), wroteToStdinConnected( FALSE ), readStdoutCalled( FALSE ), readStderrCalled( FALSE ), comms( Stdin|Stdout|Stderr ) diff --git a/experimental/tqtinterface/qt4/src/kernel/tqprocess.h b/experimental/tqtinterface/qt4/src/kernel/tqprocess.h index ad00b303b..741077c0b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqprocess.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqprocess.h @@ -58,9 +58,9 @@ class TQ_EXPORT TQProcess : public TQObject Q_OBJECT TQ_OBJECT public: - TQProcess( TQObject *tqparent=0, const char *name=0 ); - TQProcess( const TQString& arg0, TQObject *tqparent=0, const char *name=0 ); - TQProcess( const TQStringList& args, TQObject *tqparent=0, const char *name=0 ); + TQProcess( TQObject *parent=0, const char *name=0 ); + TQProcess( const TQString& arg0, TQObject *parent=0, const char *name=0 ); + TQProcess( const TQStringList& args, TQObject *parent=0, const char *name=0 ); ~TQProcess(); // set and get the arguments and working directory diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp index f881bf8e0..010951278 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp @@ -148,8 +148,8 @@ static const char *const ps_header = "TQCIcolor length 3 idiv 1 sub{/TQCIindex ED/x TQCIindex 3 mul d TQCIgray\n" "TQCIindex TQCIcolor x get 0.30 mul TQCIcolor x 1 add get 0.59 mul TQCIcolor x 2\n" "add get 0.11 mul add add cvi put}for TQCIgray image}ie}D/di{gsave TR 1 i 1 eq\n" -"{false eq{pop true 3 1 roll 4 i 4 i false 4 i 4 i imagetqmask BkCol SC\n" -"imagetqmask}{pop false 3 1 roll imagetqmask}ie}{dup false ne{/languagelevel\n" +"{false eq{pop true 3 1 roll 4 i 4 i false 4 i 4 i imagemask BkCol SC\n" +"imagemask}{pop false 3 1 roll imagemask}ie}{dup false ne{/languagelevel\n" "where{pop languagelevel 3 ge}{false}ie}{false}ie{/ma ED 8 eq{/dc[0 1]d\n" "/DeviceGray}{/dc[0 1 0 1 0 1]d/DeviceRGB}ie scs/im ED/mt ED/h ED/w ED/id 7\n" "DB/ImageType 1 d/Width w d/Height h d/ImageMatrix mt d/DataSource im d\n" @@ -1379,7 +1379,7 @@ public: void resetDrawingTools( TQPainter * ); void emitHeader( bool finished ); void setFont( const TQFont &, int script ); - void drawImage( TQPainter *, float x, float y, float w, float h, const TQImage &img, const TQImage &tqmask ); + void drawImage( TQPainter *, float x, float y, float w, float h, const TQImage &img, const TQImage &mask ); void initPage( TQPainter *paint ); void flushPage( bool last = FALSE ); @@ -5807,7 +5807,7 @@ static const char * psJoin( TQt::PenJoinStyle p ) { void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w, float h, - const TQImage &img, const TQImage &tqmask ) + const TQImage &img, const TQImage &mask ) { if ( !w || !h || img.isNull() ) return; @@ -5831,7 +5831,7 @@ void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w, while( suby < height ) { drawImage(paint, x, y + suby/scaleY, w, TQMIN( subheight, height-suby )/scaleY, img.copy( 0, suby, width, TQMIN( subheight, height-suby ) ), - tqmask.isNull() ? tqmask : tqmask.copy( 0, suby, width, TQMIN( subheight, height-suby ) )); + mask.isNull() ? mask : mask.copy( 0, suby, width, TQMIN( subheight, height-suby ) )); suby += subheight; } } else { @@ -5839,10 +5839,10 @@ void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w, int size = 0; const char *bits; - if ( !tqmask.isNull() ) { - out = ::compress( tqmask, TRUE ); + if ( !mask.isNull() ) { + out = ::compress( mask, TRUE ); size = (width+7)/8*height; - pageStream << "/tqmask " << size << " string uc\n"; + pageStream << "/mask " << size << " string uc\n"; ps_r7( pageStream, out, out.size() ); pageStream << "d\n"; } @@ -5862,7 +5862,7 @@ void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w, ps_r7( pageStream, out, out.size() ); pageStream << "d\n" << width << ' ' << height << "[" << scaleX << " 0 0 " << scaleY << " 0 0]sl " - << bits << (!tqmask.isNull() ? "tqmask " : "false ") + << bits << (!mask.isNull() ? "mask " : "false ") << x << ' ' << y << " di\n"; } } @@ -6486,10 +6486,10 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p ) TQRect r = *p[0].rect; TQImage img; img = *(p[1].pixmap); - TQImage tqmask; - if ( p[1].pixmap->tqmask() ) - tqmask = *(p[1].pixmap->tqmask()); - d->drawImage(paint, r.x(), r.y(), r.width(), r.height(), img, tqmask); + TQImage mask; + if ( p[1].pixmap->mask() ) + mask = *(p[1].pixmap->mask()); + d->drawImage(paint, r.x(), r.y(), r.width(), r.height(), img, mask); break; } case PdcDrawImage: { @@ -6497,12 +6497,12 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p ) break; TQRect r = *(p[0].rect); TQImage img = *(p[1].image); - TQImage tqmask; + TQImage mask; #ifndef TQT_NO_IMAGE_DITHER_TO_1 if ( img.hasAlphaBuffer() ) - tqmask = img.createAlphaMask(); + mask = img.createAlphaMask(); #endif - d->drawImage(paint, r.x(), r.y(), r.width(), r.height(), img, tqmask); + d->drawImage(paint, r.x(), r.y(), r.width(), r.height(), img, mask); break; } case PdcSetBkColor: diff --git a/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp b/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp index e8e91b3df..644255bed 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp @@ -6724,7 +6724,7 @@ TQTextImage::TQTextImage(TQTextDocument *p, const QMap<TQString, TQString> &attr } } if (pm.hasAlphaChannel()) { - QRegion mask(pm.mask()); + QRegion mask(pm.QPixmap::mask()); QRegion all(0, 0, pm.width(), pm.height()); reg = new QRegion(all.subtracted(mask)); } @@ -8954,7 +8954,7 @@ void TQTextCursor::insert( const QString &str, bool checkNewLine, TQMemArray<TQT para->format( -1, TRUE ); if ( h != para->rect().height() ) invalidateNested(); - else if ( para->document() && para->document()->tqparent() ) + else if ( para->document() && para->document()->parent() ) para->document()->nextDoubleBuffered = TRUE; fixCursorPosition(); @@ -9597,7 +9597,7 @@ bool TQTextCursor::remove() para->format( -1, TRUE ); if ( h != para->rect().height() ) invalidateNested(); - else if ( para->document() && para->document()->tqparent() ) + else if ( para->document() && para->document()->parent() ) para->document()->nextDoubleBuffered = TRUE; return FALSE; } else if ( para->next() ) { @@ -9621,7 +9621,7 @@ bool TQTextCursor::removePreviousChar() para->format( -1, TRUE ); if ( h != para->rect().height() ) invalidateNested(); - else if ( para->document() && para->document()->tqparent() ) + else if ( para->document() && para->document()->parent() ) para->document()->nextDoubleBuffered = TRUE; return FALSE; } else if ( para->prev() ) { @@ -11025,7 +11025,7 @@ bool TQTextDocument::setSelectionEnd( int id, const TQTextCursor &cursor ) if ( p == lastParagraph() && c.atParagEnd() ) break; } else { - if ( p->document()->tqparent() ) + if ( p->document()->parent() ) do { c.gotoNextLetter(); } while ( c.paragraph() == p ); @@ -11090,7 +11090,7 @@ bool TQTextDocument::removeSelection( int id ) p = start.paragraph(); p->removeSelection( id ); //### avoid endless loop by all means necessary, did somebody mention refactoring? - if ( !tqparent() && p == lParag ) + if ( !parent() && p == lParag ) break; } start.gotoNextLetter(); @@ -11147,7 +11147,7 @@ TQString TQTextDocument::selectedText( int id, bool asRichText ) const // end selection 3.0.3 improvement - if ( asRichText && !tqparent() ) { + if ( asRichText && !parent() ) { richTextExportStart = &c1; richTextExportEnd = &c2; @@ -11670,7 +11670,7 @@ TQTextParagraph *TQTextDocument::draw( TQPainter *p, int cx, int cy, int cw, int floating: if ( parag->rect().y() + parag->rect().height() < parag->document()->height() ) { - if ( !parag->document()->tqparent() ) { + if ( !parag->document()->parent() ) { TQRect fillRect = TQRect( 0, parag->rect().y() + parag->rect().height(), parag->document()->width(), parag->document()->height() - ( parag->rect().y() + parag->rect().height() ) ); if ( TQRect( cx, cy, cw, ch ).intersects( fillRect ) ) @@ -14444,7 +14444,7 @@ void TQTextFormatCollection::setPaintDevice( TQPaintDevice *pd ) TQTextFormat *TQTextFormatCollection::format( TQTextFormat *f ) { - if ( f->tqparent() == this || f == defFormat ) { + if ( f->parent() == this || f == defFormat ) { lastFormat = f; lastFormat->addRef(); return lastFormat; @@ -14998,10 +14998,10 @@ TQTextImage::TQTextImage( TQTextDocument *p, const QMap<TQString, TQString> &att pmi.ref++; } } - if ( pm.tqmask() ) { - TQRegion tqmask( *pm.tqmask() ); + if ( pm.mask() ) { + TQRegion mask( *pm.mask() ); TQRegion all( 0, 0, pm.width(), pm.height() ); - reg = new TQRegion( all.subtract( tqmask ) ); + reg = new TQRegion( all.subtract( mask ) ); } } @@ -16261,7 +16261,7 @@ bool TQTextTable::enterAt( TQTextCursor *c, TQTextDocument *&doc, TQTextParagrap doc = cell->richText(); parag = doc->firstParagraph(); idx = 0; - ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + tqparent->x(); + ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + parent->x(); oy += cell->tqgeometry().y() + cell->verticalAlignmentOffset() + outerborder; return TRUE; } @@ -16294,7 +16294,7 @@ bool TQTextTable::next( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph * doc = cell->richText(); parag = doc->firstParagraph(); idx = 0; - ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + tqparent->x(); + ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + parent->x(); oy += cell->tqgeometry().y() + cell->verticalAlignmentOffset() + outerborder; return TRUE; } @@ -16327,7 +16327,7 @@ bool TQTextTable::prev( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph * doc = cell->richText(); parag = doc->lastParagraph(); idx = parag->length() - 1; - ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + tqparent->x(); + ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + parent->x(); oy += cell->tqgeometry().y() + cell->verticalAlignmentOffset() + outerborder; return TRUE; } @@ -16365,7 +16365,7 @@ bool TQTextTable::down( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph * return FALSE; parag = doc->firstParagraph(); idx = 0; - ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + tqparent->x(); + ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + parent->x(); oy += cell->tqgeometry().y() + cell->verticalAlignmentOffset() + outerborder; return TRUE; } @@ -16403,7 +16403,7 @@ bool TQTextTable::up( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph *&p return FALSE; parag = doc->lastParagraph(); idx = parag->length() - 1; - ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + tqparent->x(); + ox += cell->tqgeometry().x() + cell->horizontalAlignmentOffset() + outerborder + parent->x(); oy += cell->tqgeometry().y() + cell->verticalAlignmentOffset() + outerborder; return TRUE; } @@ -16422,12 +16422,12 @@ TQTextTableCell::TQTextTableCell( TQTextTable* table, maxw = TQWIDGETSIZE_MAX; minw = 0; - tqparent = table; + parent = table; row_ = row; col_ = column; stretch_ = 0; - richtext = new TQTextDocument( table->tqparent ); - richtext->formatCollection()->setPaintDevice( table->tqparent->formatCollection()->paintDevice() ); + richtext = new TQTextDocument( table->parent ); + richtext->formatCollection()->setPaintDevice( table->parent->formatCollection()->paintDevice() ); richtext->bodyText = fmt.color(); richtext->setTableCell( this ); TQString a = *attr.find( "align" ); @@ -16451,8 +16451,8 @@ TQTextTableCell::TQTextTableCell( TQTextTable* table, else if ( va == "bottom" ) align |= TQt::AlignBottom; } - richtext->setFormatter( table->tqparent->formatter() ); - richtext->setUseFormatCollection( table->tqparent->useFormatCollection() ); + richtext->setFormatter( table->parent->formatter() ); + richtext->setUseFormatCollection( table->parent->useFormatCollection() ); richtext->setMimeSourceFactory( &factory ); richtext->setStyleSheet( sheet ); richtext->setRichText( doc, context, &fmt ); @@ -16487,7 +16487,7 @@ TQTextTableCell::TQTextTableCell( TQTextTable* table, attributes = attr; - tqparent->addCell( this ); + parent->addCell( this ); } TQTextTableCell::~TQTextTableCell() @@ -16500,11 +16500,11 @@ TQTextTableCell::~TQTextTableCell() TQSize TQTextTableCell::tqsizeHint() const { - int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding + border_tolerance); + int extra = 2 * ( parent->innerborder + parent->cellpadding + border_tolerance); int used = richtext->widthUsed() + extra; if (stretch_ ) { - int w = tqparent->width * stretch_ / 100 - 2*tqparent->cellspacing - 2*tqparent->cellpadding; + int w = parent->width * stretch_ / 100 - 2*parent->cellspacing - 2*parent->cellpadding; return TQSize( TQMIN( w, maxw ), 0 ).expandedTo( tqminimumSize() ); } @@ -16513,7 +16513,7 @@ TQSize TQTextTableCell::tqsizeHint() const TQSize TQTextTableCell::tqminimumSize() const { - int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding + border_tolerance); + int extra = 2 * ( parent->innerborder + parent->cellpadding + border_tolerance); return TQSize( TQMAX( richtext->minimumWidth() + extra, minw), 0 ); } @@ -16533,7 +16533,7 @@ bool TQTextTableCell::isEmpty() const } void TQTextTableCell::setGeometry( const TQRect& r ) { - int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding ); + int extra = 2 * ( parent->innerborder + parent->cellpadding ); if ( r.width() != cached_width ) richtext->doLayout( TQTextFormat::painter(), r.width() - extra ); cached_width = r.width(); @@ -16552,7 +16552,7 @@ bool TQTextTableCell::hasHeightForWidth() const int TQTextTableCell::heightForWidth( int w ) const { - int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding ); + int extra = 2 * ( parent->innerborder + parent->cellpadding ); w = TQMAX( minw, w ); if ( cached_width != w ) { @@ -16574,7 +16574,7 @@ void TQTextTableCell::adjustToPainter( TQPainter* p ) int TQTextTableCell::horizontalAlignmentOffset() const { - return tqparent->cellpadding; + return parent->cellpadding; } int TQTextTableCell::verticalAlignmentOffset() const @@ -16582,14 +16582,14 @@ int TQTextTableCell::verticalAlignmentOffset() const if ( (align & TQt::AlignVCenter ) == TQt::AlignVCenter ) return ( geom.height() - richtext->height() ) / 2; else if ( ( align & TQt::AlignBottom ) == TQt::AlignBottom ) - return geom.height() - tqparent->cellpadding - richtext->height() ; - return tqparent->cellpadding; + return geom.height() - parent->cellpadding - richtext->height() ; + return parent->cellpadding; } void TQTextTableCell::draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool ) { if ( cached_width != geom.width() ) { - int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding ); + int extra = 2 * ( parent->innerborder + parent->cellpadding ); richtext->doLayout( p, geom.width() - extra ); cached_width = geom.width(); } @@ -16622,4 +16622,4 @@ void TQTextTableCell::draw( TQPainter* p, int x, int y, int cx, int cy, int cw, #endif //TQT_NO_RICHTEXT -#endif // USE_QT4
\ No newline at end of file +#endif // USE_QT4 diff --git a/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp b/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp index 31649dd5c..83927c7c2 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp @@ -892,7 +892,7 @@ TQTextFormat::TQTextFormat( const TQStyleSheetItem *style ) addRef(); } -TQTextFormat::TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatCollection *tqparent ) +TQTextFormat::TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatCollection *parent ) : fn( f ), col( c ), fm( TQFontMetrics( f ) ), linkColor( TRUE ), logicalFontSize( 3 ), stdSize( f.pointSize() ) { @@ -902,7 +902,7 @@ TQTextFormat::TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatColle stdSize = f.pixelSize(); usePixelSizes = TRUE; } - collection = tqparent; + collection = parent; leftBearing = fm.minLeftBearing(); rightBearing = fm.minRightBearing(); hei = fm.lineSpacing(); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h b/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h index bcfdb9bc4..90dc963e1 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h @@ -2619,7 +2619,7 @@ class TQ_EXPORT TQTextCustomItem { public: TQTextCustomItem( TQTextDocument *p ) - : xpos(0), ypos(-1), width(-1), height(0), tqparent( p ) + : xpos(0), ypos(-1), width(-1), height(0), parent( p ) {} virtual ~TQTextCustomItem(); virtual void draw(TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ) = 0; @@ -2657,7 +2657,7 @@ public: virtual void setParagraph( TQTextParagraph *p ) { parag = p; } TQTextParagraph *paragraph() const { return parag; } - TQTextDocument *tqparent; + TQTextDocument *parent; TQTextParagraph *parag; virtual void pageBreak( int y, TQTextFlow* flow ); @@ -2808,7 +2808,7 @@ public: int stretch() const { return stretch_; } TQTextDocument* richText() const { return richtext; } - TQTextTable* table() const { return tqparent; } + TQTextTable* table() const { return parent; } void draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ); @@ -2820,7 +2820,7 @@ public: private: TQRect geom; - TQTextTable* tqparent; + TQTextTable* parent; TQTextDocument* richtext; int row_; int col_; @@ -2953,7 +2953,7 @@ public: TQTextDocument( TQTextDocument *p ); virtual ~TQTextDocument(); - TQTextDocument *tqparent() const { return par; } + TQTextDocument *parent() const { return par; } TQTextParagraph *parentParagraph() const { return parentPar; } void setText( const TQString &text, const TQString &context ); @@ -3665,7 +3665,7 @@ public: virtual ~TQTextFormat(); TQTextFormat( const TQStyleSheetItem *s ); - TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatCollection *tqparent = 0 ); + TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatCollection *parent = 0 ); TQTextFormat( const TQTextFormat &fm ); TQTextFormat makeTextFormat( const TQStyleSheetItem *style, const TQMap<TQString,TQString>& attr, double scaleFontsFactor ) const; TQTextFormat& operator=( const TQTextFormat &fm ); @@ -3696,7 +3696,7 @@ public: void setVAlign( VerticalAlignment a ); bool operator==( const TQTextFormat &f ) const; - TQTextFormatCollection *tqparent() const; + TQTextFormatCollection *parent() const; const TQString &key() const; static TQString getKey( const TQFont &f, const TQColor &c, bool misspelled, VerticalAlignment vAlign ); @@ -4006,7 +4006,7 @@ inline void TQTextDocument::takeFlow() inline bool TQTextDocument::useDoubleBuffer( TQTextParagraph *parag, TQPainter *p ) { - return ( !parag->document()->tqparent() || parag->document()->nextDoubleBuffered ) && + return ( !parag->document()->parent() || parag->document()->nextDoubleBuffered ) && ( !p || !p->tqdevice() || p->tqdevice()->devType() != TQInternal::Printer ); } @@ -4037,7 +4037,7 @@ inline bool TQTextFormat::operator==( const TQTextFormat &f ) const return k == f.k; } -inline TQTextFormatCollection *TQTextFormat::tqparent() const +inline TQTextFormatCollection *TQTextFormat::parent() const { return collection; } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqscriptengine.cpp b/experimental/tqtinterface/qt4/src/kernel/tqscriptengine.cpp index 0bb29fc7d..2156fe872 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqscriptengine.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqscriptengine.cpp @@ -564,8 +564,8 @@ enum ArabicGroup { // NonJoining ArabicNone, ArabicSpace, - // Transtqparent - Transtqparent, + // Transparent + Transparent, // Causing Center, Kashida, @@ -641,8 +641,8 @@ static const unsigned char arabic_group[0x150] = { ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, - Transtqparent, Transtqparent, Transtqparent, Transtqparent, - Transtqparent, Transtqparent, ArabicNone, ArabicNone, + Transparent, Transparent, Transparent, Transparent, + Transparent, Transparent, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, @@ -659,12 +659,12 @@ static const unsigned char arabic_group[0x150] = { // 0x640 Kashida, Feh, Qaf, Kaf, Lam, Meem, Noon, Heh, - Waw, Yeh, Yeh, Transtqparent, - Transtqparent, Transtqparent, Transtqparent, Transtqparent, + Waw, Yeh, Yeh, Transparent, + Transparent, Transparent, Transparent, Transparent, - Transtqparent, Transtqparent, Transtqparent, Transtqparent, - Transtqparent, Transtqparent, Transtqparent, Transtqparent, - Transtqparent, ArabicNone, ArabicNone, ArabicNone, + Transparent, Transparent, Transparent, Transparent, + Transparent, Transparent, Transparent, Transparent, + Transparent, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, @@ -672,7 +672,7 @@ static const unsigned char arabic_group[0x150] = { ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, Beh, Qaf, - Transtqparent, Alef, Alef, Alef, + Transparent, Alef, Alef, Alef, ArabicNone, Alef, Waw, Waw, Yeh, Beh, Beh, Beh, Beh, Beh, Beh, Beh, @@ -705,14 +705,14 @@ static const unsigned char arabic_group[0x150] = { Yeh, YehWithTail, Yeh, Waw, Yeh, Yeh, YehBarre, YehBarre, - ArabicNone, TehMarbuta, Transtqparent, Transtqparent, - Transtqparent, Transtqparent, Transtqparent, Transtqparent, - Transtqparent, ArabicNone, ArabicNone, Transtqparent, + ArabicNone, TehMarbuta, Transparent, Transparent, + Transparent, Transparent, Transparent, Transparent, + Transparent, ArabicNone, ArabicNone, Transparent, - Transtqparent, Transtqparent, Transtqparent, Transtqparent, - Transtqparent, ArabicNone, ArabicNone, Transtqparent, - Transtqparent, ArabicNone, Transtqparent, Transtqparent, - Transtqparent, Transtqparent, Dal, Reh, + Transparent, Transparent, Transparent, Transparent, + Transparent, ArabicNone, ArabicNone, Transparent, + Transparent, ArabicNone, Transparent, Transparent, + Transparent, Transparent, Dal, Reh, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, @@ -725,7 +725,7 @@ static const unsigned char arabic_group[0x150] = { ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, ArabicNone, - Alaph, Transtqparent, Beth, Gamal, + Alaph, Transparent, Beth, Gamal, Gamal, Dalath, Dalath, He, SyriacWaw, Zain, Heth, Teth, Teth, Yudh, YudhHe, Kaph, @@ -735,14 +735,14 @@ static const unsigned char arabic_group[0x150] = { Sadhe, Qaph, Dalath, Shin, Taw, Beth, Gamal, Dalath, - Transtqparent, Transtqparent, Transtqparent, Transtqparent, - Transtqparent, Transtqparent, Transtqparent, Transtqparent, - Transtqparent, Transtqparent, Transtqparent, Transtqparent, - Transtqparent, Transtqparent, Transtqparent, Transtqparent, + Transparent, Transparent, Transparent, Transparent, + Transparent, Transparent, Transparent, Transparent, + Transparent, Transparent, Transparent, Transparent, + Transparent, Transparent, Transparent, Transparent, - Transtqparent, Transtqparent, Transtqparent, Transtqparent, - Transtqparent, Transtqparent, Transtqparent, Transtqparent, - Transtqparent, Transtqparent, Transtqparent, ArabicNone, + Transparent, Transparent, Transparent, Transparent, + Transparent, Transparent, Transparent, Transparent, + Transparent, Transparent, Transparent, ArabicNone, ArabicNone, Zain, Kaph, Fe, }; @@ -763,15 +763,15 @@ static inline ArabicGroup arabicGroup(unsigned short uc) Arabic shaping obeys a number of rules according to the joining classes (see Unicode book, section on arabic). - Each tqunicode char has a joining class (right, dual (left&right), center (joincausing) or transtqparent). - transtqparent joining is not encoded in TQChar::joining(), but applies to all combining marks and format marks. + Each tqunicode char has a joining class (right, dual (left&right), center (joincausing) or transparent). + transparent joining is not encoded in TQChar::joining(), but applies to all combining marks and format marks. Right join-causing: dual + center Left join-causing: dual + right + center Rules are as follows (for a string already in visual order, as we have it here): - R1 Transtqparent characters do not affect joining behaviour. + R1 Transparent characters do not affect joining behaviour. R2 A right joining character, that has a right join-causing char on the right will get form XRight (R3 A left joining character, that has a left join-causing char on the left will get form XLeft) Note: the above rule is meaningless, as there are no pure left joining characters defined in Unicode @@ -785,7 +785,7 @@ static inline ArabicGroup arabicGroup(unsigned short uc) Additionally we have to do the minimal ligature support for lam-alef ligatures: - L1 Transtqparent characters do not affect ligature behaviour. + L1 Transparent characters do not affect ligature behaviour. L2 Any sequence of Alef(XRight) + Lam(XMedial) will form the ligature Alef.Lam(XLeft) L3 Any sequence of Alef(XRight) + Lam(XLeft) will form the ligature Alef.Lam(XIsolated) @@ -807,7 +807,7 @@ enum Joining { JCausing, JDual, JRight, - JTranstqparent + JTransparent }; @@ -815,8 +815,8 @@ static const Joining joining_for_group[ArabicGroupsEnd] = { // NonJoining JNone, // ArabicNone JNone, // ArabicSpace - // Transtqparent - JTranstqparent, // Transtqparent + // Transparent + JTransparent, // Transparent // Causing JCausing, // Center JCausing, // Kashida @@ -919,7 +919,7 @@ static void getArabicProperties(const unsigned short *chars, int len, TQArabicPr group = arabicGroup(chars[i]); j = joining_for_group[group]; - if (j == JTranstqparent) { + if (j == JTransparent) { properties[i].tqshape = XIsolated; continue; } @@ -959,8 +959,8 @@ static void getArabicProperties(const unsigned short *chars, int len, TQArabicPr switch(group) { case ArabicNone: - case Transtqparent: - // ### Center should probably be treated as transtqparent when it comes to justification. + case Transparent: + // ### Center should probably be treated as transparent when it comes to justification. case Center: break; case ArabicSpace: @@ -1351,7 +1351,7 @@ static inline const TQChar nextChar(const TQString *str, int pos) //qDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining()); if(::category(*ch) != TQChar::Mark_NonSpacing) return *ch; - // assume it's a transtqparent char, this might not be 100% correct + // assume it's a transparent char, this might not be 100% correct pos++; ch++; } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsignal.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsignal.cpp index 836f87084..2d6dbac00 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsignal.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqsignal.cpp @@ -341,12 +341,12 @@ QT_END_NAMESPACE */ /*! - Constructs a signal object called \a name, with the tqparent object - \a tqparent. These arguments are passed directly to TQObject. + Constructs a signal object called \a name, with the parent object + \a parent. These arguments are passed directly to TQObject. */ -TQSignal::TQSignal( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +TQSignal::TQSignal( TQObject *parent, const char *name ) + : TQObject( parent, name ) { isSignal = TRUE; #ifndef TQT_NO_VARIANT diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsignal.h b/experimental/tqtinterface/qt4/src/kernel/tqsignal.h index 72fd88019..f4da0ee8b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsignal.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqsignal.h @@ -111,7 +111,7 @@ class TQ_EXPORT TQSignal : public TQObject TQ_OBJECT public: - TQSignal( TQObject *tqparent=0, const char *name=0 ); + TQSignal( TQObject *parent=0, const char *name=0 ); ~TQSignal(); bool connect( const TQT_BASE_OBJECT_NAME *receiver, const char *member ); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp index 40b08eeb0..560640ba9 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp @@ -78,11 +78,11 @@ public: */ /*! - Constructs a TQSignalMapper called \a name, with tqparent \a tqparent. - Like all TQObjects, it will be deleted when the tqparent is deleted. + Constructs a TQSignalMapper called \a name, with parent \a parent. + Like all TQObjects, it will be deleted when the parent is deleted. */ -TQSignalMapper::TQSignalMapper( TQObject* tqparent, const char* name ) : - TQObject( tqparent, name ) +TQSignalMapper::TQSignalMapper( TQObject* parent, const char* name ) : + TQObject( parent, name ) { d = new TQSignalMapperData; } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.h b/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.h index 903dad241..fbe25b3ba 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.h @@ -53,7 +53,7 @@ class TQ_EXPORT TQSignalMapper : public TQObject { Q_OBJECT TQ_OBJECT public: - TQSignalMapper( TQObject* tqparent, const char* name=0 ); + TQSignalMapper( TQObject* parent, const char* name=0 ); ~TQSignalMapper(); virtual void setMapping( const TQObject* sender, int identifier ); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.cpp index bcea2dbec..96d3c816b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.cpp @@ -106,10 +106,10 @@ static TQWidget* qt_sizegrip_workspace( TQWidget* w ) /*! Constructs a resize corner called \a name, as a child widget of \a - tqparent. + parent. */ -TQSizeGrip::TQSizeGrip( TQWidget * tqparent, const char* name ) - : TQWidget( tqparent, name ) +TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name ) + : TQWidget( parent, name ) { #ifndef TQT_NO_CURSOR #ifndef TQ_WS_MAC diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.h b/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.h index fa893a286..94e8c608a 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.h @@ -52,7 +52,7 @@ class TQ_EXPORT TQSizeGrip: public TQWidget Q_OBJECT TQ_OBJECT public: - TQSizeGrip( TQWidget* tqparent, const char* name=0 ); + TQSizeGrip( TQWidget* parent, const char* name=0 ); ~TQSizeGrip(); TQSize tqsizeHint() const; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp index a9b394365..770b710dc 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.cpp @@ -51,7 +51,7 @@ #if 0 //#ifdef USE_QT4 -TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *tqparent, const char *name ) : QSocketNotifier(socket, type, tqparent) { +TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *parent, const char *name ) : QSocketNotifier(socket, type, parent) { setObjectName(name); } @@ -139,8 +139,8 @@ TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *tqparent, c /*! - Constructs a socket notifier called \a name, with the tqparent, \a - tqparent. It watches \a socket for \a type events, and enables it. + Constructs a socket notifier called \a name, with the parent, \a + parent. It watches \a socket for \a type events, and enables it. It is generally advisable to explicitly enable or disable the socket notifier, especially for write notifiers. @@ -148,9 +148,9 @@ TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *tqparent, c \sa setEnabled(), isEnabled() */ -TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *tqparent, +TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *parent, const char *name ) - : TQObject( tqparent, name ) + : TQObject( parent, name ) { #if defined(TQT_CHECK_RANGE) if ( socket < 0 ) diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h b/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h index 490447139..816f83926 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqsocketnotifier.h @@ -62,7 +62,7 @@ class TQ_EXPORT TQSocketNotifier : public QSocketNotifier Q_OBJECT TQ_OBJECT public: - TQSocketNotifier( int socket, Type type, TQObject *tqparent=0, const char *name=0 ); + TQSocketNotifier( int socket, Type type, TQObject *parent=0, const char *name=0 ); }; #else // USE_QT4 @@ -74,7 +74,7 @@ class TQ_EXPORT TQSocketNotifier : public TQObject public: enum Type { Read, Write, Exception }; - TQSocketNotifier( int socket, Type, TQObject *tqparent=0, const char *name=0 ); + TQSocketNotifier( int socket, Type, TQObject *parent=0, const char *name=0 ); ~TQSocketNotifier(); int socket() const; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsound.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsound.cpp index afb387126..4a6e96b28 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsound.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqsound.cpp @@ -46,8 +46,8 @@ static TQPtrList<TQAuServer> *servers=0; -TQAuServer::TQAuServer(TQObject* tqparent, const char* name) : - TQObject(tqparent,name) +TQAuServer::TQAuServer(TQObject* parent, const char* name) : + TQObject(parent,name) { if ( !servers ) { servers = new TQPtrList<TQAuServer>; @@ -161,11 +161,11 @@ void TQSound::play(const TQString& filename) This may use more memory than the static \c play function. - The \a tqparent and \a name arguments (default 0) are passed on to + The \a parent and \a name arguments (default 0) are passed on to the TQObject constructor. */ -TQSound::TQSound(const TQString& filename, TQObject* tqparent, const char* name) : - TQObject(tqparent,name), +TQSound::TQSound(const TQString& filename, TQObject* parent, const char* name) : + TQObject(parent,name), d(new TQSoundData(filename)) { server().init(this); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsound.h b/experimental/tqtinterface/qt4/src/kernel/tqsound.h index a24a63f91..043dd1f58 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsound.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqsound.h @@ -55,7 +55,7 @@ public: static bool isAvailable(); static void play(const TQString& filename); - TQSound(const TQString& filename, TQObject* tqparent=0, const char* name=0); + TQSound(const TQString& filename, TQObject* parent=0, const char* name=0); ~TQSound(); /* Coming soon... @@ -106,7 +106,7 @@ class TQAuServer : public TQObject { TQ_OBJECT public: - TQAuServer(TQObject* tqparent, const char* name); + TQAuServer(TQObject* parent, const char* name); ~TQAuServer(); virtual void init(TQSound*); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsound_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsound_x11.cpp index 80b6dbf88..52d7523ae 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsound_x11.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqsound_x11.cpp @@ -93,7 +93,7 @@ class TQAuServerNAS : public TQAuServer { TQSocketNotifier* sn; public: - TQAuServerNAS(TQObject* tqparent); + TQAuServerNAS(TQObject* parent); ~TQAuServerNAS(); void init(TQSound*); @@ -114,8 +114,8 @@ private: } }; -TQAuServerNAS::TQAuServerNAS(TQObject* tqparent) : - TQAuServer(tqparent,"Network Audio System") +TQAuServerNAS::TQAuServerNAS(TQObject* parent) : + TQAuServer(parent,"Network Audio System") { nas = AuOpenServer(NULL, 0, NULL, 0, NULL, NULL); if (nas) { @@ -254,7 +254,7 @@ void TQAuServerNAS::dataReceived() class TQAuServerNull : public TQAuServer { public: - TQAuServerNull(TQObject* tqparent); + TQAuServerNull(TQObject* parent); void play(const TQString&) { } void play(TQSound*s) { while(decLoop(s) > 0) /* nothing */ ; } @@ -262,8 +262,8 @@ public: bool okay() { return FALSE; } }; -TQAuServerNull::TQAuServerNull(TQObject* tqparent) : - TQAuServer(tqparent,"Null Audio Server") +TQAuServerNull::TQAuServerNull(TQObject* parent) : + TQAuServer(parent,"Null Audio Server") { } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp b/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp index 9aa3a59b9..b2861b076 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp @@ -217,27 +217,27 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, x += w - pm.width(); if ( !enabled ) { - if ( pm.tqmask() ) { // pixmap with a tqmask - if ( !pm.selfMask() ) { // tqmask is not pixmap itself - TQPixmap pmm( *pm.tqmask() ); + if ( pm.mask() ) { // pixmap with a mask + if ( !pm.selfMask() ) { // mask is not pixmap itself + TQPixmap pmm( *pm.mask() ); pmm.setMask( *((TQBitmap *)&pmm) ); pm = pmm; } - } else if ( pm.depth() == 1 ) { // monochrome pixmap, no tqmask + } else if ( pm.depth() == 1 ) { // monochrome pixmap, no mask pm.setMask( *((TQBitmap *)&pm) ); #ifndef TQT_NO_IMAGE_HEURISTIC_MASK - } else { // color pixmap, no tqmask + } else { // color pixmap, no mask TQString k; k.sprintf( "$qt-drawitem-%x", pm.serialNumber() ); - TQPixmap *tqmask = TQPixmapCache::find(k); + TQPixmap *mask = TQPixmapCache::find(k); bool del=FALSE; - if ( !tqmask ) { - tqmask = new TQPixmap( pm.createHeuristicMask() ); - tqmask->setMask( *((TQBitmap*)tqmask) ); - del = !TQPixmapCache::insert( k, tqmask ); + if ( !mask ) { + mask = new TQPixmap( pm.createHeuristicMask() ); + mask->setMask( *((TQBitmap*)mask) ); + del = !TQPixmapCache::insert( k, mask ); } - pm = *tqmask; - if (del) delete tqmask; + pm = *mask; + if (del) delete mask; #endif } if ( gs == TQt::WindowsStyle ) { @@ -898,27 +898,27 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, x += w - pm.width(); if ( !enabled ) { - if ( pm.tqmask() ) { // pixmap with a tqmask - if ( !pm.selfMask() ) { // tqmask is not pixmap itself - TQPixmap pmm( *pm.tqmask() ); + if ( pm.mask() ) { // pixmap with a mask + if ( !pm.selfMask() ) { // mask is not pixmap itself + TQPixmap pmm( *pm.mask() ); pmm.setMask( *((TQBitmap *)&pmm) ); pm = pmm; } - } else if ( pm.depth() == 1 ) { // monochrome pixmap, no tqmask + } else if ( pm.depth() == 1 ) { // monochrome pixmap, no mask pm.setMask( *((TQBitmap *)&pm) ); #ifndef TQT_NO_IMAGE_HEURISTIC_MASK - } else { // color pixmap, no tqmask + } else { // color pixmap, no mask TQString k; k.sprintf( "$qt-drawitem-%x", pm.serialNumber() ); - TQPixmap *tqmask = TQPixmapCache::find(k); + TQPixmap *mask = TQPixmapCache::find(k); bool del=FALSE; - if ( !tqmask ) { - tqmask = new TQPixmap( pm.createHeuristicMask() ); - tqmask->setMask( *((TQBitmap*)tqmask) ); - del = !TQPixmapCache::insert( k, tqmask ); + if ( !mask ) { + mask = new TQPixmap( pm.createHeuristicMask() ); + mask->setMask( *((TQBitmap*)mask) ); + del = !TQPixmapCache::insert( k, mask ); } - pm = *tqmask; - if (del) delete tqmask; + pm = *mask; + if (del) delete mask; #endif } if ( gs == TQt::WindowsStyle ) { @@ -974,10 +974,10 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, \value PE_Indicator on/off indicator, for example, a TQCheckBox. - \value PE_IndicatorMask bitmap tqmask for an indicator. + \value PE_IndicatorMask bitmap mask for an indicator. \value PE_ExclusiveIndicator exclusive on/off indicator, for example, a TQRadioButton. - \value PE_ExclusiveIndicatorMask bitmap tqmask for an exclusive indicator. + \value PE_ExclusiveIndicatorMask bitmap mask for an exclusive indicator. \value PE_DockWindowHandle tear off handle for dock windows and @@ -1376,7 +1376,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, /*! \fn void TQStyle::tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& opt) const - Draw a bittqmask for the ControlElement \a element using the painter + Draw a bitmask for the ControlElement \a element using the painter \a p in the area \a r. See tqdrawControl() for an explanation of the use of the \a widget and \a opt arguments. @@ -1665,7 +1665,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, /*! \fn void TQStyle::tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& opt) const - Draw a bittqmask for the ComplexControl \a control using the painter + Draw a bitmask for the ComplexControl \a control using the painter \a p in the area \a r. See tqdrawComplexControl() for an explanation of the use of the \a widget and \a opt arguments. diff --git a/experimental/tqtinterface/qt4/src/kernel/tqstyle.h b/experimental/tqtinterface/qt4/src/kernel/tqstyle.h index 02682cba1..0ae52a03a 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqstyle.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqstyle.h @@ -294,7 +294,7 @@ public: // typedef State SFlags; typedef StandardPixmap StylePixmap; - TQStyle() : QStyle() { TQT_TQOBJECT_REQUIRED_INITIALIZATION(tqparent) } + TQStyle() : QStyle() { TQT_TQOBJECT_REQUIRED_INITIALIZATION(parent) } enum SH_NewTypes { SH_GUIStyle = 0x00000100, diff --git a/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.cpp b/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.cpp index 08a29dca0..c3fc72fbe 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.cpp @@ -141,20 +141,20 @@ public: /*! Constructs a new style called \a name for the stylesheet \a - tqparent. + parent. All properties in TQStyleSheetItem are initially in the "do not change" state, except \link TQStyleSheetItem::DisplayMode display mode\endlink, which defaults to \c DisplayInline. */ -TQStyleSheetItem::TQStyleSheetItem( TQStyleSheet* tqparent, const TQString& name ) +TQStyleSheetItem::TQStyleSheetItem( TQStyleSheet* parent, const TQString& name ) { d = new TQStyleSheetItemData; d->stylename = name.lower(); - d->sheet = tqparent; + d->sheet = parent; init(); - if (tqparent) - tqparent->insert( this ); + if (parent) + parent->insert( this ); } /*! @@ -332,7 +332,7 @@ TQStyleSheetItem::VerticalAlignment TQStyleSheetItem::verticalAlignment() const \value VAlignBaseline align the baseline of the element (or the bottom, if the element doesn't have a baseline) with the - baseline of the tqparent + baseline of the parent \value VAlignSub subscript the element @@ -1086,14 +1086,14 @@ int TQStyleSheetItem::lineSpacing() const */ /*! - Creates a style sheet called \a name, with tqparent \a tqparent. Like - any TQObject it will be deleted when its tqparent is destroyed (if + Creates a style sheet called \a name, with parent \a parent. Like + any TQObject it will be deleted when its parent is destroyed (if the child still exists). By default the style sheet has the tag definitions defined above. */ -TQStyleSheet::TQStyleSheet( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +TQStyleSheet::TQStyleSheet( TQObject *parent, const char *name ) + : TQObject( parent, name ) { init(); } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.h b/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.h index 7f650bedf..c207357ed 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.h @@ -59,7 +59,7 @@ class TQStyleSheetItemData; class TQ_EXPORT TQStyleSheetItem : public TQt { public: - TQStyleSheetItem( TQStyleSheet* tqparent, const TQString& name ); + TQStyleSheetItem( TQStyleSheet* parent, const TQString& name ); TQStyleSheetItem( const TQStyleSheetItem & ); ~TQStyleSheetItem(); @@ -212,7 +212,7 @@ class TQ_EXPORT TQStyleSheet : public TQObject { TQ_OBJECT public: - TQStyleSheet( TQObject *tqparent=0, const char *name=0 ); + TQStyleSheet( TQObject *parent=0, const char *name=0 ); virtual ~TQStyleSheet(); static TQStyleSheet* defaultSheet(); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqtaddons_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqtaddons_x11.cpp index 4ad21996c..81d10ac42 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqtaddons_x11.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqtaddons_x11.cpp @@ -100,11 +100,11 @@ XftDraw *XftDrawCreateAlpha( Display *display, XRenderPictFormat *format = 0; XRenderPictFormat req; - unsigned long tqmask = PictFormatType | PictFormatDepth | PictFormatAlphaMask; + unsigned long mask = PictFormatType | PictFormatDepth | PictFormatAlphaMask; req.type = PictTypeDirect; req.depth = depth; req.direct.alphaMask = 0xff; - format = XRenderFindFormat(draw->dpy, tqmask, &req, 0); + format = XRenderFindFormat(draw->dpy, mask, &req, 0); if (format) { draw->render.pict = XRenderCreatePicture(draw->dpy, draw->drawable, format, 0, 0); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqtimer.cpp b/experimental/tqtinterface/qt4/src/kernel/tqtimer.cpp index 7062b6a49..c3ddda597 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqtimer.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqtimer.cpp @@ -61,7 +61,7 @@ emit the timeout() signal. Note that a TQTimer object is destroyed automatically when its - tqparent object is destroyed. + parent object is destroyed. Example: \code @@ -113,14 +113,14 @@ static const int INV_TIMER = -1; // invalid timer id /*! - Constructs a timer called \a name, with the tqparent \a tqparent. + Constructs a timer called \a name, with the parent \a parent. - Note that the tqparent object's destructor will destroy this timer + Note that the parent object's destructor will destroy this timer object. */ -TQTimer::TQTimer( TQT_BASE_OBJECT_NAME *tqparent, const char *name ) - : TQObject( tqparent, name ), id(INV_TIMER), single(0), nulltimer(0) +TQTimer::TQTimer( TQT_BASE_OBJECT_NAME *parent, const char *name ) + : TQObject( parent, name ), id(INV_TIMER), single(0), nulltimer(0) { } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqtimer.h b/experimental/tqtinterface/qt4/src/kernel/tqtimer.h index 1d2398ac2..111daf48d 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqtimer.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqtimer.h @@ -51,7 +51,7 @@ class TQ_EXPORT TQTimer : public TQObject Q_OBJECT TQ_OBJECT public: - TQTimer( TQT_BASE_OBJECT_NAME *tqparent=0, const char *name=0 ); + TQTimer( TQT_BASE_OBJECT_NAME *parent=0, const char *name=0 ); ~TQTimer(); bool isActive() const; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqtranslator.cpp b/experimental/tqtinterface/qt4/src/kernel/tqtranslator.cpp index fabbb98ef..4a3e34ec0 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqtranslator.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqtranslator.cpp @@ -1304,11 +1304,11 @@ extern int qt_ntfs_permission_lookup; /*! Constructs an empty message file object that is not connected to - any file. The object is called \a name with tqparent \a tqparent. + any file. The object is called \a name with parent \a parent. */ -TQTranslator::TQTranslator( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ) +TQTranslator::TQTranslator( TQObject * parent, const char * name ) + : TQObject( parent, name ) { d = new TQTranslatorPrivate; #if defined(TQ_WS_WIN) diff --git a/experimental/tqtinterface/qt4/src/kernel/tqtranslator.h b/experimental/tqtinterface/qt4/src/kernel/tqtranslator.h index 67135681b..e1726ce59 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqtranslator.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqtranslator.h @@ -123,7 +123,7 @@ class TQ_EXPORT TQTranslator: public QTranslator, virtual public TQt Q_OBJECT TQ_OBJECT public: - TQTranslator( TQObject * tqparent = 0, const char * name = 0 ) : QTranslator( tqparent ) { setObjectName(QString::fromAscii(name)); } + TQTranslator( TQObject * parent = 0, const char * name = 0 ) : QTranslator( parent ) { setObjectName(QString::fromAscii(name)); } // inline TQString find(const char *context, const char *sourceText, const char * comment = 0) const { return translate(context, sourceText, comment); } @@ -218,7 +218,7 @@ class TQ_EXPORT TQTranslator: public TQObject Q_OBJECT TQ_OBJECT public: - TQTranslator( TQObject * tqparent = 0, const char * name = 0 ); + TQTranslator( TQObject * parent = 0, const char * name = 0 ); ~TQTranslator(); #ifndef TQT_NO_COMPAT diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp b/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp index c6523df35..31b7fc92d 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp @@ -217,11 +217,11 @@ void TQWidget::destroyInputContext( void ) { printf("[TQT UNIMPLEMENTED CALL] destroyInputContext()\n\r"); } -TQWidget::TQWidget( QWidget* tqparent, const char* name, WFlags f ) : QWidget( tqparent, (Qt::WindowFlags)(f&(~WTQtFlagMask)) ), TQtUpperWidgetFlags((WFlags)0) { +TQWidget::TQWidget( QWidget* parent, const char* name, WFlags f ) : QWidget( parent, (Qt::WindowFlags)(f&(~WTQtFlagMask)) ), TQtUpperWidgetFlags((WFlags)0) { TQtUpperWidgetFlags = f & WTQtFlagMask; TQT_TQWIDGET_REQUIRED_INITIALIZATION static_cast<QWidget*>(this)->setObjectName(QString::fromAscii(name)); - TQT_TQOBJECT_REQUIRED_INITIALIZATION(tqparent) + TQT_TQOBJECT_REQUIRED_INITIALIZATION(parent) } void TQWidget::setActiveWindow( void ) { @@ -286,7 +286,7 @@ void TQWidget::setName(const char *aName) { TQWidget *TQWidget::parentWidget( bool sameWindow ) { TQ_UNUSED(sameWindow); - return static_cast<TQWidget*>(this->parent()); + return static_cast<TQWidget*>(this->QWidget::parent()); } bool TQWidget::isDialog() const { @@ -984,11 +984,11 @@ void TQWidget::createTLExtra() /*! \property TQWidget::autoMask - \brief whether the auto tqmask feature is enabled for the widget + \brief whether the auto mask feature is enabled for the widget - Transtqparent widgets use a tqmask to define their visible region. + Transparent widgets use a mask to define their visible region. TQWidget has some built-in support to make the task of - recalculating the tqmask easier. When setting auto tqmask to TRUE, + recalculating the mask easier. When setting auto mask to TRUE, updateMask() will be called whenever the widget is resized or changes its focus state. Note that you must reimplement updateMask() (which should include a call to setMask()) or nothing @@ -996,7 +996,7 @@ void TQWidget::createTLExtra() Note: when you re-implement resizeEvent(), focusInEvent() or focusOutEvent() in your custom widgets and still want to ensure - that the auto tqmask calculation works, you should add: + that the auto mask calculation works, you should add: \code if ( autoMask() ) @@ -1005,17 +1005,17 @@ void TQWidget::createTLExtra() at the end of your event handlers. This is true for all member functions that change the appearance of the widget in a way that - requires a recalculation of the tqmask. + requires a recalculation of the mask. While being a technically appealing concept, masks have a big drawback: when using complex masks that cannot be expressed easily with relatively simple regions, they can be very slow on some - window systems. The classic example is a transtqparent label. The + window systems. The classic example is a transparent label. The complex tqshape of its contents makes it necessary to represent its - tqmask by a bitmap, which consumes both memory and time. If all you + mask by a bitmap, which consumes both memory and time. If all you want is to blend the background of several neighboring widgets together seamlessly, you will probably want to use - setBackgroundOrigin() rather than a tqmask. + setBackgroundOrigin() rather than a mask. \sa autoMask() updateMask() setMask() clearMask() setBackgroundOrigin() */ @@ -1048,7 +1048,7 @@ void TQWidget::setFocus(TQFocusEvent::Reason reason) setFocus((Qt::FocusReason)reason); } -TQObject *TQWidget::tqparent() const { +TQObject *TQWidget::parent() const { return TQT_TQOBJECT(parent()); } @@ -1388,8 +1388,8 @@ const TQPixmap TQWidget::iconPixmap() const { /*! This function can be reimplemented in a subclass to support - transtqparent widgets. It should be called whenever a widget changes - state in a way that means that the tqshape tqmask must be recalculated. + transparent widgets. It should be called whenever a widget changes + state in a way that means that the tqshape mask must be recalculated. \sa setAutoMask(), updateMask(), setMask(), clearMask() */ @@ -2054,7 +2054,7 @@ void TQWidget::mouseDoubleClickEvent( TQMouseEvent *e ) If you reimplement this handler, it is very important that you \link TQWheelEvent ignore()\endlink the event if you do not handle - it, so that the widget's tqparent can interpret it. + it, so that the widget's parent can interpret it. The default implementation ignores the event. @@ -2074,7 +2074,7 @@ void TQWidget::wheelEvent( TQWheelEvent *e ) If you reimplement this handler, it is very important that you \link TQTabletEvent ignore()\endlink the event if you do not handle - it, so that the widget's tqparent can interpret it. + it, so that the widget's parent can interpret it. The default implementation ignores the event. @@ -2096,10 +2096,10 @@ void TQWidget::tabletEvent( TQTabletEvent *e ) If you reimplement this handler, it is very important that you explicitly \link TQKeyEvent::ignore() ignore\endlink the event - if you do not understand it, so that the widget's tqparent can + if you do not understand it, so that the widget's parent can interpret it; otherwise, the event will be implicitly accepted. Although top-level widgets are able to choose whether to accept - or ignore unknown events because they have no tqparent widgets that + or ignore unknown events because they have no parent widgets that could otherwise handle them, it is good practice to explicitly ignore events to make widgets as reusable as possible. @@ -2130,7 +2130,7 @@ void TQWidget::keyPressEvent( TQKeyEvent *e ) If you reimplement this handler, it is very important that you \link TQKeyEvent ignore()\endlink the release if you do not - understand it, so that the widget's tqparent can interpret it. + understand it, so that the widget's parent can interpret it. The default implementation ignores the event. @@ -2748,26 +2748,26 @@ WState TQWidget::testWState( TQt::WidgetState s ) const { keyboard and other events from the window system, and paints a representation of itself on the screen. Every widget is rectangular, and they are sorted in a Z-order. A widget is - clipped by its tqparent and by the widgets in front of it. + clipped by its parent and by the widgets in front of it. - A widget that isn't embedded in a tqparent widget is called a + A widget that isn't embedded in a parent widget is called a top-level widget. Usually, top-level widgets are windows with a frame and a title bar (although it is also possible to create top-level widgets without such decoration if suitable widget flags are used). In TQt, TQMainWindow and the various subclasses of TQDialog are the most common top-level windows. - A widget without a tqparent widget is always a top-level widget. + A widget without a parent widget is always a top-level widget. Non-top-level widgets are child widgets. These are child windows - in their tqparent widgets. You cannot usually distinguish a child - widget from its tqparent visually. Most other widgets in TQt are + in their parent widgets. You cannot usually distinguish a child + widget from its parent visually. Most other widgets in TQt are useful only as child widgets. (It is possible to make, say, a button into a top-level widget, but most people prefer to put their buttons inside other widgets, e.g. TQDialog.) If you want to use a TQWidget to hold child widgets you will - probably want to add a tqlayout to the tqparent TQWidget. (See \link + probably want to add a tqlayout to the parent TQWidget. (See \link tqlayout.html Layouts\endlink.) TQWidget has many member functions, but some of them have little @@ -2949,10 +2949,10 @@ WState TQWidget::testWState( TQt::WidgetState s ) const { Every widget's constructor accepts two or three standard arguments: \list 1 - \i \c{TQWidget *tqparent = 0} is the tqparent of the new widget. + \i \c{TQWidget *parent = 0} is the parent of the new widget. If it is 0 (the default), the new widget will be a top-level window. - If not, it will be a child of \e tqparent, and be constrained by \e - tqparent's tqgeometry (unless you specify \c WType_TopLevel as + If not, it will be a child of \e parent, and be constrained by \e + parent's tqgeometry (unless you specify \c WType_TopLevel as widget flag). \i \c{const char *name = 0} is the widget name of the new widget. You can access it using name(). The widget name is little @@ -3015,7 +3015,7 @@ WState TQWidget::testWState( TQt::WidgetState s ) const { If your widget only contains child widgets, you probably do not need to implement any event handlers. If you want to detect a mouse click in a child widget call the child's hasMouse() function inside the - tqparent widget's mousePressEvent(). + parent widget's mousePressEvent(). Widgets that accept keyboard input need to reimplement a few more event handlers: @@ -3070,7 +3070,7 @@ WState TQWidget::testWState( TQt::WidgetState s ) const { space. \i moveEvent() - called when the widget has been moved relative to its - tqparent. + parent. \i closeEvent() - called when the user closes the widget (or when close() is called). @@ -3258,7 +3258,7 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) { \i WState_Reparented The widget has been reparented. \i WState_ConfigPending A configuration (resize/move) event is pending. \i WState_Resized The widget has been resized. - \i WState_AutoMask The widget has an automatic tqmask, see setAutoMask(). + \i WState_AutoMask The widget has an automatic mask, see setAutoMask(). \i WState_Polished The widget has been "polished" (i.e. late initialization) by a TQStyle. \i WState_DND The widget supports drag and drop, see setAcceptDrops(). @@ -3294,11 +3294,11 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) { window that should be decorated as a dialog (i.e. typically no maximize or minimize buttons in the title bar). If you want to use it as a modal dialog it should be launched from another window, or - have a tqparent and this flag should be combined with \c WShowModal. + have a parent and this flag should be combined with \c WShowModal. If you make it modal, the dialog will prevent other top-level windows in the application from getting any input. \c WType_Dialog implies \c WType_TopLevel. We refer to a top-level window that has - a tqparent as a \e secondary window. (See also \c WGroupLeader.) + a parent as a \e secondary window. (See also \c WGroupLeader.) \value WType_Popup indicates that this widget is a popup top-level window, i.e. that it is modal, but has a window system @@ -3358,8 +3358,8 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) { \value WStyle_Tool makes the window a tool window. A tool window is often a small window with a smaller than usual title bar and decoration, typically used for collections of tool buttons. It - there is a tqparent, the tool window will always be kept on top of - it. If there isn't a tqparent, you may consider passing \c + there is a parent, the tool window will always be kept on top of + it. If there isn't a parent, you may consider passing \c WStyle_StaysOnTop as well. If the window system supports it, a tool window can be decorated with a somewhat lighter frame. It can also be combined with \c WStyle_NoBorder. @@ -3370,9 +3370,9 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) { this flag to work correctly. \value WStyle_Dialog indicates that the window is a logical - subwindow of its tqparent (i.e. a dialog). The window will not get - its own taskbar entry and will be kept on top of its tqparent by the - window system. Usually it will also be minimized when the tqparent + subwindow of its parent (i.e. a dialog). The window will not get + its own taskbar entry and will be kept on top of its parent by the + window system. Usually it will also be minimized when the parent is minimized. If not customized, the window is decorated with a slightly simpler title bar. This is the flag TQDialog uses. @@ -3400,7 +3400,7 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) { system tqrepaint events directly. (This tends to produce more events and smaller tqrepaint regions.) - \value WMouseNoMask indicates that even if the widget has a tqmask, + \value WMouseNoMask indicates that even if the widget has a mask, it wants mouse events for its entire rectangle. \value WStaticContents indicates that the widget contents are @@ -3415,11 +3415,11 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) { \value WResizeNoErase this value is obsolete; use WNoAutoErase instead. \value WRepaintNoErase this value is obsolete; use WNoAutoErase instead. \value WGroupLeader makes this window a group leader. A group - leader should \e not have a tqparent (i.e. it should be a top-level + leader should \e not have a parent (i.e. it should be a top-level window). Any decendant windows (direct or indirect) of a group leader are in its group; other windows are not. If you show a secondary window from the group (i.e. show a window whose top-most - tqparent is a group leader), that window will be modal with respect + parent is a group leader), that window will be modal with respect to the other windows in the group, but modeless with respect to windows in other groups. @@ -3495,19 +3495,19 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) { */ /*! - Constructs a widget which is a child of \a tqparent, with the name + Constructs a widget which is a child of \a parent, with the name \a name and widget flags set to \a f. - If \a tqparent is 0, the new widget becomes a top-level window. If - \a tqparent is another widget, this widget becomes a child window - inside \a tqparent. The new widget is deleted when its \a tqparent is + If \a parent is 0, the new widget becomes a top-level window. If + \a parent is another widget, this widget becomes a child window + inside \a parent. The new widget is deleted when its \a parent is deleted. The \a name is sent to the TQObject constructor. The widget flags argument, \a f, is normally 0, but it can be set to customize the window frame of a top-level widget (i.e. \a - tqparent must be 0). To customize the frame, set the \c + parent must be 0). To customize the frame, set the \c WStyle_Customize flag OR'ed with any of the \l TQt::WidgetFlags. If you add a child widget to an already visible widget you must @@ -3526,8 +3526,8 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) { \endcode */ -TQWidget::TQWidget( TQWidget *tqparent, const char *name, WFlags f ) - : TQObject( tqparent, name ), TQPaintDevice( TQInternal::Widget ) +TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f ) + : TQObject( parent, name ), TQPaintDevice( TQInternal::Widget ) { #if defined(TQT_CHECK_STATE) && !defined(TQ_WS_WIN) if ( tqApp->type() == TQApplication::Tty ) { @@ -3633,7 +3633,7 @@ TQWidget::~TQWidget() if ( isTopLevel() && isShown() && winId() ) hide(); - // A tqparent widget must destroy all its tqchildren before destroying itself + // A parent widget must destroy all its tqchildren before destroying itself if ( childObjects ) { // delete tqchildren objects TQObjectListIt it(*childObjects); TQObject *obj; @@ -3686,7 +3686,7 @@ void TQWidget::destroyMapper() register TQWidget *w; while ( (w=it.current()) ) { // remove parents widgets ++it; - if ( !w->parentObj ) // widget is a tqparent + if ( !w->parentObj ) // widget is a parent w->destroy( TRUE, TRUE ); } delete myMapper; @@ -4048,14 +4048,14 @@ void TQWidget::styleChange( TQStyle& /* oldStyle */ ) TQWidget::isPopup() Popup\endlink and \link TQWidget::isDesktop() desktop\endlink widgets are also top-level widgets. - A top-level widget can have a \link TQWidget::parentWidget() tqparent - widget\endlink. It will then be grouped with its tqparent and deleted - when the tqparent is deleted, minimized when the tqparent is minimized + A top-level widget can have a \link TQWidget::parentWidget() parent + widget\endlink. It will then be grouped with its parent and deleted + when the parent is deleted, minimized when the parent is minimized etc. If supported by the window manager, it will also have a - common taskbar entry with its tqparent. + common taskbar entry with its parent. TQDialog and TQMainWindow widgets are by default top-level, even if - a tqparent widget is specified in the constructor. This behavior is + a parent widget is specified in the constructor. This behavior is specified by the \c WType_TopLevel widget flag. \sa tqtopLevelWidget(), isDialog(), isModal(), isPopup(), isDesktop(), parentWidget() @@ -4066,7 +4066,7 @@ void TQWidget::styleChange( TQStyle& /* oldStyle */ ) \brief whether the widget is a dialog widget A dialog widget is a secondary top-level widget, i.e. a top-level - widget with a tqparent. + widget with a parent. \sa isTopLevel(), TQDialog */ @@ -4307,7 +4307,7 @@ void TQWidget::showNormal() Returns TRUE if this widget would become enabled if \a ancestor is enabled; otherwise returns FALSE. - This is the case if neither the widget itself nor every tqparent up + This is the case if neither the widget itself nor every parent up to but excluding \a ancestor has been explicitly disabled. isEnabledTo(0) is equivalent to isEnabled(). @@ -4506,7 +4506,7 @@ void TQWidget::windowActivationChange( bool ) /*! \property TQWidget::frameGeometry - \brief tqgeometry of the widget relative to its tqparent including any + \brief tqgeometry of the widget relative to its parent including any window frame See the \link tqgeometry.html Window Geometry documentation\endlink @@ -4530,7 +4530,7 @@ TQRect TQWidget::frameGeometry() const } /*! \property TQWidget::x - \brief the x coordinate of the widget relative to its tqparent including + \brief the x coordinate of the widget relative to its parent including any window frame See the \link tqgeometry.html Window Geometry documentation\endlink @@ -4551,7 +4551,7 @@ int TQWidget::x() const /*! \property TQWidget::y - \brief the y coordinate of the widget relative to its tqparent and + \brief the y coordinate of the widget relative to its parent and including any window frame See the \link tqgeometry.html Window Geometry documentation\endlink @@ -4572,7 +4572,7 @@ int TQWidget::y() const /*! \property TQWidget::pos - \brief the position of the widget within its tqparent widget + \brief the position of the widget within its parent widget If the widget is a top-level widget, the position is that of the widget on the desktop, including its frame. @@ -4607,7 +4607,7 @@ TQPoint TQWidget::pos() const /*! \property TQWidget::tqgeometry - \brief the tqgeometry of the widget relative to its tqparent and + \brief the tqgeometry of the widget relative to its parent and excluding the window frame When changing the tqgeometry, the widget, if visible, receives a @@ -4937,18 +4937,18 @@ void TQWidget::setFixedHeight( int h ) /*! Translates the widget coordinate \a pos to the coordinate system - of \a tqparent. The \a tqparent must not be 0 and must be a tqparent + of \a parent. The \a parent must not be 0 and must be a parent of the calling widget. \sa mapFrom() mapToParent() mapToGlobal() hasMouse() */ -TQPoint TQWidget::mapTo( TQWidget * tqparent, const TQPoint & pos ) const +TQPoint TQWidget::mapTo( TQWidget * parent, const TQPoint & pos ) const { TQPoint p = pos; - if ( tqparent ) { + if ( parent ) { const TQWidget * w = this; - while ( w != tqparent ) { + while ( w != parent ) { p = w->mapToParent( p ); w = w->parentWidget(); } @@ -4959,18 +4959,18 @@ TQPoint TQWidget::mapTo( TQWidget * tqparent, const TQPoint & pos ) const /*! Translates the widget coordinate \a pos from the coordinate system - of \a tqparent to this widget's coordinate system. The \a tqparent - must not be 0 and must be a tqparent of the calling widget. + of \a parent to this widget's coordinate system. The \a parent + must not be 0 and must be a parent of the calling widget. \sa mapTo() mapFromParent() mapFromGlobal() hasMouse() */ -TQPoint TQWidget::mapFrom( TQWidget * tqparent, const TQPoint & pos ) const +TQPoint TQWidget::mapFrom( TQWidget * parent, const TQPoint & pos ) const { TQPoint p( pos ); - if ( tqparent ) { + if ( parent ) { const TQWidget * w = this; - while ( w != tqparent ) { + while ( w != parent ) { p = w->mapFromParent( p ); w = w->parentWidget(); } @@ -4981,9 +4981,9 @@ TQPoint TQWidget::mapFrom( TQWidget * tqparent, const TQPoint & pos ) const /*! Translates the widget coordinate \a pos to a coordinate in the - tqparent widget. + parent widget. - Same as mapToGlobal() if the widget has no tqparent. + Same as mapToGlobal() if the widget has no parent. \sa mapFromParent() mapTo() mapToGlobal() hasMouse() */ @@ -4994,10 +4994,10 @@ TQPoint TQWidget::mapToParent( const TQPoint &pos ) const } /*! - Translates the tqparent widget coordinate \a pos to widget + Translates the parent widget coordinate \a pos to widget coordinates. - Same as mapFromGlobal() if the widget has no tqparent. + Same as mapFromGlobal() if the widget has no parent. \sa mapToParent() mapFrom() mapFromGlobal() hasMouse() */ @@ -5535,7 +5535,7 @@ const TQColorGroup &TQWidget::tqcolorGroup() const As long as no special palette has been set, or after unsetPalette() has been called, this is either a special palette for the widget - class, the tqparent's palette or (if this widget is a top level + class, the parent's palette or (if this widget is a top level widget), the default application palette. Instead of defining an entirely new palette, you can also use the @@ -5614,7 +5614,7 @@ void TQWidget::paletteChange( const TQPalette & ) As long as no special font has been set, or after unsetFont() is called, this is either a special font for the widget class, the - tqparent's font or (if this widget is a top level widget), the + parent's font or (if this widget is a top level widget), the default application font. This code fragment sets a 12 point helvetica bold font: @@ -5631,7 +5631,7 @@ void TQWidget::paletteChange( const TQPalette & ) void TQWidget::setFont( const TQFont &font ) { own_font = TRUE; - if ( fnt == font && fnt.d->tqmask == font.d->tqmask ) + if ( fnt == font && fnt.d->mask == font.d->mask ) return; TQFont old = fnt; fnt = font.resolve( qt_naturalWidgetFont( this ) ); @@ -5724,7 +5724,7 @@ void TQWidget::fontChange( const TQFont & ) \endcode If no cursor has been set, or after a call to unsetCursor(), the - tqparent's cursor is used. The function unsetCursor() has no effect + parent's cursor is used. The function unsetCursor() has no effect on top-level widgets. \sa TQApplication::setOverrideCursor() @@ -6066,7 +6066,7 @@ void TQWidget::clearFocus() TQWidget::focusNextPrevChild() only when it reaches the last or first link on the "page". - Child widgets call focusNextPrevChild() on their tqparent widgets, + Child widgets call focusNextPrevChild() on their parent widgets, but only the top-level widget decides where to redirect focus. By overriding this method for an object, you thus gain control of focus traversal for all child widgets. @@ -6257,11 +6257,11 @@ bool TQWidget::isActiveWindow() const } #endif #if defined(TQ_WS_WIN32) - HWND tqparent = tlw->winId(); - HWND toptqparent = GetActiveWindow(); - while ( tqparent ) { - tqparent = ::GetParent( tqparent ); - if ( tqparent && tqparent == toptqparent ) + HWND parent = tlw->winId(); + HWND topparent = GetActiveWindow(); + while ( parent ) { + parent = ::GetParent( parent ); + if ( parent && parent == topparent ) return TRUE; } #endif @@ -6344,7 +6344,7 @@ void TQWidget::setTabOrder( TQWidget* first, TQWidget *second ) /*!\internal Moves the relevant subwidgets of this widget from the \a oldtlw's - tab chain to that of the new tqparent, if there's anything to move and + tab chain to that of the new parent, if there's anything to move and we're really moving This function is called from TQWidget::reparent() *after* the widget @@ -6394,7 +6394,7 @@ void TQWidget::reparentFocusWidgets( TQWidget * oldtlw ) } /*! - \fn void TQWidget::recreate( TQWidget *tqparent, WFlags f, const TQPoint & p, bool showIt ) + \fn void TQWidget::recreate( TQWidget *parent, WFlags f, const TQPoint & p, bool showIt ) \obsolete @@ -6423,7 +6423,7 @@ TQSize TQWidget::frameSize() const \internal Recursive function that updates \a widget and all its tqchildren, - if they have some tqparent background origin. + if they have some parent background origin. */ static void qt_update_bg_recursive( TQWidget *widget ) { @@ -6607,7 +6607,7 @@ void TQWidget::show() if ( !isTopLevel() && !parentWidget()->isVisible() ) { // we should become visible, but one of our ancestors is // explicitly hidden. Since we cleared the ForceHide flag, our - // immediate tqparent will call show() on us again during its + // immediate parent will call show() on us again during its // own processing of show(). if ( wasHidden ) { TQEvent showToParentEvent( TQEvent::ShowToParent ); @@ -6741,14 +6741,14 @@ void TQWidget::hide() tqApp->closePopup( this ); // Move test modal here. Otherwise, a modal dialog could get - // destroyed and we lose all access to its tqparent because we haven't + // destroyed and we lose all access to its parent because we haven't // left modality. (Eg. modal Progress Dialog) if ( testWFlags(WShowModal) ) qt_leave_modal( this ); #if defined(TQ_WS_WIN) if ( isTopLevel() && !isPopup() && parentWidget() && isActiveWindow() ) - parentWidget()->setActiveWindow(); // Activate tqparent + parentWidget()->setActiveWindow(); // Activate parent #endif hideWindow(); @@ -6772,7 +6772,7 @@ void TQWidget::hide() TQApplication::sendEvent( this, &hideToParentEvent ); } - // post tqlayout hint for non toplevels. The tqparent widget check is + // post tqlayout hint for non toplevels. The parent widget check is // necessary since the function is called in the destructor if ( !isTopLevel() && parentWidget() ) TQApplication::postEvent( parentWidget(), @@ -6873,7 +6873,7 @@ void TQWidget::polish() if ( isTopLevel() ) { const TQPixmap *pm = icon(); if ( !pm || pm->isNull() ) { - TQWidget *mw = (TQWidget *)tqparent(); + TQWidget *mw = (TQWidget *)parent(); pm = mw ? mw->icon() : 0; if ( pm && !pm->isNull() ) setIcon( *pm ); @@ -7018,7 +7018,7 @@ bool TQWidget::close( bool alsoDelete ) \property TQWidget::visible \brief whether the widget is visible - Calling show() sets the widget to visible status if all its tqparent + Calling show() sets the widget to visible status if all its parent widgets up to the top-level widget are visible. If an ancestor is not visible, the widget won't become visible until all its ancestors are shown. @@ -7051,7 +7051,7 @@ bool TQWidget::close( bool alsoDelete ) Returns TRUE if this widget would become visible if \a ancestor is shown; otherwise returns FALSE. - The TRUE case occurs if neither the widget itself nor any tqparent + The TRUE case occurs if neither the widget itself nor any parent up to but excluding \a ancestor has been explicitly hidden. This function will still return TRUE if the widget is obscured by @@ -7256,9 +7256,9 @@ TQSize TQWidget::tqminimumSizeHint() const /*! \fn TQWidget *TQWidget::parentWidget( bool sameWindow ) const - Returns the tqparent of this widget, or 0 if it does not have any - tqparent widget. If \a sameWindow is TRUE and the widget is top - level returns 0; otherwise returns the widget's tqparent. + Returns the parent of this widget, or 0 if it does not have any + parent widget. If \a sameWindow is TRUE and the widget is top + level returns 0; otherwise returns the widget's parent. */ /*! @@ -7742,7 +7742,7 @@ void TQWidget::mouseDoubleClickEvent( TQMouseEvent *e ) If you reimplement this handler, it is very important that you \link TQWheelEvent ignore()\endlink the event if you do not handle - it, so that the widget's tqparent can interpret it. + it, so that the widget's parent can interpret it. The default implementation ignores the event. @@ -7762,7 +7762,7 @@ void TQWidget::wheelEvent( TQWheelEvent *e ) If you reimplement this handler, it is very important that you \link TQTabletEvent ignore()\endlink the event if you do not handle - it, so that the widget's tqparent can interpret it. + it, so that the widget's parent can interpret it. The default implementation ignores the event. @@ -7784,10 +7784,10 @@ void TQWidget::tabletEvent( TQTabletEvent *e ) If you reimplement this handler, it is very important that you explicitly \link TQKeyEvent::ignore() ignore\endlink the event - if you do not understand it, so that the widget's tqparent can + if you do not understand it, so that the widget's parent can interpret it; otherwise, the event will be implicitly accepted. Although top-level widgets are able to choose whether to accept - or ignore unknown events because they have no tqparent widgets that + or ignore unknown events because they have no parent widgets that could otherwise handle them, it is good practice to explicitly ignore events to make widgets as reusable as possible. @@ -7818,7 +7818,7 @@ void TQWidget::keyPressEvent( TQKeyEvent *e ) If you reimplement this handler, it is very important that you \link TQKeyEvent ignore()\endlink the release if you do not - understand it, so that the widget's tqparent can interpret it. + understand it, so that the widget's parent can interpret it. The default implementation ignores the event. @@ -8285,11 +8285,11 @@ bool TQWidget::qwsEvent( TQWSEvent * ) /*! \property TQWidget::autoMask - \brief whether the auto tqmask feature is enabled for the widget + \brief whether the auto mask feature is enabled for the widget - Transtqparent widgets use a tqmask to define their visible region. + Transparent widgets use a mask to define their visible region. TQWidget has some built-in support to make the task of - recalculating the tqmask easier. When setting auto tqmask to TRUE, + recalculating the mask easier. When setting auto mask to TRUE, updateMask() will be called whenever the widget is resized or changes its focus state. Note that you must reimplement updateMask() (which should include a call to setMask()) or nothing @@ -8297,7 +8297,7 @@ bool TQWidget::qwsEvent( TQWSEvent * ) Note: when you re-implement resizeEvent(), focusInEvent() or focusOutEvent() in your custom widgets and still want to ensure - that the auto tqmask calculation works, you should add: + that the auto mask calculation works, you should add: \code if ( autoMask() ) @@ -8306,17 +8306,17 @@ bool TQWidget::qwsEvent( TQWSEvent * ) at the end of your event handlers. This is true for all member functions that change the appearance of the widget in a way that - requires a recalculation of the tqmask. + requires a recalculation of the mask. While being a technically appealing concept, masks have a big drawback: when using complex masks that cannot be expressed easily with relatively simple regions, they can be very slow on some - window systems. The classic example is a transtqparent label. The + window systems. The classic example is a transparent label. The complex tqshape of its contents makes it necessary to represent its - tqmask by a bitmap, which consumes both memory and time. If all you + mask by a bitmap, which consumes both memory and time. If all you want is to blend the background of several neighboring widgets together seamlessly, you will probably want to use - setBackgroundOrigin() rather than a tqmask. + setBackgroundOrigin() rather than a mask. \sa autoMask() updateMask() setMask() clearMask() setBackgroundOrigin() */ @@ -8348,9 +8348,9 @@ void TQWidget::setAutoMask( bool enable ) The pixmap is drawn using the: \value WidgetOrigin widget's coordinate system. - \value ParentOrigin tqparent's coordinate system. + \value ParentOrigin parent's coordinate system. \value WindowOrigin top-level window's coordinate system. - \value AncestorOrigin same origin as the tqparent uses. + \value AncestorOrigin same origin as the parent uses. */ /*! @@ -8385,8 +8385,8 @@ void TQWidget::setBackgroundOrigin( BackgroundOrigin origin ) /*! This function can be reimplemented in a subclass to support - transtqparent widgets. It should be called whenever a widget changes - state in a way that means that the tqshape tqmask must be recalculated. + transparent widgets. It should be called whenever a widget changes + state in a way that means that the tqshape mask must be recalculated. \sa setAutoMask(), updateMask(), setMask(), clearMask() */ @@ -8620,22 +8620,22 @@ void TQWidget::updateGeometry() /*! - Reparents the widget. The widget gets a new \a tqparent, new widget + Reparents the widget. The widget gets a new \a parent, new widget flags (\a f, but as usual, use 0) at a new position in its new - tqparent (\a p). + parent (\a p). If \a showIt is TRUE, show() is called once the widget has been reparented. - If the new tqparent widget is in a different top-level widget, the + If the new parent widget is in a different top-level widget, the reparented widget and its tqchildren are appended to the end of the - \link setFocusPolicy() tab chain \endlink of the new tqparent + \link setFocusPolicy() tab chain \endlink of the new parent widget, in the same internal order as before. If one of the moved widgets had keyboard focus, reparent() calls clearFocus() for that widget. - If the new tqparent widget is in the same top-level widget as the - old tqparent, reparent doesn't change the tab order or keyboard + If the new parent widget is in the same top-level widget as the + old parent, reparent doesn't change the tab order or keyboard focus. \warning It is extremely unlikely that you will ever need this @@ -8646,11 +8646,11 @@ void TQWidget::updateGeometry() \sa getWFlags() */ -void TQWidget::reparent( TQWidget *tqparent, WFlags f, const TQPoint &p, +void TQWidget::reparent( TQWidget *parent, WFlags f, const TQPoint &p, bool showIt ) { - reparentSys( tqparent, f, p, showIt ); - TQEvent e( TQEvent::Retqparent ); + reparentSys( parent, f, p, showIt ); + TQEvent e( TQEvent::Reparent ); TQApplication::sendEvent( this, &e ); if (!own_font) unsetFont(); @@ -8668,20 +8668,20 @@ void TQWidget::reparent( TQWidget *tqparent, WFlags f, const TQPoint &p, A convenience version of reparent that does not take widget flags as argument. - Calls reparent(\a tqparent, getWFlags() \& ~\l WType_Mask, \a p, \a + Calls reparent(\a parent, getWFlags() \& ~\l WType_Mask, \a p, \a showIt). */ -void TQWidget::reparent( TQWidget *tqparent, const TQPoint & p, +void TQWidget::reparent( TQWidget *parent, const TQPoint & p, bool showIt ) { - reparent( tqparent, getWFlags() & ~WType_Mask, p, showIt ); + reparent( parent, getWFlags() & ~WType_Mask, p, showIt ); } /*! \property TQWidget::ownCursor \brief whether the widget uses its own cursor - If FALSE, the widget uses its tqparent widget's cursor. + If FALSE, the widget uses its parent widget's cursor. \sa cursor */ @@ -8690,7 +8690,7 @@ void TQWidget::reparent( TQWidget *tqparent, const TQPoint & p, \property TQWidget::ownFont \brief whether the widget uses its own font - If FALSE, the widget uses its tqparent widget's font. + If FALSE, the widget uses its parent widget's font. \sa font */ @@ -8699,7 +8699,7 @@ void TQWidget::reparent( TQWidget *tqparent, const TQPoint & p, \property TQWidget::ownPalette \brief whether the widget uses its own palette - If FALSE, the widget uses its tqparent widget's palette. + If FALSE, the widget uses its parent widget's palette. \sa palette */ @@ -8737,16 +8737,16 @@ void TQDesktopWidget::insertChild( TQObject *obj ) \brief The level of opacity for the window. The valid range of opacity is from 1.0 (completely opaque) to - 0.0 (completely transtqparent). + 0.0 (completely transparent). By default the value of this property is 1.0. This feature is only present on Mac OS X and Windows 2000 and up. - \warning Changing this property from opaque to transtqparent might issue a + \warning Changing this property from opaque to transparent might issue a paint event that needs to be processed before the window is displayed correctly. This affects mainly the use of TQPixmap::grabWindow(). Also note - that semi-transtqparent windows update and resize significantely slower than + that semi-transparent windows update and resize significantely slower than opaque windows. */ diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidget.h b/experimental/tqtinterface/qt4/src/kernel/tqwidget.h index 6af93ed35..d5f9cb5ff 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwidget.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqwidget.h @@ -87,7 +87,7 @@ struct TQTLWExtra : public QTLWExtra, virtual public TQt uint ussize : 1; // User defined size #if defined(TQ_WS_X11) - WId parentWinId; // tqparent window Id (valid after reparenting) + WId parentWinId; // parent window Id (valid after reparenting) #endif }; @@ -190,7 +190,7 @@ class TQ_EXPORT TQWidget : public QWidget, virtual public TQt Q_OBJECT TQ_OBJECT public: - TQObject *tqparent() const; + TQObject *parent() const; TQObjectList childrenListObject(); const TQObjectList childrenListObject() const; @@ -207,7 +207,7 @@ public: // TQWidget methods public: - TQWidget( QWidget* tqparent=0, const char* name=0, WFlags f=0 ); + TQWidget( QWidget* parent=0, const char* name=0, WFlags f=0 ); void setWState( uint state ); void clearWState( uint flags ); @@ -592,7 +592,7 @@ public: X11WindowTypePopup }; void x11SetWindowType( X11WindowType type = X11WindowTypeSelect ); - void x11SetWindowTransient( TQWidget* tqparent ); + void x11SetWindowTransient( TQWidget* parent ); #endif }; @@ -676,7 +676,7 @@ class TQ_EXPORT TQWidget : public TQObject, public TQPaintDevice Q_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false ) public: - TQ_EXPLICIT TQWidget( TQWidget* tqparent=0, const char* name=0, WFlags f=0 ); + TQ_EXPLICIT TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0 ); ~TQWidget(); WId winId() const; @@ -946,13 +946,13 @@ public: TQLayout * tqlayout() const { return lay_out; } #endif void updateGeometry(); - virtual void reparent( TQWidget *tqparent, WFlags, const TQPoint &, + virtual void reparent( TQWidget *parent, WFlags, const TQPoint &, bool showIt=FALSE ); - void reparent( TQWidget *tqparent, const TQPoint &, + void reparent( TQWidget *parent, const TQPoint &, bool showIt=FALSE ); #ifndef TQT_NO_COMPAT - void recreate( TQWidget *tqparent, WFlags f, const TQPoint & p, - bool showIt=FALSE ) { reparent(tqparent,f,p,showIt); } + void recreate( TQWidget *parent, WFlags f, const TQPoint & p, + bool showIt=FALSE ) { reparent(parent,f,p,showIt); } #endif void erase(); @@ -1019,7 +1019,7 @@ public: X11WindowTypePopup }; void x11SetWindowType( X11WindowType type = X11WindowTypeSelect ); - void x11SetWindowTransient( TQWidget* tqparent ); + void x11SetWindowTransient( TQWidget* parent ); #endif void setWindowOpacity(double level); double windowOpacity() const; @@ -1180,7 +1180,7 @@ private: void hideWindow(); void showChildren( bool spontaneous ); void hideChildren( bool spontaneous ); - void reparentSys( TQWidget *tqparent, WFlags, const TQPoint &, bool showIt); + void reparentSys( TQWidget *parent, WFlags, const TQPoint &, bool showIt); void createTLExtra(); void createExtra(); void deleteExtra(); @@ -1434,8 +1434,8 @@ inline void TQWidget::drawText( const TQPoint &p, const TQString &s ) inline TQWidget *TQWidget::parentWidget( bool sameWindow ) const { if ( sameWindow ) - return isTopLevel() ? 0 : (TQWidget *)TQObject::tqparent(); - return (TQWidget *)TQObject::tqparent(); + return isTopLevel() ? 0 : (TQWidget *)TQObject::parent(); + return (TQWidget *)TQObject::parent(); } inline TQWidgetMapper *TQWidget::wmapper() @@ -1530,7 +1530,7 @@ struct TQ_EXPORT TQTLWExtra { uint savedFlags; // Save widgetflags while showing fullscreen short basew, baseh; // base sizes #if defined(TQ_WS_X11) - WId parentWinId; // tqparent window Id (valid after reparenting) + WId parentWinId; // parent window Id (valid after reparenting) uint embedded : 1; // window is embedded in another TQt application uint spont_unmapped: 1; // window was spontaneously unmapped uint reserved: 1; // reserved @@ -1600,7 +1600,7 @@ struct TQ_EXPORT TQWExtra { uint compress_events : 1; #endif #if defined(TQ_WS_TQWS) || defined(TQ_WS_MAC) - TQRegion tqmask; // widget tqmask + TQRegion mask; // widget mask #endif char bg_mode; // background mode char bg_mode_visual; // visual background mode diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp index 60df4121f..532a372e8 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp @@ -189,7 +189,7 @@ void TQWidget::setMask( const QBitmap bitmap ) fixerUpper.drawLine(0, fixedBitmap.height()-1, fixedBitmap.width()-1, fixedBitmap.height()-1); fixerUpper.drawLine(fixedBitmap.width()-1, 0, fixedBitmap.width()-1, fixedBitmap.height()-1); fixerUpper.end(); - QWidget::setMask(fixedBitmap.mask()); + QWidget::setMask(fixedBitmap.QBitmap::mask()); } /*! @@ -395,9 +395,9 @@ void TQWidget::sendMouseEventToInputContext( int x, TQEvent::Type type, TQt::But #endif } -void TQWidget::x11SetWindowTransient( TQWidget* tqparent ) +void TQWidget::x11SetWindowTransient( TQWidget* parent ) { - XSetTransientForHint( x11Display(), winId(), tqparent->winId()); + XSetTransientForHint( x11Display(), winId(), parent->winId()); } // Sets the EWMH (netwm) window type. Needed as a separate function @@ -551,7 +551,7 @@ extern int qt_curr_events_stylus; extern int qt_curr_events_eraser; #endif -const uint stdWidgetEventMask = // X event tqmask +const uint stdWidgetEventMask = // X event mask (uint)( KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | @@ -564,7 +564,7 @@ const uint stdWidgetEventMask = // X event tqmask StructureNotifyMask ); -const uint stdDesktopEventMask = // X event tqmask +const uint stdDesktopEventMask = // X event mask (uint)( KeymapStateMask | EnterWindowMask | LeaveWindowMask | @@ -577,13 +577,13 @@ const uint stdDesktopEventMask = // X event tqmask */ Window qt_XCreateWindow( const TQWidget *creator, - Display *display, Window tqparent, + Display *display, Window parent, int x, int y, uint w, uint h, int borderwidth, int depth, uint windowclass, Visual *visual, - ulong valuetqmask, XSetWindowAttributes *attributes ); + ulong valuemask, XSetWindowAttributes *attributes ); Window qt_XCreateSimpleWindow( const TQWidget *creator, - Display *display, Window tqparent, + Display *display, Window parent, int x, int y, uint w, uint h, int borderwidth, ulong border, ulong background ); void qt_XDestroyWindow( const TQWidget *destroyer, @@ -743,7 +743,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) xd->x_defvisual = TQPaintDevice::x11AppDefaultVisual( xd->x_screen ); setX11Data( xd ); } else if ( parentWidget() && parentWidget()->x11Screen() != x11Screen() ) { - // if we have a tqparent widget, move to its screen if necessary + // if we have a parent widget, move to its screen if necessary TQPaintDeviceX11Data* xd = getX11Data( TRUE ); xd->x_screen = parentWidget()->x11Screen(); xd->x_depth = TQPaintDevice::x11AppDepth( xd->x_screen ); @@ -955,7 +955,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) &wsa ); x11SetWindowType(); } else if ( topLevel && !desktop ) { // top-level widget - TQWidget *p = parentWidget(); // real tqparent + TQWidget *p = parentWidget(); // real parent if (p) p = p->tqtopLevelWidget(); @@ -966,7 +966,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) XSetTransientForHint( dpy, id, root_win ); } - // find the real client leader, i.e. a toplevel without tqparent + // find the real client leader, i.e. a toplevel without parent while ( p && p->parentWidget()) p = p->parentWidget()->tqtopLevelWidget(); @@ -1064,7 +1064,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) } setWState( WState_MouseTracking ); - setMouseTracking( FALSE ); // also sets event tqmask + setMouseTracking( FALSE ); // also sets event mask if ( desktop ) { setWState( WState_Visible ); } else if ( topLevel ) { // set X cursor @@ -1158,7 +1158,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows ) } } -void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool showIt ) +void TQWidget::reparentSys( TQWidget *parent, WFlags f, const TQPoint &p, bool showIt ) { extern void qPRCreate( const TQWidget *, Window ); @@ -1179,7 +1179,7 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool clearWState(WState_MouseTracking); TQWidget* oldtlw = tqtopLevelWidget(); - TQWidget *oldtqparent = parentWidget(); + TQWidget *oldparent = parentWidget(); WId old_winid = winid; if ( testWFlags(WType_Desktop) ) old_winid = 0; @@ -1203,14 +1203,14 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool destroySyncCounter(); #endif - if ( isTopLevel() || !tqparent ) // we are toplevel, or reparenting to toplevel + if ( isTopLevel() || !parent ) // we are toplevel, or reparenting to toplevel topData()->parentWinId = 0; - if ( tqparent != parentObj ) { - if ( parentObj ) // remove from tqparent + if ( parent != parentObj ) { + if ( parentObj ) // remove from parent parentObj->removeChild( this ); - if ( tqparent ) // insert into new tqparent - tqparent->insertChild( this ); + if ( parent ) // insert into new parent + parent->insertChild( this ); } bool enable = isEnabled(); // remember status FocusPolicy fp = focusPolicy(); @@ -1221,7 +1221,7 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool widget_flags = f; clearWState( WState_Created | WState_Visible | WState_ForceHide ); create(); - if ( isTopLevel() || (!tqparent || tqparent->isVisible() ) ) + if ( isTopLevel() || (!parent || parent->isVisible() ) ) setWState( WState_ForceHide ); // new widgets do not show up in already visible parents const TQObjectList *chlist = childrenListObject(); @@ -1245,7 +1245,7 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool WM_TRANSIENT_FOR information... unfortunately, some window managers don't handle changing WM_TRANSIENT_FOR before the toplevel window is visible, so we unmap and remap all toplevel-transient tqchildren *after* - the toplevel tqparent has been mapped. thankfully, this is easy in TQt :) + the toplevel parent has been mapped. thankfully, this is easy in TQt :) */ XUnmapWindow(w->x11Display(), w->winId()); XSetTransientForHint(w->x11Display(), w->winId(), winId()); @@ -1288,8 +1288,8 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool reparentFocusWidgets( oldtlw ); // re-register dnd - if (oldtqparent) - oldtqparent->checkChildrenDnd(); + if (oldparent) + oldparent->checkChildrenDnd(); if ( accept_drops ) setAcceptDrops( TRUE ); @@ -1358,9 +1358,9 @@ void TQWidget::x11SetWindowType( X11WindowType type ) XDeleteProperty(x11Display(), winId(), qt_net_wm_window_type); } -void TQWidget::x11SetWindowTransient( TQWidget* tqparent ) +void TQWidget::x11SetWindowTransient( TQWidget* parent ) { - XSetTransientForHint( x11Display(), winId(), tqparent->winId()); + XSetTransientForHint( x11Display(), winId(), parent->winId()); } /*! @@ -1621,11 +1621,11 @@ void TQWidget::setIcon( const TQPixmap &pixmap ) if ( !pixmap.isNull() ) { TQPixmap* pm = new TQPixmap( pixmap ); extra->topextra->icon = pm; - if ( !pm->tqmask() ) + if ( !pm->mask() ) pm->setMask( pm->createHeuristicMask() ); // may do detach() icon_pixmap = pm->handle(); - if ( pm->tqmask() ) - mask_pixmap = pm->tqmask()->handle(); + if ( pm->mask() ) + mask_pixmap = pm->mask()->handle(); } XWMHints *h = XGetWMHints( x11Display(), winId() ); XWMHints wm_hints; @@ -2311,7 +2311,7 @@ void TQWidget::hideWindow() } /*! - Raises this widget to the top of the tqparent widget's stack. + Raises this widget to the top of the parent widget's stack. After this call the widget will be visually in front of any overlapping sibling widgets. @@ -2328,7 +2328,7 @@ void TQWidget::raise() } /*! - Lowers the widget to the bottom of the tqparent widget's stack. + Lowers the widget to the bottom of the parent widget's stack. After this call the widget will be visually behind (and therefore obscured by) any overlapping sibling widgets. @@ -2346,7 +2346,7 @@ void TQWidget::lower() /*! - Places the widget under \a w in the tqparent widget's stack. + Places the widget under \a w in the parent widget's stack. To make this work, the widget itself and \a w must be siblings. @@ -2902,7 +2902,7 @@ void TQWidget::deleteTLSysExtra() } /* - examine the tqchildren of our tqparent up the tree and set the + examine the tqchildren of our parent up the tree and set the tqchildren_use_dnd extra data appropriately... this is used to keep DND enabled for widgets that are reparented and don't have DND enabled, BUT *DO* have tqchildren (or tqchildren of tqchildren ...) with DND enabled... @@ -3040,7 +3040,7 @@ void TQWidget::setMask( const TQRegion& region ) /*! Causes only the pixels of the widget for which \a bitmap has a corresponding 1 bit to be visible. Use TQt::color0 to draw - transtqparent regions and TQt::color1 to draw opaque regions of the + transparent regions and TQt::color1 to draw opaque regions of the bitmap. If the region includes pixels outside the rect() of the widget, @@ -3065,7 +3065,7 @@ void TQWidget::setMask( const TQBitmap &bitmap ) } /*! - Removes any tqmask set by setMask(). + Removes any mask set by setMask(). \sa setMask() */ @@ -3106,7 +3106,7 @@ void TQWidget::updateFrameStrut() const } Atom type_ret; - Window l = winId(), w = winId(), p, r; // target window, it's tqparent, root + Window l = winId(), w = winId(), p, r; // target window, it's parent, root Window *c; int i_unused; unsigned int nc; @@ -3118,11 +3118,11 @@ void TQWidget::updateFrameStrut() const XFree(c); if (! p) { - qWarning("TQWidget::updateFrameStrut(): ERROR - no tqparent"); + qWarning("TQWidget::updateFrameStrut(): ERROR - no parent"); return; } - // if the tqparent window is the root window, an Enlightenment virtual root or + // if the parent window is the root window, an Enlightenment virtual root or // a NET WM virtual root window, stop here data_ret = 0; if (p == r || diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidgetcreate_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqwidgetcreate_x11.cpp index 574374dcb..5bbb7c12f 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwidgetcreate_x11.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqwidgetcreate_x11.cpp @@ -48,22 +48,22 @@ custom versions. */ -Window qt_XCreateWindow( const TQWidget*, Display *display, Window tqparent, +Window qt_XCreateWindow( const TQWidget*, Display *display, Window parent, int x, int y, uint w, uint h, int borderwidth, int depth, uint windowclass, Visual *visual, - ulong valuetqmask, XSetWindowAttributes *attributes ) + ulong valuemask, XSetWindowAttributes *attributes ) { - return XCreateWindow( display, tqparent, x, y, w, h, borderwidth, depth, - windowclass, visual, valuetqmask, attributes ); + return XCreateWindow( display, parent, x, y, w, h, borderwidth, depth, + windowclass, visual, valuemask, attributes ); } -Window qt_XCreateSimpleWindow( const TQWidget*, Display *display, Window tqparent, +Window qt_XCreateSimpleWindow( const TQWidget*, Display *display, Window parent, int x, int y, uint w, uint h, int borderwidth, ulong border, ulong background ) { - return XCreateSimpleWindow( display, tqparent, x, y, w, h, borderwidth, + return XCreateSimpleWindow( display, parent, x, y, w, h, borderwidth, border, background ); } diff --git a/experimental/tqtinterface/qt4/src/network/tqdns.cpp b/experimental/tqtinterface/qt4/src/network/tqdns.cpp index 898ac43a6..4ba3a85ee 100644 --- a/experimental/tqtinterface/qt4/src/network/tqdns.cpp +++ b/experimental/tqtinterface/qt4/src/network/tqdns.cpp @@ -4166,8 +4166,8 @@ void TQDnsDomain::sweep( TQ_UINT32 thisSweep ) // so I can subclass and reimplement the Q_SLOTS. -TQDnsSocket::TQDnsSocket( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ) +TQDnsSocket::TQDnsSocket( TQObject * parent, const char * name ) + : TQObject( parent, name ) { // nothing } diff --git a/experimental/tqtinterface/qt4/src/network/tqftp.cpp b/experimental/tqtinterface/qt4/src/network/tqftp.cpp index 7b6acdd46..78f1ce8c0 100644 --- a/experimental/tqtinterface/qt4/src/network/tqftp.cpp +++ b/experimental/tqtinterface/qt4/src/network/tqftp.cpp @@ -76,7 +76,7 @@ public: CsConnectionRefused }; - TQFtpDTP( TQFtpPI *p, TQObject *tqparent=0, const char *name=0 ); + TQFtpDTP( TQFtpPI *p, TQObject *parent=0, const char *name=0 ); void setData( TQByteArray * ); void setDevice( TQIODevice * ); @@ -163,7 +163,7 @@ class TQFtpPI : public TQObject TQ_OBJECT public: - TQFtpPI( TQObject *tqparent = 0 ); + TQFtpPI( TQObject *parent = 0 ); void connectToHost( const TQString &host, TQ_UINT16 port ); @@ -291,8 +291,8 @@ TQFtpCommand::~TQFtpCommand() * TQFtpDTP implemenatation * *********************************************************************/ -TQFtpDTP::TQFtpDTP( TQFtpPI *p, TQObject *tqparent, const char *name ) : - TQObject( tqparent, name ), +TQFtpDTP::TQFtpDTP( TQFtpPI *p, TQObject *parent, const char *name ) : + TQObject( parent, name ), socket( 0, "TQFtpDTP_socket" ), pi( p ), callWriteData( FALSE ) @@ -629,8 +629,8 @@ void TQFtpDTP::socketBytesWritten( int bytes ) * TQFtpPI implemenatation * *********************************************************************/ -TQFtpPI::TQFtpPI( TQObject *tqparent ) : - TQObject( tqparent ), +TQFtpPI::TQFtpPI( TQObject *parent ) : + TQObject( parent ), rawCommand(FALSE), dtp( this ), commandSocket( 0, "TQFtpPI_socket" ), @@ -1125,7 +1125,7 @@ static void delete_d( const TQFtp* foo ) simply achieved: \code - TQFtp *ftp = new TQFtp( this ); // this is an optional TQObject tqparent + TQFtp *ftp = new TQFtp( this ); // this is an optional TQObject parent ftp->connectToHost( "ftp.trolltech.com" ); ftp->login(); \endcode @@ -1237,13 +1237,13 @@ TQFtp::TQFtp() : TQNetworkProtocol() } /*! - Constructs a TQFtp object. The \a tqparent and \a name parameters + Constructs a TQFtp object. The \a parent and \a name parameters are passed to the TQObject constructor. */ -TQFtp::TQFtp( TQObject *tqparent, const char *name ) : TQNetworkProtocol() +TQFtp::TQFtp( TQObject *parent, const char *name ) : TQNetworkProtocol() { - if ( tqparent ) - tqparent->insertChild( this ); + if ( parent ) + parent->insertChild( this ); TQT_TQOBJECT(this)->setName( name ); init(); } diff --git a/experimental/tqtinterface/qt4/src/network/tqftp.h b/experimental/tqtinterface/qt4/src/network/tqftp.h index ee49afca6..afa746109 100644 --- a/experimental/tqtinterface/qt4/src/network/tqftp.h +++ b/experimental/tqtinterface/qt4/src/network/tqftp.h @@ -67,7 +67,7 @@ class TQM_EXPORT_FTP TQFtp : public TQNetworkProtocol public: TQFtp(); // ### TQt 4.0: get rid of this overload - TQFtp( TQObject *tqparent, const char *name=0 ); + TQFtp( TQObject *parent, const char *name=0 ); virtual ~TQFtp(); int supportedOperations() const; diff --git a/experimental/tqtinterface/qt4/src/network/tqhttp.cpp b/experimental/tqtinterface/qt4/src/network/tqhttp.cpp index 53cdbebf3..6b1f0615b 100644 --- a/experimental/tqtinterface/qt4/src/network/tqhttp.cpp +++ b/experimental/tqtinterface/qt4/src/network/tqhttp.cpp @@ -1189,13 +1189,13 @@ TQHttp::TQHttp() } /*! - Constructs a TQHttp object. The parameters \a tqparent and \a name + Constructs a TQHttp object. The parameters \a parent and \a name are passed on to the TQObject constructor. */ -TQHttp::TQHttp( TQObject* tqparent, const char* name ) +TQHttp::TQHttp( TQObject* parent, const char* name ) { - if ( tqparent ) - tqparent->insertChild( this ); + if ( parent ) + parent->insertChild( this ); setName( name ); init(); } @@ -1203,15 +1203,15 @@ TQHttp::TQHttp( TQObject* tqparent, const char* name ) /*! Constructs a TQHttp object. Subsequent requests are done by connecting to the server \a hostname on port \a port. The - parameters \a tqparent and \a name are passed on to the TQObject + parameters \a parent and \a name are passed on to the TQObject constructor. \sa setHost() */ -TQHttp::TQHttp( const TQString &hostname, TQ_UINT16 port, TQObject* tqparent, const char* name ) +TQHttp::TQHttp( const TQString &hostname, TQ_UINT16 port, TQObject* parent, const char* name ) { - if ( tqparent ) - tqparent->insertChild( this ); + if ( parent ) + parent->insertChild( this ); setName( name ); init(); diff --git a/experimental/tqtinterface/qt4/src/network/tqhttp.h b/experimental/tqtinterface/qt4/src/network/tqhttp.h index 37ab91614..fb20d4fdd 100644 --- a/experimental/tqtinterface/qt4/src/network/tqhttp.h +++ b/experimental/tqtinterface/qt4/src/network/tqhttp.h @@ -173,8 +173,8 @@ class TQM_EXPORT_HTTP TQHttp : public TQNetworkProtocol public: TQHttp(); - TQHttp( TQObject* tqparent, const char* name = 0 ); // ### TQt 4.0: make tqparent=0 and get rid of the TQHttp() constructor - TQHttp( const TQString &hostname, TQ_UINT16 port=80, TQObject* tqparent=0, const char* name = 0 ); + TQHttp( TQObject* parent, const char* name = 0 ); // ### TQt 4.0: make parent=0 and get rid of the TQHttp() constructor + TQHttp( const TQString &hostname, TQ_UINT16 port=80, TQObject* parent=0, const char* name = 0 ); virtual ~TQHttp(); int supportedOperations() const; diff --git a/experimental/tqtinterface/qt4/src/network/tqserversocket.cpp b/experimental/tqtinterface/qt4/src/network/tqserversocket.cpp index bd067b131..02a15b09c 100644 --- a/experimental/tqtinterface/qt4/src/network/tqserversocket.cpp +++ b/experimental/tqtinterface/qt4/src/network/tqserversocket.cpp @@ -86,7 +86,7 @@ public: backlog to specify how many pending connections the server can have. - The \a tqparent and \a name arguments are passed on to the TQObject + The \a parent and \a name arguments are passed on to the TQObject constructor. \warning On Tru64 Unix systems a value of 0 for \a backlog means @@ -95,8 +95,8 @@ public: */ TQServerSocket::TQServerSocket( TQ_UINT16 port, int backlog, - TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) + TQObject *parent, const char *name ) + : TQObject( parent, name ) { d = new TQServerSocketPrivate; init( TQHostAddress(), port, backlog ); @@ -108,7 +108,7 @@ TQServerSocket::TQServerSocket( TQ_UINT16 port, int backlog, only on the given \a address. Use \a backlog to specify how many pending connections the server can have. - The \a tqparent and \a name arguments are passed on to the TQObject + The \a parent and \a name arguments are passed on to the TQObject constructor. \warning On Tru64 Unix systems a value of 0 for \a backlog means @@ -118,8 +118,8 @@ TQServerSocket::TQServerSocket( TQ_UINT16 port, int backlog, TQServerSocket::TQServerSocket( const TQHostAddress & address, TQ_UINT16 port, int backlog, - TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) + TQObject *parent, const char *name ) + : TQObject( parent, name ) { d = new TQServerSocketPrivate; init( address, port, backlog ); @@ -133,14 +133,14 @@ TQServerSocket::TQServerSocket( const TQHostAddress & address, TQ_UINT16 port, use the TQServerSocket class as a wrapper for other socket types (e.g. Unix Domain Sockets under Unix). - The \a tqparent and \a name arguments are passed on to the TQObject + The \a parent and \a name arguments are passed on to the TQObject constructor. \sa setSocket() */ -TQServerSocket::TQServerSocket( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +TQServerSocket::TQServerSocket( TQObject *parent, const char *name ) + : TQObject( parent, name ) { d = new TQServerSocketPrivate; } diff --git a/experimental/tqtinterface/qt4/src/network/tqserversocket.h b/experimental/tqtinterface/qt4/src/network/tqserversocket.h index 5024c6258..d1f4a83b9 100644 --- a/experimental/tqtinterface/qt4/src/network/tqserversocket.h +++ b/experimental/tqtinterface/qt4/src/network/tqserversocket.h @@ -63,10 +63,10 @@ class TQM_EXPORT_NETWORK TQServerSocket : public TQObject TQ_OBJECT public: TQServerSocket( TQ_UINT16 port, int backlog = 1, - TQObject *tqparent=0, const char *name=0 ); + TQObject *parent=0, const char *name=0 ); TQServerSocket( const TQHostAddress & address, TQ_UINT16 port, int backlog = 1, - TQObject *tqparent=0, const char *name=0 ); - TQServerSocket( TQObject *tqparent=0, const char *name=0 ); + TQObject *parent=0, const char *name=0 ); + TQServerSocket( TQObject *parent=0, const char *name=0 ); virtual ~TQServerSocket(); bool ok() const; diff --git a/experimental/tqtinterface/qt4/src/network/tqsocket.cpp b/experimental/tqtinterface/qt4/src/network/tqsocket.cpp index c894f3e2f..8e4d40ab0 100644 --- a/experimental/tqtinterface/qt4/src/network/tqsocket.cpp +++ b/experimental/tqtinterface/qt4/src/network/tqsocket.cpp @@ -393,22 +393,22 @@ qint64 TQSocket::writeData( const char *data, qint64 len ) /*! Creates a TQSocket object in \c TQSocket::Idle state. - The \a tqparent and \a name arguments are passed on to the TQObject + The \a parent and \a name arguments are passed on to the TQObject constructor. Note that a TQApplication must have been constructed before sockets can be used. */ -TQSocket::TQSocket( TQObject *tqparent, const char *name ) +TQSocket::TQSocket( TQObject *parent, const char *name ) #ifdef USE_QT4 : TQIODevice() #else // USE_QT4 - : TQObject( tqparent, name ) + : TQObject( parent, name ) #endif // USE_QT4 { #ifdef USE_QT4 - setParent(tqparent); + setParent(parent); setObjectName(name); #endif // USE_QT4 d = new TQSocketPrivate; diff --git a/experimental/tqtinterface/qt4/src/network/tqsocket.h b/experimental/tqtinterface/qt4/src/network/tqsocket.h index 664356c08..7b9453e84 100644 --- a/experimental/tqtinterface/qt4/src/network/tqsocket.h +++ b/experimental/tqtinterface/qt4/src/network/tqsocket.h @@ -72,7 +72,7 @@ public: ErrSocketRead }; - TQSocket( TQObject *tqparent=0, const char *name=0 ); + TQSocket( TQObject *parent=0, const char *name=0 ); virtual ~TQSocket(); enum State { Idle, HostLookup, Connecting, diff --git a/experimental/tqtinterface/qt4/src/opengl/tqgl.cpp b/experimental/tqtinterface/qt4/src/opengl/tqgl.cpp index 7054e8eb0..77d48092b 100644 --- a/experimental/tqtinterface/qt4/src/opengl/tqgl.cpp +++ b/experimental/tqtinterface/qt4/src/opengl/tqgl.cpp @@ -207,8 +207,8 @@ TQGLFormat::TQGLFormat() \code // The rendering in MyGLWidget depends on using // stencil buffer and alpha channel - MyGLWidget::MyGLWidget( TQWidget* tqparent, const char* name ) - : TQGLWidget( TQGLFormat( StencilBuffer | AlphaChannel ), tqparent, name ) + MyGLWidget::MyGLWidget( TQWidget* parent, const char* name ) + : TQGLWidget( TQGLFormat( StencilBuffer | AlphaChannel ), parent, name ) { if ( !format().stencil() ) qWarning( "Could not get stencil buffer; results will be suboptimal" ); @@ -998,17 +998,17 @@ void TQGLContext::init( TQPaintDevice *dev ) \fn TQColor TQGLContext::overlayTransparentColor() const If this context is a valid context in an overlay plane, returns - the plane's transtqparent color. Otherwise returns an \link + the plane's transparent color. Otherwise returns an \link TQColor::isValid() invalid \endlink color. The returned color's \link TQColor::pixel() pixel \endlink value is - the index of the transtqparent color in the colormap of the overlay + the index of the transparent color in the colormap of the overlay plane. (Naturally, the color's RGB values are meaningless.) The returned TQColor object will generally work as expected only when passed as the argument to TQGLWidget::qglColor() or TQGLWidget::qglClearColor(). Under certain circumstances it can - also be used to draw transtqparent graphics with a TQPainter. See the + also be used to draw transparent graphics with a TQPainter. See the examples/opengl/overlay_x11 example for details. */ @@ -1168,8 +1168,8 @@ bool TQGLContext::create( const TQGLContext* shareContext ) TQ_OBJECT // must include this if you use TQt Q_SIGNALS/Q_SLOTS public: - MyGLDrawer( TQWidget *tqparent, const char *name ) - : TQGLWidget(tqparent, name) {} + MyGLDrawer( TQWidget *parent, const char *name ) + : TQGLWidget(parent, name) {} protected: @@ -1245,7 +1245,7 @@ bool TQGLContext::create( const TQGLContext* shareContext ) functions, except that they will be called when the overlay context is made current. You can explicitly make the overlay context current by using makeOverlayCurrent(), and you can access - the overlay context directly (e.g. to ask for its transtqparent + the overlay context directly (e.g. to ask for its transparent color) by calling overlayContext(). On X servers in which the default visual is in an overlay plane, @@ -1292,13 +1292,13 @@ void qgl_delete_d( const TQGLWidget * w ) } /*! - Constructs an OpenGL widget with a \a tqparent widget and a \a name. + Constructs an OpenGL widget with a \a parent widget and a \a name. The \link TQGLFormat::defaultFormat() default format\endlink is used. The widget will be \link isValid() invalid\endlink if the system has no \link TQGLFormat::hasOpenGL() OpenGL support\endlink. - The \a tqparent, \a name and widget flag, \a f, arguments are passed + The \a parent, \a name and widget flag, \a f, arguments are passed to the TQWidget constructor. If the \a shareWidget parameter points to a valid TQGLWidget, this @@ -1314,16 +1314,16 @@ void qgl_delete_d( const TQGLWidget * w ) \sa TQGLFormat::defaultFormat() */ -TQGLWidget::TQGLWidget( TQWidget *tqparent, const char *name, +TQGLWidget::TQGLWidget( TQWidget *parent, const char *name, const TQGLWidget* shareWidget, WFlags f ) - : TQWidget( tqparent, name, (WFlags)(f | TQt::WWinOwnDC | WNoAutoErase) ) + : TQWidget( parent, name, (WFlags)(f | TQt::WWinOwnDC | WNoAutoErase) ) { init( new TQGLContext(TQGLFormat::defaultFormat(), TQT_TQPAINTDEVICE(this)), shareWidget ); } /*! - Constructs an OpenGL widget with tqparent \a tqparent, called \a name. + Constructs an OpenGL widget with parent \a parent, called \a name. The \a format argument specifies the desired \link TQGLFormat rendering options \endlink. If the underlying OpenGL/Window system @@ -1334,7 +1334,7 @@ TQGLWidget::TQGLWidget( TQWidget *tqparent, const char *name, The widget will be \link isValid() invalid\endlink if the system has no \link TQGLFormat::hasOpenGL() OpenGL support\endlink. - The \a tqparent, \a name and widget flag, \a f, arguments are passed + The \a parent, \a name and widget flag, \a f, arguments are passed to the TQWidget constructor. If the \a shareWidget parameter points to a valid TQGLWidget, this @@ -1350,16 +1350,16 @@ TQGLWidget::TQGLWidget( TQWidget *tqparent, const char *name, \sa TQGLFormat::defaultFormat(), isValid() */ -TQGLWidget::TQGLWidget( const TQGLFormat &format, TQWidget *tqparent, +TQGLWidget::TQGLWidget( const TQGLFormat &format, TQWidget *parent, const char *name, const TQGLWidget* shareWidget, WFlags f ) - : TQWidget( tqparent, name, f | (WFlags)(TQt::WWinOwnDC | WNoAutoErase) ) + : TQWidget( parent, name, f | (WFlags)(TQt::WWinOwnDC | WNoAutoErase) ) { init( new TQGLContext(format, TQT_TQPAINTDEVICE(this)), shareWidget ); } /*! - Constructs an OpenGL widget with tqparent \a tqparent, called \a name. + Constructs an OpenGL widget with parent \a parent, called \a name. The \a context argument is a pointer to the TQGLContext that you wish to be bound to this widget. This allows you to pass in @@ -1368,7 +1368,7 @@ TQGLWidget::TQGLWidget( const TQGLFormat &format, TQWidget *tqparent, The widget will be \link isValid() invalid\endlink if the system has no \link TQGLFormat::hasOpenGL() OpenGL support\endlink. - The \a tqparent, \a name and widget flag, \a f, arguments are passed + The \a parent, \a name and widget flag, \a f, arguments are passed to the TQWidget constructor. If the \a shareWidget parameter points to a valid TQGLWidget, this @@ -1383,9 +1383,9 @@ TQGLWidget::TQGLWidget( const TQGLFormat &format, TQWidget *tqparent, \sa TQGLFormat::defaultFormat(), isValid() */ -TQGLWidget::TQGLWidget( TQGLContext *context, TQWidget *tqparent, +TQGLWidget::TQGLWidget( TQGLContext *context, TQWidget *parent, const char *name, const TQGLWidget *shareWidget, WFlags f ) - : TQWidget( tqparent, name, (WFlags)(f | TQt::WWinOwnDC | WNoAutoErase) ) + : TQWidget( parent, name, (WFlags)(f | TQt::WWinOwnDC | WNoAutoErase) ) { init( context, shareWidget ); } diff --git a/experimental/tqtinterface/qt4/src/opengl/tqgl.h b/experimental/tqtinterface/qt4/src/opengl/tqgl.h index 4b6fce4ea..2f0431f75 100644 --- a/experimental/tqtinterface/qt4/src/opengl/tqgl.h +++ b/experimental/tqtinterface/qt4/src/opengl/tqgl.h @@ -277,11 +277,11 @@ class TQM_EXPORT_OPENGL TQGLWidget : public TQWidget, public TQGL Q_OBJECT TQ_OBJECT public: - TQGLWidget( TQWidget* tqparent=0, const char* name=0, + TQGLWidget( TQWidget* parent=0, const char* name=0, const TQGLWidget* shareWidget = 0, WFlags f=0 ); - TQGLWidget( TQGLContext *context, TQWidget* tqparent, const char* name=0, + TQGLWidget( TQGLContext *context, TQWidget* parent, const char* name=0, const TQGLWidget* shareWidget = 0, WFlags f=0 ); - TQGLWidget( const TQGLFormat& format, TQWidget* tqparent=0, const char* name=0, + TQGLWidget( const TQGLFormat& format, TQWidget* parent=0, const char* name=0, const TQGLWidget* shareWidget = 0, WFlags f=0 ); ~TQGLWidget(); @@ -318,7 +318,7 @@ public: static TQImage convertToGLFormat( const TQImage& img ); void setMouseTracking( bool enable ); - virtual void reparent( TQWidget* tqparent, WFlags f, const TQPoint& p, + virtual void reparent( TQWidget* parent, WFlags f, const TQPoint& p, bool showIt = FALSE ); const TQGLColormap & colormap() const; diff --git a/experimental/tqtinterface/qt4/src/opengl/tqgl_x11.cpp b/experimental/tqtinterface/qt4/src/opengl/tqgl_x11.cpp index 2bedfd688..bc6bc0e65 100644 --- a/experimental/tqtinterface/qt4/src/opengl/tqgl_x11.cpp +++ b/experimental/tqtinterface/qt4/src/opengl/tqgl_x11.cpp @@ -608,7 +608,7 @@ void *TQGLContext::tryVisual( const TQGLFormat& f, int bufDepth ) if ( useTranspExt ) { // bug workaround - some systems (eg. FireGL) refuses to return an overlay // visual if the GLX_TRANSPARENT_TYPE_EXT attribute is specfied, even if - // the implementation supports transtqparent overlays + // the implementation supports transparent overlays int tmpSpec[] = { GLX_LEVEL, f.plane(), GLX_TRANSPARENT_TYPE_EXT, f.rgba() ? GLX_TRANSPARENT_RGB_EXT : GLX_TRANSPARENT_INDEX_EXT, None }; @@ -623,7 +623,7 @@ void *TQGLContext::tryVisual( const TQGLFormat& f, int bufDepth ) useTranspExtChecked = TRUE; } if ( f.plane() && useTranspExt ) { - // Required to avoid non-transtqparent overlay visual(!) on some systems + // Required to avoid non-transparent overlay visual(!) on some systems spec[i++] = GLX_TRANSPARENT_TYPE_EXT; spec[i++] = f.rgba() ? GLX_TRANSPARENT_RGB_EXT : GLX_TRANSPARENT_INDEX_EXT; } @@ -985,7 +985,7 @@ class TQGLOverlayWidget : public TQGLWidget { TQ_OBJECT public: - TQGLOverlayWidget( const TQGLFormat& format, TQGLWidget* tqparent, + TQGLOverlayWidget( const TQGLFormat& format, TQGLWidget* parent, const char* name=0, const TQGLWidget* shareWidget=0 ); protected: @@ -1004,12 +1004,12 @@ private: // Disabled copy constructor and operator= }; -TQGLOverlayWidget::TQGLOverlayWidget( const TQGLFormat& format, TQGLWidget* tqparent, +TQGLOverlayWidget::TQGLOverlayWidget( const TQGLFormat& format, TQGLWidget* parent, const char* name, const TQGLWidget* shareWidget ) - : TQGLWidget( format, tqparent, name, shareWidget ? shareWidget->olw : 0 ) + : TQGLWidget( format, parent, name, shareWidget ? shareWidget->olw : 0 ) { - realWidget = tqparent; + realWidget = parent; } @@ -1020,7 +1020,7 @@ void TQGLOverlayWidget::initializeGL() if ( transparentColor.isValid() ) qglClearColor( transparentColor ); else - qWarning( "TQGLOverlayWidget::initializeGL(): Could not get transtqparent color" ); + qWarning( "TQGLOverlayWidget::initializeGL(): Could not get transparent color" ); realWidget->initializeOverlayGL(); } @@ -1077,12 +1077,12 @@ void TQGLWidget::init( TQGLContext *context, const TQGLWidget *shareWidget ) } /*! \reimp */ -void TQGLWidget::reparent( TQWidget* tqparent, WFlags f, const TQPoint& p, +void TQGLWidget::reparent( TQWidget* parent, WFlags f, const TQPoint& p, bool showIt ) { if (glcx) glcx->doneCurrent(); - TQWidget::reparent( tqparent, f, p, FALSE ); + TQWidget::reparent( parent, f, p, FALSE ); if ( showIt ) show(); } @@ -1308,15 +1308,15 @@ static bool qCanAllocColors( TQWidget * w ) { bool validVisual = FALSE; int numVisuals; - long tqmask; + long mask; XVisualInfo templ; XVisualInfo * visuals; VisualID id = XVisualIDFromVisual( (Visual *) w->tqtopLevelWidget()->x11Visual() ); - tqmask = VisualScreenMask; + mask = VisualScreenMask; templ.screen = w->x11Screen(); - visuals = XGetVisualInfo( w->x11Display(), tqmask, &templ, &numVisuals ); + visuals = XGetVisualInfo( w->x11Display(), mask, &templ, &numVisuals ); for ( int i = 0; i < numVisuals; i++ ) { if ( visuals[i].visualid == id ) { diff --git a/experimental/tqtinterface/qt4/src/opengl/tqgl_x11_p.h b/experimental/tqtinterface/qt4/src/opengl/tqgl_x11_p.h index cb8835234..dfb8acd88 100644 --- a/experimental/tqtinterface/qt4/src/opengl/tqgl_x11_p.h +++ b/experimental/tqtinterface/qt4/src/opengl/tqgl_x11_p.h @@ -69,7 +69,7 @@ typedef void (*_glMatrixMode)( GLenum mode ); typedef void (*_glOrtho)( GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val ); typedef void (*_glPopAttrib)( void ); typedef void (*_glPopMatrix)( void ); -typedef void (*_glPushAttrib)( GLbitfield tqmask ); +typedef void (*_glPushAttrib)( GLbitfield mask ); typedef void (*_glPushMatrix)( void ); typedef void (*_glRasterPos2i)( GLint x, GLint y ); typedef void (*_glRasterPos3d)( GLdouble x, GLdouble y, GLdouble z ); diff --git a/experimental/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.cpp b/experimental/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.cpp index ddc103aed..735363c67 100644 --- a/experimental/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.cpp +++ b/experimental/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.cpp @@ -757,14 +757,14 @@ int TQIBaseResult::numRowsAffected() /*********************************/ -TQIBaseDriver::TQIBaseDriver(TQObject * tqparent, const char * name) - : TQSqlDriver(tqparent, name ? name : TQIBASE_DRIVER_NAME) +TQIBaseDriver::TQIBaseDriver(TQObject * parent, const char * name) + : TQSqlDriver(parent, name ? name : TQIBASE_DRIVER_NAME) { d = new TQIBaseDriverPrivate(this); } -TQIBaseDriver::TQIBaseDriver(void *connection, TQObject *tqparent, const char *name) - : TQSqlDriver(tqparent, name ? name : TQIBASE_DRIVER_NAME) +TQIBaseDriver::TQIBaseDriver(void *connection, TQObject *parent, const char *name) + : TQSqlDriver(parent, name ? name : TQIBASE_DRIVER_NAME) { d = new TQIBaseDriverPrivate(this); d->ibase = (isc_db_handle)(long int)connection; diff --git a/experimental/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.h b/experimental/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.h index be5bfd509..e720c1cad 100644 --- a/experimental/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.h +++ b/experimental/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.h @@ -78,8 +78,8 @@ class TQIBaseDriver : public TQSqlDriver friend class TQIBaseResultPrivate; friend class TQIBaseResult; public: - TQIBaseDriver(TQObject *tqparent = 0, const char *name = 0); - TQIBaseDriver(void *connection, TQObject *tqparent = 0, const char *name = 0); + TQIBaseDriver(TQObject *parent = 0, const char *name = 0); + TQIBaseDriver(void *connection, TQObject *parent = 0, const char *name = 0); virtual ~TQIBaseDriver(); bool hasFeature(DriverFeature f) const; bool open(const TQString & db, diff --git a/experimental/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp b/experimental/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp index e13f12b12..98cccb286 100644 --- a/experimental/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp +++ b/experimental/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp @@ -376,8 +376,8 @@ static void qServerInit() #endif // TQ_NO_MYSTQL_EMBEDDED } -TQMYSTQLDriver::TQMYSTQLDriver( TQObject * tqparent, const char * name ) - : TQSqlDriver( tqparent, name ? name : TQMYSTQL_DRIVER_NAME ) +TQMYSTQLDriver::TQMYSTQLDriver( TQObject * parent, const char * name ) + : TQSqlDriver( parent, name ? name : TQMYSTQL_DRIVER_NAME ) { init(); qServerInit(); @@ -387,8 +387,8 @@ TQMYSTQLDriver::TQMYSTQLDriver( TQObject * tqparent, const char * name ) Create a driver instance with an already open connection handle. */ -TQMYSTQLDriver::TQMYSTQLDriver( MYSQL * con, TQObject * tqparent, const char * name ) - : TQSqlDriver( tqparent, name ? name : TQMYSTQL_DRIVER_NAME ) +TQMYSTQLDriver::TQMYSTQLDriver( MYSQL * con, TQObject * parent, const char * name ) + : TQSqlDriver( parent, name ? name : TQMYSTQL_DRIVER_NAME ) { init(); if ( con ) { diff --git a/experimental/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.h b/experimental/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.h index ef4f4ce29..385d9006b 100644 --- a/experimental/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.h +++ b/experimental/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.h @@ -90,8 +90,8 @@ class TQ_EXPORT_STQLDRIVER_MYSQL TQMYSTQLDriver : public TQSqlDriver { friend class TQMYSTQLResult; public: - TQMYSTQLDriver( TQObject * tqparent=0, const char * name=0 ); - TQMYSTQLDriver( MYSQL * con, TQObject * tqparent=0, const char * name=0 ); + TQMYSTQLDriver( TQObject * parent=0, const char * name=0 ); + TQMYSTQLDriver( MYSQL * con, TQObject * parent=0, const char * name=0 ); ~TQMYSTQLDriver(); bool hasFeature( DriverFeature f ) const; bool open( const TQString & db, diff --git a/experimental/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp b/experimental/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp index 340143505..8e75f901a 100644 --- a/experimental/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp +++ b/experimental/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp @@ -1325,14 +1325,14 @@ bool TQODBCResult::exec() //////////////////////////////////////// -TQODBCDriver::TQODBCDriver( TQObject * tqparent, const char * name ) - : TQSqlDriver(tqparent,name ? name : "TQODBC") +TQODBCDriver::TQODBCDriver( TQObject * parent, const char * name ) + : TQSqlDriver(parent,name ? name : "TQODBC") { init(); } -TQODBCDriver::TQODBCDriver( STQLHANDLE env, STQLHANDLE con, TQObject * tqparent, const char * name ) - : TQSqlDriver(tqparent,name ? name : "TQODBC") +TQODBCDriver::TQODBCDriver( STQLHANDLE env, STQLHANDLE con, TQObject * parent, const char * name ) + : TQSqlDriver(parent,name ? name : "TQODBC") { init(); d->hEnv = env; diff --git a/experimental/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.h b/experimental/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.h index 74ab4e7f8..cb09743b4 100644 --- a/experimental/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.h +++ b/experimental/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.h @@ -121,8 +121,8 @@ private: class TQ_EXPORT_STQLDRIVER_ODBC TQODBCDriver : public TQSqlDriver { public: - TQODBCDriver( TQObject * tqparent=0, const char * name=0 ); - TQODBCDriver( STQLHANDLE env, STQLHANDLE con, TQObject * tqparent=0, const char * name=0 ); + TQODBCDriver( TQObject * parent=0, const char * name=0 ); + TQODBCDriver( STQLHANDLE env, STQLHANDLE con, TQObject * parent=0, const char * name=0 ); ~TQODBCDriver(); bool hasFeature( DriverFeature f ) const; bool open( const TQString & db, diff --git a/experimental/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp b/experimental/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp index b5885bff4..7809749a4 100644 --- a/experimental/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp +++ b/experimental/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp @@ -554,14 +554,14 @@ static TQPSTQLDriver::Protocol getPSTQLVersion( PGconn* connection ) return TQPSTQLDriver::Version6; } -TQPSTQLDriver::TQPSTQLDriver( TQObject * tqparent, const char * name ) - : TQSqlDriver(tqparent,name ? name : "TQPSQL"), pro( TQPSTQLDriver::Version6 ) +TQPSTQLDriver::TQPSTQLDriver( TQObject * parent, const char * name ) + : TQSqlDriver(parent,name ? name : "TQPSQL"), pro( TQPSTQLDriver::Version6 ) { init(); } -TQPSTQLDriver::TQPSTQLDriver( PGconn * conn, TQObject * tqparent, const char * name ) - : TQSqlDriver(tqparent,name ? name : "TQPSQL"), pro( TQPSTQLDriver::Version6 ) +TQPSTQLDriver::TQPSTQLDriver( PGconn * conn, TQObject * parent, const char * name ) + : TQSqlDriver(parent,name ? name : "TQPSQL"), pro( TQPSTQLDriver::Version6 ) { init(); d->connection = conn; diff --git a/experimental/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.h b/experimental/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.h index c0051073e..6afbc9652 100644 --- a/experimental/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.h +++ b/experimental/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.h @@ -88,8 +88,8 @@ public: Version73 = 9 }; - TQPSTQLDriver( TQObject * tqparent=0, const char * name=0 ); - TQPSTQLDriver( PGconn * conn, TQObject * tqparent=0, const char * name=0 ); + TQPSTQLDriver( TQObject * parent=0, const char * name=0 ); + TQPSTQLDriver( PGconn * conn, TQObject * parent=0, const char * name=0 ); ~TQPSTQLDriver(); bool hasFeature( DriverFeature f ) const; bool open( const TQString & db, diff --git a/experimental/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp b/experimental/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp index 864c4c9da..bf330e38a 100644 --- a/experimental/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp +++ b/experimental/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp @@ -277,14 +277,14 @@ int TQSTQLiteResult::numRowsAffected() ///////////////////////////////////////////////////////// -TQSTQLiteDriver::TQSTQLiteDriver(TQObject * tqparent, const char * name) - : TQSqlDriver(tqparent, name ? name : TQSQLITE_DRIVER_NAME) +TQSTQLiteDriver::TQSTQLiteDriver(TQObject * parent, const char * name) + : TQSqlDriver(parent, name ? name : TQSQLITE_DRIVER_NAME) { d = new TQSTQLiteDriverPrivate(); } -TQSTQLiteDriver::TQSTQLiteDriver(sqlite *connection, TQObject *tqparent, const char *name) - : TQSqlDriver(tqparent, name ? name : TQSQLITE_DRIVER_NAME) +TQSTQLiteDriver::TQSTQLiteDriver(sqlite *connection, TQObject *parent, const char *name) + : TQSqlDriver(parent, name ? name : TQSQLITE_DRIVER_NAME) { d = new TQSTQLiteDriverPrivate(); d->access = connection; diff --git a/experimental/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.h b/experimental/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.h index 5350ba19b..610008966 100644 --- a/experimental/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.h +++ b/experimental/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.h @@ -56,8 +56,8 @@ class TQSTQLiteDriver : public TQSqlDriver { friend class TQSTQLiteResult; public: - TQSTQLiteDriver(TQObject *tqparent = 0, const char *name = 0); - TQSTQLiteDriver(sqlite *connection, TQObject *tqparent = 0, const char *name = 0); + TQSTQLiteDriver(TQObject *parent = 0, const char *name = 0); + TQSTQLiteDriver(sqlite *connection, TQObject *parent = 0, const char *name = 0); ~TQSTQLiteDriver(); bool hasFeature(DriverFeature f) const; bool open(const TQString & db, diff --git a/experimental/tqtinterface/qt4/src/sql/tqdatabrowser.cpp b/experimental/tqtinterface/qt4/src/sql/tqdatabrowser.cpp index 910fb119a..df5d15b38 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqdatabrowser.cpp +++ b/experimental/tqtinterface/qt4/src/sql/tqdatabrowser.cpp @@ -155,12 +155,12 @@ public: */ /*! - Constructs a data browser which is a child of \a tqparent, with the + Constructs a data browser which is a child of \a parent, with the name \a name and widget flags set to \a fl. */ -TQDataBrowser::TQDataBrowser( TQWidget *tqparent, const char *name, WFlags fl ) - : TQWidget( tqparent, name, fl ) +TQDataBrowser::TQDataBrowser( TQWidget *parent, const char *name, WFlags fl ) + : TQWidget( parent, name, fl ) { d = new TQDataBrowserPrivate(); d->dat.setMode( TQSql::Update ); diff --git a/experimental/tqtinterface/qt4/src/sql/tqdatabrowser.h b/experimental/tqtinterface/qt4/src/sql/tqdatabrowser.h index 5379b78c9..1dd20b4ad 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqdatabrowser.h +++ b/experimental/tqtinterface/qt4/src/sql/tqdatabrowser.h @@ -72,7 +72,7 @@ class TQ_EXPORT TQDataBrowser : public TQWidget Q_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit ) public: - TQDataBrowser( TQWidget* tqparent=0, const char* name=0, WFlags fl = 0 ); + TQDataBrowser( TQWidget* parent=0, const char* name=0, WFlags fl = 0 ); ~TQDataBrowser(); enum Boundary { diff --git a/experimental/tqtinterface/qt4/src/sql/tqdatatable.cpp b/experimental/tqtinterface/qt4/src/sql/tqdatatable.cpp index 647c3a244..99ef39671 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqdatatable.cpp +++ b/experimental/tqtinterface/qt4/src/sql/tqdatatable.cpp @@ -235,18 +235,18 @@ void qt_debug_buffer( const TQString& msg, TQSqlRecord* cursor ) */ /*! - Constructs a data table which is a child of \a tqparent, called + Constructs a data table which is a child of \a parent, called name \a name. */ -TQDataTable::TQDataTable ( TQWidget * tqparent, const char * name ) - : TQTable( tqparent, name ) +TQDataTable::TQDataTable ( TQWidget * parent, const char * name ) + : TQTable( parent, name ) { init(); } /*! - Constructs a data table which is a child of \a tqparent, called name + Constructs a data table which is a child of \a parent, called name \a name using the cursor \a cursor. If \a autoPopulate is TRUE (the default is FALSE), columns are @@ -259,8 +259,8 @@ TQDataTable::TQDataTable ( TQWidget * tqparent, const char * name ) representing NULL values as strings. */ -TQDataTable::TQDataTable ( TQSqlCursor* cursor, bool autoPopulate, TQWidget * tqparent, const char * name ) - : TQTable( tqparent, name ) +TQDataTable::TQDataTable ( TQSqlCursor* cursor, bool autoPopulate, TQWidget * parent, const char * name ) + : TQTable( parent, name ) { init(); setSqlCursor( cursor, autoPopulate ); diff --git a/experimental/tqtinterface/qt4/src/sql/tqdatatable.h b/experimental/tqtinterface/qt4/src/sql/tqdatatable.h index 2f1c5dd4e..37f58640b 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqdatatable.h +++ b/experimental/tqtinterface/qt4/src/sql/tqdatatable.h @@ -86,8 +86,8 @@ class TQM_EXPORT_SQL TQDataTable : public TQTable Q_PROPERTY( int numRows READ numRows ) public: - TQDataTable ( TQWidget* tqparent=0, const char* name=0 ); - TQDataTable ( TQSqlCursor* cursor, bool autoPopulate = FALSE, TQWidget* tqparent=0, const char* name=0 ); + TQDataTable ( TQWidget* parent=0, const char* name=0 ); + TQDataTable ( TQSqlCursor* cursor, bool autoPopulate = FALSE, TQWidget* parent=0, const char* name=0 ); ~TQDataTable(); virtual void addColumn( const TQString& fieldName, diff --git a/experimental/tqtinterface/qt4/src/sql/tqdataview.cpp b/experimental/tqtinterface/qt4/src/sql/tqdataview.cpp index b2fbecf30..e4a22a8d9 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqdataview.cpp +++ b/experimental/tqtinterface/qt4/src/sql/tqdataview.cpp @@ -76,12 +76,12 @@ public: */ /*! - Constructs a data view which is a child of \a tqparent, called \a + Constructs a data view which is a child of \a parent, called \a name, and with widget flags \a fl. */ -TQDataView::TQDataView( TQWidget *tqparent, const char *name, WFlags fl ) - : TQWidget( tqparent, name, fl ) +TQDataView::TQDataView( TQWidget *parent, const char *name, WFlags fl ) + : TQWidget( parent, name, fl ) { d = new TQDataViewPrivate(); } diff --git a/experimental/tqtinterface/qt4/src/sql/tqdataview.h b/experimental/tqtinterface/qt4/src/sql/tqdataview.h index 017fae6a8..77c6344b5 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqdataview.h +++ b/experimental/tqtinterface/qt4/src/sql/tqdataview.h @@ -63,7 +63,7 @@ class TQM_EXPORT_SQL TQDataView : public TQWidget TQ_OBJECT public: - TQDataView( TQWidget* tqparent=0, const char* name=0, WFlags fl = 0 ); + TQDataView( TQWidget* parent=0, const char* name=0, WFlags fl = 0 ); ~TQDataView(); virtual void setForm( TQSqlForm* form ); diff --git a/experimental/tqtinterface/qt4/src/sql/tqeditorfactory.cpp b/experimental/tqtinterface/qt4/src/sql/tqeditorfactory.cpp index 2d02088bc..7c6e962da 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqeditorfactory.cpp +++ b/experimental/tqtinterface/qt4/src/sql/tqeditorfactory.cpp @@ -69,11 +69,11 @@ */ /*! - Constructs an editor factory with tqparent \a tqparent, called \a name. + Constructs an editor factory with parent \a parent, called \a name. */ -TQEditorFactory::TQEditorFactory ( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ) +TQEditorFactory::TQEditorFactory ( TQObject * parent, const char * name ) + : TQObject( parent, name ) { } @@ -124,11 +124,11 @@ void TQEditorFactory::installDefaultFactory( TQEditorFactory * factory ) /*! Creates and returns the appropriate editor for the TQVariant \a v. - If the TQVariant is invalid, 0 is returned. The \a tqparent is passed + If the TQVariant is invalid, 0 is returned. The \a parent is passed to the appropriate editor's constructor. */ -TQWidget * TQEditorFactory::createEditor( TQWidget * tqparent, const TQVariant & v ) +TQWidget * TQEditorFactory::createEditor( TQWidget * parent, const TQVariant & v ) { TQWidget * w = 0; switch( v.type() ){ @@ -136,34 +136,34 @@ TQWidget * TQEditorFactory::createEditor( TQWidget * tqparent, const TQVariant & w = 0; break; case TQVariant::Bool: - w = new TQComboBox( tqparent, "qt_editor_bool" ); + w = new TQComboBox( parent, "qt_editor_bool" ); ((TQComboBox *) w)->insertItem( "False" ); ((TQComboBox *) w)->insertItem( "True" ); break; case TQVariant::UInt: - w = new TQSpinBox( 0, 999999, 1, tqparent, "qt_editor_spinbox" ); + w = new TQSpinBox( 0, 999999, 1, parent, "qt_editor_spinbox" ); break; case TQVariant::Int: - w = new TQSpinBox( -999999, 999999, 1, tqparent, "qt_editor_int" ); + w = new TQSpinBox( -999999, 999999, 1, parent, "qt_editor_int" ); break; case TQVariant::String: case TQVariant::CString: case TQVariant::Double: - w = new TQLineEdit( tqparent, "qt_editor_double" ); + w = new TQLineEdit( parent, "qt_editor_double" ); ((TQLineEdit*)w)->setFrame( FALSE ); break; case TQVariant::Date: - w = new TQDateEdit( tqparent, "qt_editor_date" ); + w = new TQDateEdit( parent, "qt_editor_date" ); break; case TQVariant::Time: - w = new TQTimeEdit( tqparent, "qt_editor_time" ); + w = new TQTimeEdit( parent, "qt_editor_time" ); break; case TQVariant::DateTime: - w = new TQDateTimeEdit( tqparent, "qt_editor_datetime" ); + w = new TQDateTimeEdit( parent, "qt_editor_datetime" ); break; #ifndef TQT_NO_LABEL case TQVariant::Pixmap: - w = new TQLabel( tqparent, "qt_editor_pixmap" ); + w = new TQLabel( parent, "qt_editor_pixmap" ); break; #endif case TQVariant::Palette: @@ -184,7 +184,7 @@ TQWidget * TQEditorFactory::createEditor( TQWidget * tqparent, const TQVariant & case TQVariant::SizePolicy: case TQVariant::ByteArray: default: - w = new TQWidget( tqparent, "qt_editor_default" ); + w = new TQWidget( parent, "qt_editor_default" ); break; } return w; diff --git a/experimental/tqtinterface/qt4/src/sql/tqeditorfactory.h b/experimental/tqtinterface/qt4/src/sql/tqeditorfactory.h index fb67e0f93..12c123f6b 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqeditorfactory.h +++ b/experimental/tqtinterface/qt4/src/sql/tqeditorfactory.h @@ -57,10 +57,10 @@ class TQM_EXPORT_SQL TQEditorFactory : public TQObject { public: - TQEditorFactory ( TQObject * tqparent = 0, const char * name = 0 ); + TQEditorFactory ( TQObject * parent = 0, const char * name = 0 ); ~TQEditorFactory(); - virtual TQWidget * createEditor( TQWidget * tqparent, const TQVariant & v ); + virtual TQWidget * createEditor( TQWidget * parent, const TQVariant & v ); static TQEditorFactory * defaultFactory(); static void installDefaultFactory( TQEditorFactory * factory); diff --git a/experimental/tqtinterface/qt4/src/sql/tqsqldatabase.cpp b/experimental/tqtinterface/qt4/src/sql/tqsqldatabase.cpp index 70a15ae49..1876720cb 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqsqldatabase.cpp +++ b/experimental/tqtinterface/qt4/src/sql/tqsqldatabase.cpp @@ -149,7 +149,7 @@ typedef TQDict<TQSqlDriverCreatorBase> TQDriverDict; class TQSqlDatabaseManager : public TQObject { public: - TQSqlDatabaseManager( TQObject * tqparent = 0, const char * name = 0 ); + TQSqlDatabaseManager( TQObject * parent = 0, const char * name = 0 ); ~TQSqlDatabaseManager(); static TQSqlDatabase* database( const TQString& name, bool open ); static TQSqlDatabase* addDatabase( TQSqlDatabase* db, const TQString & name ); @@ -168,8 +168,8 @@ protected: Constructs an SQL database manager. */ -TQSqlDatabaseManager::TQSqlDatabaseManager( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), dbDict( 1 ), drDict( 0 ) +TQSqlDatabaseManager::TQSqlDatabaseManager( TQObject * parent, const char * name ) + : TQObject( parent, name ), dbDict( 1 ), drDict( 0 ) { } @@ -563,7 +563,7 @@ bool TQSqlDatabase::contains( const TQString& connectionName ) /*! Creates a TQSqlDatabase connection called \a name that uses the - driver referred to by \a type, with the tqparent \a tqparent and the + driver referred to by \a type, with the parent \a parent and the object name \a objname. If the \a type is not recognized, the database connection will have no functionality. @@ -587,8 +587,8 @@ bool TQSqlDatabase::contains( const TQString& connectionName ) \sa registerSqlDriver() */ -TQSqlDatabase::TQSqlDatabase( const TQString& type, const TQString& name, TQObject * tqparent, const char * objname ) - : TQObject( tqparent, objname ) +TQSqlDatabase::TQSqlDatabase( const TQString& type, const TQString& name, TQObject * parent, const char * objname ) + : TQObject( parent, objname ) { init( type, name ); } @@ -598,14 +598,14 @@ TQSqlDatabase::TQSqlDatabase( const TQString& type, const TQString& name, TQObje \overload Creates a database connection using the driver \a driver, with - the tqparent \a tqparent and the object name \a objname. + the parent \a parent and the object name \a objname. \warning The framework takes ownership of the \a driver pointer, so it should not be deleted. */ -TQSqlDatabase::TQSqlDatabase( TQSqlDriver* driver, TQObject * tqparent, const char * objname ) - : TQObject( tqparent, objname ) +TQSqlDatabase::TQSqlDatabase( TQSqlDriver* driver, TQObject * parent, const char * objname ) + : TQObject( parent, objname ) { d = new TQSqlDatabasePrivate(); d->driver = driver; diff --git a/experimental/tqtinterface/qt4/src/sql/tqsqldatabase.h b/experimental/tqtinterface/qt4/src/sql/tqsqldatabase.h index 98e7be297..24af2b8f0 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqsqldatabase.h +++ b/experimental/tqtinterface/qt4/src/sql/tqsqldatabase.h @@ -140,8 +140,8 @@ public: static bool isDriverAvailable( const TQString& name ); protected: - TQSqlDatabase( const TQString& type, const TQString& name, TQObject * tqparent=0, const char * objname=0 ); - TQSqlDatabase( TQSqlDriver* driver, TQObject * tqparent=0, const char * objname=0 ); + TQSqlDatabase( const TQString& type, const TQString& name, TQObject * parent=0, const char * objname=0 ); + TQSqlDatabase( TQSqlDriver* driver, TQObject * parent=0, const char * objname=0 ); private: void init( const TQString& type, const TQString& name ); TQSqlDatabasePrivate* d; diff --git a/experimental/tqtinterface/qt4/src/sql/tqsqldriver.cpp b/experimental/tqtinterface/qt4/src/sql/tqsqldriver.cpp index 3f6f13701..8ce3fabbc 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqsqldriver.cpp +++ b/experimental/tqtinterface/qt4/src/sql/tqsqldriver.cpp @@ -65,13 +65,13 @@ TQPtrDict<TQSqlOpenExtension> *qSqlOpenExtDict(); */ /*! - Default constructor. Creates a new driver with tqparent \a tqparent, + Default constructor. Creates a new driver with parent \a parent, called \a name. */ -TQSqlDriver::TQSqlDriver( TQObject * tqparent, const char * name ) -: TQObject(tqparent, name), +TQSqlDriver::TQSqlDriver( TQObject * parent, const char * name ) +: TQObject(parent, name), dbState(0), error() { diff --git a/experimental/tqtinterface/qt4/src/sql/tqsqldriver.h b/experimental/tqtinterface/qt4/src/sql/tqsqldriver.h index 84e936c6a..70a60f134 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqsqldriver.h +++ b/experimental/tqtinterface/qt4/src/sql/tqsqldriver.h @@ -74,7 +74,7 @@ public: enum DriverFeature { Transactions, QuerySize, BLOB, Unicode, PreparedQueries, NamedPlaceholders, PositionalPlaceholders }; - TQSqlDriver( TQObject * tqparent=0, const char * name=0 ); + TQSqlDriver( TQObject * parent=0, const char * name=0 ); ~TQSqlDriver(); bool isOpen() const; bool isOpenError() const; diff --git a/experimental/tqtinterface/qt4/src/sql/tqsqleditorfactory.cpp b/experimental/tqtinterface/qt4/src/sql/tqsqleditorfactory.cpp index 0c6b16ffc..b7201bb6e 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqsqleditorfactory.cpp +++ b/experimental/tqtinterface/qt4/src/sql/tqsqleditorfactory.cpp @@ -73,12 +73,12 @@ /*! - Constructs a SQL editor factory with tqparent \a tqparent, called \a + Constructs a SQL editor factory with parent \a parent, called \a name. */ -TQSqlEditorFactory::TQSqlEditorFactory ( TQObject * tqparent, const char * name ) - : TQEditorFactory( tqparent, name ) +TQSqlEditorFactory::TQSqlEditorFactory ( TQObject * parent, const char * name ) + : TQEditorFactory( parent, name ) { } @@ -132,14 +132,14 @@ void TQSqlEditorFactory::installDefaultFactory( TQSqlEditorFactory * factory ) Creates and returns the appropriate editor widget for the TQVariant \a variant. - The widget that is returned has the tqparent \a tqparent (which may be + The widget that is returned has the parent \a parent (which may be zero). If \a variant is invalid, 0 is returned. */ -TQWidget * TQSqlEditorFactory::createEditor( TQWidget * tqparent, +TQWidget * TQSqlEditorFactory::createEditor( TQWidget * parent, const TQVariant & variant ) { - return TQEditorFactory::createEditor( tqparent, variant ); + return TQEditorFactory::createEditor( parent, variant ); } /*! @@ -149,7 +149,7 @@ TQWidget * TQSqlEditorFactory::createEditor( TQWidget * tqparent, field. */ -TQWidget * TQSqlEditorFactory::createEditor( TQWidget * tqparent, +TQWidget * TQSqlEditorFactory::createEditor( TQWidget * parent, const TQSqlField * field ) { if ( !field ) { @@ -162,36 +162,36 @@ TQWidget * TQSqlEditorFactory::createEditor( TQWidget * tqparent, w = 0; break; case TQVariant::Bool: - w = new TQComboBox( tqparent, "qt_editor_bool" ); + w = new TQComboBox( parent, "qt_editor_bool" ); ((TQComboBox *) w)->insertItem( "False" ); ((TQComboBox *) w)->insertItem( "True" ); break; case TQVariant::UInt: - w = new TQSpinBox( 0, 2147483647, 1, tqparent, "qt_editor_spinbox" ); + w = new TQSpinBox( 0, 2147483647, 1, parent, "qt_editor_spinbox" ); break; case TQVariant::Int: - w = new TQSpinBox( -2147483647, 2147483647, 1, tqparent, "qt_editor_int" ); + w = new TQSpinBox( -2147483647, 2147483647, 1, parent, "qt_editor_int" ); break; case TQVariant::LongLong: case TQVariant::ULongLong: case TQVariant::String: case TQVariant::CString: case TQVariant::Double: - w = new TQLineEdit( tqparent, "qt_editor_double" ); + w = new TQLineEdit( parent, "qt_editor_double" ); ((TQLineEdit*)w)->setFrame( FALSE ); break; case TQVariant::Date: - w = new TQDateEdit( tqparent, "qt_editor_date" ); + w = new TQDateEdit( parent, "qt_editor_date" ); break; case TQVariant::Time: - w = new TQTimeEdit( tqparent, "qt_editor_time" ); + w = new TQTimeEdit( parent, "qt_editor_time" ); break; case TQVariant::DateTime: - w = new TQDateTimeEdit( tqparent, "qt_editor_datetime" ); + w = new TQDateTimeEdit( parent, "qt_editor_datetime" ); break; #ifndef TQT_NO_LABEL case TQVariant::Pixmap: - w = new TQLabel( tqparent, "qt_editor_pixmap" ); + w = new TQLabel( parent, "qt_editor_pixmap" ); break; #endif case TQVariant::Palette: @@ -212,7 +212,7 @@ TQWidget * TQSqlEditorFactory::createEditor( TQWidget * tqparent, case TQVariant::SizePolicy: case TQVariant::ByteArray: default: - w = new TQWidget( tqparent, "qt_editor_default" ); + w = new TQWidget( parent, "qt_editor_default" ); break; } return w; diff --git a/experimental/tqtinterface/qt4/src/sql/tqsqleditorfactory.h b/experimental/tqtinterface/qt4/src/sql/tqsqleditorfactory.h index 151fb5e5f..54a50b335 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqsqleditorfactory.h +++ b/experimental/tqtinterface/qt4/src/sql/tqsqleditorfactory.h @@ -58,10 +58,10 @@ class TQSqlField; class TQM_EXPORT_SQL TQSqlEditorFactory : public TQEditorFactory { public: - TQSqlEditorFactory ( TQObject * tqparent = 0, const char * name = 0 ); + TQSqlEditorFactory ( TQObject * parent = 0, const char * name = 0 ); ~TQSqlEditorFactory(); - virtual TQWidget * createEditor( TQWidget * tqparent, const TQVariant & variant ); - virtual TQWidget * createEditor( TQWidget * tqparent, const TQSqlField * field ); + virtual TQWidget * createEditor( TQWidget * parent, const TQVariant & variant ); + virtual TQWidget * createEditor( TQWidget * parent, const TQSqlField * field ); static TQSqlEditorFactory * defaultFactory(); static void installDefaultFactory( TQSqlEditorFactory * factory ); diff --git a/experimental/tqtinterface/qt4/src/sql/tqsqlform.cpp b/experimental/tqtinterface/qt4/src/sql/tqsqlform.cpp index a33c18b94..95c125fbd 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqsqlform.cpp +++ b/experimental/tqtinterface/qt4/src/sql/tqsqlform.cpp @@ -131,10 +131,10 @@ public: /*! - Constructs a TQSqlForm with tqparent \a tqparent and called \a name. + Constructs a TQSqlForm with parent \a parent and called \a name. */ -TQSqlForm::TQSqlForm( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ) +TQSqlForm::TQSqlForm( TQObject * parent, const char * name ) + : TQObject( parent, name ) { d = new TQSqlFormPrivate(); } diff --git a/experimental/tqtinterface/qt4/src/sql/tqsqlform.h b/experimental/tqtinterface/qt4/src/sql/tqsqlform.h index 14cdca18a..14087eba7 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqsqlform.h +++ b/experimental/tqtinterface/qt4/src/sql/tqsqlform.h @@ -66,7 +66,7 @@ class TQM_EXPORT_SQL TQSqlForm : public TQObject Q_OBJECT TQ_OBJECT public: - TQSqlForm( TQObject * tqparent = 0, const char * name = 0 ); + TQSqlForm( TQObject * parent = 0, const char * name = 0 ); ~TQSqlForm(); virtual void insert( TQWidget * widget, const TQString& field ); diff --git a/experimental/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp b/experimental/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp index 6a35ef77c..b70f1b5fa 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp +++ b/experimental/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp @@ -675,13 +675,13 @@ TQDataManager::~TQDataManager() information about the error. */ -void TQDataManager::handleError( TQWidget* tqparent, const TQSqlError& e ) +void TQDataManager::handleError( TQWidget* parent, const TQSqlError& e ) { #ifndef TQT_NO_MESSAGEBOX if (e.driverText().isEmpty() && e.databaseText().isEmpty()) { - TQMessageBox::warning ( tqparent, "Warning", "An error occurred while accessing the database"); + TQMessageBox::warning ( parent, "Warning", "An error occurred while accessing the database"); } else { - TQMessageBox::warning ( tqparent, "Warning", e.driverText() + "\n" + e.databaseText(), + TQMessageBox::warning ( parent, "Warning", e.driverText() + "\n" + e.databaseText(), 0, 0 ); } #endif // TQT_NO_MESSAGEBOX @@ -859,16 +859,16 @@ bool TQDataManager::confirmCancels() const m. Derived classes can reimplement this function and provide their own confirmation dialog. The default implementation uses a message box which prompts the user to confirm the edit action. The dialog - is centered over \a tqparent. + is centered over \a parent. */ -TQSql::Confirm TQDataManager::confirmEdit( TQWidget* tqparent, TQSql::Op m ) +TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m ) { int ans = 2; if ( m == TQSql::Delete ) { #ifndef TQT_NO_MESSAGEBOX - ans = TQMessageBox::information( tqparent, + ans = TQMessageBox::information( parent, tqApp->translate( "TQSql", "Delete" ), tqApp->translate( "TQSql", "Delete this record?" ), tqApp->translate( "TQSql", "Yes" ), @@ -885,7 +885,7 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* tqparent, TQSql::Op m ) caption = tqApp->translate( "TQSql", "Update" ); } #ifndef TQT_NO_MESSAGEBOX - ans = TQMessageBox::information( tqparent, caption, + ans = TQMessageBox::information( parent, caption, tqApp->translate( "TQSql", "Save edits?" ), tqApp->translate( "TQSql", "Yes" ), tqApp->translate( "TQSql", "No" ), @@ -912,15 +912,15 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* tqparent, TQSql::Op m ) mode \a m. Derived classes can reimplement this function and provide their own confirmation dialog. The default implementation uses a message box which prompts the user to confirm the edit - action. The dialog is centered over \a tqparent. + action. The dialog is centered over \a parent. */ -TQSql::Confirm TQDataManager::confirmCancel( TQWidget* tqparent, TQSql::Op ) +TQSql::Confirm TQDataManager::confirmCancel( TQWidget* parent, TQSql::Op ) { #ifndef TQT_NO_MESSAGEBOX - switch ( TQMessageBox::information( tqparent, + switch ( TQMessageBox::information( parent, tqApp->translate( "TQSql", "Confirm" ), tqApp->translate( "TQSql", "Cancel your edits?" ), tqApp->translate( "TQSql", "Yes" ), diff --git a/experimental/tqtinterface/qt4/src/sql/tqsqlmanager_p.h b/experimental/tqtinterface/qt4/src/sql/tqsqlmanager_p.h index ed892e31b..da0083053 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqsqlmanager_p.h +++ b/experimental/tqtinterface/qt4/src/sql/tqsqlmanager_p.h @@ -138,9 +138,9 @@ public: virtual void setAutoEdit( bool autoEdit ); bool autoEdit() const; - virtual void handleError( TQWidget* tqparent, const TQSqlError& error ); - virtual TQSql::Confirm confirmEdit( TQWidget* tqparent, TQSql::Op m ); - virtual TQSql::Confirm confirmCancel( TQWidget* tqparent, TQSql::Op m ); + virtual void handleError( TQWidget* parent, const TQSqlError& error ); + virtual TQSql::Confirm confirmEdit( TQWidget* parent, TQSql::Op m ); + virtual TQSql::Confirm confirmCancel( TQWidget* parent, TQSql::Op m ); virtual void setConfirmEdits( bool confirm ); virtual void setConfirmInsert( bool confirm ); diff --git a/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.cpp index 8ab5d910f..90a5588b2 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.cpp @@ -216,8 +216,8 @@ void TQCommonStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, p->setPen( TQPen( lv->tqpalette().color( TQPalette::Disabled, TQColorGroup::Text ), 2 ) ); bool parentControl = FALSE; - if ( item->tqparent() && item->tqparent()->rtti() == 1 && - ((TQCheckListItem*) item->tqparent())->type() == TQCheckListItem::Controller ) + if ( item->parent() && item->parent()->rtti() == 1 && + ((TQCheckListItem*) item->parent())->type() == TQCheckListItem::Controller ) parentControl = TRUE; if ( flags & Style_Selected && !lv->rootIsDecorated() && !parentControl ) { p->fillRect( 0, 0, x + marg + w + 4, item->height(), diff --git a/experimental/tqtinterface/qt4/src/styles/tqinterlacestyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqinterlacestyle.cpp index 042f0996f..1d42786d7 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqinterlacestyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqinterlacestyle.cpp @@ -150,7 +150,7 @@ void TQInterlaceStyle::unPolish( TQApplication *app) void TQInterlaceStyle::polish( TQWidget* w) { - // the polish function sets some widgets to transtqparent mode and + // the polish function sets some widgets to transparent mode and // some to translate background mode in order to get the full // benefit from the nice pixmaps in the color group. @@ -208,7 +208,7 @@ void TQInterlaceStyle::polish( TQWidget* w) void TQInterlaceStyle::unPolish( TQWidget* w) { - // the polish function sets some widgets to transtqparent mode and + // the polish function sets some widgets to transparent mode and // some to translate background mode in order to get the full // benefit from the nice pixmaps in the color group. diff --git a/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.cpp index b05c46d31..83d87da79 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.cpp @@ -1837,10 +1837,10 @@ TQRect TQMotifStyle::subRect( SubRect r, const TQWidget *widget ) const case SR_DockWindowHandleRect: { #ifndef TQT_NO_MAINWINDOW - if ( !widget || !widget->tqparent() ) + if ( !widget || !widget->parent() ) break; - const TQDockWindow * dw = (const TQDockWindow *) widget->tqparent(); + const TQDockWindow * dw = (const TQDockWindow *) widget->parent(); if ( !dw->area() || !dw->isCloseEnabled() ) rect.setRect( 0, 0, widget->width(), widget->height() ); else { diff --git a/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp index 5a25f3d6e..75889978f 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp @@ -98,7 +98,7 @@ class FriendlyMenuData : public TQMenuData class TQWindowsStyle::Private : public TQObject { public: - Private(TQWindowsStyle *tqparent); + Private(TQWindowsStyle *parent); bool hasSeenAlt(const TQWidget *widget) const; bool altDown() const { return alt_down; } @@ -112,12 +112,12 @@ private: int menuBarTimer; }; -TQWindowsStyle::Private::Private(TQWindowsStyle *tqparent) -: TQObject(tqparent, "TQWindowsStylePrivate"), alt_down(FALSE), menuBarTimer(0) +TQWindowsStyle::Private::Private(TQWindowsStyle *parent) +: TQObject(parent, "TQWindowsStylePrivate"), alt_down(FALSE), menuBarTimer(0) { } -// Returns true if the toplevel tqparent of \a widget has seen the Alt-key +// Returns true if the toplevel parent of \a widget has seen the Alt-key bool TQWindowsStyle::Private::hasSeenAlt(const TQWidget *widget) const { widget = widget->tqtopLevelWidget(); diff --git a/experimental/tqtinterface/qt4/src/table/tqtable.cpp b/experimental/tqtinterface/qt4/src/table/tqtable.cpp index cb1d0687a..e6d4d3a64 100644 --- a/experimental/tqtinterface/qt4/src/table/tqtable.cpp +++ b/experimental/tqtinterface/qt4/src/table/tqtable.cpp @@ -90,7 +90,7 @@ public: Selected }; - TQTableHeader( int, TQTable *t, TQWidget* tqparent=0, const char* name=0 ); + TQTableHeader( int, TQTable *t, TQWidget* parent=0, const char* name=0 ); ~TQTableHeader() {}; void addLabel( const TQString &s, int size ); void setLabel( int section, const TQString & s, int size = -1 ); @@ -782,7 +782,7 @@ implementation creates a TQLineEdit. If the function returns 0, the cell is read-only. The returned widget should preferably be invisible, ideally with -TQTable::viewport() as tqparent. +TQTable::viewport() as parent. If you reimplement this function you'll almost certainly need to reimplement setContentFromEditor(), and may need to reimplement @@ -2027,7 +2027,7 @@ TQSize TQCheckTableItem::tqsizeHint() const /*! Creates an empty table object called \a name as a child of \a - tqparent. + parent. Call setNumRows() and setNumCols() to set the table size before populating the table if you're using TQTableItems. @@ -2035,8 +2035,8 @@ TQSize TQCheckTableItem::tqsizeHint() const \sa TQWidget::clearWFlags() TQt::WidgetFlags */ -TQTable::TQTable( TQWidget *tqparent, const char *name ) - : TQScrollView( tqparent, name, (WFlags)(WNoAutoErase | TQt::WStaticContents) ), +TQTable::TQTable( TQWidget *parent, const char *name ) + : TQScrollView( parent, name, (WFlags)(WNoAutoErase | TQt::WStaticContents) ), leftHeader( 0 ), topHeader( 0 ), currentSel( 0 ), lastSortCol( -1 ), sGrid( TRUE ), mRows( FALSE ), mCols( FALSE ), asc( TRUE ), doSort( TRUE ), readOnly( FALSE ) @@ -2046,7 +2046,7 @@ TQTable::TQTable( TQWidget *tqparent, const char *name ) /*! Constructs an empty table called \a name with \a numRows rows and - \a numCols columns. The table is a child of \a tqparent. + \a numCols columns. The table is a child of \a parent. If you're using \l{TQTableItem}s to populate the table's cells, you can create TQTableItem, TQComboTableItem and TQCheckTableItem items @@ -2056,8 +2056,8 @@ TQTable::TQTable( TQWidget *tqparent, const char *name ) \sa TQWidget::clearWFlags() TQt::WidgetFlags */ -TQTable::TQTable( int numRows, int numCols, TQWidget *tqparent, const char *name ) - : TQScrollView( tqparent, name, (WFlags)(WNoAutoErase | TQt::WStaticContents) ), +TQTable::TQTable( int numRows, int numCols, TQWidget *parent, const char *name ) + : TQScrollView( parent, name, (WFlags)(WNoAutoErase | TQt::WStaticContents) ), leftHeader( 0 ), topHeader( 0 ), currentSel( 0 ), lastSortCol( -1 ), sGrid( TRUE ), mRows( FALSE ), mCols( FALSE ), asc( TRUE ), doSort( TRUE ), readOnly( FALSE ) @@ -2750,10 +2750,10 @@ void TQTable::swapCells( int row1, int col1, int row2, int col2 ) widgets.setAutoDelete( TRUE ); } -static bool is_child_of( TQWidget *child, TQWidget *tqparent ) +static bool is_child_of( TQWidget *child, TQWidget *parent ) { while ( child ) { - if ( child == tqparent ) + if ( child == parent ) return TRUE; child = child->parentWidget(); } @@ -5999,7 +5999,7 @@ void TQTable::setCellWidget( int row, int col, TQWidget *e ) e->installEventFilter( this ); clearCellWidget( row, col ); - if ( e->tqparent() != TQT_TQOBJECT(viewport()) ) + if ( e->parent() != TQT_TQOBJECT(viewport()) ) e->reparent( viewport(), TQPoint( 0,0 ) ); TQTableItem *itm = item(row, col); if (itm && itm->row() >= 0 && itm->col() >= 0) { // get the correct row and col if the item is spanning @@ -6516,12 +6516,12 @@ void TQTable::setEnabled( bool b ) /*! Creates a new table header called \a name with \a i sections. It - is a child of widget \a tqparent and attached to table \a t. + is a child of widget \a parent and attached to table \a t. */ TQTableHeader::TQTableHeader( int i, TQTable *t, - TQWidget *tqparent, const char *name ) - : TQHeader( i, tqparent, name ), mousePressed(FALSE), startPos(-1), + TQWidget *parent, const char *name ) + : TQHeader( i, parent, name ), mousePressed(FALSE), startPos(-1), table( t ), caching( FALSE ), resizedSection(-1), numStretches( 0 ) { diff --git a/experimental/tqtinterface/qt4/src/table/tqtable.h b/experimental/tqtinterface/qt4/src/table/tqtable.h index 47b37fd49..1b8792f2e 100644 --- a/experimental/tqtinterface/qt4/src/table/tqtable.h +++ b/experimental/tqtinterface/qt4/src/table/tqtable.h @@ -266,9 +266,9 @@ class TQM_EXPORT_TABLE TQTable : public TQScrollView friend class TQTableItem; public: - TQTable( TQWidget* tqparent=0, const char* name=0 ); + TQTable( TQWidget* parent=0, const char* name=0 ); TQTable( int numRows, int numCols, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); ~TQTable(); TQHeader *horizontalHeader() const; diff --git a/experimental/tqtinterface/qt4/src/tools/tqdir.cpp b/experimental/tqtinterface/qt4/src/tools/tqdir.cpp index 99c9094e8..311a44dd1 100644 --- a/experimental/tqtinterface/qt4/src/tools/tqdir.cpp +++ b/experimental/tqtinterface/qt4/src/tools/tqdir.cpp @@ -601,19 +601,19 @@ void TQDir::setNameFilter( const TQString &nameFilter ) systems that don't support symbolic links). \value All List directories, files, drives and symlinks (this does not list broken symlinks unless you specify System). - \value TypeMask A tqmask for the the Dirs, Files, Drives and + \value TypeMask A mask for the the Dirs, Files, Drives and NoSymLinks flags. \value Readable List files for which the application has read access. \value Writable List files for which the application has write access. \value Executable List files for which the application has execute access. Executables needs to be combined with Dirs or Files. - \value RWEMask A tqmask for the Readable, Writable and Executable flags. + \value RWEMask A mask for the Readable, Writable and Executable flags. \value Modified Only list files that have been modified (ignored under Unix). \value Hidden List hidden files (on Unix, files starting with a .). \value System List system files (on Unix, FIFOs, sockets and tqdevice files) - \value AccessMask A tqmask for the Readable, Writable, Executable + \value AccessMask A mask for the Readable, Writable, Executable Modified, Hidden and System flags \value DefaultFilter Internal flag. @@ -665,7 +665,7 @@ void TQDir::setFilter( int filterSpec ) \value Time Sort by time (modification time). \value Size Sort by file size. \value Unsorted Do not sort. - \value SortByMask A tqmask for Name, Time and Size. + \value SortByMask A mask for Name, Time and Size. \value DirsFirst Put the directories first, then the files. \value Reversed Reverse the sort order. diff --git a/experimental/tqtinterface/qt4/src/tools/tqfileinfo_unix.cpp b/experimental/tqtinterface/qt4/src/tools/tqfileinfo_unix.cpp index 4a0891699..dcde72ab4 100644 --- a/experimental/tqtinterface/qt4/src/tools/tqfileinfo_unix.cpp +++ b/experimental/tqtinterface/qt4/src/tools/tqfileinfo_unix.cpp @@ -290,33 +290,33 @@ bool TQFileInfo::permission( int permissionSpec ) const if ( !fic || !cache ) doStat(); if ( fic ) { - uint tqmask = 0; + uint mask = 0; if ( permissionSpec & ReadOwner ) - tqmask |= S_IRUSR; + mask |= S_IRUSR; if ( permissionSpec & WriteOwner ) - tqmask |= S_IWUSR; + mask |= S_IWUSR; if ( permissionSpec & ExeOwner ) - tqmask |= S_IXUSR; + mask |= S_IXUSR; if ( permissionSpec & ReadUser ) - tqmask |= S_IRUSR; + mask |= S_IRUSR; if ( permissionSpec & WriteUser ) - tqmask |= S_IWUSR; + mask |= S_IWUSR; if ( permissionSpec & ExeUser ) - tqmask |= S_IXUSR; + mask |= S_IXUSR; if ( permissionSpec & ReadGroup ) - tqmask |= S_IRGRP; + mask |= S_IRGRP; if ( permissionSpec & WriteGroup ) - tqmask |= S_IWGRP; + mask |= S_IWGRP; if ( permissionSpec & ExeGroup ) - tqmask |= S_IXGRP; + mask |= S_IXGRP; if ( permissionSpec & ReadOther ) - tqmask |= S_IROTH; + mask |= S_IROTH; if ( permissionSpec & WriteOther ) - tqmask |= S_IWOTH; + mask |= S_IWOTH; if ( permissionSpec & ExeOther ) - tqmask |= S_IXOTH; - if ( tqmask ) { - return (fic->st.st_mode & tqmask) == tqmask; + mask |= S_IXOTH; + if ( mask ) { + return (fic->st.st_mode & mask) == mask; } else { #if defined(TQT_CHECK_NULL) qWarning( "TQFileInfo::permission: permissionSpec is 0" ); diff --git a/experimental/tqtinterface/qt4/src/tools/tqmap.cpp b/experimental/tqtinterface/qt4/src/tools/tqmap.cpp index 70d63423e..e58145536 100644 --- a/experimental/tqtinterface/qt4/src/tools/tqmap.cpp +++ b/experimental/tqtinterface/qt4/src/tools/tqmap.cpp @@ -49,16 +49,16 @@ void TQMapPrivateBase::rotateLeft( NodePtr x, NodePtr& root) NodePtr y = x->right; x->right = y->left; if (y->left !=0) - y->left->tqparent = x; - y->tqparent = x->tqparent; + y->left->parent = x; + y->parent = x->parent; if (x == root) root = y; - else if (x == x->tqparent->left) - x->tqparent->left = y; + else if (x == x->parent->left) + x->parent->left = y; else - x->tqparent->right = y; + x->parent->right = y; y->left = x; - x->tqparent = y; + x->parent = y; } @@ -67,54 +67,54 @@ void TQMapPrivateBase::rotateRight( NodePtr x, NodePtr& root ) NodePtr y = x->left; x->left = y->right; if (y->right != 0) - y->right->tqparent = x; - y->tqparent = x->tqparent; + y->right->parent = x; + y->parent = x->parent; if (x == root) root = y; - else if (x == x->tqparent->right) - x->tqparent->right = y; + else if (x == x->parent->right) + x->parent->right = y; else - x->tqparent->left = y; + x->parent->left = y; y->right = x; - x->tqparent = y; + x->parent = y; } void TQMapPrivateBase::rebalance( NodePtr x, NodePtr& root) { x->color = Node::Red; - while ( x != root && x->tqparent->color == Node::Red ) { - if ( x->tqparent == x->tqparent->tqparent->left ) { - NodePtr y = x->tqparent->tqparent->right; + while ( x != root && x->parent->color == Node::Red ) { + if ( x->parent == x->parent->parent->left ) { + NodePtr y = x->parent->parent->right; if (y && y->color == Node::Red) { - x->tqparent->color = Node::Black; + x->parent->color = Node::Black; y->color = Node::Black; - x->tqparent->tqparent->color = Node::Red; - x = x->tqparent->tqparent; + x->parent->parent->color = Node::Red; + x = x->parent->parent; } else { - if (x == x->tqparent->right) { - x = x->tqparent; + if (x == x->parent->right) { + x = x->parent; rotateLeft( x, root ); } - x->tqparent->color = Node::Black; - x->tqparent->tqparent->color = Node::Red; - rotateRight (x->tqparent->tqparent, root ); + x->parent->color = Node::Black; + x->parent->parent->color = Node::Red; + rotateRight (x->parent->parent, root ); } } else { - NodePtr y = x->tqparent->tqparent->left; + NodePtr y = x->parent->parent->left; if ( y && y->color == Node::Red ) { - x->tqparent->color = Node::Black; + x->parent->color = Node::Black; y->color = Node::Black; - x->tqparent->tqparent->color = Node::Red; - x = x->tqparent->tqparent; + x->parent->parent->color = Node::Red; + x = x->parent->parent; } else { - if (x == x->tqparent->left) { - x = x->tqparent; + if (x == x->parent->left) { + x = x->parent; rotateRight( x, root ); } - x->tqparent->color = Node::Black; - x->tqparent->tqparent->color = Node::Red; - rotateLeft( x->tqparent->tqparent, root ); + x->parent->color = Node::Black; + x->parent->parent->color = Node::Red; + rotateLeft( x->parent->parent, root ); } } } @@ -128,7 +128,7 @@ NodePtr TQMapPrivateBase::removeAndRebalance( NodePtr z, NodePtr& root, { NodePtr y = z; NodePtr x; - NodePtr x_tqparent; + NodePtr x_parent; if (y->left == 0) { x = y->right; } else { @@ -143,109 +143,109 @@ NodePtr TQMapPrivateBase::removeAndRebalance( NodePtr z, NodePtr& root, } } if (y != z) { - z->left->tqparent = y; + z->left->parent = y; y->left = z->left; if (y != z->right) { - x_tqparent = y->tqparent; + x_parent = y->parent; if (x) - x->tqparent = y->tqparent; - y->tqparent->left = x; + x->parent = y->parent; + y->parent->left = x; y->right = z->right; - z->right->tqparent = y; + z->right->parent = y; } else { - x_tqparent = y; + x_parent = y; } if (root == z) root = y; - else if (z->tqparent->left == z) - z->tqparent->left = y; + else if (z->parent->left == z) + z->parent->left = y; else - z->tqparent->right = y; - y->tqparent = z->tqparent; + z->parent->right = y; + y->parent = z->parent; // Swap the colors Node::Color c = y->color; y->color = z->color; z->color = c; y = z; } else { - x_tqparent = y->tqparent; + x_parent = y->parent; if (x) - x->tqparent = y->tqparent; + x->parent = y->parent; if (root == z) root = x; - else if (z->tqparent->left == z) - z->tqparent->left = x; + else if (z->parent->left == z) + z->parent->left = x; else - z->tqparent->right = x; + z->parent->right = x; if ( leftmost == z ) { if (z->right == 0) - leftmost = z->tqparent; + leftmost = z->parent; else leftmost = x->minimum(); } if (rightmost == z) { if (z->left == 0) - rightmost = z->tqparent; + rightmost = z->parent; else rightmost = x->maximum(); } } if (y->color != Node::Red) { while (x != root && (x == 0 || x->color == Node::Black)) { - if (x == x_tqparent->left) { - NodePtr w = x_tqparent->right; + if (x == x_parent->left) { + NodePtr w = x_parent->right; if (w->color == Node::Red) { w->color = Node::Black; - x_tqparent->color = Node::Red; - rotateLeft(x_tqparent, root); - w = x_tqparent->right; + x_parent->color = Node::Red; + rotateLeft(x_parent, root); + w = x_parent->right; } if ((w->left == 0 || w->left->color == Node::Black) && (w->right == 0 || w->right->color == Node::Black)) { w->color = Node::Red; - x = x_tqparent; - x_tqparent = x_tqparent->tqparent; + x = x_parent; + x_parent = x_parent->parent; } else { if (w->right == 0 || w->right->color == Node::Black) { if (w->left) w->left->color = Node::Black; w->color = Node::Red; rotateRight(w, root); - w = x_tqparent->right; + w = x_parent->right; } - w->color = x_tqparent->color; - x_tqparent->color = Node::Black; + w->color = x_parent->color; + x_parent->color = Node::Black; if (w->right) w->right->color = Node::Black; - rotateLeft(x_tqparent, root); + rotateLeft(x_parent, root); break; } } else { - NodePtr w = x_tqparent->left; + NodePtr w = x_parent->left; if (w->color == Node::Red) { w->color = Node::Black; - x_tqparent->color = Node::Red; - rotateRight(x_tqparent, root); - w = x_tqparent->left; + x_parent->color = Node::Red; + rotateRight(x_parent, root); + w = x_parent->left; } if ((w->right == 0 || w->right->color == Node::Black) && (w->left == 0 || w->left->color == Node::Black)) { w->color = Node::Red; - x = x_tqparent; - x_tqparent = x_tqparent->tqparent; + x = x_parent; + x_parent = x_parent->parent; } else { if (w->left == 0 || w->left->color == Node::Black) { if (w->right) w->right->color = Node::Black; w->color = Node::Red; rotateLeft(w, root); - w = x_tqparent->left; + w = x_parent->left; } - w->color = x_tqparent->color; - x_tqparent->color = Node::Black; + w->color = x_parent->color; + x_parent->color = Node::Black; if (w->left) w->left->color = Node::Black; - rotateRight(x_tqparent, root); + rotateRight(x_parent, root); break; } } diff --git a/experimental/tqtinterface/qt4/src/tools/tqmap.h b/experimental/tqtinterface/qt4/src/tools/tqmap.h index 006f49037..cb280fcc9 100644 --- a/experimental/tqtinterface/qt4/src/tools/tqmap.h +++ b/experimental/tqtinterface/qt4/src/tools/tqmap.h @@ -71,7 +71,7 @@ struct TQ_EXPORT TQMapNodeBase TQMapNodeBase* left; TQMapNodeBase* right; - TQMapNodeBase* tqparent; + TQMapNodeBase* parent; Color color; @@ -183,10 +183,10 @@ TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::inc() while ( tmp->left ) tmp = tmp->left; } else { - TQMapNodeBase* y = tmp->tqparent; + TQMapNodeBase* y = tmp->parent; while (tmp == y->right) { tmp = y; - y = y->tqparent; + y = y->parent; } if (tmp->right != y) tmp = y; @@ -200,7 +200,7 @@ TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::dec() { TQMapNodeBase* tmp = node; if (tmp->color == TQMapNodeBase::Red && - tmp->tqparent->tqparent == tmp ) { + tmp->parent->parent == tmp ) { tmp = tmp->right; } else if (tmp->left != 0) { TQMapNodeBase* y = tmp->left; @@ -208,10 +208,10 @@ TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::dec() y = y->right; tmp = y; } else { - TQMapNodeBase* y = tmp->tqparent; + TQMapNodeBase* y = tmp->parent; while (tmp == y->left) { tmp = y; - y = y->tqparent; + y = y->parent; } tmp = y; } @@ -299,10 +299,10 @@ TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc() while ( tmp->left ) tmp = tmp->left; } else { - TQMapNodeBase* y = tmp->tqparent; + TQMapNodeBase* y = tmp->parent; while (tmp == y->right) { tmp = y; - y = y->tqparent; + y = y->parent; } if (tmp->right != y) tmp = y; @@ -316,7 +316,7 @@ TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec() { TQMapNodeBase* tmp = node; if (tmp->color == TQMapNodeBase::Red && - tmp->tqparent->tqparent == tmp ) { + tmp->parent->parent == tmp ) { tmp = tmp->right; } else if (tmp->left != 0) { TQMapNodeBase* y = tmp->left; @@ -324,10 +324,10 @@ TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec() y = y->right; tmp = y; } else { - TQMapNodeBase* y = tmp->tqparent; + TQMapNodeBase* y = tmp->parent; while (tmp == y->left) { tmp = y; - y = y->tqparent; + y = y->parent; } tmp = y; } @@ -394,7 +394,7 @@ public: ConstIterator find(const Key& k) const; void remove( Iterator it ) { - NodePtr del = (NodePtr) removeAndRebalance( it.node, header->tqparent, header->left, header->right ); + NodePtr del = (NodePtr) removeAndRebalance( it.node, header->parent, header->left, header->right ); delete del; --node_count; } @@ -402,7 +402,7 @@ public: #ifdef TQT_TQMAP_DEBUG void inorder( TQMapNodeBase* x = 0, int level = 0 ){ if ( !x ) - x = header->tqparent; + x = header->parent; if ( x->left ) inorder( x->left, level + 1 ); //cout << level << " Key=" << key(x) << " Value=" << ((NodePtr)x)->data << endl; @@ -414,7 +414,7 @@ public: #if 0 Iterator insertMulti(const Key& v){ TQMapNodeBase* y = header; - TQMapNodeBase* x = header->tqparent; + TQMapNodeBase* x = header->parent; while (x != 0){ y = x; x = ( v < key(x) ) ? x->left : x->right; @@ -443,21 +443,21 @@ template <class Key, class T> TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate() { header = new Node; header->color = TQMapNodeBase::Red; // Mark the header - header->tqparent = 0; + header->parent = 0; header->left = header->right = header; } template <class Key, class T> TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate< Key, T >* _map ) : TQMapPrivateBase( _map ) { header = new Node; header->color = TQMapNodeBase::Red; // Mark the header - if ( _map->header->tqparent == 0 ) { - header->tqparent = 0; + if ( _map->header->parent == 0 ) { + header->parent = 0; header->left = header->right = header; } else { - header->tqparent = copy( (NodePtr)(_map->header->tqparent) ); - header->tqparent->tqparent = header; - header->left = header->tqparent->minimum(); - header->right = header->tqparent->maximum(); + header->parent = copy( (NodePtr)(_map->header->parent) ); + header->parent->parent = header; + header->left = header->parent->minimum(); + header->right = header->parent->maximum(); } } @@ -470,13 +470,13 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T> n->color = p->color; if ( p->left ) { n->left = copy( (NodePtr)(p->left) ); - n->left->tqparent = n; + n->left->parent = n; } else { n->left = 0; } if ( p->right ) { n->right = copy( (NodePtr)(p->right) ); - n->right->tqparent = n; + n->right->parent = n; } else { n->right = 0; } @@ -486,9 +486,9 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T> template <class Key, class T> TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear() { - clear( (NodePtr)(header->tqparent) ); + clear( (NodePtr)(header->parent) ); header->color = TQMapNodeBase::Red; - header->tqparent = 0; + header->parent = 0; header->left = header->right = header; node_count = 0; } @@ -508,7 +508,7 @@ template <class Key, class T> TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<Key,T>::find(const Key& k) const { TQMapNodeBase* y = header; // Last node - TQMapNodeBase* x = header->tqparent; // Root node. + TQMapNodeBase* x = header->parent; // Root node. while ( x != 0 ) { // If as k <= key(x) go left @@ -532,7 +532,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T { // Search correct position in the tree TQMapNodeBase* y = header; - TQMapNodeBase* x = header->tqparent; + TQMapNodeBase* x = header->parent; bool result = TRUE; while ( x != 0 ) { result = ( k < key(x) ); @@ -565,7 +565,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T if (y == header || x != 0 || k < key(y) ) { y->left = z; // also makes leftmost = z when y == header if ( y == header ) { - header->tqparent = z; + header->parent = z; header->right = z; } else if ( y == header->left ) header->left = z; // maintain leftmost pointing to min node @@ -574,10 +574,10 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T if ( y == header->right ) header->right = z; // maintain rightmost pointing to max node } - z->tqparent = y; + z->parent = y; z->left = 0; z->right = 0; - rebalance( z, header->tqparent ); + rebalance( z, header->parent ); ++node_count; return Iterator(z); } diff --git a/experimental/tqtinterface/qt4/src/tools/tqregexp.cpp b/experimental/tqtinterface/qt4/src/tools/tqregexp.cpp index 5f738723d..7a7f1abed 100644 --- a/experimental/tqtinterface/qt4/src/tools/tqregexp.cpp +++ b/experimental/tqtinterface/qt4/src/tools/tqregexp.cpp @@ -1074,7 +1074,7 @@ private: */ struct Atom { - int tqparent; // index of tqparent in array of atoms + int parent; // index of parent in array of atoms int capture; // index of capture, from 1 to ncap }; #endif @@ -1111,7 +1111,7 @@ private: ( (Anchor_FirstLookahead << MaxLookaheads) - 1 ) }; #ifndef TQT_NO_REGEXP_CAPTURE int startAtom( bool capture ); - void finishAtom( int atom ) { cf = f[atom].tqparent; } + void finishAtom( int atom ) { cf = f[atom].parent; } #endif #ifndef TQT_NO_REGEXP_LOOKAHEAD @@ -1605,7 +1605,7 @@ void TQRegExpEngine::dump() const if ( nf > 0 ) { qDebug( " Atom Parent Capture" ); for ( i = 0; i < nf; i++ ) - qDebug( " %6d %6d %6d", i, f[i].tqparent, f[i].capture ); + qDebug( " %6d %6d %6d", i, f[i].parent, f[i].capture ); } #endif #ifndef TQT_NO_REGEXP_ANCHOR_ALT @@ -1672,7 +1672,7 @@ int TQRegExpEngine::startAtom( bool capture ) { if ( (nf & (nf + 1)) == 0 && nf + 1 >= (int) f.size() ) f.resize( (nf + 1) << 1 ); - f[nf].tqparent = cf; + f[nf].parent = cf; cf = nf++; f[cf].capture = capture ? ncap++ : -1; return cf; @@ -2059,11 +2059,11 @@ bool TQRegExpEngine::matchHere() /* Lemma 1. For any x in the range [0..nf), we - have f[x].tqparent < x. + have f[x].parent < x. Proof. By looking at startAtom(), it is clear that cf < nf holds all the time, and - thus that f[nf].tqparent < nf. + thus that f[nf].parent < nf. */ /* @@ -2076,7 +2076,7 @@ bool TQRegExpEngine::matchHere() b.fill( FALSE, nf ); b.setBit( q, TRUE ); for ( int ell = q + 1; ell < nf; ell++ ) { - if ( b.testBit(f[ell].tqparent) ) { + if ( b.testBit(f[ell].parent) ) { b.setBit( ell, TRUE ); cap = f[ell].capture; if ( cap >= 0 ) { @@ -2085,15 +2085,15 @@ bool TQRegExpEngine::matchHere() } } } - p = f[q].tqparent; + p = f[q].parent; /* Otherwise, close the capture zones we are leaving. We are leaving f[c].capture, - f[f[c].tqparent].capture, - f[f[f[c].tqparent].tqparent].capture, ..., + f[f[c].parent].capture, + f[f[f[c].parent].parent].capture, ..., until f[x].capture, with x such that - f[x].tqparent is the youngest common ancestor + f[x].parent is the youngest common ancestor for c and n. We go up along c's and n's ancestry until @@ -2113,9 +2113,9 @@ bool TQRegExpEngine::matchHere() capEnd[cap] = i; } } - p = f[p].tqparent; + p = f[p].parent; } else { - q = f[q].tqparent; + q = f[q].parent; } } } @@ -2123,7 +2123,7 @@ bool TQRegExpEngine::matchHere() /* In any case, we now open the capture zones we are entering. We work upwards from n - until we reach p (the tqparent of the atom we + until we reach p (the parent of the atom we reenter or the youngest common ancestor). */ while ( n > p ) { @@ -2132,7 +2132,7 @@ bool TQRegExpEngine::matchHere() capBegin[cap] = i; capEnd[cap] = EmptyCapture; } - n = f[n].tqparent; + n = f[n].parent; } /* If the next state was already in diff --git a/experimental/tqtinterface/qt4/src/tools/tqtextstream.cpp b/experimental/tqtinterface/qt4/src/tools/tqtextstream.cpp index 1225f7bf1..ca4b11e07 100644 --- a/experimental/tqtinterface/qt4/src/tools/tqtextstream.cpp +++ b/experimental/tqtinterface/qt4/src/tools/tqtextstream.cpp @@ -2310,14 +2310,14 @@ TQTextStream &TQTextStream::operator<<( void *ptr ) */ /*! - \fn int TQTextStream::setf( int bits, int tqmask ) + \fn int TQTextStream::setf( int bits, int mask ) \overload - Sets the stream flag bits \a bits with a bit tqmask \a tqmask. Returns + Sets the stream flag bits \a bits with a bit mask \a mask. Returns the previous stream flags. - Equivalent to \c{flags( (flags() & ~tqmask) | (bits & tqmask) )}. + Equivalent to \c{flags( (flags() & ~mask) | (bits & mask) )}. \sa setf(), unsetf() */ @@ -2328,7 +2328,7 @@ TQTextStream &TQTextStream::operator<<( void *ptr ) Clears the stream flag bits \a bits. Returns the previous stream flags. - Equivalent to \c{flags( flags() & ~tqmask )}. + Equivalent to \c{flags( flags() & ~mask )}. \sa setf() */ diff --git a/experimental/tqtinterface/qt4/src/tools/tqtextstream.h b/experimental/tqtinterface/qt4/src/tools/tqtextstream.h index 53aaddb56..684687b32 100644 --- a/experimental/tqtinterface/qt4/src/tools/tqtextstream.h +++ b/experimental/tqtinterface/qt4/src/tools/tqtextstream.h @@ -142,7 +142,7 @@ public: int flags() const; int flags( int f ); int setf( int bits ); - int setf( int bits, int tqmask ); + int setf( int bits, int mask ); int unsetf( int bits ); void reset(); @@ -257,8 +257,8 @@ inline int TQTextStream::flags( int f ) inline int TQTextStream::setf( int bits ) { int oldf = fflags; fflags |= bits; return oldf; } -inline int TQTextStream::setf( int bits, int tqmask ) -{ int oldf = fflags; fflags = (fflags & ~tqmask) | (bits & tqmask); return oldf; } +inline int TQTextStream::setf( int bits, int mask ) +{ int oldf = fflags; fflags = (fflags & ~mask) | (bits & mask); return oldf; } inline int TQTextStream::unsetf( int bits ) { int oldf = fflags; fflags &= ~bits; return oldf; } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqaction.cpp b/experimental/tqtinterface/qt4/src/widgets/tqaction.cpp index 8a65d068c..6857ddada 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqaction.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqaction.cpp @@ -220,7 +220,7 @@ TQActionPrivate::~TQActionPrivate() ++itci; TQComboBox* combo = ci->combo; combo->clear(); - TQActionGroup *group = ::tqqt_cast<TQActionGroup*>(action->tqparent()); + TQActionGroup *group = ::tqqt_cast<TQActionGroup*>(action->parent()); TQObjectList *siblings = group ? group->queryList("TQAction") : 0; if (siblings) { TQObjectListIt it(*siblings); @@ -392,38 +392,38 @@ static TQString qt_stripMenuText( TQString s ) } /*! - Constructs an action called \a name with tqparent \a tqparent. + Constructs an action called \a name with parent \a parent. - If \a tqparent is a TQActionGroup, the new action inserts itself into - \a tqparent. + If \a parent is a TQActionGroup, the new action inserts itself into + \a parent. - For accelerators and status tips to work, \a tqparent must either be - a widget, or an action group whose tqparent is a widget. + For accelerators and status tips to work, \a parent must either be + a widget, or an action group whose parent is a widget. \warning To prevent recursion, don't create an action as a child of a widget that the action is later added to. */ -TQAction::TQAction( TQT_BASE_OBJECT_NAME* tqparent, const char* name ) - : TQObject( TQT_TQOBJECT(tqparent), name ) +TQAction::TQAction( TQT_BASE_OBJECT_NAME* parent, const char* name ) + : TQObject( TQT_TQOBJECT(parent), name ) { d = new TQActionPrivate(this); init(); } /*! \obsolete - Constructs an action called \a name with tqparent \a tqparent. + Constructs an action called \a name with parent \a parent. If \a toggle is TRUE the action will be a toggle action, otherwise it will be a command action. - If \a tqparent is a TQActionGroup, the new action inserts itself into - \a tqparent. + If \a parent is a TQActionGroup, the new action inserts itself into + \a parent. - For accelerators and status tips to work, \a tqparent must either be - a widget, or an action group whose tqparent is a widget. + For accelerators and status tips to work, \a parent must either be + a widget, or an action group whose parent is a widget. */ -TQAction::TQAction( TQT_BASE_OBJECT_NAME* tqparent, const char* name, bool toggle ) - : TQObject( TQT_TQOBJECT(tqparent), name ) +TQAction::TQAction( TQT_BASE_OBJECT_NAME* parent, const char* name, bool toggle ) + : TQObject( TQT_TQOBJECT(parent), name ) { d = new TQActionPrivate(this); d->toggleaction = toggle; @@ -436,14 +436,14 @@ TQAction::TQAction( TQT_BASE_OBJECT_NAME* tqparent, const char* name, bool toggl /*! This constructor creates an action with the following properties: the icon or iconset \a icon, the menu text \a menuText and - keyboard accelerator \a accel. It is a child of \a tqparent and + keyboard accelerator \a accel. It is a child of \a parent and called \a name. - If \a tqparent is a TQActionGroup, the action automatically becomes + If \a parent is a TQActionGroup, the action automatically becomes a member of it. - For accelerators and status tips to work, \a tqparent must either be - a widget, or an action group whose tqparent is a widget. + For accelerators and status tips to work, \a parent must either be + a widget, or an action group whose parent is a widget. The action uses a stripped version of \a menuText (e.g. "\&Menu Option..." becomes "Menu Option") as descriptive text for @@ -458,8 +458,8 @@ TQAction::TQAction( TQT_BASE_OBJECT_NAME* tqparent, const char* name, bool toggl of a widget that the action is later added to. */ TQAction::TQAction( const TQIconSet& icon, const TQString& menuText, TQKeySequence accel, - TQT_BASE_OBJECT_NAME* tqparent, const char* name ) - : TQObject( TQT_TQOBJECT(tqparent), name ) + TQT_BASE_OBJECT_NAME* parent, const char* name ) + : TQObject( TQT_TQOBJECT(parent), name ) { d = new TQActionPrivate(this); if ( !icon.isNull() ) @@ -473,13 +473,13 @@ TQAction::TQAction( const TQIconSet& icon, const TQString& menuText, TQKeySequen /*! This constructor results in an icon-less action with the the menu text \a menuText and keyboard accelerator \a accel. It is a child - of \a tqparent and called \a name. + of \a parent and called \a name. - If \a tqparent is a TQActionGroup, the action automatically becomes + If \a parent is a TQActionGroup, the action automatically becomes a member of it. - For accelerators and status tips to work, \a tqparent must either be - a widget, or an action group whose tqparent is a widget. + For accelerators and status tips to work, \a parent must either be + a widget, or an action group whose parent is a widget. The action uses a stripped version of \a menuText (e.g. "\&Menu Option..." becomes "Menu Option") as descriptive text for @@ -494,8 +494,8 @@ TQAction::TQAction( const TQIconSet& icon, const TQString& menuText, TQKeySequen of a widget that the action is later added to. */ TQAction::TQAction( const TQString& menuText, TQKeySequence accel, - TQT_BASE_OBJECT_NAME* tqparent, const char* name ) - : TQObject( TQT_TQOBJECT(tqparent), name ) + TQT_BASE_OBJECT_NAME* parent, const char* name ) + : TQObject( TQT_TQOBJECT(parent), name ) { d = new TQActionPrivate(this); d->text = qt_stripMenuText( menuText ); @@ -508,21 +508,21 @@ TQAction::TQAction( const TQString& menuText, TQKeySequence accel, This constructor creates an action with the following properties: the description \a text, the icon or iconset \a icon, the menu text \a menuText and keyboard accelerator \a accel. It is a child - of \a tqparent and called \a name. If \a toggle is TRUE the action + of \a parent and called \a name. If \a toggle is TRUE the action will be a toggle action, otherwise it will be a command action. - If \a tqparent is a TQActionGroup, the action automatically becomes + If \a parent is a TQActionGroup, the action automatically becomes a member of it. - For accelerators and status tips to work, \a tqparent must either be - a widget, or an action group whose tqparent is a widget. + For accelerators and status tips to work, \a parent must either be + a widget, or an action group whose parent is a widget. The \a text and \a accel will be used for tool tips and status tips unless you provide specific text for these using setToolTip() and setStatusTip(). */ -TQAction::TQAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, TQKeySequence accel, TQT_BASE_OBJECT_NAME* tqparent, const char* name, bool toggle ) - : TQObject( TQT_TQOBJECT(tqparent), name ) +TQAction::TQAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, TQKeySequence accel, TQT_BASE_OBJECT_NAME* parent, const char* name, bool toggle ) + : TQObject( TQT_TQOBJECT(parent), name ) { d = new TQActionPrivate(this); d->toggleaction = toggle; @@ -538,22 +538,22 @@ TQAction::TQAction( const TQString& text, const TQIconSet& icon, const TQString& /*! \obsolete This constructor results in an icon-less action with the description \a text, the menu text \a menuText and the keyboard - accelerator \a accel. Its tqparent is \a tqparent and it is called \a + accelerator \a accel. Its parent is \a parent and it is called \a name. If \a toggle is TRUE the action will be a toggle action, otherwise it will be a command action. - The action automatically becomes a member of \a tqparent if \a - tqparent is a TQActionGroup. + The action automatically becomes a member of \a parent if \a + parent is a TQActionGroup. - For accelerators and status tips to work, \a tqparent must either be - a widget, or an action group whose tqparent is a widget. + For accelerators and status tips to work, \a parent must either be + a widget, or an action group whose parent is a widget. The \a text and \a accel will be used for tool tips and status tips unless you provide specific text for these using setToolTip() and setStatusTip(). */ -TQAction::TQAction( const TQString& text, const TQString& menuText, TQKeySequence accel, TQT_BASE_OBJECT_NAME* tqparent, const char* name, bool toggle ) - : TQObject( TQT_TQOBJECT(tqparent), name ) +TQAction::TQAction( const TQString& text, const TQString& menuText, TQKeySequence accel, TQT_BASE_OBJECT_NAME* parent, const char* name, bool toggle ) + : TQObject( TQT_TQOBJECT(parent), name ) { d = new TQActionPrivate(this); d->toggleaction = toggle; @@ -569,8 +569,8 @@ TQAction::TQAction( const TQString& text, const TQString& menuText, TQKeySequenc */ void TQAction::init() { - if ( ::tqqt_cast<TQActionGroup*>(tqparent()) ) - ((TQActionGroup*) tqparent())->add( this ); // insert into action group + if ( ::tqqt_cast<TQActionGroup*>(parent()) ) + ((TQActionGroup*) parent())->add( this ); // insert into action group } /*! @@ -696,7 +696,7 @@ TQString TQAction::toolTip() const \brief the action's status tip The statusTip is displayed on all status bars that this action's - toplevel tqparent widget provides. + toplevel parent widget provides. If no status tip is defined, the action uses the tool tip text. @@ -775,9 +775,9 @@ void TQAction::setAccel( const TQKeySequence& key ) return; } - TQObject* p = tqparent(); + TQObject* p = parent(); while ( p && !p->isWidgetType() ) { - p = p->tqparent(); + p = p->parent(); } if ( p ) { d->accel = new TQAccel( (TQWidget*)p, this, "qt_action_accel" ); @@ -786,7 +786,7 @@ void TQAction::setAccel( const TQKeySequence& key ) } #if defined(TQT_CHECK_STATE) else - qWarning( "TQAction::setAccel() (%s) requires widget in tqparent chain", name() ); + qWarning( "TQAction::setAccel() (%s) requires widget in parent chain", name() ); #endif d->update(); } @@ -1119,13 +1119,13 @@ void TQAction::showtqStatusText( const TQString& text ) } } - TQObject* par = tqparent(); + TQObject* par = parent(); TQObject* lpar = 0; TQStatusBar *bar = 0; while ( par && !bar ) { lpar = par; bar = (TQStatusBar*)par->child( 0, "TQStatusBar", FALSE ); - par = par->tqparent(); + par = par->parent(); } if ( !bar && lpar ) { TQObjectList *l = lpar->queryList( "TQStatusBar" ); @@ -1347,9 +1347,9 @@ void TQActionGroupPrivate::update( const TQActionGroup* that ) #endif } for ( TQPtrListIterator<TQActionGroupPrivate::MenuItem> pu( menuitems ); pu.current(); ++pu ) { - TQWidget* tqparent = pu.current()->popup->parentWidget(); - if ( ::tqqt_cast<TQPopupMenu*>(tqparent) ) { - TQPopupMenu* ppopup = (TQPopupMenu*)tqparent; + TQWidget* parent = pu.current()->popup->parentWidget(); + if ( ::tqqt_cast<TQPopupMenu*>(parent) ) { + TQPopupMenu* ppopup = (TQPopupMenu*)parent; ppopup->setItemEnabled( pu.current()->id, that->isEnabled() ); ppopup->setItemVisible( pu.current()->id, that->isVisible() ); } else { @@ -1358,20 +1358,20 @@ void TQActionGroupPrivate::update( const TQActionGroup* that ) } for ( TQPtrListIterator<TQPopupMenu> pm( popupmenus ); pm.current(); ++pm ) { TQPopupMenu *popup = pm.current(); - TQPopupMenu *tqparent = ::tqqt_cast<TQPopupMenu*>(popup->parentWidget()); - if ( !tqparent ) + TQPopupMenu *parent = ::tqqt_cast<TQPopupMenu*>(popup->parentWidget()); + if ( !parent ) continue; int index; - tqparent->findPopup( popup, &index ); - int id = tqparent->idAt( index ); + parent->findPopup( popup, &index ); + int id = parent->idAt( index ); if ( !that->iconSet().isNull() ) - tqparent->changeItem( id, that->iconSet(), that->menuText() ); + parent->changeItem( id, that->iconSet(), that->menuText() ); else - tqparent->changeItem( id, that->menuText() ); - tqparent->setItemEnabled( id, that->isEnabled() ); + parent->changeItem( id, that->menuText() ); + parent->setItemEnabled( id, that->isEnabled() ); #ifndef TQT_NO_ACCEL - tqparent->setAccel( that->accel(), id ); + parent->setAccel( that->accel(), id ); #endif } } @@ -1428,18 +1428,18 @@ void TQActionGroupPrivate::update( const TQActionGroup* that ) Actions can be added to an action group using add(), but normally they are added by creating the action with the action group as - tqparent. Actions can have separators dividing them using + parent. Actions can have separators dividing them using addSeparator(). Action groups are added to widgets with addTo(). */ /*! - Constructs an action group called \a name, with tqparent \a tqparent. + Constructs an action group called \a name, with parent \a parent. The action group is exclusive by default. Call setExclusive(FALSE) to make the action group non-exclusive. */ -TQActionGroup::TQActionGroup( TQT_BASE_OBJECT_NAME* tqparent, const char* name ) - : TQAction( TQT_TQOBJECT(tqparent), name ) +TQActionGroup::TQActionGroup( TQT_BASE_OBJECT_NAME* parent, const char* name ) + : TQAction( TQT_TQOBJECT(parent), name ) { d = new TQActionGroupPrivate; d->exclusive = TRUE; @@ -1452,15 +1452,15 @@ TQActionGroup::TQActionGroup( TQT_BASE_OBJECT_NAME* tqparent, const char* name ) } /*! - Constructs an action group called \a name, with tqparent \a tqparent. + Constructs an action group called \a name, with parent \a parent. If \a exclusive is TRUE only one toggle action in the group will ever be active. \sa exclusive */ -TQActionGroup::TQActionGroup( TQT_BASE_OBJECT_NAME* tqparent, const char* name, bool exclusive ) - : TQAction( TQT_TQOBJECT(tqparent), name ) +TQActionGroup::TQActionGroup( TQT_BASE_OBJECT_NAME* parent, const char* name, bool exclusive ) + : TQAction( TQT_TQOBJECT(parent), name ) { d = new TQActionGroupPrivate; d->exclusive = exclusive; @@ -1572,7 +1572,7 @@ bool TQActionGroup::usesDropDown() const Adds action \a action to this group. Normally an action is added to a group by creating it with the - group as tqparent, so this function is not usually used. + group as parent, so this function is not usually used. \sa addTo() */ @@ -1630,7 +1630,7 @@ void TQActionGroup::addSeparator() \obsolete Use add() instead, or better still create the action with the action - group as its tqparent. + group as its parent. */ /*! diff --git a/experimental/tqtinterface/qt4/src/widgets/tqaction.h b/experimental/tqtinterface/qt4/src/widgets/tqaction.h index 12f814808..08095e432 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqaction.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqaction.h @@ -75,19 +75,19 @@ class TQ_EXPORT TQAction : public TQObject Q_PROPERTY( bool visible READ isVisible WRITE tqsetVisible ) public: - TQAction( TQT_BASE_OBJECT_NAME* tqparent, const char* name = 0 ); + TQAction( TQT_BASE_OBJECT_NAME* parent, const char* name = 0 ); #ifndef TQT_NO_ACCEL TQAction( const TQString& menuText, TQKeySequence accel, - TQT_BASE_OBJECT_NAME* tqparent, const char* name = 0 ); + TQT_BASE_OBJECT_NAME* parent, const char* name = 0 ); TQAction( const TQIconSet& icon, const TQString& menuText, TQKeySequence accel, - TQT_BASE_OBJECT_NAME* tqparent, const char* name = 0 ); + TQT_BASE_OBJECT_NAME* parent, const char* name = 0 ); TQAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, TQKeySequence accel, - TQT_BASE_OBJECT_NAME* tqparent, const char* name = 0, bool toggle = FALSE ); // obsolete - TQAction( const TQString& text, const TQString& menuText, TQKeySequence accel, TQT_BASE_OBJECT_NAME* tqparent, + TQT_BASE_OBJECT_NAME* parent, const char* name = 0, bool toggle = FALSE ); // obsolete + TQAction( const TQString& text, const TQString& menuText, TQKeySequence accel, TQT_BASE_OBJECT_NAME* parent, const char* name = 0, bool toggle = FALSE ); // obsolete #endif - TQAction( TQT_BASE_OBJECT_NAME* tqparent, const char* name , bool toggle ); // obsolete + TQAction( TQT_BASE_OBJECT_NAME* parent, const char* name , bool toggle ); // obsolete ~TQAction(); virtual void setIconSet( const TQIconSet& ); @@ -160,8 +160,8 @@ class TQ_EXPORT TQActionGroup : public TQAction Q_PROPERTY( bool usesDropDown READ usesDropDown WRITE setUsesDropDown ) public: - TQActionGroup( TQT_BASE_OBJECT_NAME* tqparent, const char* name = 0 ); - TQActionGroup( TQT_BASE_OBJECT_NAME* tqparent, const char* name , bool exclusive ); // obsolete + TQActionGroup( TQT_BASE_OBJECT_NAME* parent, const char* name = 0 ); + TQActionGroup( TQT_BASE_OBJECT_NAME* parent, const char* name , bool exclusive ); // obsolete ~TQActionGroup(); void setExclusive( bool ); bool isExclusive() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqbutton.cpp b/experimental/tqtinterface/qt4/src/widgets/tqbutton.cpp index e9f8d10df..a94d0cb7d 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqbutton.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqbutton.cpp @@ -315,9 +315,9 @@ TQTimer *TQButton::timer() \brief the pixmap shown on the button If the pixmap is monochrome (i.e. it is a TQBitmap or its \link - TQPixmap::depth() depth\endlink is 1) and it does not have a tqmask, - this property will set the pixmap to be its own tqmask. The purpose - of this is to draw transtqparent bitmaps which are important for + TQPixmap::depth() depth\endlink is 1) and it does not have a mask, + this property will set the pixmap to be its own mask. The purpose + of this is to draw transparent bitmaps which are important for toggle buttons, for example. pixmap() returns 0 if no pixmap was set. @@ -371,15 +371,15 @@ TQTimer *TQButton::timer() */ /*! - Constructs a standard button called \a name with tqparent \a tqparent, + Constructs a standard button called \a name with parent \a parent, using the widget flags \a f. - If \a tqparent is a TQButtonGroup, this constructor calls + If \a parent is a TQButtonGroup, this constructor calls TQButtonGroup::insert(). */ -TQButton::TQButton( TQWidget *tqparent, const char *name, WFlags f ) - : TQWidget( tqparent, name, f ) +TQButton::TQButton( TQWidget *parent, const char *name, WFlags f ) + : TQWidget( parent, name, f ) { bpixmap = 0; toggleTyp = SingleShot; // button is simple @@ -391,8 +391,8 @@ TQButton::TQButton( TQWidget *tqparent, const char *name, WFlags f ) repeat = FALSE; // not in autorepeat mode d = 0; #ifndef TQT_NO_BUTTONGROUP - if ( ::tqqt_cast<TQButtonGroup*>(tqparent) ) { - setGroup((TQButtonGroup*)tqparent); + if ( ::tqqt_cast<TQButtonGroup*>(parent) ) { + setGroup((TQButtonGroup*)parent); group()->insert( this ); // insert into button group } #endif @@ -512,7 +512,7 @@ void TQButton::setPixmap( const TQPixmap &pixmap ) bpixmap = new TQPixmap( pixmap ); TQ_CHECK_PTR( bpixmap ); } - if ( bpixmap->depth() == 1 && !bpixmap->tqmask() ) + if ( bpixmap->depth() == 1 && !bpixmap->mask() ) bpixmap->setMask( *((TQBitmap *)bpixmap) ); if ( !btext.isNull() ) { btext = TQString::null; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqbutton.h b/experimental/tqtinterface/qt4/src/widgets/tqbutton.h index 42088a777..70f3e752a 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqbutton.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqbutton.h @@ -71,7 +71,7 @@ class TQ_EXPORT TQButton : public TQWidget Q_PROPERTY( bool exclusiveToggle READ isExclusiveToggle ) public: - TQButton( TQWidget* tqparent=0, const char* name=0, WFlags f=0 ); + TQButton( TQWidget* parent=0, const char* name=0, WFlags f=0 ); ~TQButton(); TQString text() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.cpp b/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.cpp index 41da90888..31ff7a5d5 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.cpp @@ -72,13 +72,13 @@ There are two ways of using a button group: \list - \i The button group is the tqparent widget of a number of buttons, - i.e. the button group is the tqparent argument in the button + \i The button group is the parent widget of a number of buttons, + i.e. the button group is the parent argument in the button constructor. The buttons are assigned identifiers 0, 1, 2, etc., in the order they are created. A TQButtonGroup can display a frame and a title because it inherits TQGroupBox. \i The button group is an invisible widget and the contained - buttons have some other tqparent widget. In this usage, each button + buttons have some other parent widget. In this usage, each button must be manually inserted, using insert(), into the button group and given an identifier. \endlist @@ -132,12 +132,12 @@ typedef TQPtrListIterator<TQButtonItem> TQButtonListIt; /*! Constructs a button group with no title. - The \a tqparent and \a name arguments are passed to the TQWidget + The \a parent and \a name arguments are passed to the TQWidget constructor. */ -TQButtonGroup::TQButtonGroup( TQWidget *tqparent, const char *name ) - : TQGroupBox( tqparent, name ) +TQButtonGroup::TQButtonGroup( TQWidget *parent, const char *name ) + : TQGroupBox( parent, name ) { init(); } @@ -145,13 +145,13 @@ TQButtonGroup::TQButtonGroup( TQWidget *tqparent, const char *name ) /*! Constructs a button group with the title \a title. - The \a tqparent and \a name arguments are passed to the TQWidget + The \a parent and \a name arguments are passed to the TQWidget constructor. */ -TQButtonGroup::TQButtonGroup( const TQString &title, TQWidget *tqparent, +TQButtonGroup::TQButtonGroup( const TQString &title, TQWidget *parent, const char *name ) - : TQGroupBox( title, tqparent, name ) + : TQGroupBox( title, parent, name ) { init(); } @@ -161,13 +161,13 @@ TQButtonGroup::TQButtonGroup( const TQString &title, TQWidget *tqparent, arranged in \a strips rows or columns (depending on \a orientation). - The \a tqparent and \a name arguments are passed to the TQWidget + The \a parent and \a name arguments are passed to the TQWidget constructor. */ TQButtonGroup::TQButtonGroup( int strips, Qt::Orientation orientation, - TQWidget *tqparent, const char *name ) - : TQGroupBox( strips, orientation, tqparent, name ) + TQWidget *parent, const char *name ) + : TQGroupBox( strips, orientation, parent, name ) { init(); } @@ -177,14 +177,14 @@ TQButtonGroup::TQButtonGroup( int strips, Qt::Orientation orientation, be arranged in \a strips rows or columns (depending on \a orientation). - The \a tqparent and \a name arguments are passed to the TQWidget + The \a parent and \a name arguments are passed to the TQWidget constructor. */ TQButtonGroup::TQButtonGroup( int strips, Qt::Orientation orientation, - const TQString &title, TQWidget *tqparent, + const TQString &title, TQWidget *parent, const char *name ) - : TQGroupBox( strips, orientation, title, tqparent, name ) + : TQGroupBox( strips, orientation, title, parent, name ) { init(); } @@ -232,11 +232,11 @@ void TQButtonGroup::setExclusive( bool enable ) group. Returns the button identifier. Buttons are normally inserted into a button group automatically by - passing the button group as the tqparent when the button is + passing the button group as the parent when the button is constructed. So it is not necessary to manually insert buttons - that have this button group as their tqparent widget. An exception + that have this button group as their parent widget. An exception is when you want custom identifiers instead of the default 0, 1, - 2, etc., or if you want the buttons to have some other tqparent. + 2, etc., or if you want the buttons to have some other parent. The button is assigned the identifier \a id or an automatically generated identifier. It works as follows: If \a id >= 0, this diff --git a/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.h b/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.h index cdef0a828..052f1acea 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqbuttongroup.h @@ -61,13 +61,13 @@ class TQ_EXPORT TQButtonGroup : public TQGroupBox Q_PROPERTY( int selectedId READ selectedId WRITE setButton ) public: - TQButtonGroup( TQWidget* tqparent=0, const char* name=0 ); + TQButtonGroup( TQWidget* parent=0, const char* name=0 ); TQButtonGroup( const TQString &title, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); TQButtonGroup( int columns, Qt::Orientation o, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); TQButtonGroup( int columns, Qt::Orientation o, const TQString &title, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); ~TQButtonGroup(); bool isExclusive() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.cpp index 49838ecdf..b295e4fb9 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.cpp @@ -120,12 +120,12 @@ /*! Constructs a checkbox with no text. - The \a tqparent and \a name arguments are sent to the TQWidget + The \a parent and \a name arguments are sent to the TQWidget constructor. */ -TQCheckBox::TQCheckBox( TQWidget *tqparent, const char *name ) - : TQButton( tqparent, name, TQt::WNoAutoErase | TQt::WMouseNoMask ) +TQCheckBox::TQCheckBox( TQWidget *parent, const char *name ) + : TQButton( parent, name, TQt::WNoAutoErase | TQt::WMouseNoMask ) { setToggleButton( TRUE ); tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); @@ -134,12 +134,12 @@ TQCheckBox::TQCheckBox( TQWidget *tqparent, const char *name ) /*! Constructs a checkbox with text \a text. - The \a tqparent and \a name arguments are sent to the TQWidget + The \a parent and \a name arguments are sent to the TQWidget constructor. */ -TQCheckBox::TQCheckBox( const TQString &text, TQWidget *tqparent, const char *name ) - : TQButton( tqparent, name, TQt::WNoAutoErase | TQt::WMouseNoMask ) +TQCheckBox::TQCheckBox( const TQString &text, TQWidget *parent, const char *name ) + : TQButton( parent, name, TQt::WNoAutoErase | TQt::WMouseNoMask ) { setText( text ); setToggleButton( TRUE ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.h b/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.h index 3f0e21bc0..66f0cbb98 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.h @@ -56,8 +56,8 @@ class TQ_EXPORT TQCheckBox : public TQButton TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: - TQCheckBox( TQWidget *tqparent, const char* name=0 ); - TQCheckBox( const TQString &text, TQWidget *tqparent, const char* name=0 ); + TQCheckBox( TQWidget *parent, const char* name=0 ); + TQCheckBox( const TQString &text, TQWidget *parent, const char* name=0 ); bool isChecked() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqcombobox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqcombobox.cpp index 382258b30..f934485d1 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqcombobox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqcombobox.cpp @@ -342,8 +342,8 @@ class TQComboBoxPopup : public TQPopupMenu { public: - TQComboBoxPopup( TQWidget *tqparent=0, const char *name=0 ) - : TQPopupMenu( tqparent, name ) + TQComboBoxPopup( TQWidget *parent=0, const char *name=0 ) + : TQPopupMenu( parent, name ) { } @@ -499,7 +499,7 @@ static inline bool checkIndex( const char *method, const char * name, /*! - Constructs a combobox widget with tqparent \a tqparent called \a name. + Constructs a combobox widget with parent \a parent called \a name. This constructor creates a popup list if the program uses Motif (or Aqua) look and feel; this is compatible with Motif 1.x and @@ -513,8 +513,8 @@ static inline bool checkIndex( const char *method, const char * name, -TQComboBox::TQComboBox( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WNoAutoErase ) +TQComboBox::TQComboBox( TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WNoAutoErase ) { d = new TQComboBoxData( this ); if ( tqstyle().tqstyleHint(TQStyle::SH_ComboBox_Popup, this) || @@ -556,13 +556,13 @@ TQComboBox::TQComboBox( TQWidget *tqparent, const char *name ) The input field can be edited if \a rw is TRUE, otherwise the user may only choose one of the items in the combobox. - The \a tqparent and \a name arguments are passed on to the TQWidget + The \a parent and \a name arguments are passed on to the TQWidget constructor. */ -TQComboBox::TQComboBox( bool rw, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WNoAutoErase ) +TQComboBox::TQComboBox( bool rw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WNoAutoErase ) { d = new TQComboBoxData( this ); setUpListBox(); @@ -2298,7 +2298,7 @@ void TQComboBox::setLineEdit( TQLineEdit *edit ) delete d->ed; d->ed = edit; - if ( edit->tqparent() != TQT_TQOBJECT(this) ) + if ( edit->parent() != TQT_TQOBJECT(this) ) edit->reparent( this, TQPoint(0,0), FALSE ); connect (edit, TQT_SIGNAL( textChanged(const TQString&) ), diff --git a/experimental/tqtinterface/qt4/src/widgets/tqcombobox.h b/experimental/tqtinterface/qt4/src/widgets/tqcombobox.h index bfee1920e..f67e7fd68 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqcombobox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqcombobox.h @@ -74,8 +74,8 @@ class TQ_EXPORT TQComboBox : public TQWidget TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: - TQComboBox( TQWidget* tqparent=0, const char* name=0 ); - TQComboBox( bool rw, TQWidget* tqparent=0, const char* name=0 ); + TQComboBox( TQWidget* parent=0, const char* name=0 ); + TQComboBox( bool rw, TQWidget* parent=0, const char* name=0 ); ~TQComboBox(); int count() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp index 346bdd34b..be63178e9 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp @@ -383,7 +383,7 @@ class TQDateTimeEditor : public TQWidget Q_OBJECT TQ_OBJECT public: - TQDateTimeEditor( TQDateTimeEditBase * widget, TQWidget *tqparent, + TQDateTimeEditor( TQDateTimeEditBase * widget, TQWidget *parent, const char * name=0 ); ~TQDateTimeEditor(); @@ -419,8 +419,8 @@ class TQDateTimeSpinWidget : public TQSpinWidget Q_OBJECT TQ_OBJECT public: - TQDateTimeSpinWidget( TQWidget *tqparent, const char *name ) - : TQSpinWidget( tqparent, name ) + TQDateTimeSpinWidget( TQWidget *parent, const char *name ) + : TQSpinWidget( parent, name ) { } @@ -456,12 +456,12 @@ protected: }; /*! - Constructs an empty datetime editor with tqparent \a tqparent and + Constructs an empty datetime editor with parent \a parent and called \a name. */ -TQDateTimeEditor::TQDateTimeEditor( TQDateTimeEditBase * widget, TQWidget *tqparent, +TQDateTimeEditor::TQDateTimeEditor( TQDateTimeEditBase * widget, TQWidget *parent, const char * name ) - : TQWidget( tqparent, name, TQt::WNoAutoErase ) + : TQWidget( parent, name, TQt::WNoAutoErase ) { d = new TQDateTimeEditorPrivate(); cw = widget; @@ -919,12 +919,12 @@ public: */ /*! - Constructs an empty date editor which is a child of \a tqparent and + Constructs an empty date editor which is a child of \a parent and called name \a name. */ -TQDateEdit::TQDateEdit( TQWidget * tqparent, const char * name ) - : TQDateTimeEditBase( tqparent, name ) +TQDateEdit::TQDateEdit( TQWidget * parent, const char * name ) + : TQDateTimeEditBase( parent, name ) { init(); updateButtons(); @@ -933,14 +933,14 @@ TQDateEdit::TQDateEdit( TQWidget * tqparent, const char * name ) /*! \overload - Constructs a date editor with the initial value \a date, tqparent \a - tqparent and called \a name. + Constructs a date editor with the initial value \a date, parent \a + parent and called \a name. The date editor is initialized with \a date. */ -TQDateEdit::TQDateEdit( const QDate& date, QWidget * tqparent, const char * name ) - : TQDateTimeEditBase( TQT_TQWIDGET(tqparent), name ) +TQDateEdit::TQDateEdit( const QDate& date, QWidget * parent, const char * name ) + : TQDateTimeEditBase( TQT_TQWIDGET(parent), name ) { init(); setDate( TQT_TQDATE_OBJECT(date) ); @@ -1823,12 +1823,12 @@ public: /*! - Constructs an empty time edit with tqparent \a tqparent and called \a + Constructs an empty time edit with parent \a parent and called \a name. */ -TQTimeEdit::TQTimeEdit( TQWidget * tqparent, const char * name ) - : TQDateTimeEditBase( tqparent, name ) +TQTimeEdit::TQTimeEdit( TQWidget * parent, const char * name ) + : TQDateTimeEditBase( parent, name ) { init(); } @@ -1837,11 +1837,11 @@ TQTimeEdit::TQTimeEdit( TQWidget * tqparent, const char * name ) \overload Constructs a time edit with the initial time value, \a time, - tqparent \a tqparent and called \a name. + parent \a parent and called \a name. */ -TQTimeEdit::TQTimeEdit( const QTime& time, QWidget * tqparent, const char * name ) - : TQDateTimeEditBase( TQT_TQWIDGET(tqparent), name ) +TQTimeEdit::TQTimeEdit( const QTime& time, QWidget * parent, const char * name ) + : TQDateTimeEditBase( TQT_TQWIDGET(parent), name ) { init(); setTime( TQT_TQTIME_OBJECT(time) ); @@ -2649,11 +2649,11 @@ public: */ /*! - Constructs an empty datetime edit with tqparent \a tqparent and called + Constructs an empty datetime edit with parent \a parent and called \a name. */ -TQDateTimeEdit::TQDateTimeEdit( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ) +TQDateTimeEdit::TQDateTimeEdit( TQWidget * parent, const char * name ) + : TQWidget( parent, name ) { init(); } @@ -2663,11 +2663,11 @@ TQDateTimeEdit::TQDateTimeEdit( TQWidget * tqparent, const char * name ) \overload Constructs a datetime edit with the initial value \a datetime, - tqparent \a tqparent and called \a name. + parent \a parent and called \a name. */ TQDateTimeEdit::TQDateTimeEdit( const TQDateTime& datetime, - TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ) + TQWidget * parent, const char * name ) + : TQWidget( parent, name ) { init(); setDateTime( datetime ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.h b/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.h index ab5935861..4c072f0a6 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.h @@ -54,8 +54,8 @@ class TQ_EXPORT TQDateTimeEditBase : public TQWidget Q_OBJECT TQ_OBJECT public: - TQDateTimeEditBase( TQWidget* tqparent=0, const char* name=0 ) - : TQWidget( tqparent, name ) {} + TQDateTimeEditBase( TQWidget* parent=0, const char* name=0 ) + : TQWidget( parent, name ) {} virtual bool setFocusSection( int sec ) = 0; virtual TQString sectionFormattedText( int sec ) = 0; @@ -87,8 +87,8 @@ class TQ_EXPORT TQDateEdit : public TQDateTimeEditBase Q_PROPERTY( TQDate minValue READ minValue WRITE setMinValue ) public: - TQDateEdit( TQWidget* tqparent=0, const char* name=0 ); - TQDateEdit( const QDate& date, QWidget* tqparent=0, const char* name=0 ); + TQDateEdit( TQWidget* parent=0, const char* name=0 ); + TQDateEdit( const QDate& date, QWidget* parent=0, const char* name=0 ); ~TQDateEdit(); enum Order { DMY, MDY, YMD, YDM }; @@ -176,8 +176,8 @@ public: AMPM = 0x10 }; - TQTimeEdit( TQWidget* tqparent=0, const char* name=0 ); - TQTimeEdit( const QTime& time, QWidget* tqparent=0, const char* name=0 ); + TQTimeEdit( TQWidget* parent=0, const char* name=0 ); + TQTimeEdit( const QTime& time, QWidget* parent=0, const char* name=0 ); ~TQTimeEdit(); TQSize tqsizeHint() const; @@ -250,8 +250,8 @@ class TQ_EXPORT TQDateTimeEdit : public TQWidget Q_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime ) public: - TQDateTimeEdit( TQWidget* tqparent=0, const char* name=0 ); - TQDateTimeEdit( const TQDateTime& datetime, TQWidget* tqparent=0, + TQDateTimeEdit( TQWidget* parent=0, const char* name=0 ); + TQDateTimeEdit( const TQDateTime& datetime, TQWidget* parent=0, const char* name=0 ); ~TQDateTimeEdit(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdial.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdial.cpp index 5b9601bcc..8158d47c7 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdial.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdial.cpp @@ -143,13 +143,13 @@ public: /*! - Constructs a dial called \a name with tqparent \a tqparent. \a f is + Constructs a dial called \a name with parent \a parent. \a f is propagated to the TQWidget constructor. It has the default range of a TQRangeControl. */ -TQDial::TQDial( TQWidget *tqparent, const char *name, WFlags f ) - : TQWidget( tqparent, name, f | TQt::WNoAutoErase ), TQRangeControl() +TQDial::TQDial( TQWidget *parent, const char *name, WFlags f ) + : TQWidget( parent, name, f | TQt::WNoAutoErase ), TQRangeControl() { d = new TQDialPrivate; d->eraseAreaValid = FALSE; @@ -161,7 +161,7 @@ TQDial::TQDial( TQWidget *tqparent, const char *name, WFlags f ) /*! - Constructs a dial called \a name with tqparent \a tqparent. The dial's + Constructs a dial called \a name with parent \a parent. The dial's value can never be smaller than \a minValue or greater than \a maxValue. Its page step size is \a pageStep, and its initial value is \a value. @@ -170,8 +170,8 @@ TQDial::TQDial( TQWidget *tqparent, const char *name, WFlags f ) */ TQDial::TQDial( int minValue, int maxValue, int pageStep, int value, - TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WNoAutoErase ), + TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WNoAutoErase ), TQRangeControl( minValue, maxValue, 1, pageStep, value ) { d = new TQDialPrivate; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdial.h b/experimental/tqtinterface/qt4/src/widgets/tqdial.h index d7cfcad15..10ee43798 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdial.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqdial.h @@ -67,9 +67,9 @@ class TQ_EXPORT TQDial: public TQWidget, public TQRangeControl Q_PROPERTY( int value READ value WRITE setValue ) public: - TQDial( TQWidget* tqparent=0, const char* name=0, WFlags f = 0 ); + TQDial( TQWidget* parent=0, const char* name=0, WFlags f = 0 ); TQDial( int minValue, int maxValue, int pageStep, int value, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); ~TQDial(); bool tracking() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp index bb7d5f1da..18f563129 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp @@ -63,19 +63,19 @@ struct TQDialogButtonsPrivate }; #ifndef TQT_NO_DIALOG -TQDialogButtons::TQDialogButtons(TQDialog *tqparent, bool autoConnect, TQ_UINT32 buttons, - Qt::Orientation orient, const char *name ) : TQWidget(tqparent, name) +TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, TQ_UINT32 buttons, + Qt::Orientation orient, const char *name ) : TQWidget(parent, name) { init(buttons, orient); - if(tqparent && autoConnect) { - TQObject::connect(this, TQT_SIGNAL(acceptClicked()), tqparent, TQT_SLOT(accept())); - TQObject::connect(this, TQT_SIGNAL(rejectClicked()), tqparent, TQT_SLOT(reject())); + if(parent && autoConnect) { + TQObject::connect(this, TQT_SIGNAL(acceptClicked()), parent, TQT_SLOT(accept())); + TQObject::connect(this, TQT_SIGNAL(rejectClicked()), parent, TQT_SLOT(reject())); } } #endif // TQT_NO_DIALOG -TQDialogButtons::TQDialogButtons(TQWidget *tqparent, TQ_UINT32 buttons, - Qt::Orientation orient, const char *name ) : TQWidget(tqparent, name) +TQDialogButtons::TQDialogButtons(TQWidget *parent, TQ_UINT32 buttons, + Qt::Orientation orient, const char *name ) : TQWidget(parent, name) { init(buttons, orient); } @@ -164,7 +164,7 @@ TQDialogButtons::addWidget(TQWidget *w) } else { lay = (TQBoxLayout*)d->custom->tqlayout(); } - if(w->tqparent() != TQT_TQOBJECT(d->custom)) + if(w->parent() != TQT_TQOBJECT(d->custom)) w->reparent(d->custom, 0, TQPoint(0, 0), TRUE); lay->addWidget(w); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h b/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h index 4262ec1fc..3c0673314 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h @@ -56,10 +56,10 @@ TQDialogButtons : public TQWidget public: enum Button { None=0, Accept=0x01, Reject=0x02, Help=0x04, Apply=0x08, All=0x10, Abort=0x20, Retry=0x40, Ignore=0x80 }; #ifndef TQT_NO_DIALOG - TQDialogButtons(TQDialog *tqparent, bool autoConnect = TRUE, TQ_UINT32 buttons = Accept | Reject, + TQDialogButtons(TQDialog *parent, bool autoConnect = TRUE, TQ_UINT32 buttons = Accept | Reject, Qt::Orientation orient = Qt::Horizontal, const char *name = NULL); #endif // TQT_NO_DIALOG - TQDialogButtons(TQWidget *tqparent, TQ_UINT32 buttons = Accept | Reject, + TQDialogButtons(TQWidget *parent, TQ_UINT32 buttons = Accept | Reject, Qt::Orientation orient = Qt::Horizontal, const char *name = NULL); ~TQDialogButtons(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp index 72f65c2cf..370135583 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp @@ -573,11 +573,11 @@ int TQDockAreaLayout::widthForHeight( int h ) const /*! Constructs a TQDockArea with orientation \a o, HandlePosition \a h, - tqparent \a tqparent and called \a name. + parent \a parent and called \a name. */ -TQDockArea::TQDockArea( Qt::Orientation o, HandlePosition h, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), orient( o ), tqlayout( 0 ), hPos( h ) +TQDockArea::TQDockArea( Qt::Orientation o, HandlePosition h, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), orient( o ), tqlayout( 0 ), hPos( h ) { dockWindows = new TQPtrList<TQDockWindow>; tqlayout = new TQDockAreaLayout( this, o, dockWindows, 0, 0, "tooltqlayout" ); @@ -592,7 +592,7 @@ TQDockArea::TQDockArea( Qt::Orientation o, HandlePosition h, TQWidget *tqparent, dock areas, even if they first appeared in this dock area. Floating dock windows are effectively top level windows and are not child windows of the dock area. When a floating dock window is - docked (dragged into a dock area) its tqparent becomes the dock + docked (dragged into a dock area) its parent becomes the dock area. */ @@ -624,7 +624,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, int index ) orientation() == Qt::Vertical ? TQSizePolicy::Expanding : TQSizePolicy::Minimum ) ); dockWindows->append( w ); } else { - if ( w->tqparent() != TQT_TQOBJECT(this) ) + if ( w->parent() != TQT_TQOBJECT(this) ) w->reparent( this, TQPoint( 0, 0 ), TRUE ); if ( index == - 1 ) { dockWindows->removeRef( w ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.h b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.h index 550732bb0..6cdd6e691 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.h @@ -67,8 +67,8 @@ class TQ_EXPORT TQDockAreaLayout : public TQLayout friend class TQDockArea; public: - TQDockAreaLayout( TQWidget* tqparent, Orientation o, TQPtrList<TQDockWindow> *wl, int space = -1, int margin = -1, const char *name = 0 ) - : TQLayout( tqparent, space, margin, name ), orient( o ), dockWindows( wl ), parentWidget( tqparent ) { init(); } + TQDockAreaLayout( TQWidget* parent, Orientation o, TQPtrList<TQDockWindow> *wl, int space = -1, int margin = -1, const char *name = 0 ) + : TQLayout( parent, space, margin, name ), orient( o ), dockWindows( wl ), parentWidget( parent ) { init(); } ~TQDockAreaLayout() {} void addItem( QLayoutItem * ) {} @@ -127,7 +127,7 @@ class TQ_EXPORT TQDockArea : public TQWidget public: enum HandlePosition { Normal, Reverse }; - TQDockArea( Qt::Orientation o, HandlePosition h = Normal, TQWidget* tqparent=0, const char* name=0 ); + TQDockArea( Qt::Orientation o, HandlePosition h = Normal, TQWidget* parent=0, const char* name=0 ); ~TQDockArea(); void moveDockWindow( TQDockWindow *w, const TQPoint &globalPos, const TQRect &rect, bool swap ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp index fcf0821d2..1a9796e19 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp @@ -76,7 +76,7 @@ class TQDockWindowResizeHandle : public TQWidget TQ_OBJECT public: - TQDockWindowResizeHandle( Orientation o, TQWidget *tqparent, TQDockWindow *w, const char* /*name*/=0 ); + TQDockWindowResizeHandle( Orientation o, TQWidget *parent, TQDockWindow *w, const char* /*name*/=0 ); void setOrientation( Orientation o ); Orientation orientation() const { return orient; } @@ -102,9 +102,9 @@ private: }; -TQDockWindowResizeHandle::TQDockWindowResizeHandle( Orientation o, TQWidget *tqparent, +TQDockWindowResizeHandle::TQDockWindowResizeHandle( Orientation o, TQWidget *parent, TQDockWindow *w, const char * ) - : TQWidget( tqparent, "qt_dockwidget_internal" ), mousePressed( FALSE ), unclippedPainter( 0 ), dockWindow( w ) + : TQWidget( parent, "qt_dockwidget_internal" ), mousePressed( FALSE ), unclippedPainter( 0 ), dockWindow( w ) { setOrientation( o ); } @@ -752,8 +752,8 @@ void TQDockWindowTitleBar::mouseDoubleClickEvent( TQMouseEvent * ) have a \link setCaption() caption\endlink.) When you construct a dock window you \e must pass it a TQDockArea - or a TQMainWindow as its tqparent if you want it docked. Pass 0 for - the tqparent if you want it floated. + or a TQMainWindow as its parent if you want it docked. Pass 0 for + the parent if you want it floated. \code TQToolBar *fileTools = new TQToolBar( this, "File Actions" ); @@ -909,12 +909,12 @@ void TQDockWindowTitleBar::mouseDoubleClickEvent( TQMouseEvent * ) /*! - Constructs a TQDockWindow with tqparent \a tqparent, called \a name and + Constructs a TQDockWindow with parent \a parent, called \a name and with widget flags \a f. */ -TQDockWindow::TQDockWindow( TQWidget* tqparent, const char* name, WFlags f ) - : TQFrame( tqparent, name, (WFlags)(f | TQt::WType_Dialog | WStyle_Customize | TQt::WStyle_NoBorder) ) +TQDockWindow::TQDockWindow( TQWidget* parent, const char* name, WFlags f ) + : TQFrame( parent, name, (WFlags)(f | TQt::WType_Dialog | WStyle_Customize | TQt::WStyle_NoBorder) ) { curPlace = InDock; isToolbar = FALSE; @@ -922,24 +922,24 @@ TQDockWindow::TQDockWindow( TQWidget* tqparent, const char* name, WFlags f ) } /*! - Constructs a TQDockWindow with tqparent \a tqparent, called \a name and + Constructs a TQDockWindow with parent \a parent, called \a name and with widget flags \a f. If \a p is \c InDock, the dock window is docked into a dock area - and \a tqparent \e must be a TQDockArea or a TQMainWindow. If the \a - tqparent is a TQMainWindow the dock window will be docked in the main + and \a parent \e must be a TQDockArea or a TQMainWindow. If the \a + parent is a TQMainWindow the dock window will be docked in the main window's \c Top dock area. If \a p is \c OutsideDock, the dock window is created as a floating window. We recommend creating the dock area \c InDock with a TQMainWindow - as tqparent then calling TQMainWindow::moveDockWindow() to move the + as parent then calling TQMainWindow::moveDockWindow() to move the dock window where you want it. */ -TQDockWindow::TQDockWindow( Place p, TQWidget *tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, (WFlags)(f | TQt::WType_Dialog | WStyle_Customize | TQt::WStyle_NoBorder) ) +TQDockWindow::TQDockWindow( Place p, TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, (WFlags)(f | TQt::WType_Dialog | WStyle_Customize | TQt::WStyle_NoBorder) ) { curPlace = p; isToolbar = FALSE; @@ -949,8 +949,8 @@ TQDockWindow::TQDockWindow( Place p, TQWidget *tqparent, const char *name, WFlag /*! \internal */ -TQDockWindow::TQDockWindow( Place p, TQWidget *tqparent, const char *name, WFlags f, bool toolbar ) - : TQFrame( tqparent, name, (WFlags)(f | TQt::WType_Dialog | WStyle_Customize | TQt::WStyle_NoBorder) ) +TQDockWindow::TQDockWindow( Place p, TQWidget *parent, const char *name, WFlags f, bool toolbar ) + : TQFrame( parent, name, (WFlags)(f | TQt::WType_Dialog | WStyle_Customize | TQt::WStyle_NoBorder) ) { curPlace = p; isToolbar = toolbar; @@ -960,8 +960,8 @@ TQDockWindow::TQDockWindow( Place p, TQWidget *tqparent, const char *name, WFlag class TQDockWindowGridLayout : public TQGridLayout { public: - TQDockWindowGridLayout( TQWidget *tqparent, int nRows, int nCols ) - : TQGridLayout( tqparent, nRows, nCols ) {}; + TQDockWindowGridLayout( TQWidget *parent, int nRows, int nCols ) + : TQGridLayout( parent, nRows, nCols ) {}; TQ_SPExpandData expandingDirections() const { @@ -1970,7 +1970,7 @@ void TQDockWindow::hideEvent( TQHideEvent *e ) void TQDockWindow::showEvent( TQShowEvent *e ) { - if (curPlace == OutsideDock && (tqparent() && strcmp(tqparent()->name(), "qt_hide_dock") != 0)) { + if (curPlace == OutsideDock && (parent() && strcmp(parent()->name(), "qt_hide_dock") != 0)) { TQRect sr = tqApp->desktop()->availableGeometry( this ); if ( !sr.contains( pos() ) ) { int nx = TQMIN( TQMAX( x(), sr.x() ), sr.right()-width() ); @@ -2115,7 +2115,7 @@ void TQDockWindow::contextMenuEvent( TQContextMenuEvent *e ) while ( o ) { if ( ::tqqt_cast<TQMainWindow*>(o) ) break; - o = o->tqparent(); + o = o->parent(); } if ( !o || ! ( (TQMainWindow*)o )->showDockMenu( e->globalPos() ) ) e->ignore(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.h b/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.h index 6906fd972..99858eb8c 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.h @@ -91,8 +91,8 @@ public: enum Place { InDock, OutsideDock }; enum CloseMode { Never = 0, Docked = 1, Undocked = 2, Always = Docked | Undocked }; - TQDockWindow( Place p = InDock, TQWidget* tqparent=0, const char* name=0, WFlags f = 0 ); - TQDockWindow( TQWidget* tqparent, const char* name=0, WFlags f = 0 ); + TQDockWindow( Place p = InDock, TQWidget* parent=0, const char* name=0, WFlags f = 0 ); + TQDockWindow( TQWidget* parent, const char* name=0, WFlags f = 0 ); ~TQDockWindow(); virtual void setWidget( TQWidget *w ); @@ -175,7 +175,7 @@ private Q_SLOTS: void toggleVisible() { if ( !isVisible() ) show(); else hide(); } private: - TQDockWindow( Place p, TQWidget* tqparent, const char* name, WFlags f, bool toolbar ); + TQDockWindow( Place p, TQWidget* parent, const char* name, WFlags f, bool toolbar ); void handleMove( const TQPoint &pos, const TQPoint &gp, bool drawRect ); void updateGui(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqeffects.cpp b/experimental/tqtinterface/qt4/src/widgets/tqeffects.cpp index 0ac6a249b..c98a8ee6d 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqeffects.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqeffects.cpp @@ -58,8 +58,8 @@ class TQAccessWidget : public TQWidget friend class TQAlphaWidget; friend class TQRollEffect; public: - TQAccessWidget( TQWidget* tqparent=0, const char* name=0, WFlags f = 0 ) - : TQWidget( tqparent, name, f ) {} + TQAccessWidget( TQWidget* parent=0, const char* name=0, WFlags f = 0 ) + : TQWidget( parent, name, f ) {} }; /* diff --git a/experimental/tqtinterface/qt4/src/widgets/tqframe.cpp b/experimental/tqtinterface/qt4/src/widgets/tqframe.cpp index 811292470..1c6f6d86c 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqframe.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqframe.cpp @@ -130,7 +130,7 @@ look depends upon the current GUI style. \value TabWidgetPanel is used to draw a frame suitable for tab widgets. The look depends upon the current GUI style. - \value MShape internal tqmask + \value MShape internal mask When it does not call TQStyle, Shape interacts with TQFrame::Shadow, the lineWidth() and the midLineWidth() to create the total result. @@ -155,7 +155,7 @@ \value Sunken the frame and contents appear sunken; draws a 3D sunken line using the light and dark colors of the current color group - \value MShadow internal; tqmask for the shadow + \value MShadow internal; mask for the shadow Shadow interacts with TQFrame::Shape, the lineWidth() and the midLineWidth(). See the \link #picture picture of the frames\endlink @@ -169,12 +169,12 @@ Constructs a frame widget with frame style \c NoFrame and a 1-pixel frame width. - The \a tqparent, \a name and \a f arguments are passed to the + The \a parent, \a name and \a f arguments are passed to the TQWidget constructor. */ -TQFrame::TQFrame( TQWidget *tqparent, const char *name, WFlags f ) - : TQWidget( tqparent, name, f ) +TQFrame::TQFrame( TQWidget *parent, const char *name, WFlags f ) + : TQWidget( parent, name, f ) { frect = TQRect( 0, 0, 0, 0 ); fstyle = NoFrame | Plain; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqframe.h b/experimental/tqtinterface/qt4/src/widgets/tqframe.h index 8d289d241..d8ae55c70 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqframe.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqframe.h @@ -62,7 +62,7 @@ class TQ_EXPORT TQFrame : public TQWidget Q_PROPERTY( TQRect frameRect READ frameRect WRITE setFrameRect DESIGNABLE false ) public: - TQFrame( TQWidget* tqparent=0, const char* name=0, WFlags f=0 ); + TQFrame( TQWidget* parent=0, const char* name=0, WFlags f=0 ); int frameStyle() const; virtual void setFrameStyle( int ); @@ -89,12 +89,12 @@ public: LineEditPanel = 0x000a, TabWidgetPanel = 0x000b, GroupBoxPanel = 0x000c, - MShape = 0x000f // tqmask for the tqshape + MShape = 0x000f // mask for the tqshape }; enum Shadow { Plain = 0x0010, // plain line Raised = 0x0020, // raised shadow effect Sunken = 0x0030, // sunken shadow effect - MShadow = 0x00f0 }; // tqmask for the shadow + MShadow = 0x00f0 }; // mask for the shadow Shape frameShape() const; void setFrameShape( Shape ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqgrid.cpp b/experimental/tqtinterface/qt4/src/widgets/tqgrid.cpp index 06c6a88b8..bd66cc2f0 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqgrid.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqgrid.cpp @@ -67,14 +67,14 @@ */ /*! - Constructs a grid widget with tqparent \a tqparent, called \a name. + Constructs a grid widget with parent \a parent, called \a name. If \a orient is \c Horizontal, \a n specifies the number of columns. If \a orient is \c Vertical, \a n specifies the number of rows. The widget flags \a f are passed to the TQFrame constructor. */ -TQGrid::TQGrid( int n, Qt::Orientation orient, TQWidget *tqparent, const char *name, +TQGrid::TQGrid( int n, Qt::Orientation orient, TQWidget *parent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f ) + : TQFrame( parent, name, f ) { int nCols, nRows; if ( orient == Qt::Horizontal ) { @@ -91,12 +91,12 @@ TQGrid::TQGrid( int n, Qt::Orientation orient, TQWidget *tqparent, const char *n /*! - Constructs a grid widget with tqparent \a tqparent, called \a name. + Constructs a grid widget with parent \a parent, called \a name. \a n specifies the number of columns. The widget flags \a f are passed to the TQFrame constructor. */ -TQGrid::TQGrid( int n, TQWidget *tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f ) +TQGrid::TQGrid( int n, TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f ) { lay = new TQGridLayout( this, -1, n, 0, 0, name ); lay->setAutoAdd( TRUE ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqgrid.h b/experimental/tqtinterface/qt4/src/widgets/tqgrid.h index 98ee82619..787dbd5fe 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqgrid.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqgrid.h @@ -50,8 +50,8 @@ class TQ_EXPORT TQGrid : public TQFrame Q_OBJECT TQ_OBJECT public: - TQGrid( int n, TQWidget* tqparent=0, const char* name=0, WFlags f = 0 ); - TQGrid( int n, Qt::Orientation orient, TQWidget* tqparent=0, const char* name=0, + TQGrid( int n, TQWidget* parent=0, const char* name=0, WFlags f = 0 ); + TQGrid( int n, Qt::Orientation orient, TQWidget* parent=0, const char* name=0, WFlags f = 0 ); void setSpacing( int ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqgridview.cpp b/experimental/tqtinterface/qt4/src/widgets/tqgridview.cpp index 0551c30dd..d4c163861 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqgridview.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqgridview.cpp @@ -89,11 +89,11 @@ /*! Constructs a grid view. - The \a tqparent, \a name and widget flag, \a f, arguments are passed + The \a parent, \a name and widget flag, \a f, arguments are passed to the TQScrollView constructor. */ -TQGridView::TQGridView( TQWidget *tqparent, const char *name, WFlags f ) - :TQScrollView( tqparent, name, (WFlags)(f | TQt::WStaticContents) ), +TQGridView::TQGridView( TQWidget *parent, const char *name, WFlags f ) + :TQScrollView( parent, name, (WFlags)(f | TQt::WStaticContents) ), nrows( 5 ), ncols( 5 ), cellw( 12 ), cellh( 12 ) { viewport()->setBackgroundMode( TQt::PaletteBase ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqgridview.h b/experimental/tqtinterface/qt4/src/widgets/tqgridview.h index 01e0b1a27..d45843209 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqgridview.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqgridview.h @@ -59,7 +59,7 @@ class TQ_EXPORT TQGridView : public TQScrollView Q_PROPERTY( int cellHeight READ cellHeight WRITE setCellHeight ) public: - TQGridView( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); + TQGridView( TQWidget *parent=0, const char *name=0, WFlags f=0 ); ~TQGridView(); int numRows() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.cpp index 228204acb..ef877e7a7 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.cpp @@ -73,7 +73,7 @@ The simplest way to use it is to create a group box with the desired number of columns (or rows) and orientation, and then just - create widgets with the group box as tqparent. + create widgets with the group box as parent. It is also possible to change the orientation() and number of columns() after construction, or to ignore all the automatic @@ -112,14 +112,14 @@ public: /*! Constructs a group box widget with no title. - The \a tqparent and \a name arguments are passed to the TQWidget + The \a parent and \a name arguments are passed to the TQWidget constructor. This constructor does not do automatic tqlayout. */ -TQGroupBox::TQGroupBox( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name ) +TQGroupBox::TQGroupBox( TQWidget *parent, const char *name ) + : TQFrame( parent, name ) { init(); } @@ -127,14 +127,14 @@ TQGroupBox::TQGroupBox( TQWidget *tqparent, const char *name ) /*! Constructs a group box with the title \a title. - The \a tqparent and \a name arguments are passed to the TQWidget + The \a parent and \a name arguments are passed to the TQWidget constructor. This constructor does not do automatic tqlayout. */ -TQGroupBox::TQGroupBox( const TQString &title, TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name ) +TQGroupBox::TQGroupBox( const TQString &title, TQWidget *parent, const char *name ) + : TQFrame( parent, name ) { init(); setTitle( title ); @@ -145,13 +145,13 @@ TQGroupBox::TQGroupBox( const TQString &title, TQWidget *tqparent, const char *n arranged in \a strips rows or columns (depending on \a orientation). - The \a tqparent and \a name arguments are passed to the TQWidget + The \a parent and \a name arguments are passed to the TQWidget constructor. */ TQGroupBox::TQGroupBox( int strips, Qt::Orientation orientation, - TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name ) + TQWidget *parent, const char *name ) + : TQFrame( parent, name ) { init(); setColumnLayout( strips, orientation ); @@ -162,14 +162,14 @@ TQGroupBox::TQGroupBox( int strips, Qt::Orientation orientation, arranged in \a strips rows or columns (depending on \a orientation). - The \a tqparent and \a name arguments are passed to the TQWidget + The \a parent and \a name arguments are passed to the TQWidget constructor. */ TQGroupBox::TQGroupBox( int strips, Qt::Orientation orientation, - const TQString &title, TQWidget *tqparent, + const TQString &title, TQWidget *parent, const char *name ) - : TQFrame( tqparent, name ) + : TQFrame( parent, name ) { init(); setTitle( title ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.h b/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.h index d73403ef6..ce77addf1 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.h @@ -68,13 +68,13 @@ class TQ_EXPORT TQGroupBox : public TQFrame Q_PROPERTY( bool checked READ isChecked WRITE setChecked ) #endif public: - TQGroupBox( TQWidget* tqparent=0, const char* name=0 ); + TQGroupBox( TQWidget* parent=0, const char* name=0 ); TQGroupBox( const TQString &title, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); TQGroupBox( int strips, Qt::Orientation o, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); TQGroupBox( int strips, Qt::Orientation o, const TQString &title, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); ~TQGroupBox(); virtual void setColumnLayout(int strips, Qt::Orientation o); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqhbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqhbox.cpp index d25956d8a..bbd3dfd6f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqhbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqhbox.cpp @@ -66,12 +66,12 @@ /*! - Constructs an hbox widget with tqparent \a tqparent, called \a name. - The tqparent, name and widget flags, \a f, are passed to the TQFrame + Constructs an hbox widget with parent \a parent, called \a name. + The parent, name and widget flags, \a f, are passed to the TQFrame constructor. */ -TQHBox::TQHBox( TQWidget *tqparent, const char *name, WFlags f ) - :TQFrame( tqparent, name, f ) +TQHBox::TQHBox( TQWidget *parent, const char *name, WFlags f ) + :TQFrame( parent, name, f ) { lay = new TQHBoxLayout( this, frameWidth(), frameWidth(), name ); lay->setAutoAdd( TRUE ); @@ -85,12 +85,12 @@ TQHBox::TQHBox( TQWidget *tqparent, const char *name, WFlags f ) This constructor is provided for the TQVBox class. You should never need to use it directly. - The \a tqparent, \a name and widget flags, \a f, are passed to the + The \a parent, \a name and widget flags, \a f, are passed to the TQFrame constructor. */ -TQHBox::TQHBox( bool horizontal, TQWidget *tqparent , const char *name, WFlags f ) - :TQFrame( tqparent, name, f ) +TQHBox::TQHBox( bool horizontal, TQWidget *parent , const char *name, WFlags f ) + :TQFrame( parent, name, f ) { lay = new TQBoxLayout( this, horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::Down, diff --git a/experimental/tqtinterface/qt4/src/widgets/tqhbox.h b/experimental/tqtinterface/qt4/src/widgets/tqhbox.h index e669eb0fc..b6a524d8d 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqhbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqhbox.h @@ -53,14 +53,14 @@ class TQ_EXPORT TQHBox : public TQFrame Q_OBJECT TQ_OBJECT public: - TQHBox( TQWidget* tqparent=0, const char* name=0, WFlags f=0 ); + TQHBox( TQWidget* parent=0, const char* name=0, WFlags f=0 ); void setSpacing( int ); bool setStretchFactor( TQWidget*, int stretch ); TQSize tqsizeHint() const; protected: - TQHBox( bool horizontal, TQWidget* tqparent, const char* name, WFlags f = 0 ); + TQHBox( bool horizontal, TQWidget* parent, const char* name, WFlags f = 0 ); void frameChanged(); private: diff --git a/experimental/tqtinterface/qt4/src/widgets/tqhbuttongroup.cpp b/experimental/tqtinterface/qt4/src/widgets/tqhbuttongroup.cpp index 29af0a910..3f02794a3 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqhbuttongroup.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqhbuttongroup.cpp @@ -64,24 +64,24 @@ /*! Constructs a horizontal button group with no title. - The \a tqparent and \a name arguments are passed to the TQWidget + The \a parent and \a name arguments are passed to the TQWidget constructor. */ -TQHButtonGroup::TQHButtonGroup( TQWidget *tqparent, const char *name ) - : TQButtonGroup( 1, Qt::Vertical /* sic! */, tqparent, name ) +TQHButtonGroup::TQHButtonGroup( TQWidget *parent, const char *name ) + : TQButtonGroup( 1, Qt::Vertical /* sic! */, parent, name ) { } /*! Constructs a horizontal button group with the title \a title. - The \a tqparent and \a name arguments are passed to the TQWidget + The \a parent and \a name arguments are passed to the TQWidget constructor. */ -TQHButtonGroup::TQHButtonGroup( const TQString &title, TQWidget *tqparent, +TQHButtonGroup::TQHButtonGroup( const TQString &title, TQWidget *parent, const char *name ) - : TQButtonGroup( 1, Qt::Vertical /* sic! */, title, tqparent, name ) + : TQButtonGroup( 1, Qt::Vertical /* sic! */, title, parent, name ) { } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqhbuttongroup.h b/experimental/tqtinterface/qt4/src/widgets/tqhbuttongroup.h index 0a0cf502b..a45e25c5a 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqhbuttongroup.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqhbuttongroup.h @@ -51,8 +51,8 @@ class TQ_EXPORT TQHButtonGroup : public TQButtonGroup { TQ_OBJECT public: - TQHButtonGroup( TQWidget* tqparent=0, const char* name=0 ); - TQHButtonGroup( const TQString &title, TQWidget* tqparent=0, const char* name=0 ); + TQHButtonGroup( TQWidget* parent=0, const char* name=0 ); + TQHButtonGroup( const TQString &title, TQWidget* parent=0, const char* name=0 ); ~TQHButtonGroup(); private: // Disabled copy constructor and operator= diff --git a/experimental/tqtinterface/qt4/src/widgets/tqheader.cpp b/experimental/tqtinterface/qt4/src/widgets/tqheader.cpp index 18d813de9..28be09185 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqheader.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqheader.cpp @@ -217,12 +217,12 @@ public: /*! - Constructs a horizontal header called \a name, with tqparent \a - tqparent. + Constructs a horizontal header called \a name, with parent \a + parent. */ -TQHeader::TQHeader( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WStaticContents ) +TQHeader::TQHeader( TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WStaticContents ) { orient = Qt::Horizontal; init( 0 ); @@ -230,11 +230,11 @@ TQHeader::TQHeader( TQWidget *tqparent, const char *name ) /*! Constructs a horizontal header called \a name, with \a n sections - and tqparent \a tqparent. + and parent \a parent. */ -TQHeader::TQHeader( int n, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WStaticContents ) +TQHeader::TQHeader( int n, TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WStaticContents ) { orient = Qt::Horizontal; init( n ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqheader.h b/experimental/tqtinterface/qt4/src/widgets/tqheader.h index 24fcd259e..cfd549162 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqheader.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqheader.h @@ -69,8 +69,8 @@ class TQ_EXPORT TQHeader : public TQWidget Q_PROPERTY( bool stretching READ isStretchEnabled WRITE setStretchEnabled ) public: - TQHeader( TQWidget* tqparent=0, const char* name=0 ); - TQHeader( int, TQWidget* tqparent=0, const char* name=0 ); + TQHeader( TQWidget* parent=0, const char* name=0 ); + TQHeader( int, TQWidget* parent=0, const char* name=0 ); ~TQHeader(); int addLabel( const TQString &, int size = -1 ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqhgroupbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqhgroupbox.cpp index 2bac06c74..37765df58 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqhgroupbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqhgroupbox.cpp @@ -63,24 +63,24 @@ /*! Constructs a horizontal group box with no title. - The \a tqparent and \a name arguments are passed to the TQWidget + The \a parent and \a name arguments are passed to the TQWidget constructor. */ -TQHGroupBox::TQHGroupBox( TQWidget *tqparent, const char *name ) - : TQGroupBox( 1, Qt::Vertical /* sic! */, tqparent, name ) +TQHGroupBox::TQHGroupBox( TQWidget *parent, const char *name ) + : TQGroupBox( 1, Qt::Vertical /* sic! */, parent, name ) { } /*! Constructs a horizontal group box with the title \a title. - The \a tqparent and \a name arguments are passed to the TQWidget + The \a parent and \a name arguments are passed to the TQWidget constructor. */ -TQHGroupBox::TQHGroupBox( const TQString &title, TQWidget *tqparent, +TQHGroupBox::TQHGroupBox( const TQString &title, TQWidget *parent, const char *name ) - : TQGroupBox( 1, Qt::Vertical /* sic! */, title, tqparent, name ) + : TQGroupBox( 1, Qt::Vertical /* sic! */, title, parent, name ) { } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqhgroupbox.h b/experimental/tqtinterface/qt4/src/widgets/tqhgroupbox.h index 4b52836d7..bff396c1d 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqhgroupbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqhgroupbox.h @@ -52,8 +52,8 @@ class TQ_EXPORT TQHGroupBox : public TQGroupBox Q_OBJECT TQ_OBJECT public: - TQHGroupBox( TQWidget* tqparent=0, const char* name=0 ); - TQHGroupBox( const TQString &title, TQWidget* tqparent=0, const char* name=0 ); + TQHGroupBox( TQWidget* parent=0, const char* name=0 ); + TQHGroupBox( const TQString &title, TQWidget* parent=0, const char* name=0 ); ~TQHGroupBox(); private: // Disabled copy constructor and operator= diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp index 491adab9c..206a7cd78 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp @@ -145,14 +145,14 @@ public: /*! Constructs an empty label. - The \a tqparent, \a name and widget flag \a f, arguments are passed + The \a parent, \a name and widget flag \a f, arguments are passed to the TQFrame constructor. \sa tqsetAlignment(), setFrameStyle(), setIndent() */ -TQLabel::TQLabel( TQWidget *tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f | TQt::WMouseNoMask ) +TQLabel::TQLabel( TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f | TQt::WMouseNoMask ) { init(); } @@ -161,15 +161,15 @@ TQLabel::TQLabel( TQWidget *tqparent, const char *name, WFlags f ) /*! Constructs a label that displays the text, \a text. - The \a tqparent, \a name and widget flag \a f, arguments are passed + The \a parent, \a name and widget flag \a f, arguments are passed to the TQFrame constructor. \sa setText(), tqsetAlignment(), setFrameStyle(), setIndent() */ -TQLabel::TQLabel( const TQString &text, TQWidget *tqparent, const char *name, +TQLabel::TQLabel( const TQString &text, TQWidget *parent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f | TQt::WMouseNoMask ) + : TQFrame( parent, name, f | TQt::WMouseNoMask ) { init(); setText( text ); @@ -185,15 +185,15 @@ TQLabel::TQLabel( const TQString &text, TQWidget *tqparent, const char *name, user presses Alt+ the underlined letter, focus is passed to the buddy widget. - The \a tqparent, \a name and widget flag, \a f, arguments are passed + The \a parent, \a name and widget flag, \a f, arguments are passed to the TQFrame constructor. \sa setText(), setBuddy(), tqsetAlignment(), setFrameStyle(), setIndent() */ TQLabel::TQLabel( TQWidget *buddy, const TQString &text, - TQWidget *tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f | TQt::WMouseNoMask ) + TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f | TQt::WMouseNoMask ) { init(); #ifndef TQT_NO_ACCEL @@ -345,7 +345,7 @@ void TQLabel::setPixmap( const TQPixmap &pixmap ) lpixmap = new TQPixmap( pixmap ); } - if ( lpixmap->depth() == 1 && !lpixmap->tqmask() ) + if ( lpixmap->depth() == 1 && !lpixmap->mask() ) lpixmap->setMask( *((TQBitmap *)lpixmap) ); updateLabel( osh ); @@ -1000,7 +1000,7 @@ void TQLabel::movieUpdated(const TQRect& rect) r.moveBy(rect.x(), rect.y()); r.setWidth(TQMIN(r.width(), rect.width())); r.setHeight(TQMIN(r.height(), rect.height())); - tqrepaint( r, mov->framePixmap().tqmask() != 0 ); + tqrepaint( r, mov->framePixmap().mask() != 0 ); } } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlabel.h b/experimental/tqtinterface/qt4/src/widgets/tqlabel.h index 654648ecf..266b5c5f9 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlabel.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqlabel.h @@ -63,11 +63,11 @@ class TQ_EXPORT TQLabel : public TQFrame TQ_OVERRIDE( BackgroundMode backgroundMode DESIGNABLE true) public: - TQLabel( TQWidget *tqparent, const char* name=0, WFlags f=0 ); - TQLabel( const TQString &text, TQWidget *tqparent, const char* name=0, + TQLabel( TQWidget *parent, const char* name=0, WFlags f=0 ); + TQLabel( const TQString &text, TQWidget *parent, const char* name=0, WFlags f=0 ); TQLabel( TQWidget *buddy, const TQString &, - TQWidget *tqparent, const char* name=0, WFlags f=0 ); + TQWidget *parent, const char* name=0, WFlags f=0 ); ~TQLabel(); TQString text() const { return ltext; } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp index e84332cb7..56d69b0cc 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp @@ -302,14 +302,14 @@ static const char *getSegments( char ch ) // gets list of segments to decimal, the decimal point mode to 'small' and the frame style to a raised box. The segmentStyle() is set to \c Outline. - The \a tqparent and \a name arguments are passed to the TQFrame + The \a parent and \a name arguments are passed to the TQFrame constructor. \sa setNumDigits(), setSmallDecimalPoint() */ -TQLCDNumber::TQLCDNumber( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name ) +TQLCDNumber::TQLCDNumber( TQWidget *parent, const char *name ) + : TQFrame( parent, name ) { ndigits = 5; init(); @@ -322,14 +322,14 @@ TQLCDNumber::TQLCDNumber( TQWidget *tqparent, const char *name ) and the frame style to a raised box. The segmentStyle() is set to \c Outline. - The \a tqparent and \a name arguments are passed to the TQFrame + The \a parent and \a name arguments are passed to the TQFrame constructor. \sa setNumDigits(), setSmallDecimalPoint() */ -TQLCDNumber::TQLCDNumber( uint numDigits, TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name ) +TQLCDNumber::TQLCDNumber( uint numDigits, TQWidget *parent, const char *name ) + : TQFrame( parent, name ) { ndigits = numDigits; init(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.h b/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.h index e9543056a..7d9fd5aca 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.h @@ -64,8 +64,8 @@ class TQ_EXPORT TQLCDNumber : public TQFrame // LCD number widget Q_PROPERTY( int intValue READ intValue WRITE display ) public: - TQLCDNumber( TQWidget* tqparent=0, const char* name=0 ); - TQLCDNumber( uint numDigits, TQWidget* tqparent=0, const char* name=0 ); + TQLCDNumber( TQWidget* parent=0, const char* name=0 ); + TQLCDNumber( uint numDigits, TQWidget* parent=0, const char* name=0 ); ~TQLCDNumber(); enum Mode { Hex, Dec, Oct, Bin, HEX = Hex, DEC = Dec, OCT = Oct, diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlineedit.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlineedit.cpp index cca37a751..645c646c7 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlineedit.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlineedit.cpp @@ -122,7 +122,7 @@ struct TQLineEditPrivate : public TQt const TQValidator* validator; struct MaskInputData { enum Casemode { NoCaseMode, Upper, Lower }; - TQChar maskChar; // either the separator char or the inputtqmask + TQChar maskChar; // either the separator char or the inputmask bool separator; Casemode caseMode; }; @@ -246,7 +246,7 @@ struct TQLineEditPrivate : public TQt // masking void parseInputMask( const TQString &maskFields ); - bool isValidInput( TQChar key, TQChar tqmask ) const; + bool isValidInput( TQChar key, TQChar mask ) const; TQString maskString( uint pos, const TQString &str, bool clear = FALSE ) const; TQString clearString( uint pos, uint len ) const; TQString stripString( const TQString &str ) const; @@ -390,13 +390,13 @@ struct TQLineEditPrivate : public TQt The maximum text length is set to 32767 characters. - The \a tqparent and \a name arguments are sent to the TQWidget constructor. + The \a parent and \a name arguments are sent to the TQWidget constructor. \sa setText(), setMaxLength() */ -TQLineEdit::TQLineEdit( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name, TQt::WNoAutoErase ), d(new TQLineEditPrivate( this )) +TQLineEdit::TQLineEdit( TQWidget* parent, const char* name ) + : TQFrame( parent, name, TQt::WNoAutoErase ), d(new TQLineEditPrivate( this )) { d->init( TQString::null ); } @@ -407,14 +407,14 @@ TQLineEdit::TQLineEdit( TQWidget* tqparent, const char* name ) The cursor position is set to the end of the line and the maximum text length to 32767 characters. - The \a tqparent and \a name arguments are sent to the TQWidget + The \a parent and \a name arguments are sent to the TQWidget constructor. \sa text(), setMaxLength() */ -TQLineEdit::TQLineEdit( const TQString& contents, TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name, TQt::WNoAutoErase ), d(new TQLineEditPrivate( this )) +TQLineEdit::TQLineEdit( const TQString& contents, TQWidget* parent, const char* name ) + : TQFrame( parent, name, TQt::WNoAutoErase ), d(new TQLineEditPrivate( this )) { d->init( contents ); } @@ -424,16 +424,16 @@ TQLineEdit::TQLineEdit( const TQString& contents, TQWidget* tqparent, const char contents. The cursor position is set to the end of the line and the maximum - text length is set to the length of the tqmask (the number of tqmask + text length is set to the length of the mask (the number of mask characters and separators). - The \a tqparent and \a name arguments are sent to the TQWidget + The \a parent and \a name arguments are sent to the TQWidget constructor. \sa setMask() text() */ -TQLineEdit::TQLineEdit( const TQString& contents, const TQString &inputMask, TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name, TQt::WNoAutoErase ), d(new TQLineEditPrivate( this )) +TQLineEdit::TQLineEdit( const TQString& contents, const TQString &inputMask, TQWidget* parent, const char* name ) + : TQFrame( parent, name, TQt::WNoAutoErase ), d(new TQLineEditPrivate( this )) { d->parseInputMask( inputMask ); if ( d->maskData ) { @@ -519,7 +519,7 @@ TQString TQLineEdit::displayText() const cursor position is set to 0 and the first part of the string is shown. - If the line edit has an input tqmask, the tqmask defines the maximum + If the line edit has an input mask, the mask defines the maximum string length. \sa inputMask @@ -1109,18 +1109,18 @@ bool TQLineEdit::hasAcceptableInput() const /*! \property TQLineEdit::inputMask - \brief The validation input tqmask + \brief The validation input mask - If no tqmask is set, inputMask() returns TQString::null. + If no mask is set, inputMask() returns TQString::null. - Sets the TQLineEdit's validation tqmask. Validators can be used + Sets the TQLineEdit's validation mask. Validators can be used instead of, or in conjunction with masks; see setValidator(). - Unset the tqmask and return to normal TQLineEdit operation by passing + Unset the mask and return to normal TQLineEdit operation by passing an empty string ("") or just calling setInputMask() with no arguments. - The tqmask format understands these tqmask characters: + The mask format understands these mask characters: \table \header \i Character \i Meaning \row \i \c A \i ASCII alphabetic character required. A-Z, a-z. @@ -1142,7 +1142,7 @@ bool TQLineEdit::hasAcceptableInput() const separators. \endtable - The tqmask consists of a string of tqmask characters and separators, + The mask consists of a string of mask characters and separators, optionally followed by a semi-colon and the character used for blanks: the blank characters are always removed from the text after editing. The default blank character is space. @@ -2740,9 +2740,9 @@ void TQLineEditPrivate::parseInputMask( const TQString &maskFields ) /* checks if the key is valid compared to the inputMask */ -bool TQLineEditPrivate::isValidInput( TQChar key, TQChar tqmask ) const +bool TQLineEditPrivate::isValidInput( TQChar key, TQChar mask ) const { - switch ( tqmask ) { + switch ( mask ) { case 'A': if ( key.isLetter() && key != blank ) return TRUE; @@ -2794,7 +2794,7 @@ bool TQLineEditPrivate::isValidInput( TQChar key, TQChar tqmask ) const } /* - Applies the inputMask on \a str starting from position \a pos in the tqmask. \a clear + Applies the inputMask on \a str starting from position \a pos in the mask. \a clear specifies from where characters should be gotten when a separator is met in \a str - TRUE means that blanks will be used, FALSE that previous input is used. Calling this when no inputMask is set is undefined. diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlineedit.h b/experimental/tqtinterface/qt4/src/widgets/tqlineedit.h index 0b7fd525f..62232d96f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlineedit.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqlineedit.h @@ -82,9 +82,9 @@ class TQ_EXPORT TQLineEdit : public TQFrame Q_PROPERTY( bool acceptableInput READ hasAcceptableInput ) public: - TQLineEdit( TQWidget* tqparent, const char* name=0 ); - TQLineEdit( const TQString &, TQWidget* tqparent, const char* name=0 ); - TQLineEdit( const TQString &, const TQString &, TQWidget* tqparent, const char* name=0 ); + TQLineEdit( TQWidget* parent, const char* name=0 ); + TQLineEdit( const TQString &, TQWidget* parent, const char* name=0 ); + TQLineEdit( const TQString &, const TQString &, TQWidget* parent, const char* name=0 ); ~TQLineEdit(); TQString text() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlistbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlistbox.cpp index 3b84d033f..331bf261a 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlistbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlistbox.cpp @@ -992,8 +992,8 @@ int TQListBoxPixmap::rtti() const /*! - Constructs a new empty list box called \a name and with tqparent \a - tqparent. + Constructs a new empty list box called \a name and with parent \a + parent. Performance is boosted by modifying the widget flags \a f so that only part of the TQListBoxItem tqchildren is redrawn. This may be @@ -1004,8 +1004,8 @@ int TQListBoxPixmap::rtti() const \sa TQWidget::clearWFlags() TQt::WidgetFlags */ -TQListBox::TQListBox( TQWidget *tqparent, const char *name, WFlags f ) - : TQScrollView( tqparent, name, (WFlags)(f | TQt::WStaticContents | TQt::WNoAutoErase) ) +TQListBox::TQListBox( TQWidget *parent, const char *name, WFlags f ) + : TQScrollView( parent, name, (WFlags)(f | TQt::WStaticContents | TQt::WNoAutoErase) ) { d = new TQListBoxPrivate( this ); d->updateTimer = new TQTimer( this, "listbox update timer" ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlistbox.h b/experimental/tqtinterface/qt4/src/widgets/tqlistbox.h index 0b464a9c1..0a5763bf5 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlistbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqlistbox.h @@ -79,7 +79,7 @@ class TQ_EXPORT TQListBox : public TQScrollView Q_PROPERTY( bool variableHeight READ variableHeight WRITE setVariableHeight ) public: - TQListBox( TQWidget* tqparent=0, const char* name=0, WFlags f=0 ); + TQListBox( TQWidget* parent=0, const char* name=0, WFlags f=0 ); ~TQListBox(); virtual void setFont( const TQFont & ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlistview.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlistview.cpp index 506ec6035..5b032b04b 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlistview.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlistview.cpp @@ -91,7 +91,7 @@ struct TQListViewPrivate // the magical hidden mother of all items class Root: public TQListViewItem { public: - Root( TQListView * tqparent ); + Root( TQListView * parent ); void setHeight( int ); void invalidateHeight(); @@ -264,7 +264,7 @@ struct TQListViewPrivate class TQListViewToolTip : public TQToolTip { public: - TQListViewToolTip( TQWidget *tqparent, TQListView *lv ); + TQListViewToolTip( TQWidget *parent, TQListView *lv ); void maybeTip( const TQPoint &pos ); @@ -273,8 +273,8 @@ private: }; -TQListViewToolTip::TQListViewToolTip( TQWidget *tqparent, TQListView *lv ) - : TQToolTip( tqparent ), view( lv ) +TQListViewToolTip::TQListViewToolTip( TQWidget *parent, TQListView *lv ) + : TQToolTip( parent ), view( lv ) { } @@ -381,18 +381,18 @@ static TQString qEllipsisText( const TQString &org, const TQFontMetrics &fm, int The easiest way to use TQListViewItem is to construct one with a few constant strings, and either a TQListView or another - TQListViewItem as tqparent. + TQListViewItem as parent. \code (void) new TQListViewItem( listView, "Column 1", "Column 2" ); (void) new TQListViewItem( listView->firstChild(), "A", "B", "C" ); \endcode We've discarded the pointers to the items since we can still access - them via their tqparent \e listView. By default, TQListView sorts its + them via their parent \e listView. By default, TQListView sorts its items; this can be switched off with TQListView::setSorting(-1). - The tqparent must be another TQListViewItem or a TQListView. If the - tqparent is a TQListView, the item becomes a top-level item within - that TQListView. If the tqparent is another TQListViewItem, the item + The parent must be another TQListViewItem or a TQListView. If the + parent is a TQListView, the item becomes a top-level item within + that TQListView. If the parent is another TQListViewItem, the item becomes a child of that list view item. If you keep the pointer, you can set or change the texts using @@ -491,53 +491,53 @@ static TQString qEllipsisText( const TQString &org, const TQFontMetrics &fm, int /*! Constructs a new top-level list view item in the TQListView \a - tqparent. + parent. */ -TQListViewItem::TQListViewItem( TQListView * tqparent ) +TQListViewItem::TQListViewItem( TQListView * parent ) { init(); - tqparent->insertItem( this ); + parent->insertItem( this ); } /*! - Constructs a new list view item that is a child of \a tqparent and - first in the tqparent's list of tqchildren. + Constructs a new list view item that is a child of \a parent and + first in the parent's list of tqchildren. */ -TQListViewItem::TQListViewItem( TQListViewItem * tqparent ) +TQListViewItem::TQListViewItem( TQListViewItem * parent ) { init(); - tqparent->insertItem( this ); + parent->insertItem( this ); } /*! - Constructs an empty list view item that is a child of \a tqparent - and is after item \a after in the tqparent's list of tqchildren. Since - \a tqparent is a TQListView the item will be a top-level item. + Constructs an empty list view item that is a child of \a parent + and is after item \a after in the parent's list of tqchildren. Since + \a parent is a TQListView the item will be a top-level item. */ -TQListViewItem::TQListViewItem( TQListView * tqparent, TQListViewItem * after ) +TQListViewItem::TQListViewItem( TQListView * parent, TQListViewItem * after ) { init(); - tqparent->insertItem( this ); + parent->insertItem( this ); moveToJustAfter( after ); } /*! - Constructs an empty list view item that is a child of \a tqparent - and is after item \a after in the tqparent's list of tqchildren. + Constructs an empty list view item that is a child of \a parent + and is after item \a after in the parent's list of tqchildren. */ -TQListViewItem::TQListViewItem( TQListViewItem * tqparent, TQListViewItem * after ) +TQListViewItem::TQListViewItem( TQListViewItem * parent, TQListViewItem * after ) { init(); - tqparent->insertItem( this ); + parent->insertItem( this ); moveToJustAfter( after ); } @@ -545,14 +545,14 @@ TQListViewItem::TQListViewItem( TQListViewItem * tqparent, TQListViewItem * afte /*! Constructs a new top-level list view item in the TQListView \a - tqparent, with up to eight constant strings, \a label1, \a label2, \a + parent, with up to eight constant strings, \a label1, \a label2, \a label3, \a label4, \a label5, \a label6, \a label7 and \a label8 defining its columns' contents. \sa setText() */ -TQListViewItem::TQListViewItem( TQListView * tqparent, +TQListViewItem::TQListViewItem( TQListView * parent, TQString label1, TQString label2, TQString label3, @@ -563,7 +563,7 @@ TQListViewItem::TQListViewItem( TQListView * tqparent, TQString label8 ) { init(); - tqparent->insertItem( this ); + parent->insertItem( this ); setText( 0, label1 ); setText( 1, label2 ); @@ -578,14 +578,14 @@ TQListViewItem::TQListViewItem( TQListView * tqparent, /*! Constructs a new list view item as a child of the TQListViewItem \a - tqparent with up to eight constant strings, \a label1, \a label2, \a + parent with up to eight constant strings, \a label1, \a label2, \a label3, \a label4, \a label5, \a label6, \a label7 and \a label8 as columns' contents. \sa setText() */ -TQListViewItem::TQListViewItem( TQListViewItem * tqparent, +TQListViewItem::TQListViewItem( TQListViewItem * parent, TQString label1, TQString label2, TQString label3, @@ -596,7 +596,7 @@ TQListViewItem::TQListViewItem( TQListViewItem * tqparent, TQString label8 ) { init(); - tqparent->insertItem( this ); + parent->insertItem( this ); setText( 0, label1 ); setText( 1, label2 ); @@ -609,7 +609,7 @@ TQListViewItem::TQListViewItem( TQListViewItem * tqparent, } /*! - Constructs a new list view item in the TQListView \a tqparent that is + Constructs a new list view item in the TQListView \a parent that is included after item \a after and that has up to eight column texts, \a label1, \a label2, \a label3, \a label4, \a label5, \a label6, \a label7 and\a label8. @@ -621,7 +621,7 @@ TQListViewItem::TQListViewItem( TQListViewItem * tqparent, \sa setText() */ -TQListViewItem::TQListViewItem( TQListView * tqparent, TQListViewItem * after, +TQListViewItem::TQListViewItem( TQListView * parent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, @@ -632,7 +632,7 @@ TQListViewItem::TQListViewItem( TQListView * tqparent, TQListViewItem * after, TQString label8 ) { init(); - tqparent->insertItem( this ); + parent->insertItem( this ); moveToJustAfter( after ); setText( 0, label1 ); @@ -648,7 +648,7 @@ TQListViewItem::TQListViewItem( TQListView * tqparent, TQListViewItem * after, /*! Constructs a new list view item as a child of the TQListViewItem \a - tqparent. It is inserted after item \a after and may contain up to + parent. It is inserted after item \a after and may contain up to eight strings, \a label1, \a label2, \a label3, \a label4, \a label5, \a label6, \a label7 and \a label8 as column entries. @@ -659,7 +659,7 @@ TQListViewItem::TQListViewItem( TQListView * tqparent, TQListViewItem * after, \sa setText() */ -TQListViewItem::TQListViewItem( TQListViewItem * tqparent, TQListViewItem * after, +TQListViewItem::TQListViewItem( TQListViewItem * parent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, @@ -670,7 +670,7 @@ TQListViewItem::TQListViewItem( TQListViewItem * tqparent, TQListViewItem * afte TQString label8 ) { init(); - tqparent->insertItem( this ); + parent->insertItem( this ); moveToJustAfter( after ); setText( 0, label1 ); @@ -762,14 +762,14 @@ void TQListViewItem::tqsetVisible( bool b ) TQListView *lv = listView(); if ( !lv ) return; - if ( b && tqparent() && !tqparent()->isVisible() ) + if ( b && parent() && !parent()->isVisible() ) return; visible = b; configured = FALSE; setHeight( 0 ); invalidateHeight(); - if ( tqparent() ) - tqparent()->invalidateHeight(); + if ( parent() ) + parent()->invalidateHeight(); else lv->d->r->invalidateHeight(); for ( TQListViewItem *i = childItem; i; i = i->siblingItem ) @@ -969,9 +969,9 @@ void TQListViewItem::okRename( int col ) setText( col, renameBox->text() ); removeRenameBox(); - // we set the tqparent lsc to Unsorted if that column is the sorted one - if ( tqparent() && (int)tqparent()->lsc == col ) - tqparent()->lsc = Unsorted; + // we set the parent lsc to Unsorted if that column is the sorted one + if ( parent() && (int)parent()->lsc == col ) + parent()->lsc = Unsorted; emit lv->itemRenamed( this, col ); emit lv->itemRenamed( this, col, text( col ) ); @@ -2280,10 +2280,10 @@ void TQListViewItem::paintBranches( TQPainter * p, const TQColorGroup & cg, } -TQListViewPrivate::Root::Root( TQListView * tqparent ) - : TQListViewItem( tqparent ) +TQListViewPrivate::Root::Root( TQListView * parent ) + : TQListViewItem( parent ) { - lv = tqparent; + lv = parent; setHeight( 0 ); setOpen( TRUE ); } @@ -2422,7 +2422,7 @@ void TQListViewItem::ignoreDoubleClick() The simplest pattern of use is to create a TQListView, add some column headers using addColumn() and create one or more TQListViewItem or TQCheckListItem objects with the TQListView as - tqparent: + parent: \quotefile xml/tagreader-with-features/structureparser.h \skipto TQListView * table @@ -2460,7 +2460,7 @@ void TQListViewItem::ignoreDoubleClick() The default is FALSE. \row \i \l setTreeStepSize() \i Sets how many pixels an item's tqchildren are indented - relative to their tqparent. The default is 20. This is + relative to their parent. The default is 20. This is mostly a matter of taste. \row \i \l setSorting() \i Sets whether the items should be sorted, whether it should @@ -2556,7 +2556,7 @@ void TQListViewItem::ignoreDoubleClick() \i Make the item below the current item current and visible. \row \i Left Arrow \i If the current item is closed (<b>+</b> icon) or has no - tqchildren, make its tqparent item current and visible. If the + tqchildren, make its parent item current and visible. If the current item is open (<b>-</b> icon) close it, i.e. hide its tqchildren. Exception: if the current item is the first item and is closed and the horizontal scrollbar is offset to @@ -2606,8 +2606,8 @@ void TQListViewItem::ignoreDoubleClick() */ /*! - Constructs a new empty list view called \a name with tqparent \a - tqparent. + Constructs a new empty list view called \a name with parent \a + parent. Performance is boosted by modifying the widget flags \a f so that only part of the TQListViewItem tqchildren is redrawn. This may be @@ -2616,8 +2616,8 @@ void TQListViewItem::ignoreDoubleClick() \sa TQWidget::clearWFlags() TQt::WidgetFlags */ -TQListView::TQListView( TQWidget * tqparent, const char *name, WFlags f ) - : TQScrollView( tqparent, name, (WFlags)(f | TQt::WStaticContents | TQt::WNoAutoErase) ) +TQListView::TQListView( TQWidget * parent, const char *name, WFlags f ) + : TQScrollView( parent, name, (WFlags)(f | TQt::WStaticContents | TQt::WNoAutoErase) ) { init(); } @@ -3165,7 +3165,7 @@ void TQListView::buildDrawableList() const /*! \property TQListView::treeStepSize - \brief the number of pixels a child is offset from its tqparent + \brief the number of pixels a child is offset from its parent The default is 20 pixels. @@ -3908,7 +3908,7 @@ int TQListViewItem::depth() const /*! Returns a pointer to the item immediately above this item on the screen. This is usually the item's closest older sibling, but it - may also be its tqparent or its next older sibling's youngest child, + may also be its parent or its next older sibling's youngest child, or something else if anyoftheabove->height() returns 0. Returns 0 if there is no item immediately above this item. @@ -3948,8 +3948,8 @@ TQListViewItem * TQListViewItem::itemAbove() /*! Returns a pointer to the item immediately below this item on the screen. This is usually the item's eldest child, but it may also - be its next younger sibling, its tqparent's next younger sibling, - grandtqparent's, etc., or something else if anyoftheabove->height() + be its next younger sibling, its parent's next younger sibling, + grandparent's, etc., or something else if anyoftheabove->height() returns 0. Returns 0 if there is no item immediately below this item. @@ -4009,12 +4009,12 @@ TQListViewItem* TQListViewItem::firstChild() const /*! - Returns the tqparent of this item, or 0 if this item has no tqparent. + Returns the parent of this item, or 0 if this item has no parent. \sa firstChild(), nextSibling() */ -TQListViewItem* TQListViewItem::tqparent() const +TQListViewItem* TQListViewItem::parent() const { if ( !parentItem || parentItem->is_root ) return 0; return parentItem; @@ -4324,11 +4324,11 @@ void TQListView::contentsMousePressEventEx( TQMouseEvent * e ) bool newCurrent = FALSE; TQListViewItem *ci = d->focusItem; while ( ci ) { - if ( ci->tqparent() && ci->tqparent() == i ) { + if ( ci->parent() && ci->parent() == i ) { newCurrent = TRUE; break; } - ci = ci->tqparent(); + ci = ci->parent(); } if ( newCurrent ) { setCurrentItem( i ); @@ -4534,11 +4534,11 @@ void TQListView::contentsMouseReleaseEventEx( TQMouseEvent * e ) bool newCurrent = FALSE; TQListViewItem *ci = d->focusItem; while ( ci ) { - if ( ci->tqparent() && ci->tqparent() == i ) { + if ( ci->parent() && ci->parent() == i ) { newCurrent = TRUE; break; } - ci = ci->tqparent(); + ci = ci->parent(); } if ( newCurrent ) setCurrentItem( i ); @@ -5200,7 +5200,7 @@ TQListViewItem * TQListView::itemAt( const TQPoint & viewPos ) const while( c && c->i && ( c->y + c->i->height() <= g || !c->i->isVisible() || - (c->i->tqparent() && !c->i->tqparent()->isVisible()) ) ) + (c->i->parent() && !c->i->parent()->isVisible()) ) ) c = d->drawables->next(); TQListViewItem *i = (c && c->y <= g) ? c->i : 0; @@ -6057,55 +6057,55 @@ struct TQCheckListItemPrivate /*! - Constructs a checkable item with tqparent \a tqparent, text \a text + Constructs a checkable item with parent \a parent, text \a text and of type \a tt. Note that a \c RadioButton must be the child of a \c RadioButtonController, otherwise it will not toggle. */ -TQCheckListItem::TQCheckListItem( TQCheckListItem *tqparent, const TQString &text, +TQCheckListItem::TQCheckListItem( TQCheckListItem *parent, const TQString &text, Type tt ) - : TQListViewItem( tqparent, text, TQString::null ) + : TQListViewItem( parent, text, TQString::null ) { myType = tt; init(); if ( myType == RadioButton ) { - if ( tqparent->type() != RadioButtonController ) + if ( parent->type() != RadioButtonController ) qWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " "child of a controller" ); else - d->exclusive = tqparent; + d->exclusive = parent; } } /*! - Constructs a checkable item with tqparent \a tqparent, which is after - \a after in the tqparent's list of tqchildren, and with text \a text + Constructs a checkable item with parent \a parent, which is after + \a after in the parent's list of tqchildren, and with text \a text and of type \a tt. Note that a \c RadioButton must be the child of a \c RadioButtonController, otherwise it will not toggle. */ -TQCheckListItem::TQCheckListItem( TQCheckListItem *tqparent, TQListViewItem *after, +TQCheckListItem::TQCheckListItem( TQCheckListItem *parent, TQListViewItem *after, const TQString &text, Type tt ) - : TQListViewItem( tqparent, after, text ) + : TQListViewItem( parent, after, text ) { myType = tt; init(); if ( myType == RadioButton ) { - if ( tqparent->type() != RadioButtonController ) + if ( parent->type() != RadioButtonController ) qWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " "child of a controller" ); else - d->exclusive = tqparent; + d->exclusive = parent; } } /*! - Constructs a checkable item with tqparent \a tqparent, text \a text + Constructs a checkable item with parent \a parent, text \a text and of type \a tt. Note that this item must \e not be a \c RadioButton. Radio buttons must be tqchildren of a \c RadioButtonController. */ -TQCheckListItem::TQCheckListItem( TQListViewItem *tqparent, const TQString &text, +TQCheckListItem::TQCheckListItem( TQListViewItem *parent, const TQString &text, Type tt ) - : TQListViewItem( tqparent, text, TQString::null ) + : TQListViewItem( parent, text, TQString::null ) { myType = tt; if ( myType == RadioButton ) { @@ -6116,15 +6116,15 @@ TQCheckListItem::TQCheckListItem( TQListViewItem *tqparent, const TQString &text } /*! - Constructs a checkable item with tqparent \a tqparent, which is after - \a after in the tqparent's list of tqchildren, with text \a text and + Constructs a checkable item with parent \a parent, which is after + \a after in the parent's list of tqchildren, with text \a text and of type \a tt. Note that this item must \e not be a \c RadioButton. Radio buttons must be tqchildren of a \c RadioButtonController. */ -TQCheckListItem::TQCheckListItem( TQListViewItem *tqparent, TQListViewItem *after, +TQCheckListItem::TQCheckListItem( TQListViewItem *parent, TQListViewItem *after, const TQString &text, Type tt ) - : TQListViewItem( tqparent, after, text ) + : TQListViewItem( parent, after, text ) { myType = tt; if ( myType == RadioButton ) { @@ -6136,13 +6136,13 @@ TQCheckListItem::TQCheckListItem( TQListViewItem *tqparent, TQListViewItem *afte /*! - Constructs a checkable item with tqparent \a tqparent, text \a text + Constructs a checkable item with parent \a parent, text \a text and of type \a tt. Note that \a tt must \e not be \c RadioButton. Radio buttons must be tqchildren of a \c RadioButtonController. */ -TQCheckListItem::TQCheckListItem( TQListView *tqparent, const TQString &text, +TQCheckListItem::TQCheckListItem( TQListView *parent, const TQString &text, Type tt ) - : TQListViewItem( tqparent, text ) + : TQListViewItem( parent, text ) { myType = tt; if ( tt == RadioButton ) @@ -6152,14 +6152,14 @@ TQCheckListItem::TQCheckListItem( TQListView *tqparent, const TQString &text, } /*! - Constructs a checkable item with tqparent \a tqparent, which is after - \a after in the tqparent's list of tqchildren, with text \a text and + Constructs a checkable item with parent \a parent, which is after + \a after in the parent's list of tqchildren, with text \a text and of type \a tt. Note that \a tt must \e not be \c RadioButton. Radio buttons must be tqchildren of a \c RadioButtonController. */ -TQCheckListItem::TQCheckListItem( TQListView *tqparent, TQListViewItem *after, +TQCheckListItem::TQCheckListItem( TQListView *parent, TQListViewItem *after, const TQString &text, Type tt ) - : TQListViewItem( tqparent, after, text ) + : TQListViewItem( parent, after, text ) { myType = tt; if ( tt == RadioButton ) @@ -6179,12 +6179,12 @@ int TQCheckListItem::rtti() const } /*! - Constructs a \c RadioButtonController item with tqparent \a tqparent, + Constructs a \c RadioButtonController item with parent \a parent, text \a text and pixmap \a p. */ -TQCheckListItem::TQCheckListItem( TQListView *tqparent, const TQString &text, +TQCheckListItem::TQCheckListItem( TQListView *parent, const TQString &text, const TQPixmap & p ) - : TQListViewItem( tqparent, text ) + : TQListViewItem( parent, text ) { myType = RadioButtonController; setPixmap( 0, p ); @@ -6192,12 +6192,12 @@ TQCheckListItem::TQCheckListItem( TQListView *tqparent, const TQString &text, } /*! - Constructs a \c RadioButtonController item with tqparent \a tqparent, + Constructs a \c RadioButtonController item with parent \a parent, text \a text and pixmap \a p. */ -TQCheckListItem::TQCheckListItem( TQListViewItem *tqparent, const TQString &text, +TQCheckListItem::TQCheckListItem( TQListViewItem *parent, const TQString &text, const TQPixmap & p ) - : TQListViewItem( tqparent, text ) + : TQListViewItem( parent, text ) { myType = RadioButtonController; setPixmap( 0, p ); @@ -6288,7 +6288,7 @@ TQCheckListItem::ToggleState TQCheckListItem::state() const } /* - Same as the public state() except this one does not tqmask NoChange into Off + Same as the public state() except this one does not mask NoChange into Off when tristate is disabled. */ TQCheckListItem::ToggleState TQCheckListItem::internalState() const @@ -6323,8 +6323,8 @@ void TQCheckListItem::setState( ToggleState s ) /* Sets the toggle state of the checklistitems. \a update tells if the - controller / tqparent controller should be aware of these changes, \a store - tells if the tqparent should store its tqchildren if certain conditions arise + controller / parent controller should be aware of these changes, \a store + tells if the parent should store its tqchildren if certain conditions arise */ void TQCheckListItem::setState( ToggleState s, bool update, bool store) { @@ -6335,9 +6335,9 @@ void TQCheckListItem::setState( ToggleState s, bool update, bool store) if ( myType == CheckBox ) { setCurrentState( s ); stateChange( state() ); - if ( update && tqparent() && tqparent()->rtti() == 1 - && ((TQCheckListItem*)tqparent())->type() == CheckBoxController ) - ((TQCheckListItem*)tqparent())->updateController( update, store ); + if ( update && parent() && parent()->rtti() == 1 + && ((TQCheckListItem*)parent())->type() == CheckBoxController ) + ((TQCheckListItem*)parent())->updateController( update, store ); } else if ( myType == CheckBoxController ) { if ( s == NoChange && childCount()) { restoreState( (void*) this ); @@ -6359,18 +6359,18 @@ void TQCheckListItem::setState( ToggleState s, bool update, bool store) ToggleState oldState = internalState(); updateController( FALSE, FALSE ); if ( oldState != internalState() && - tqparent() && tqparent()->rtti() == 1 && - ((TQCheckListItem*)tqparent())->type() == CheckBoxController ) - ((TQCheckListItem*)tqparent())->updateController( update, store ); + parent() && parent()->rtti() == 1 && + ((TQCheckListItem*)parent())->type() == CheckBoxController ) + ((TQCheckListItem*)parent())->updateController( update, store ); updateController( update, store ); } else { - // if there are no tqchildren we simply set the CheckBoxController and update its tqparent + // if there are no tqchildren we simply set the CheckBoxController and update its parent setCurrentState( s ); stateChange( state() ); - if ( tqparent() && tqparent()->rtti() == 1 - && ((TQCheckListItem*)tqparent())->type() == CheckBoxController ) - ((TQCheckListItem*)tqparent())->updateController( update, store ); + if ( parent() && parent()->rtti() == 1 + && ((TQCheckListItem*)parent())->type() == CheckBoxController ) + ((TQCheckListItem*)parent())->updateController( update, store ); } } else { setCurrentState( s ); @@ -6421,7 +6421,7 @@ void TQCheckListItem::setCurrentState( ToggleState s ) /* - updates the internally stored state of this item for the tqparent (key) + updates the internally stored state of this item for the parent (key) */ void TQCheckListItem::setStoredState( ToggleState newState, void *key ) { @@ -6477,8 +6477,8 @@ void TQCheckListItem::activate() int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv); if ( activatedPos( pos ) ) { bool parentControl = FALSE; - if ( tqparent() && tqparent()->rtti() == 1 && - ((TQCheckListItem*) tqparent())->type() == RadioButtonController ) + if ( parent() && parent()->rtti() == 1 && + ((TQCheckListItem*) parent())->type() == RadioButtonController ) parentControl = TRUE; int x = parentControl ? 0 : 3; @@ -6600,7 +6600,7 @@ void TQCheckListItem::restoreState( void *key, int depth ) /* Checks the tqchildrens state and updates the controllers state - if necessary. If the controllers state change, then his tqparent again is + if necessary. If the controllers state change, then his parent again is called to update itself. */ void TQCheckListItem::updateController( bool update , bool store ) @@ -6609,10 +6609,10 @@ void TQCheckListItem::updateController( bool update , bool store ) return; TQCheckListItem *controller = 0; - // checks if this CheckBoxController has another CheckBoxController as tqparent - if ( tqparent() && tqparent()->rtti() == 1 - && ((TQCheckListItem*)tqparent())->type() == CheckBoxController ) - controller = (TQCheckListItem*)tqparent(); + // checks if this CheckBoxController has another CheckBoxController as parent + if ( parent() && parent()->rtti() == 1 + && ((TQCheckListItem*)parent())->type() == CheckBoxController ) + controller = (TQCheckListItem*)parent(); ToggleState theState = Off; bool first = TRUE; @@ -6734,8 +6734,8 @@ void TQCheckListItem::paintCell( TQPainter * p, const TQColorGroup & cg, } bool parentControl = FALSE; - if ( tqparent() && tqparent()->rtti() == 1 && - ((TQCheckListItem*) tqparent())->type() == RadioButtonController ) + if ( parent() && parent()->rtti() == 1 && + ((TQCheckListItem*) parent())->type() == RadioButtonController ) parentControl = TRUE; TQFontMetrics fm( lv->fontMetrics() ); @@ -6819,8 +6819,8 @@ void TQCheckListItem::paintFocus( TQPainter *p, const TQColorGroup & cg, intersect = r.intersects( TQRect( p, r.y(), xdepth - p + 1, r.height() ) ); } bool parentControl = FALSE; - if ( tqparent() && tqparent()->rtti() == 1 && - ((TQCheckListItem*) tqparent())->type() == RadioButtonController ) + if ( parent() && parent()->rtti() == 1 && + ((TQCheckListItem*) parent())->type() == RadioButtonController ) parentControl = TRUE; if ( myType != RadioButtonController && intersect && (lv->rootIsDecorated() || myType == RadioButton || @@ -6981,7 +6981,7 @@ bool TQListView::rootIsDecorated() const /*! Ensures that item \a i is visible, scrolling the list view - vertically if necessary and opening (expanding) any tqparent items + vertically if necessary and opening (expanding) any parent items if this is required to show the item. \sa tqitemRect() TQScrollView::ensureVisible() @@ -6992,11 +6992,11 @@ void TQListView::ensureItemVisible( const TQListViewItem * i ) if ( !i || !i->isVisible() ) return; - TQListViewItem *tqparent = i->tqparent(); - while ( tqparent ) { - if ( !tqparent->isOpen() ) - tqparent->setOpen( TRUE ); - tqparent = tqparent->tqparent(); + TQListViewItem *parent = i->parent(); + while ( parent ) { + if ( !parent->isOpen() ) + parent->setOpen( TRUE ); + parent = parent->parent(); } if ( d->r->maybeTotalHeight < 0 ) @@ -7051,7 +7051,7 @@ int TQListView::childCount() const /* Moves this item to just after \a olderSibling. \a olderSibling and - this object must have the same tqparent. + this object must have the same parent. If you need to move an item in the hierarchy use takeItem() and insertItem(). @@ -7089,7 +7089,7 @@ void TQListViewItem::moveItem( TQListViewItem *after ) { if ( !after || after == this ) return; - if ( tqparent() != after->tqparent() ) { + if ( parent() != after->parent() ) { if ( parentItem ) parentItem->takeItem( this ); if ( after->parentItem ) { @@ -7371,7 +7371,7 @@ bool TQListView::isRenaming() const starting point. This means that it always makes the first child of the current item the new current item. If there is no child, the next sibling becomes the new current item; and if there is no next - sibling, the next sibling of the tqparent becomes current. + sibling, the next sibling of the parent becomes current. The following example creates a list of all the items that have been selected by the user, storing pointers to the items in a @@ -7404,7 +7404,7 @@ bool TQListView::isRenaming() const its TQListViewItems. So when a TQListViewItem gets removed all iterators that point to this item are updated and point to the following item if possible, otherwise to a valid item before the - current one or to 0. Note however that deleting the tqparent item of + current one or to 0. Note however that deleting the parent item of an item that an iterator points to is not safe. \sa TQListView, TQListViewItem @@ -7605,7 +7605,7 @@ TQListViewItemIterator &TQListViewItemIterator::operator++() TQListViewItem *item = curr->firstChild(); if ( !item ) { while ( (item = curr->nextSibling()) == 0 ) { - curr = curr->tqparent(); + curr = curr->parent(); if ( curr == 0 ) break; } @@ -7655,7 +7655,7 @@ TQListViewItemIterator &TQListViewItemIterator::operator--() if ( !curr ) return *this; - if ( !curr->tqparent() ) { + if ( !curr->parent() ) { // we are in the first depth if ( curr->listView() ) { if ( curr->listView()->firstChild() != curr ) { @@ -7669,7 +7669,7 @@ TQListViewItemIterator &TQListViewItemIterator::operator--() if ( i && i->firstChild() ) { // go to the last child of this item TQListViewItemIterator it( curr->firstChild() ); - for ( ; it.current() && it.current()->tqparent(); ++it ) + for ( ; it.current() && it.current()->parent(); ++it ) curr = it.current(); } @@ -7685,11 +7685,11 @@ TQListViewItemIterator &TQListViewItemIterator::operator--() } else return *this; } else { - TQListViewItem *tqparent = curr->tqparent(); + TQListViewItem *parent = curr->parent(); - if ( curr != tqparent->firstChild() ) { + if ( curr != parent->firstChild() ) { // go to the previous sibling - TQListViewItem *i = tqparent->firstChild(); + TQListViewItem *i = parent->firstChild(); while ( i && i->siblingItem != curr ) i = i->siblingItem; @@ -7698,7 +7698,7 @@ TQListViewItemIterator &TQListViewItemIterator::operator--() if ( i && i->firstChild() ) { // go to the last child of this item TQListViewItemIterator it( curr->firstChild() ); - for ( ; it.current() && it.current()->tqparent() != tqparent; ++it ) + for ( ; it.current() && it.current()->parent() != parent; ++it ) curr = it.current(); } @@ -7707,8 +7707,8 @@ TQListViewItemIterator &TQListViewItemIterator::operator--() return *this; } else { - // make our tqparent the current item - curr = tqparent; + // make our parent the current item + curr = parent; if ( curr && !matchesFlags( curr ) ) --( *this ); @@ -7816,8 +7816,8 @@ void TQListViewItemIterator::currentRemoved() { if ( !curr ) return; - if ( curr->tqparent() ) - curr = curr->tqparent(); + if ( curr->parent() ) + curr = curr->parent(); else if ( curr->nextSibling() ) curr = curr->nextSibling(); else if ( listView && listView->firstChild() && diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlistview.h b/experimental/tqtinterface/qt4/src/widgets/tqlistview.h index 3d6c997c2..7c3d68b8a 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlistview.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqlistview.h @@ -69,28 +69,28 @@ class TQ_EXPORT TQListViewItem : public TQt friend class TQListViewToolTip; public: - TQListViewItem( TQListView * tqparent ); - TQListViewItem( TQListViewItem * tqparent ); - TQListViewItem( TQListView * tqparent, TQListViewItem * after ); - TQListViewItem( TQListViewItem * tqparent, TQListViewItem * after ); + TQListViewItem( TQListView * parent ); + TQListViewItem( TQListViewItem * parent ); + TQListViewItem( TQListView * parent, TQListViewItem * after ); + TQListViewItem( TQListViewItem * parent, TQListViewItem * after ); - TQListViewItem( TQListView * tqparent, + TQListViewItem( TQListView * parent, TQString, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null ); - TQListViewItem( TQListViewItem * tqparent, + TQListViewItem( TQListViewItem * parent, TQString, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null ); - TQListViewItem( TQListView * tqparent, TQListViewItem * after, + TQListViewItem( TQListView * parent, TQListViewItem * after, TQString, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null ); - TQListViewItem( TQListViewItem * tqparent, TQListViewItem * after, + TQListViewItem( TQListViewItem * parent, TQListViewItem * after, TQString, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, TQString = TQString::null, @@ -137,7 +137,7 @@ public: TQListViewItem * firstChild() const; TQListViewItem * nextSibling() const { return siblingItem; } - TQListViewItem * tqparent() const; + TQListViewItem * parent() const; TQListViewItem * itemAbove(); TQListViewItem * itemBelow(); @@ -259,7 +259,7 @@ class TQ_EXPORT TQListView: public TQScrollView Q_PROPERTY( RenameAction defaultRenameAction READ defaultRenameAction WRITE setDefaultRenameAction ) public: - TQListView( TQWidget* tqparent=0, const char* name=0, WFlags f = 0 ); + TQListView( TQWidget* parent=0, const char* name=0, WFlags f = 0 ); ~TQListView(); int treeStepSize() const; @@ -483,21 +483,21 @@ public: // ### should be integrated with qbutton in ver4 perhaps enum ToggleState { Off, NoChange, On }; - TQCheckListItem( TQCheckListItem *tqparent, const TQString &text, + TQCheckListItem( TQCheckListItem *parent, const TQString &text, Type = RadioButtonController ); - TQCheckListItem( TQCheckListItem *tqparent, TQListViewItem *after, + TQCheckListItem( TQCheckListItem *parent, TQListViewItem *after, const TQString &text, Type = RadioButtonController ); - TQCheckListItem( TQListViewItem *tqparent, const TQString &text, + TQCheckListItem( TQListViewItem *parent, const TQString &text, Type = RadioButtonController ); - TQCheckListItem( TQListViewItem *tqparent, TQListViewItem *after, + TQCheckListItem( TQListViewItem *parent, TQListViewItem *after, const TQString &text, Type = RadioButtonController ); - TQCheckListItem( TQListView *tqparent, const TQString &text, + TQCheckListItem( TQListView *parent, const TQString &text, Type = RadioButtonController ); - TQCheckListItem( TQListView *tqparent, TQListViewItem *after, + TQCheckListItem( TQListView *parent, TQListViewItem *after, const TQString &text, Type = RadioButtonController ); - TQCheckListItem( TQListViewItem *tqparent, const TQString &text, + TQCheckListItem( TQListViewItem *parent, const TQString &text, const TQPixmap & ); - TQCheckListItem( TQListView *tqparent, const TQString &text, + TQCheckListItem( TQListView *parent, const TQString &text, const TQPixmap & ); ~TQCheckListItem(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.cpp b/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.cpp index 6a649bc7f..446371ccd 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.cpp @@ -132,7 +132,7 @@ class TQMainWindowLayout : public TQLayout TQ_OBJECT public: - TQMainWindowLayout( TQMainWindow *mw, TQLayout* tqparent = 0 ); + TQMainWindowLayout( TQMainWindow *mw, TQLayout* parent = 0 ); ~TQMainWindowLayout() {} void addItem( QLayoutItem * ); @@ -236,8 +236,8 @@ TQSize TQMainWindowLayout::tqminimumSize() const return TQSize( w, h ); } -TQMainWindowLayout::TQMainWindowLayout( TQMainWindow *mw, TQLayout* tqparent ) - : TQLayout( tqparent ), left( 0 ), right( 0 ), central( 0 ) +TQMainWindowLayout::TQMainWindowLayout( TQMainWindow *mw, TQLayout* parent ) + : TQLayout( parent ), left( 0 ), right( 0 ), central( 0 ) { mainWindow = mw; } @@ -318,7 +318,7 @@ TQLayoutIterator TQMainWindowLayout::iterator() class TQHideToolTip : public TQToolTip { public: - TQHideToolTip( TQWidget *tqparent ) : TQToolTip( tqparent ) {} + TQHideToolTip( TQWidget *parent ) : TQToolTip( parent ) {} ~TQHideToolTip() {} virtual void maybeTip( const TQPoint &pos ); @@ -332,14 +332,14 @@ class TQHideDock : public TQWidget TQ_OBJECT public: - TQHideDock( TQMainWindow *tqparent ) : TQWidget( tqparent, "qt_hide_dock" ) { + TQHideDock( TQMainWindow *parent ) : TQWidget( parent, "qt_hide_dock" ) { hide(); setFixedHeight( tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ) + 3 ); pressedHandle = -1; pressed = FALSE; setMouseTracking( TRUE ); - win = tqparent; + win = parent; #ifndef TQT_NO_TOOLTIP tip = new TQHideToolTip( this ); #endif @@ -590,7 +590,7 @@ void TQHideToolTip::maybeTip( const TQPoint &pos ) When subclassing we add the menu items and toolbars in the subclass's constructor. If we've created a TQMainWindow instance directly we can add menu items and toolbars just as easily by - passing the TQMainWindow instance as the tqparent instead of the \e + passing the TQMainWindow instance as the parent instead of the \e this pointer. \quotefile application/application.cpp @@ -615,7 +615,7 @@ void TQHideToolTip::maybeTip( const TQPoint &pos ) default). The slot will be called when the toolbar button is clicked. Any dock window can be added to a dock area either using addDockWindow(), or by creating a dock window with the TQMainWindow - as the tqparent. + as the parent. \quotefile application/application.cpp \skipto editor @@ -669,7 +669,7 @@ void TQHideToolTip::maybeTip( const TQPoint &pos ) The main window will take care of the dock areas, and the tqgeometry of the central widget, but all other aspects of the central widget are left to you. TQMainWindow automatically detects the creation of - a menu bar or status bar if you specify the TQMainWindow as tqparent, + a menu bar or status bar if you specify the TQMainWindow as parent, or you can use the provided menuBar() and statusBar() functions. The functions menuBar() and statusBar() create a suitable widget if one doesn't exist, and update the window's tqlayout to make @@ -914,7 +914,7 @@ void TQHideToolTip::maybeTip( const TQPoint &pos ) */ /*! - Constructs an empty main window. The \a tqparent, \a name and widget + Constructs an empty main window. The \a parent, \a name and widget flags \a f, are passed on to the TQWidget constructor. By default, the widget flags are set to \c WType_TopLevel rather @@ -923,8 +923,8 @@ void TQHideToolTip::maybeTip( const TQPoint &pos ) f to 0. */ -TQMainWindow::TQMainWindow( TQWidget * tqparent, const char * name, WFlags f ) - : TQWidget( tqparent, name, f ) +TQMainWindow::TQMainWindow( TQWidget * parent, const char * name, WFlags f ) + : TQWidget( parent, name, f ) { d = new TQMainWindowPrivate; #ifdef TQ_WS_MACX @@ -1641,11 +1641,11 @@ void TQMainWindow::paintEvent( TQPaintEvent * ) bool TQMainWindow::dockMainWindow( TQObject *dock ) { while ( dock ) { - if ( dock->tqparent() && TQT_BASE_OBJECT(dock->tqparent()) == TQT_BASE_OBJECT(this) ) + if ( dock->parent() && TQT_BASE_OBJECT(dock->parent()) == TQT_BASE_OBJECT(this) ) return TRUE; - if ( ::tqqt_cast<TQMainWindow*>(dock->tqparent()) ) + if ( ::tqqt_cast<TQMainWindow*>(dock->parent()) ) return FALSE; - dock = dock->tqparent(); + dock = dock->parent(); } return FALSE; } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.h b/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.h index 6cbcc02ac..b2e27344f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.h @@ -68,7 +68,7 @@ class TQ_EXPORT TQMainWindow: public TQWidget Q_PROPERTY( bool opaqueMoving READ opaqueMoving WRITE setOpaqueMoving ) public: - TQMainWindow( TQWidget* tqparent=0, const char* name=0, WFlags f = (WFlags)TQt::WType_TopLevel ); + TQMainWindow( TQWidget* parent=0, const char* name=0, WFlags f = (WFlags)TQt::WType_TopLevel ); ~TQMainWindow(); #ifndef TQT_NO_MENUBAR diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmenubar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqmenubar.cpp index e932f1814..eee931454 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmenubar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqmenubar.cpp @@ -99,8 +99,8 @@ extern int qt_xfocusout_grab_counter; // defined in qapplication_x11.cpp setItemEnabled(). There is no need to lay out a menu bar. It automatically sets its - own tqgeometry to the top of the tqparent widget and changes it - appropriately whenever the tqparent is resized. + own tqgeometry to the top of the parent widget and changes it + appropriately whenever the parent is resized. \important insertItem removeItem clear insertSeparator setItemEnabled isItemEnabled setItemVisible isItemVisible @@ -260,10 +260,10 @@ static const int gtkItemVMargin = 8; /*! - Constructs a menu bar called \a name with tqparent \a tqparent. + Constructs a menu bar called \a name with parent \a parent. */ -TQMenuBar::TQMenuBar( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, TQt::WNoAutoErase ) +TQMenuBar::TQMenuBar( TQWidget *parent, const char *name ) + : TQFrame( parent, name, TQt::WNoAutoErase ) { #if defined( TQ_WS_MAC ) && !defined(TQMAC_TQMENUBAR_NO_NATIVE) mac_eaten_menubar = FALSE; @@ -284,13 +284,13 @@ TQMenuBar::TQMenuBar( TQWidget *tqparent, const char *name ) toggleclose = 0; pendingDelayedContentsChanges = 0; pendingDelayedStateChanges = 0; - if ( tqparent ) { - // filter tqparent events for resizing - tqparent->installEventFilter( this ); + if ( parent ) { + // filter parent events for resizing + parent->installEventFilter( this ); // filter top-level-widget events for accelerators TQWidget *tlw = tqtopLevelWidget(); - if ( tlw != tqparent ) + if ( tlw != parent ) tlw->installEventFilter( this ); } installEventFilter( this ); @@ -392,7 +392,7 @@ void TQMenuBar::performDelayedContentsChanged() if ( isVisible() ) { update(); #ifndef TQT_NO_MAINWINDOW - TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(tqparent()); + TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(parent()); if ( mw ) { mw->triggerLayout(); mw->update(); @@ -503,17 +503,17 @@ void TQMenuBar::languageChange() \internal This function is used to adjust the menu bar's tqgeometry to the - tqparent widget's tqgeometry. Note that this is \e not part of the + parent widget's tqgeometry. Note that this is \e not part of the public interface - the function is \c public only because TQObject::eventFilter() is. - Resizes the menu bar to fit in the tqparent widget when the tqparent + Resizes the menu bar to fit in the parent widget when the parent receives a resize event. */ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event ) { - if ( object == tqparent() && object + if ( object == parent() && object #ifndef TQT_NO_TOOLBAR && !::tqqt_cast<TQToolBar*>(object) #endif @@ -568,7 +568,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event ) // this key and don't wait for Alt on this widget if ( waitforalt ) { waitforalt = 0; - if ( object->tqparent() ) + if ( object->parent() ) object->removeEventFilter( this ); ke->accept(); return TRUE; @@ -603,7 +603,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event ) #endif // look for Alt release if ( TQT_TQOBJECT(((TQWidget*)object)->tqfocusWidget()) == object || - (object->tqparent() == 0 && ((TQWidget*)object)->tqfocusWidget() == 0) ) { + (object->parent() == 0 && ((TQWidget*)object)->tqfocusWidget() == 0) ) { if ( waitforalt && event->type() == TQEvent::KeyRelease && ( ke->key() == Qt::Key_Alt || ke->key() == Qt::Key_Meta ) #if defined(TQ_WS_X11) @@ -611,7 +611,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event ) #endif ) { setAltMode( TRUE ); - if ( object->tqparent() ) + if ( object->parent() ) object->removeEventFilter( this ); TQWidget * tlw = ((TQWidget *)object)->tqtopLevelWidget(); if ( tlw ) { @@ -626,7 +626,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event ) } else if ( !hasFocus() && (event->type() == TQEvent::AccelOverride ) && !(((TQKeyEvent *)event)->key() == Qt::Key_Alt || ((TQKeyEvent *)event)->key() == Qt::Key_Meta) ) { - if ( object->tqparent() ) + if ( object->parent() ) object->removeEventFilter( this ); setAltMode( FALSE ); } @@ -767,7 +767,7 @@ void TQMenuBar::openActPopup() return; TQ_ASSERT( popup->parentMenu == 0 ); - popup->parentMenu = this; // set tqparent menu + popup->parentMenu = this; // set parent menu popup->snapToMouse = FALSE; popup->popup( pos ); @@ -843,7 +843,7 @@ void TQMenuBar::show() #endif #ifndef TQT_NO_MAINWINDOW - TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(tqparent()); + TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(parent()); if ( mw ) //### ugly workaround mw->triggerLayout(); #endif @@ -861,7 +861,7 @@ void TQMenuBar::hide() setAltMode( FALSE ); hidePopups(); #ifndef TQT_NO_MAINWINDOW - TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(tqparent()); + TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(parent()); if ( mw ) //### ugly workaround mw->triggerLayout(); #endif @@ -1064,7 +1064,7 @@ int TQMenuBar::calculateRects( int max_width ) /*! Returns the height that the menu would resize itself to if its - tqparent (and hence itself) resized to the given \a max_width. This + parent (and hence itself) resized to the given \a max_width. This can be useful for simple tqlayout tasks in which the height of the menu bar is needed after items have been inserted. See \l showimg/showimg.cpp for an example of the usage. @@ -1638,7 +1638,7 @@ TQSize TQMenuBar::tqsizeHint() const TQSize TQMenuBar::tqminimumSize() const { #ifndef TQT_NO_TOOLBAR - TQToolBar *tb = ::tqqt_cast<TQToolBar*>(tqparent()); + TQToolBar *tb = ::tqqt_cast<TQToolBar*>(parent()); if ( tb ) return tqsizeHint(); #endif diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmenubar.h b/experimental/tqtinterface/qt4/src/widgets/tqmenubar.h index 6b320319f..c5668a523 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmenubar.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqmenubar.h @@ -60,7 +60,7 @@ class TQ_EXPORT TQMenuBar : public TQFrame, public TQMenuData Q_PROPERTY( bool defaultUp READ isDefaultUp WRITE setDefaultUp ) public: - TQMenuBar( TQWidget* tqparent=0, const char* name=0 ); + TQMenuBar( TQWidget* parent=0, const char* name=0 ); ~TQMenuBar(); void updateItem( int id ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmenudata.cpp b/experimental/tqtinterface/qt4/src/widgets/tqmenudata.cpp index 2061254a3..925ed2270 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmenudata.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqmenudata.cpp @@ -469,7 +469,7 @@ int TQMenuData::insertItem( const TQIconSet& icon, be displayed to the left of the text in the item. To look best when being highlighted as a menu item, the pixmap - should provide a tqmask (see TQPixmap::tqmask()). + should provide a mask (see TQPixmap::mask()). Returns the allocated menu identifier number (\a id if \a id >= 0). @@ -500,7 +500,7 @@ int TQMenuData::insertItem( const QPixmap &pixmap, receiver object. To look best when being highlighted as a menu item, the pixmap - should provide a tqmask (see TQPixmap::tqmask()). + should provide a mask (see TQPixmap::mask()). Returns the allocated menu identifier number (\a id if \a id >= 0). @@ -565,7 +565,7 @@ int TQMenuData::insertItem( const TQIconSet& icon, Inserts a menu item with text \a text, submenu \a popup, optional id \a id, and optional \a index position. - The \a popup must be deleted by the programmer or by its tqparent + The \a popup must be deleted by the programmer or by its parent widget. It is not deleted when this menu item is removed or when the menu is deleted. @@ -588,7 +588,7 @@ int TQMenuData::insertItem( const QString &text, TQPopupMenu *popup, popup, optional id \a id, and optional \a index position. The icon will be displayed to the left of the text in the item. - The \a popup must be deleted by the programmer or by its tqparent + The \a popup must be deleted by the programmer or by its parent widget. It is not deleted when this menu item is removed or when the menu is deleted. @@ -611,7 +611,7 @@ int TQMenuData::insertItem( const TQIconSet& icon, optional \a index position. To look best when being highlighted as a menu item, the pixmap - should provide a tqmask (see TQPixmap::tqmask()). + should provide a mask (see TQPixmap::mask()). Returns the allocated menu identifier number (\a id if \a id >= 0). @@ -648,7 +648,7 @@ int TQMenuData::insertItem( const TQIconSet& icon, Inserts a menu item with pixmap \a pixmap, submenu \a popup, optional id \a id, and optional \a index position. - The \a popup must be deleted by the programmer or by its tqparent + The \a popup must be deleted by the programmer or by its parent widget. It is not deleted when this menu item is removed or when the menu is deleted. @@ -671,7 +671,7 @@ int TQMenuData::insertItem( const QPixmap &pixmap, TQPopupMenu *popup, popup, optional id \a id, and optional \a index position. The icon will be displayed to the left of the pixmap in the item. - The \a popup must be deleted by the programmer or by its tqparent + The \a popup must be deleted by the programmer or by its parent widget. It is not deleted when this menu item is removed or when the menu is deleted. @@ -801,9 +801,9 @@ int TQMenuData::insertSeparator( int index ) void TQMenuData::removeItem( int id ) { - TQMenuData *tqparent; - if ( findItem( id, &tqparent ) ) - tqparent->removeItemAt(tqparent->indexOf(id)); + TQMenuData *parent; + if ( findItem( id, &parent ) ) + parent->removeItemAt(parent->indexOf(id)); } /*! @@ -926,11 +926,11 @@ TQKeySequence TQMenuData::accel( int id ) const void TQMenuData::setAccel( const TQKeySequence& key, int id ) { - TQMenuData *tqparent; - TQMenuItem *mi = findItem( id, &tqparent ); + TQMenuData *parent; + TQMenuItem *mi = findItem( id, &parent ); if ( mi ) { mi->accel_key = key; - tqparent->menuContentsChanged(); + parent->menuContentsChanged(); } } @@ -1012,8 +1012,8 @@ TQPixmap *TQMenuData::pixmap( int id ) const void TQMenuData::changeItem( int id, const TQString &text ) { - TQMenuData *tqparent; - TQMenuItem *mi = findItem( id, &tqparent ); + TQMenuData *parent; + TQMenuItem *mi = findItem( id, &parent ); if ( mi ) { // item found if ( mi->text_data == text ) // same string return; @@ -1026,7 +1026,7 @@ void TQMenuData::changeItem( int id, const TQString &text ) if ( !mi->accel_key && text.find( '\t' ) != -1 ) mi->accel_key = TQt::Key_unknown; #endif - tqparent->menuContentsChanged(); + parent->menuContentsChanged(); } } @@ -1041,8 +1041,8 @@ void TQMenuData::changeItem( int id, const TQString &text ) void TQMenuData::changeItem( int id, const TQPixmap &pixmap ) { - TQMenuData *tqparent; - TQMenuItem *mi = findItem( id, &tqparent ); + TQMenuData *parent; + TQMenuItem *mi = findItem( id, &parent ); if ( mi ) { // item found register TQPixmap *i = mi->pixmap_data; bool fast_refresh = i != 0 && @@ -1057,9 +1057,9 @@ void TQMenuData::changeItem( int id, const TQPixmap &pixmap ) mi->pixmap_data = 0; delete i; // old mi->pixmap_data, could be &pixmap if ( fast_refresh ) - tqparent->updateItem( id ); + parent->updateItem( id ); else - tqparent->menuContentsChanged(); + parent->menuContentsChanged(); } } @@ -1103,8 +1103,8 @@ void TQMenuData::changeItem( int id, const TQIconSet &icon, const TQPixmap &pixm void TQMenuData::changeItemIconSet( int id, const TQIconSet &icon ) { - TQMenuData *tqparent; - TQMenuItem *mi = findItem( id, &tqparent ); + TQMenuData *parent; + TQMenuItem *mi = findItem( id, &parent ); if ( mi ) { // item found register TQIconSet *i = mi->iconset_data; bool fast_refresh = i != 0; @@ -1114,9 +1114,9 @@ void TQMenuData::changeItemIconSet( int id, const TQIconSet &icon ) mi->iconset_data = 0; delete i; // old mi->iconset_data, could be &icon if ( fast_refresh ) - tqparent->updateItem( id ); + parent->updateItem( id ); else - tqparent->menuContentsChanged(); + parent->menuContentsChanged(); } } @@ -1143,15 +1143,15 @@ bool TQMenuData::isItemEnabled( int id ) const void TQMenuData::setItemEnabled( int id, bool enable ) { - TQMenuData *tqparent; - TQMenuItem *mi = findItem( id, &tqparent ); + TQMenuData *parent; + TQMenuItem *mi = findItem( id, &parent ); if ( mi && (bool)mi->is_enabled != enable ) { mi->is_enabled = enable; #if !defined(TQT_NO_ACCEL) && !defined(TQT_NO_POPUPMENU) if ( mi->popup() ) mi->popup()->enableAccel( enable ); #endif - tqparent->menuStateChanged(); + parent->menuStateChanged(); } } @@ -1190,15 +1190,15 @@ bool TQMenuData::isItemChecked( int id ) const void TQMenuData::setItemChecked( int id, bool check ) { - TQMenuData *tqparent; - TQMenuItem *mi = findItem( id, &tqparent ); + TQMenuData *parent; + TQMenuItem *mi = findItem( id, &parent ); if ( mi && (bool)mi->is_checked != check ) { mi->is_checked = check; #ifndef TQT_NO_POPUPMENU - if ( tqparent->isPopupMenu && !((TQPopupMenu *)tqparent)->isCheckable() ) - ((TQPopupMenu *)tqparent)->setCheckable( TRUE ); + if ( parent->isPopupMenu && !((TQPopupMenu *)parent)->isCheckable() ) + ((TQPopupMenu *)parent)->setCheckable( TRUE ); #endif - tqparent->menuStateChanged(); + parent->menuStateChanged(); } } @@ -1224,11 +1224,11 @@ bool TQMenuData::isItemVisible( int id ) const void TQMenuData::setItemVisible( int id, bool visible ) { - TQMenuData *tqparent; - TQMenuItem *mi = findItem( id, &tqparent ); + TQMenuData *parent; + TQMenuItem *mi = findItem( id, &parent ); if ( mi && (bool)mi->is_visible != visible ) { mi->is_visible = visible; - tqparent->menuContentsChanged(); + parent->menuContentsChanged(); } } @@ -1255,8 +1255,8 @@ TQMenuItem *TQMenuData::findItem( int id ) const \overload Returns the menu item with identifier \a id, or 0 if there is no - item with this identifier. Changes \a *tqparent to point to the - tqparent of the return value. + item with this identifier. Changes \a *parent to point to the + parent of the return value. Note that TQMenuItem is an internal class, and that you should not need to call this function. Use the higher level functions like @@ -1266,10 +1266,10 @@ TQMenuItem *TQMenuData::findItem( int id ) const \sa indexOf() */ -TQMenuItem * TQMenuData::findItem( int id, TQMenuData ** tqparent ) const +TQMenuItem * TQMenuData::findItem( int id, TQMenuData ** parent ) const { - if ( tqparent ) - *tqparent = (TQMenuData *)this; // ### + if ( parent ) + *parent = (TQMenuData *)this; // ### if ( id == -1 ) // bad identifier return 0; @@ -1288,7 +1288,7 @@ TQMenuItem * TQMenuData::findItem( int id, TQMenuData ** tqparent ) const TQPopupMenu *p = mi->popup_menu; if (!p->avoid_circularity) { p->avoid_circularity = 1; - mi = mi->popup_menu->findItem( id, tqparent ); + mi = mi->popup_menu->findItem( id, parent ); p->avoid_circularity = 0; if ( mi ) // found item return mi; @@ -1441,11 +1441,11 @@ bool TQMenuData::disconnectItem( int id, const TQT_BASE_OBJECT_NAME *receiver, void TQMenuData::setWhatsThis( int id, const TQString& text ) { - TQMenuData *tqparent; - TQMenuItem *mi = findItem( id, &tqparent ); + TQMenuData *parent; + TQMenuItem *mi = findItem( id, &parent ); if ( mi ) { mi->setWhatsThis( text ); - tqparent->menuContentsChanged(); + parent->menuContentsChanged(); } } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmenudata.h b/experimental/tqtinterface/qt4/src/widgets/tqmenudata.h index 70f7a4375..bc5095f7d 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmenudata.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqmenudata.h @@ -246,7 +246,7 @@ public: int itemParameter( int id ) const; TQMenuItem *findItem( int id ) const; - TQMenuItem *findItem( int id, TQMenuData ** tqparent ) const; + TQMenuItem *findItem( int id, TQMenuData ** parent ) const; TQMenuItem * findPopup( TQPopupMenu *, int *index = 0 ); virtual void activateItemAt( int index ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmultilineedit.cpp b/experimental/tqtinterface/qt4/src/widgets/tqmultilineedit.cpp index 1dba7ed38..4a928a87b 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmultilineedit.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqmultilineedit.cpp @@ -130,12 +130,12 @@ class TQMultiLineEditData /*! - Constructs a new, empty, TQMultiLineEdit with tqparent \a tqparent called + Constructs a new, empty, TQMultiLineEdit with parent \a parent called \a name. */ -TQMultiLineEdit::TQMultiLineEdit( TQWidget *tqparent , const char *name ) - : TQTextEdit( tqparent, name ) +TQMultiLineEdit::TQMultiLineEdit( TQWidget *parent , const char *name ) + : TQTextEdit( parent, name ) { d = new TQMultiLineEditData; setTextFormat( TQt::PlainText ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmultilineedit.h b/experimental/tqtinterface/qt4/src/widgets/tqmultilineedit.h index f382f789b..dc7a669f1 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmultilineedit.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqmultilineedit.h @@ -62,7 +62,7 @@ class TQ_EXPORT TQMultiLineEdit : public TQTextEdit Q_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false ) public: - TQMultiLineEdit( TQWidget* tqparent=0, const char* name=0 ); + TQMultiLineEdit( TQWidget* parent=0, const char* name=0 ); ~TQMultiLineEdit(); TQString textLine( int line ) const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp b/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp index a96b67d8f..b528c8bae 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp @@ -281,15 +281,15 @@ public: static TQPopupMenu* active_popup_menu = 0; /*! - Constructs a popup menu called \a name with tqparent \a tqparent. + Constructs a popup menu called \a name with parent \a parent. - Although a popup menu is always a top-level widget, if a tqparent is - passed the popup menu will be deleted when that tqparent is + Although a popup menu is always a top-level widget, if a parent is + passed the popup menu will be deleted when that parent is destroyed (as with any other TQObject). */ -TQPopupMenu::TQPopupMenu( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, (WFlags)WType_Popup | TQt::WNoAutoErase ) +TQPopupMenu::TQPopupMenu( TQWidget *parent, const char *name ) + : TQFrame( parent, name, (WFlags)WType_Popup | TQt::WNoAutoErase ) { d = new TQPopupMenuPrivate; d->scroll.scrollableSize = d->scroll.topScrollableIndex = 0; @@ -599,13 +599,13 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint ) x11SetWindowTransient( static_cast< TQPopupMenu* >( parentMenu )); if( !parentMenu ) { // hackish ... try to find the main window related to this popup - TQWidget* tqparent = parentWidget() ? parentWidget()->tqtopLevelWidget() : NULL; - if( tqparent == NULL ) - tqparent = TQApplication::widgetAt( pos ); - if( tqparent == NULL ) - tqparent = TQT_TQWIDGET(tqApp->activeWindow()); - if( tqparent != NULL ) - x11SetWindowTransient( tqparent ); + TQWidget* parent = parentWidget() ? parentWidget()->tqtopLevelWidget() : NULL; + if( parent == NULL ) + parent = TQApplication::widgetAt( pos ); + if( parent == NULL ) + parent = TQT_TQWIDGET(tqApp->activeWindow()); + if( parent != NULL ) + x11SetWindowTransient( parent ); } #endif @@ -1267,33 +1267,33 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) #ifndef TQT_NO_ACCEL /*! \internal - The \a tqparent is 0 when it is updated when a menu item has + The \a parent is 0 when it is updated when a menu item has changed a state, or it is something else if called from the menu bar. */ -void TQPopupMenu::updateAccel( TQWidget *tqparent ) +void TQPopupMenu::updateAccel( TQWidget *parent ) { TQMenuItemListIt it(*mitems); register TQMenuItem *mi; - if ( tqparent ) { + if ( parent ) { delete autoaccel; autoaccel = 0; } else if ( !autoaccel ) { - // we have no tqparent. Rather than ignoring any accelerators we try to find this popup's main window + // we have no parent. Rather than ignoring any accelerators we try to find this popup's main window if ( tornOff ) { - tqparent = this; + parent = this; } else { TQWidget *w = (TQWidget *) this; - tqparent = w->parentWidget(); - while ( (!w->testWFlags(TQt::WType_TopLevel) || !w->testWFlags(WType_Popup)) && tqparent ) { - w = tqparent; - tqparent = tqparent->parentWidget(); + parent = w->parentWidget(); + while ( (!w->testWFlags(TQt::WType_TopLevel) || !w->testWFlags(WType_Popup)) && parent ) { + w = parent; + parent = parent->parentWidget(); } } } - if ( tqparent == 0 && autoaccel == 0 ) + if ( parent == 0 && autoaccel == 0 ) return; if ( autoaccel ) // build it from scratch @@ -1301,7 +1301,7 @@ void TQPopupMenu::updateAccel( TQWidget *tqparent ) else { // create an autoaccel in any case, even if we might not use // it immediately. Maybe the user needs it later. - autoaccel = new TQAccel( tqparent, this ); + autoaccel = new TQAccel( parent, this ); connect( autoaccel, TQT_SIGNAL(activated(int)), TQT_SLOT(accelActivated(int)) ); connect( autoaccel, TQT_SIGNAL(activatedAmbiguously(int)), @@ -1342,12 +1342,12 @@ void TQPopupMenu::updateAccel( TQWidget *tqparent ) badSize = TRUE; } } - if ( mi->popup() && tqparent ) { // call recursively + if ( mi->popup() && parent ) { // call recursively // reuse TQPopupMenu* popup = mi->popup(); if (!popup->avoid_circularity) { popup->avoid_circularity = 1; - popup->updateAccel( tqparent ); + popup->updateAccel( parent ); popup->avoid_circularity = 0; } } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.h b/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.h index 8863cd549..d7290f4b6 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.h @@ -55,7 +55,7 @@ class TQ_EXPORT TQPopupMenu : public TQFrame, public TQMenuData TQ_OBJECT Q_PROPERTY( bool checkable READ isCheckable WRITE setCheckable ) public: - TQPopupMenu( TQWidget* tqparent=0, const char* name=0 ); + TQPopupMenu( TQWidget* parent=0, const char* name=0 ); ~TQPopupMenu(); void popup( const TQPoint & pos, int indexAtPoint = -1 ); // open @@ -88,7 +88,7 @@ public: Q_SIGNALS: void activated( int itemId ); void highlighted( int itemId ); - void activatedRedirect( int itemId ); // to tqparent menu + void activatedRedirect( int itemId ); // to parent menu void highlightedRedirect( int itemId ); void aboutToShow(); void aboutToHide(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.cpp index e00d12d94..007b2e88f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.cpp @@ -88,14 +88,14 @@ The total number of steps is set to 100 by default. - The \a tqparent, \a name and widget flags, \a f, are passed on to + The \a parent, \a name and widget flags, \a f, are passed on to the TQFrame::TQFrame() constructor. \sa setTotalSteps() */ -TQProgressBar::TQProgressBar( TQWidget *tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f | TQt::WNoAutoErase ), +TQProgressBar::TQProgressBar( TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f | TQt::WNoAutoErase ), total_steps( 100 ), progress_val( -1 ), percentage( -1 ), @@ -118,15 +118,15 @@ TQProgressBar::TQProgressBar( TQWidget *tqparent, const char *name, WFlags f ) would be 50. Before examining the first file, call setProgress(0); call setProgress(50) after examining the last file. - The \a tqparent, \a name and widget flags, \a f, are passed to the + The \a parent, \a name and widget flags, \a f, are passed to the TQFrame::TQFrame() constructor. \sa setTotalSteps(), setProgress() */ TQProgressBar::TQProgressBar( int totalSteps, - TQWidget *tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f | TQt::WNoAutoErase ), + TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f | TQt::WNoAutoErase ), total_steps( totalSteps ), progress_val( -1 ), percentage( -1 ), diff --git a/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.h b/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.h index 7b9d19105..a380bc020 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.h @@ -63,8 +63,8 @@ class TQ_EXPORT TQProgressBar : public TQFrame Q_PROPERTY( bool percentageVisible READ percentageVisible WRITE setPercentageVisible ) public: - TQProgressBar( TQWidget* tqparent=0, const char* name=0, WFlags f=0 ); - TQProgressBar( int totalSteps, TQWidget* tqparent=0, const char* name=0, WFlags f=0 ); + TQProgressBar( TQWidget* parent=0, const char* name=0, WFlags f=0 ); + TQProgressBar( int totalSteps, TQWidget* parent=0, const char* name=0, WFlags f=0 ); int totalSteps() const; int progress() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp b/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp index e8583ff00..aecc6c74f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp @@ -169,7 +169,7 @@ may have a slightly larger size hint. This property's default is TRUE for buttons that have a TQDialog - tqparent; otherwise it defaults to FALSE. + parent; otherwise it defaults to FALSE. See the \l default property for details of how \l default and auto-default interact. @@ -274,24 +274,24 @@ public: /*! Constructs a push button with no text. - The \a tqparent and \a name arguments are sent on to the TQWidget + The \a parent and \a name arguments are sent on to the TQWidget constructor. */ -TQPushButton::TQPushButton( TQWidget *tqparent, const char *name ) - : TQButton( tqparent, name ) +TQPushButton::TQPushButton( TQWidget *parent, const char *name ) + : TQButton( parent, name ) { init(); } /*! - Constructs a push button called \a name with the tqparent \a tqparent + Constructs a push button called \a name with the parent \a parent and the text \a text. */ -TQPushButton::TQPushButton( const TQString &text, TQWidget *tqparent, +TQPushButton::TQPushButton( const TQString &text, TQWidget *parent, const char *name ) - : TQButton( tqparent, name ) + : TQButton( parent, name ) { init(); setText( text ); @@ -304,13 +304,13 @@ TQPushButton::TQPushButton( const TQString &text, TQWidget *tqparent, Note that you can also pass a TQPixmap object as an icon (thanks to the implicit type conversion provided by C++). - The \a tqparent and \a name arguments are sent to the TQWidget + The \a parent and \a name arguments are sent to the TQWidget constructor. */ #ifndef TQT_NO_ICONSET TQPushButton::TQPushButton( const TQIconSet& icon, const TQString &text, - TQWidget *tqparent, const char *name ) - : TQButton( tqparent, name ) + TQWidget *parent, const char *name ) + : TQButton( parent, name ) { init(); setText( text ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.h b/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.h index 92a375dc7..3af2d76d4 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.h @@ -65,10 +65,10 @@ class TQ_EXPORT TQPushButton : public TQButton TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: - TQPushButton( TQWidget *tqparent, const char* name=0 ); - TQPushButton( const TQString &text, TQWidget *tqparent, const char* name=0 ); + TQPushButton( TQWidget *parent, const char* name=0 ); + TQPushButton( const TQString &text, TQWidget *parent, const char* name=0 ); #ifndef TQT_NO_ICONSET - TQPushButton( const TQIconSet& icon, const TQString &text, TQWidget *tqparent, const char* name=0 ); + TQPushButton( const TQIconSet& icon, const TQString &text, TQWidget *parent, const char* name=0 ); #endif ~TQPushButton(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.cpp b/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.cpp index 13ca86671..1c24676ed 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.cpp @@ -104,12 +104,12 @@ /*! Constructs a radio button with no text. - The \a tqparent and \a name arguments are sent on to the TQWidget + The \a parent and \a name arguments are sent on to the TQWidget constructor. */ -TQRadioButton::TQRadioButton( TQWidget *tqparent, const char *name ) - : TQButton( tqparent, name, TQt::WNoAutoErase | TQt::WMouseNoMask ) +TQRadioButton::TQRadioButton( TQWidget *parent, const char *name ) + : TQButton( parent, name, TQt::WNoAutoErase | TQt::WMouseNoMask ) { init(); } @@ -117,13 +117,13 @@ TQRadioButton::TQRadioButton( TQWidget *tqparent, const char *name ) /*! Constructs a radio button with the text \a text. - The \a tqparent and \a name arguments are sent on to the TQWidget + The \a parent and \a name arguments are sent on to the TQWidget constructor. */ -TQRadioButton::TQRadioButton( const TQString &text, TQWidget *tqparent, +TQRadioButton::TQRadioButton( const TQString &text, TQWidget *parent, const char *name ) - : TQButton( tqparent, name, TQt::WNoAutoErase | TQt::WMouseNoMask ) + : TQButton( parent, name, TQt::WNoAutoErase | TQt::WMouseNoMask ) { init(); setText( text ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.h b/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.h index 50f9927b2..1a27850e3 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.h @@ -55,8 +55,8 @@ class TQ_EXPORT TQRadioButton : public TQButton TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: - TQRadioButton( TQWidget *tqparent, const char* name=0 ); - TQRadioButton( const TQString &text, TQWidget *tqparent, const char* name=0 ); + TQRadioButton( TQWidget *parent, const char* name=0 ); + TQRadioButton( const TQString &text, TQWidget *parent, const char* name=0 ); bool isChecked() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqrangecontrol.h b/experimental/tqtinterface/qt4/src/widgets/tqrangecontrol.h index ddda65df2..d1fb4d481 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqrangecontrol.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqrangecontrol.h @@ -132,7 +132,7 @@ class TQ_EXPORT TQSpinWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - TQSpinWidget( TQWidget* tqparent=0, const char* name=0 ); + TQSpinWidget( TQWidget* parent=0, const char* name=0 ); ~TQSpinWidget(); void setEditWidget( TQWidget * widget ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.cpp index de8c74c8e..959ed28f3 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.cpp @@ -220,7 +220,7 @@ static const int repeatTime = 50; /*! Constructs a vertical scroll bar. - The \a tqparent and \a name arguments are sent on to the TQWidget + The \a parent and \a name arguments are sent on to the TQWidget constructor. The \c minValue defaults to 0, the \c maxValue to 99, with a \c @@ -228,8 +228,8 @@ static const int repeatTime = 50; \c value of 0. */ -TQScrollBar::TQScrollBar( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), orient( Qt::Vertical ) +TQScrollBar::TQScrollBar( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), orient( Qt::Vertical ) { init(); } @@ -239,7 +239,7 @@ TQScrollBar::TQScrollBar( TQWidget *tqparent, const char *name ) The \a orientation must be \c Qt::Vertical or \c Qt::Horizontal. - The \a tqparent and \a name arguments are sent on to the TQWidget + The \a parent and \a name arguments are sent on to the TQWidget constructor. The \c minValue defaults to 0, the \c maxValue to 99, with a \c @@ -247,9 +247,9 @@ TQScrollBar::TQScrollBar( TQWidget *tqparent, const char *name ) \c value of 0. */ -TQScrollBar::TQScrollBar( Qt::Orientation orientation, TQWidget *tqparent, +TQScrollBar::TQScrollBar( Qt::Orientation orientation, TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ), orient( orientation ) + : TQWidget( parent, name ), orient( orientation ) { init(); } @@ -264,14 +264,14 @@ TQScrollBar::TQScrollBar( Qt::Orientation orientation, TQWidget *tqparent, If \a orientation is \c Vertical the scroll bar is vertical and if it is \c Horizontal the scroll bar is horizontal. - The \a tqparent and \a name arguments are sent on to the TQWidget + The \a parent and \a name arguments are sent on to the TQWidget constructor. */ TQScrollBar::TQScrollBar( int minValue, int maxValue, int lineStep, int pageStep, int value, Qt::Orientation orientation, - TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), + TQWidget *parent, const char *name ) + : TQWidget( parent, name ), TQRangeControl( minValue, maxValue, lineStep, pageStep, value ), orient( orientation ) { diff --git a/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.h b/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.h index cf48a0544..2d634bd5a 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.h @@ -64,10 +64,10 @@ class TQ_EXPORT TQScrollBar : public TQWidget, public TQRangeControl Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) public: - TQScrollBar( TQWidget *tqparent, const char* name = 0 ); - TQScrollBar( Qt::Orientation, TQWidget *tqparent, const char* name = 0 ); + TQScrollBar( TQWidget *parent, const char* name = 0 ); + TQScrollBar( Qt::Orientation, TQWidget *parent, const char* name = 0 ); TQScrollBar( int minValue, int maxValue, int lineStep, int pageStep, - int value, Qt::Orientation, TQWidget *tqparent, const char* name = 0 ); + int value, Qt::Orientation, TQWidget *parent, const char* name = 0 ); ~TQScrollBar(); virtual void setOrientation( Qt::Orientation ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp b/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp index dba2bc060..f2dbfd6d9 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp @@ -104,8 +104,8 @@ class TQViewportWidget : public TQWidget TQ_OBJECT public: - TQViewportWidget( TQScrollView* tqparent=0, const char* name=0, WFlags f = 0 ) - : TQWidget( tqparent, name, f ) {} + TQViewportWidget( TQScrollView* parent=0, const char* name=0, WFlags f = 0 ) + : TQWidget( parent, name, f ) {} }; class TQClipperWidget : public TQWidget @@ -113,26 +113,26 @@ class TQClipperWidget : public TQWidget TQ_OBJECT public: - TQClipperWidget( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ) - : TQWidget ( tqparent,name,f) {} + TQClipperWidget( TQWidget * parent=0, const char * name=0, WFlags f=0 ) + : TQWidget ( parent,name,f) {} }; #include "tqscrollview.tqmoc" class TQScrollViewData { public: - TQScrollViewData(TQScrollView* tqparent, int vpwflags) : - hbar( new TQScrollBar( Qt::Horizontal, tqparent, "qt_hbar" ) ), - vbar( new TQScrollBar( Qt::Vertical, tqparent, "qt_vbar" ) ), - viewport( new TQViewportWidget( tqparent, "qt_viewport", (WFlags)vpwflags ) ), + TQScrollViewData(TQScrollView* parent, int vpwflags) : + hbar( new TQScrollBar( Qt::Horizontal, parent, "qt_hbar" ) ), + vbar( new TQScrollBar( Qt::Vertical, parent, "qt_vbar" ) ), + viewport( new TQViewportWidget( parent, "qt_viewport", (WFlags)vpwflags ) ), clipped_viewport( 0 ), flags( vpwflags ), vx( 0 ), vy( 0 ), vwidth( 1 ), vheight( 1 ), #ifndef TQT_NO_DRAGANDDROP - autoscroll_timer( tqparent, "scrollview autoscroll timer" ), + autoscroll_timer( parent, "scrollview autoscroll timer" ), drag_autoscroll( TRUE ), #endif - scrollbar_timer( tqparent, "scrollview scrollbar timer" ), + scrollbar_timer( parent, "scrollview scrollbar timer" ), inresize( FALSE ), use_cached_size_hint( TRUE ) { l_marg = r_marg = t_marg = b_marg = 0; @@ -142,7 +142,7 @@ public: vMode = TQScrollView::Auto; hMode = TQScrollView::Auto; corner = 0; - defaultCorner = new TQWidget( tqparent, "qt_default_corner" ); + defaultCorner = new TQWidget( parent, "qt_default_corner" ); defaultCorner->hide(); vbar->setSteps( 20, 1/*set later*/ ); hbar->setSteps( 20, 1/*set later*/ ); @@ -473,7 +473,7 @@ void TQScrollViewData::viewportResized( int w, int h ) To enable drag-and-drop, you would setAcceptDrops(TRUE) on the TQScrollView (because drag-and-drop events propagate to the - tqparent). But to work out the logical position in the view, you + parent). But to work out the logical position in the view, you would need to map the drop co-ordinate from being relative to the TQScrollView to being relative to the contents; use the function viewportToContents() for this. @@ -571,16 +571,16 @@ void TQScrollViewData::viewportResized( int w, int h ) //#### is received /*! - Constructs a TQScrollView called \a name with tqparent \a tqparent and + Constructs a TQScrollView called \a name with parent \a parent and widget flags \a f. The widget flags \c WStaticContents, \c WNoAutoErase and \c WPaintClever are propagated to the viewport() widget. The other - widget flags are propagated to the tqparent constructor as usual. + widget flags are propagated to the parent constructor as usual. */ -TQScrollView::TQScrollView( TQWidget *tqparent, const char *name, WFlags f ) : - TQFrame( tqparent, name, f & (~TQt::WStaticContents) & (~TQt::WResizeNoErase) ) +TQScrollView::TQScrollView( TQWidget *parent, const char *name, WFlags f ) : + TQFrame( parent, name, f & (~TQt::WStaticContents) & (~TQt::WResizeNoErase) ) { WFlags flags = (WFlags)(TQt::WResizeNoErase | (f&TQt::WPaintClever) | (f&WRepaintNoErase) | (f&TQt::WStaticContents)); d = new TQScrollViewData( this, flags ); @@ -1304,7 +1304,7 @@ TQWidget* TQScrollView::cornerWidget() const destroyed unless you separately reparent the widget after setting some other corner widget (or 0). - Any \e newly set widget should have no current tqparent. + Any \e newly set widget should have no current parent. By default, no corner widget is present. diff --git a/experimental/tqtinterface/qt4/src/widgets/tqscrollview.h b/experimental/tqtinterface/qt4/src/widgets/tqscrollview.h index caa86bbfd..3f6577639 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqscrollview.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqscrollview.h @@ -68,7 +68,7 @@ class TQ_EXPORT TQScrollView : public TQFrame #endif public: - TQScrollView(TQWidget* tqparent=0, const char* name=0, WFlags f=0); + TQScrollView(TQWidget* parent=0, const char* name=0, WFlags f=0); ~TQScrollView(); enum ResizePolicy { Default, Manual, AutoOne, AutoOneFit }; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqslider.cpp b/experimental/tqtinterface/qt4/src/widgets/tqslider.cpp index 4ba251511..38dd7cccb 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqslider.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqslider.cpp @@ -115,12 +115,12 @@ struct TQSliderPrivate /*! Constructs a vertical slider. - The \a tqparent and \a name arguments are sent on to the TQWidget + The \a parent and \a name arguments are sent on to the TQWidget constructor. */ -TQSlider::TQSlider( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +TQSlider::TQSlider( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { orient = Qt::Vertical; init(); @@ -131,12 +131,12 @@ TQSlider::TQSlider( TQWidget *tqparent, const char *name ) The \a orientation must be \l Qt::Vertical or \l Qt::Horizontal. - The \a tqparent and \a name arguments are sent on to the TQWidget + The \a parent and \a name arguments are sent on to the TQWidget constructor. */ -TQSlider::TQSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +TQSlider::TQSlider( Qt::Orientation orientation, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { orient = orientation; init(); @@ -151,14 +151,14 @@ TQSlider::TQSlider( Qt::Orientation orientation, TQWidget *tqparent, const char If \a orientation is \c Qt::Vertical the slider is vertical and if it is \c Qt::Horizontal the slider is horizontal. - The \a tqparent and \a name arguments are sent on to the TQWidget + The \a parent and \a name arguments are sent on to the TQWidget constructor. */ TQSlider::TQSlider( int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, - TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), + TQWidget *parent, const char *name ) + : TQWidget( parent, name ), TQRangeControl( minValue, maxValue, 1, pageStep, value ) { orient = orientation; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqslider.h b/experimental/tqtinterface/qt4/src/widgets/tqslider.h index ac6177d4e..76191aa24 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqslider.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqslider.h @@ -71,10 +71,10 @@ public: enum TickSetting { NoMarks = 0, Above = 1, Left = Above, Below = 2, Right = Below, Both = 3 }; - TQSlider( TQWidget *tqparent, const char* name = 0 ); - TQSlider( Qt::Orientation, TQWidget *tqparent, const char* name = 0 ); + TQSlider( TQWidget *parent, const char* name = 0 ); + TQSlider( Qt::Orientation, TQWidget *parent, const char* name = 0 ); TQSlider( int minValue, int maxValue, int pageStep, int value, Qt::Orientation, - TQWidget *tqparent, const char* name = 0 ); + TQWidget *parent, const char* name = 0 ); ~TQSlider(); virtual void setOrientation( Qt::Orientation ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqspinbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqspinbox.cpp index 8ea1775a4..51cf8ede8 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqspinbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqspinbox.cpp @@ -227,13 +227,13 @@ TQValidator::State TQSpinBoxValidator::validate( TQString& str, int& pos ) const /*! Constructs a spin box with the default TQRangeControl range and - step values. It is called \a name and has tqparent \a tqparent. + step values. It is called \a name and has parent \a parent. \sa minValue(), maxValue(), setRange(), lineStep(), setSteps() */ -TQSpinBox::TQSpinBox( TQWidget * tqparent , const char *name ) - : TQWidget( tqparent, name, TQt::WNoAutoErase ), +TQSpinBox::TQSpinBox( TQWidget * parent , const char *name ) + : TQWidget( parent, name, TQt::WNoAutoErase ), TQRangeControl() { initSpinBox(); @@ -245,14 +245,14 @@ TQSpinBox::TQSpinBox( TQWidget * tqparent , const char *name ) maxValue inclusive, with step amount \a step. The value is initially set to \a minValue. - The spin box is called \a name and has tqparent \a tqparent. + The spin box is called \a name and has parent \a parent. \sa minValue(), maxValue(), setRange(), lineStep(), setSteps() */ -TQSpinBox::TQSpinBox( int minValue, int maxValue, int step, TQWidget* tqparent, +TQSpinBox::TQSpinBox( int minValue, int maxValue, int step, TQWidget* parent, const char* name ) - : TQWidget( tqparent, name, TQt::WNoAutoErase ), + : TQWidget( parent, name, TQt::WNoAutoErase ), TQRangeControl( minValue, maxValue, step, step, minValue ) { initSpinBox(); @@ -356,7 +356,7 @@ TQString TQSpinBox::cleanText() const automatically choose a good margin width, you can set up the spin box like this: \code - TQSpinBox marginBox( -1, 20, 1, tqparent, "marginBox" ); + TQSpinBox marginBox( -1, 20, 1, parent, "marginBox" ); marginBox->setSuffix( " mm" ); marginBox->setSpecialValueText( "Auto" ); \endcode diff --git a/experimental/tqtinterface/qt4/src/widgets/tqspinbox.h b/experimental/tqtinterface/qt4/src/widgets/tqspinbox.h index 2e18cef28..1013c114c 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqspinbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqspinbox.h @@ -70,9 +70,9 @@ class TQ_EXPORT TQSpinBox: public TQWidget, public TQRangeControl Q_PROPERTY( int value READ value WRITE setValue ) public: - TQSpinBox( TQWidget* tqparent=0, const char* name=0 ); + TQSpinBox( TQWidget* parent=0, const char* name=0 ); TQSpinBox( int minValue, int maxValue, int step = 1, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); ~TQSpinBox(); TQString text() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqspinwidget.cpp b/experimental/tqtinterface/qt4/src/widgets/tqspinwidget.cpp index f035c1368..b1341801a 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqspinwidget.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqspinwidget.cpp @@ -78,13 +78,13 @@ public: \internal - Constructs an empty range control widget with tqparent \a tqparent + Constructs an empty range control widget with parent \a parent called \a name. */ -TQSpinWidget::TQSpinWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +TQSpinWidget::TQSpinWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { d = new TQSpinWidgetPrivate(); connect( &d->auRepTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timerDone() ) ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp index b5a159be8..18cf11cca 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp @@ -86,11 +86,11 @@ static TQPoint bottomRight( TQWidget *w ) } } -TQSplitterHandle::TQSplitterHandle( Qt::Orientation o, TQSplitter *tqparent, +TQSplitterHandle::TQSplitterHandle( Qt::Orientation o, TQSplitter *parent, const char * name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { - s = tqparent; + s = parent; setOrientation( o ); } @@ -172,7 +172,7 @@ TQCOORD TQSplitterLayoutStruct::getSizer( Qt::Orientation orient ) To show a TQListBox, a TQListView and a TQTextEdit side by side: \code - TQSplitter *split = new TQSplitter( tqparent ); + TQSplitter *split = new TQSplitter( parent ); TQListBox *lb = new TQListBox( split ); TQListView *lv = new TQListView( split ); TQTextEdit *ed = new TQTextEdit( split ); @@ -209,12 +209,12 @@ TQCOORD TQSplitterLayoutStruct::getSizer( Qt::Orientation orient ) /*! - Constructs a horizontal splitter with the \a tqparent and \a name + Constructs a horizontal splitter with the \a parent and \a name arguments being passed on to the TQFrame constructor. */ -TQSplitter::TQSplitter( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, TQt::WPaintUnclipped ) +TQSplitter::TQSplitter( TQWidget *parent, const char *name ) + : TQFrame( parent, name, TQt::WPaintUnclipped ) { orient = Qt::Horizontal; init(); @@ -222,12 +222,12 @@ TQSplitter::TQSplitter( TQWidget *tqparent, const char *name ) /*! - Constructs a splitter with orientation \a o with the \a tqparent and + Constructs a splitter with orientation \a o with the \a parent and \a name arguments being passed on to the TQFrame constructor. */ -TQSplitter::TQSplitter( Qt::Orientation o, TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, TQt::WPaintUnclipped ) +TQSplitter::TQSplitter( Qt::Orientation o, TQWidget *parent, const char *name ) + : TQFrame( parent, name, TQt::WPaintUnclipped ) { orient = o; init(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h index 18d62f9ed..5ab15b027 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h @@ -96,8 +96,8 @@ public: // ### TQt 4.0: remove Auto from public API enum ResizeMode { Stretch, KeepSize, FollowSizeHint, Auto }; - TQSplitter( TQWidget* tqparent = 0, const char* name = 0 ); - TQSplitter( Qt::Orientation, TQWidget* tqparent = 0, const char* name = 0 ); + TQSplitter( TQWidget* parent = 0, const char* name = 0 ); + TQSplitter( Qt::Orientation, TQWidget* parent = 0, const char* name = 0 ); ~TQSplitter(); virtual void setOrientation( Qt::Orientation ); @@ -196,7 +196,7 @@ class TQSplitterHandle : public TQWidget TQ_OBJECT public: TQSplitterHandle( Qt::Orientation o, - TQSplitter *tqparent, const char* name=0 ); + TQSplitter *parent, const char* name=0 ); void setOrientation( Qt::Orientation o ); Qt::Orientation orientation() const { return orient; } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqstatusbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqstatusbar.cpp index 6dbe4a44b..2a424d42d 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqstatusbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqstatusbar.cpp @@ -136,13 +136,13 @@ public: /*! - Constructs a status bar called \a name with tqparent \a tqparent and + Constructs a status bar called \a name with parent \a parent and with a size grip. \sa setSizeGripEnabled() */ -TQStatusBar::TQStatusBar( TQWidget * tqparent, const char *name ) - : TQWidget( tqparent, name ) +TQStatusBar::TQStatusBar( TQWidget * parent, const char *name ) + : TQWidget( parent, name ) { d = new TQStatusBarPrivate; d->items.setAutoDelete( TRUE ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqstatusbar.h b/experimental/tqtinterface/qt4/src/widgets/tqstatusbar.h index 8fc6cfc83..73929cbb9 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqstatusbar.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqstatusbar.h @@ -58,7 +58,7 @@ class TQ_EXPORT TQStatusBar: public TQWidget Q_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled ) public: - TQStatusBar( TQWidget* tqparent=0, const char* name=0 ); + TQStatusBar( TQWidget* parent=0, const char* name=0 ); virtual ~TQStatusBar(); virtual void addWidget( TQWidget *, int stretch = 0, bool = FALSE ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtabbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtabbar.cpp index fd02625a1..bcbd41aa6 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtabbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtabbar.cpp @@ -255,8 +255,8 @@ struct TQTabPrivate { class TQTabBarToolTip : public TQToolTip { public: - TQTabBarToolTip( TQWidget * tqparent ) - : TQToolTip( tqparent ) {} + TQTabBarToolTip( TQWidget * parent ) + : TQToolTip( parent ) {} virtual ~TQTabBarToolTip() {} void add( TQTab * tab, const TQString & tip ) @@ -330,12 +330,12 @@ private: */ /*! - Constructs a new, empty tab bar; the \a tqparent and \a name + Constructs a new, empty tab bar; the \a parent and \a name arguments are passed on to the TQWidget constructor. */ -TQTabBar::TQTabBar( TQWidget * tqparent, const char *name ) - : TQWidget( tqparent, name, (WFlags)(TQt::WNoAutoErase | TQt::WNoMousePropagation) ) +TQTabBar::TQTabBar( TQWidget * parent, const char *name ) + : TQWidget( parent, name, (WFlags)(TQt::WNoAutoErase | TQt::WNoMousePropagation) ) { d = new TQTabPrivate; d->pressed = 0; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtabbar.h b/experimental/tqtinterface/qt4/src/widgets/tqtabbar.h index 1b0fa7605..021e13e9d 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtabbar.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtabbar.h @@ -96,7 +96,7 @@ class TQ_EXPORT TQTabBar: public TQWidget Q_PROPERTY( int keyboardFocusTab READ keyboardFocusTab ) public: - TQTabBar( TQWidget* tqparent=0, const char* name=0 ); + TQTabBar( TQWidget* parent=0, const char* name=0 ); ~TQTabBar(); enum Shape { RoundedAbove, RoundedBelow, diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.cpp index e1afe3d97..b4275dbab 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.cpp @@ -175,12 +175,12 @@ class TQTabBarBase : public TQWidget { public: - TQTabBarBase( TQTabWidget* tqparent=0, const char* name=0 ) - : TQWidget( tqparent, name ) {}; + TQTabBarBase( TQTabWidget* parent=0, const char* name=0 ) + : TQWidget( parent, name ) {}; protected: void paintEvent( TQPaintEvent * ) { - TQObject * obj = tqparent(); + TQObject * obj = parent(); if( obj ){ TQTabWidget * t = (TQTabWidget *) obj; TQPainter p( this ); @@ -219,11 +219,11 @@ public: }; /*! - Constructs a tabbed widget called \a name with tqparent \a tqparent, + Constructs a tabbed widget called \a name with parent \a parent, and widget flags \a f. */ -TQTabWidget::TQTabWidget( TQWidget *tqparent, const char *name, WFlags f ) - : TQWidget( tqparent, name, f ) +TQTabWidget::TQTabWidget( TQWidget *parent, const char *name, WFlags f ) + : TQWidget( parent, name, f ) { d = new TQTabWidgetData; d->stack = new TQWidgetStack( this, "tab pages" ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.h b/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.h index eb11988ad..14e5a8426 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.h @@ -68,7 +68,7 @@ class TQ_EXPORT TQTabWidget : public TQWidget TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: - TQTabWidget( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + TQTabWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); ~TQTabWidget(); virtual void addTab( TQWidget *, const TQString & ); // ### make these inline in 4.0 diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtextbrowser.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtextbrowser.cpp index 81cf7de9b..a02213651 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtextbrowser.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtextbrowser.cpp @@ -132,11 +132,11 @@ public: /*! - Constructs an empty TQTextBrowser called \a name, with tqparent \a - tqparent. + Constructs an empty TQTextBrowser called \a name, with parent \a + parent. */ -TQTextBrowser::TQTextBrowser(TQWidget *tqparent, const char *name) - : TQTextEdit( tqparent, name ) +TQTextBrowser::TQTextBrowser(TQWidget *parent, const char *name) + : TQTextEdit( parent, name ) { setReadOnly( TRUE ); d = new TQTextBrowserData; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtextbrowser.h b/experimental/tqtinterface/qt4/src/widgets/tqtextbrowser.h index 91bff5084..b2319a40b 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtextbrowser.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtextbrowser.h @@ -64,7 +64,7 @@ class TQ_EXPORT TQTextBrowser : public TQTextEdit TQ_OVERRIDE( bool undoRedoEnabled DESIGNABLE false SCRIPTABLE false ) public: - TQTextBrowser( TQWidget* tqparent=0, const char* name=0 ); + TQTextBrowser( TQWidget* parent=0, const char* name=0 ); ~TQTextBrowser(); TQString source() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtextedit.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtextedit.cpp index 7900d3cd9..fe1dbbf3a 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtextedit.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtextedit.cpp @@ -891,19 +891,19 @@ static bool block_set_tqalignment = FALSE; */ /*! - Constructs an empty TQTextEdit called \a name, with tqparent \a - tqparent. + Constructs an empty TQTextEdit called \a name, with parent \a + parent. */ -TQTextEdit::TQTextEdit( TQWidget *tqparent, const char *name ) - : TQScrollView( tqparent, name, (WFlags)(TQt::WStaticContents | TQt::WNoAutoErase) ), +TQTextEdit::TQTextEdit( TQWidget *parent, const char *name ) + : TQScrollView( parent, name, (WFlags)(TQt::WStaticContents | TQt::WNoAutoErase) ), doc( new TQTextDocument( 0 ) ), undoRedoInfo( doc ) { init(); } /*! - Constructs a TQTextEdit called \a name, with tqparent \a tqparent. The + Constructs a TQTextEdit called \a name, with parent \a parent. The text edit will display the text \a text using context \a context. The \a context is a path which the text edit's TQMimeSourceFactory @@ -923,8 +923,8 @@ TQTextEdit::TQTextEdit( TQWidget *tqparent, const char *name ) */ TQTextEdit::TQTextEdit( const TQString& text, const TQString& context, - TQWidget *tqparent, const char *name) - : TQScrollView( tqparent, name, (WFlags)(TQt::WStaticContents | TQt::WNoAutoErase) ), + TQWidget *parent, const char *name) + : TQScrollView( parent, name, (WFlags)(TQt::WStaticContents | TQt::WNoAutoErase) ), doc( new TQTextDocument( 0 ) ), undoRedoInfo( doc ) { init(); @@ -3421,14 +3421,14 @@ void TQTextEdit::repaintChanged() } #ifndef TQT_NO_MIME -TQTextDrag *TQTextEdit::dragObject( TQWidget *tqparent ) const +TQTextDrag *TQTextEdit::dragObject( TQWidget *parent ) const { if ( !doc->hasSelection( TQTextDocument::Standard ) || doc->selectedText( TQTextDocument::Standard ).isEmpty() ) return 0; if ( textFormat() != TQt::RichText ) - return new TQTextDrag( doc->selectedText( TQTextDocument::Standard ), tqparent ); - TQRichTextDrag *drag = new TQRichTextDrag( tqparent ); + return new TQTextDrag( doc->selectedText( TQTextDocument::Standard ), parent ); + TQRichTextDrag *drag = new TQRichTextDrag( parent ); drag->setPlainText( doc->selectedText( TQTextDocument::Standard ) ); drag->setRichText( doc->selectedText( TQTextDocument::Standard, TRUE ) ); return drag; @@ -6278,7 +6278,7 @@ TQTextEditOptimPrivate::Tag * TQTextEdit::optimAppendTag( int index, const TQStr t->index = index; t->tag = tag; t->leftTag = 0; - t->tqparent = 0; + t->parent = 0; t->prev = d->od->lastTag; if ( d->od->lastTag ) d->od->lastTag->next = t; @@ -6307,7 +6307,7 @@ TQTextEditOptimPrivate::Tag *TQTextEdit::optimInsertTag(int line, int index, con t->index = index; t->tag = tag; t->leftTag = 0; - t->tqparent = 0; + t->parent = 0; t->next = 0; t->prev = 0; @@ -6448,7 +6448,7 @@ void TQTextEdit::optimParseTags( TQString * line, int lineNo, int indexOffset ) : TQTextEditOptimPrivate::Color; if ( tagStr[0] == '/' ) { // this is a right-tag - search for the left-tag - // and possible tqparent tag + // and possible parent tag cur = tag->prev; if ( !cur ) { #ifdef TQT_CHECK_RANGE @@ -6464,13 +6464,13 @@ void TQTextEdit::optimParseTags( TQString * line, int lineNo, int indexOffset ) if ( !tmp ) { if ( (("/" + cur->tag) == tag->tag) || (tag->tag == "/font" && cur->tag.left(4) == "font") ) { - // set up the left and tqparent of this tag + // set up the left and parent of this tag tag->leftTag = cur; tmp = cur->prev; - if ( tmp && tmp->tqparent ) { - tag->tqparent = tmp->tqparent; + if ( tmp && tmp->parent ) { + tag->parent = tmp->parent; } else if ( tmp && !tmp->leftTag ) { - tag->tqparent = tmp; + tag->parent = tmp; } break; } else if ( !cur->leftTag ) { @@ -6489,7 +6489,7 @@ void TQTextEdit::optimParseTags( TQString * line, int lineNo, int indexOffset ) tag->underline = underline > 0; tmp = tag->prev; while ( tmp && tmp->leftTag ) { - tmp = tmp->leftTag->tqparent; + tmp = tmp->leftTag->parent; } if ( tmp ) { tag->bold |= tmp->bold; @@ -6812,9 +6812,9 @@ TQTextEditOptimPrivate::Tag * TQTextEdit::optimPreviousLeftTag( int line ) } if ( ftag ) { - if ( ftag && ftag->tqparent ) // use the open tqparent tag - ftag = ftag->tqparent; - else if ( ftag && ftag->leftTag ) // this is a right-tag with no tqparent + if ( ftag && ftag->parent ) // use the open parent tag + ftag = ftag->parent; + else if ( ftag && ftag->leftTag ) // this is a right-tag with no parent ftag = 0; } return ftag; @@ -6848,7 +6848,7 @@ void TQTextEdit::optimSetTextFormat( TQTextDocument * td, TQTextCursor * cur, tag = tag->prev; while ( tag && (tag->type == TQTextEditOptimPrivate::Format || tag->leftTag) ) { - tag = tag->leftTag ? tag->tqparent : tag->prev; + tag = tag->leftTag ? tag->parent : tag->prev; } } if ( tag ) { @@ -6934,8 +6934,8 @@ void TQTextEdit::optimDrawContents( TQPainter * p, int clipx, int clipy, tmp = 0; if ( tag->prev && !tag->prev->leftTag ) { tmp = tag->prev; - } else if ( tag->prev && tag->prev->tqparent ) { - tmp = tag->prev->tqparent; + } else if ( tag->prev && tag->prev->parent ) { + tmp = tag->prev->parent; } if ( (tag->index - lastIndex) > 0 && tmp ) { optimSetTextFormat( td, &cur, &f, lastIndex, tag->index, tmp ); @@ -6945,8 +6945,8 @@ void TQTextEdit::optimDrawContents( TQPainter * p, int clipx, int clipy, tag = tag->next; } // Step 3 - color last part of the line - if necessary - if ( tmp && tmp->tqparent ) - tmp = tmp->tqparent; + if ( tmp && tmp->parent ) + tmp = tmp->parent; if ( (cur.paragraph()->length()-1 - lastIndex) > 0 && tmp && !tmp->leftTag ) { optimSetTextFormat( td, &cur, &f, lastIndex, cur.paragraph()->length() - 1, tmp ); @@ -6958,8 +6958,8 @@ void TQTextEdit::optimDrawContents( TQPainter * p, int clipx, int clipy, // tag = d->od->tags; // qWarning("###"); // while ( tag ) { -// qWarning( "Tag: %p, tqparent: %09p, leftTag: %09p, Name: %-15s, ParentName: %s, %d%d%d", tag, -// tag->tqparent, tag->leftTag, tag->tag.latin1(), tag->tqparent ? tag->tqparent->tag.latin1():"<none>", +// qWarning( "Tag: %p, parent: %09p, leftTag: %09p, Name: %-15s, ParentName: %s, %d%d%d", tag, +// tag->parent, tag->leftTag, tag->tag.latin1(), tag->parent ? tag->parent->tag.latin1():"<none>", // tag->bold, tag->italic, tag->underline ); // tag = tag->next; // } @@ -7404,8 +7404,8 @@ void TQTextEdit::optimCheckLimit( const TQString& str ) itr = d->od->tags; while ( itr ){ for ( tmp = lst.first(); tmp; tmp = lst.next() ) { - if ( itr->tqparent == tmp ) - itr->tqparent = 0; + if ( itr->parent == tmp ) + itr->parent = 0; if ( itr->leftTag == tmp ) itr->leftTag = 0; } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtextedit.h b/experimental/tqtinterface/qt4/src/widgets/tqtextedit.h index a69b43441..26d5f4fa7 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtextedit.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtextedit.h @@ -80,7 +80,7 @@ class TQSyntaxHighlighter; class TQTextEditOptimPrivate { public: - // Note: no left-tag has any value for leftTag or tqparent, and + // Note: no left-tag has any value for leftTag or parent, and // no right-tag has any formatting flags set. enum TagType { Color = 0, Format = 1 }; struct Tag { @@ -91,7 +91,7 @@ public: int line; int index; Tag * leftTag; // ptr to left-tag in a left-right tag pair - Tag * tqparent; // ptr to tqparent left-tag in a nested tag + Tag * parent; // ptr to parent left-tag in a nested tag Tag * prev; Tag * next; TQString tag; @@ -222,8 +222,8 @@ public: }; TQTextEdit( const TQString& text, const TQString& context = TQString::null, - TQWidget* tqparent=0, const char* name=0); - TQTextEdit( TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0); + TQTextEdit( TQWidget* parent=0, const char* name=0 ); virtual ~TQTextEdit(); void setPalette( const TQPalette & ); @@ -511,7 +511,7 @@ private: void copyToClipboard(); #ifndef TQT_NO_MIME TQCString pickSpecial(TQMimeSource* ms, bool always_ask, const TQPoint&); - TQTextDrag *dragObject( TQWidget *tqparent = 0 ) const; + TQTextDrag *dragObject( TQWidget *parent = 0 ) const; #endif #ifndef TQT_NO_MIMECLIPBOARD void pasteSpecial(const TQPoint&); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtextview.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtextview.cpp index 286ae122b..a262dfb1f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtextview.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtextview.cpp @@ -55,16 +55,16 @@ /*! \reimp */ TQTextView::TQTextView( const TQString& text, const TQString& context, - TQWidget *tqparent, const char *name ) - : TQTextEdit( text, context, tqparent, name ) + TQWidget *parent, const char *name ) + : TQTextEdit( text, context, parent, name ) { setReadOnly( TRUE ); } /*! \reimp */ -TQTextView::TQTextView( TQWidget *tqparent, const char *name ) - : TQTextEdit( tqparent, name ) +TQTextView::TQTextView( TQWidget *parent, const char *name ) + : TQTextEdit( parent, name ) { setReadOnly( TRUE ); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtextview.h b/experimental/tqtinterface/qt4/src/widgets/tqtextview.h index b8f74c33b..f8a4a89bf 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtextview.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtextview.h @@ -59,8 +59,8 @@ class TQ_EXPORT TQTextView : public TQTextEdit public: TQTextView( const TQString& text, const TQString& context = TQString::null, - TQWidget* tqparent=0, const char* name=0); - TQTextView( TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0); + TQTextView( TQWidget* parent=0, const char* name=0 ); virtual ~TQTextView(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtitlebar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtitlebar.cpp index 84ec7b9d9..bb5e052b5 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtitlebar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtitlebar.cpp @@ -66,7 +66,7 @@ class TQTitleBarTip : public TQToolTip { public: - TQTitleBarTip( TQWidget * tqparent ) : TQToolTip( tqparent ) { } + TQTitleBarTip( TQWidget * parent ) : TQToolTip( parent ) { } void maybeTip( const TQPoint &pos ) { @@ -154,8 +154,8 @@ public: #endif }; -TQTitleBar::TQTitleBar(TQWidget* w, TQWidget* tqparent, const char* name) - : TQWidget( tqparent, name, (WFlags)(WStyle_Customize | TQt::WStyle_NoBorder | TQt::WNoAutoErase) ) +TQTitleBar::TQTitleBar(TQWidget* w, TQWidget* parent, const char* name) + : TQWidget( parent, name, (WFlags)(WStyle_Customize | TQt::WStyle_NoBorder | TQt::WNoAutoErase) ) { d = new TQTitleBarPrivate(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtitlebar_p.h b/experimental/tqtinterface/qt4/src/widgets/tqtitlebar_p.h index 44cac8121..8e10ed117 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtitlebar_p.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtitlebar_p.h @@ -74,7 +74,7 @@ class TQ_EXPORT TQTitleBar : public TQWidget Q_PROPERTY( bool movable READ isMovable WRITE setMovable ) public: - TQTitleBar (TQWidget* w, TQWidget* tqparent, const char* name=0); + TQTitleBar (TQWidget* w, TQWidget* parent, const char* name=0); ~TQTitleBar(); bool isActive() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp index e7ff8f4ef..771a332ea 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp @@ -104,7 +104,7 @@ class TQToolBarSeparator : public TQWidget Q_OBJECT TQ_OBJECT public: - TQToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); + TQToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 ); TQSize tqsizeHint() const; Qt::Orientation orientation() const { return orient; } @@ -164,14 +164,14 @@ void TQToolBarExtensionWidget::layOut() tb->setGeometry( 2, 2, width() - 4, height() - 4 ); } -TQToolBarSeparator::TQToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent, +TQToolBarSeparator::TQToolBarSeparator(Qt::Orientation o , TQToolBar *parent, const char* name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { - connect( tqparent, TQT_SIGNAL(orientationChanged(Qt::Orientation)), + connect( parent, TQT_SIGNAL(orientationChanged(Qt::Orientation)), this, TQT_SLOT(setOrientation(Qt::Orientation)) ); setOrientation( o ); - setBackgroundMode( tqparent->backgroundMode() ); + setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } @@ -303,29 +303,29 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * ) /*! Constructs an empty toolbar. - The toolbar is called \a name and is a child of \a tqparent and is - managed by \a tqparent. It is initially located in dock area \a dock + The toolbar is called \a name and is a child of \a parent and is + managed by \a parent. It is initially located in dock area \a dock and is labeled \a label. If \a newLine is TRUE the toolbar will be placed on a new line in the dock area. */ TQToolBar::TQToolBar( const TQString &label, - TQMainWindow * tqparent, TQt::ToolBarDock dock, + TQMainWindow * parent, TQt::ToolBarDock dock, bool newLine, const char * name ) - : TQDockWindow( InDock, tqparent, name, 0, TRUE ) + : TQDockWindow( InDock, parent, name, 0, TRUE ) { - mw = tqparent; + mw = parent; init(); - if ( tqparent ) - tqparent->addToolBar( this, label, dock, newLine ); + if ( parent ) + parent->addToolBar( this, label, dock, newLine ); } /*! Constructs an empty horizontal toolbar. - The toolbar is called \a name and is a child of \a tqparent and is + The toolbar is called \a name and is a child of \a parent and is managed by \a mainWindow. The \a label and \a newLine parameters are passed straight to TQMainWindow::addDockWindow(). \a name and the widget flags \a f are passed on to the TQDockWindow constructor. @@ -336,15 +336,15 @@ TQToolBar::TQToolBar( const TQString &label, */ TQToolBar::TQToolBar( const TQString &label, TQMainWindow * mainWindow, - TQWidget * tqparent, bool newLine, const char * name, + TQWidget * parent, bool newLine, const char * name, WFlags f ) - : TQDockWindow( InDock, tqparent, name, f, TRUE ) + : TQDockWindow( InDock, parent, name, f, TRUE ) { mw = mainWindow; init(); clearWFlags( (WFlags)(TQt::WType_Dialog | WStyle_Customize | TQt::WStyle_NoBorder) ); - reparent( tqparent, TQPoint( 0, 0 ), FALSE ); + reparent( parent, TQPoint( 0, 0 ), FALSE ); if ( mainWindow ) mainWindow->addToolBar( this, label, TQt::DockUnmanaged, newLine ); @@ -354,19 +354,19 @@ TQToolBar::TQToolBar( const TQString &label, TQMainWindow * mainWindow, /*! \overload - Constructs an empty toolbar called \a name, with tqparent \a tqparent, - in its \a tqparent's top dock area, without any label and without + Constructs an empty toolbar called \a name, with parent \a parent, + in its \a parent's top dock area, without any label and without requiring a newline. */ -TQToolBar::TQToolBar( TQMainWindow * tqparent, const char * name ) - : TQDockWindow( InDock, tqparent, name, 0, TRUE ) +TQToolBar::TQToolBar( TQMainWindow * parent, const char * name ) + : TQDockWindow( InDock, parent, name, 0, TRUE ) { - mw = tqparent; + mw = parent; init(); - if ( tqparent ) - tqparent->addToolBar( this, TQString(), TQt::DockTop ); + if ( parent ) + parent->addToolBar( this, TQString(), TQt::DockTop ); } /*! @@ -521,7 +521,7 @@ bool TQToolBar::event( TQEvent * e ) if ( e->type() == TQEvent::ChildInserted ) { TQObject * child = TQT_TQOBJECT(((TQChildEvent*)e)->child()); if ( child && child->isWidgetType() && !(TQT_TQWIDGET(child)->isTopLevel()) - && TQT_BASE_OBJECT(child->tqparent()) == TQT_BASE_OBJECT(this) + && TQT_BASE_OBJECT(child->parent()) == TQT_BASE_OBJECT(this) && tqstrcmp("qt_dockwidget_internal", child->name()) != 0 ) { boxLayout()->addWidget( (TQWidget*)child ); if ( isVisible() ) { diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.h b/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.h index 92f6d9fac..a741eb0f6 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.h @@ -64,7 +64,7 @@ public: bool newLine = FALSE, const char* name=0 ); TQToolBar( const TQString &label, TQMainWindow *, TQWidget *, bool newLine = FALSE, const char* name=0, WFlags f = 0 ); - TQToolBar( TQMainWindow* tqparent=0, const char* name=0 ); + TQToolBar( TQMainWindow* parent=0, const char* name=0 ); ~TQToolBar(); void addSeparator(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.cpp index b082f5624..aa38123ed 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.cpp @@ -264,11 +264,11 @@ void TQToolBoxButton::drawButton( TQPainter *p ) */ /*! - Constructs a toolbox called \a name with tqparent \a tqparent and flags \a f. + Constructs a toolbox called \a name with parent \a parent and flags \a f. */ -TQToolBox::TQToolBox( TQWidget *tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f ) +TQToolBox::TQToolBox( TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f ) { d = new TQToolBoxPrivate; d->tqlayout = new TQVBoxLayout( this ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.h b/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.h index 0ca8c38c2..973f81c6f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.h @@ -60,7 +60,7 @@ class TQ_EXPORT TQToolBox : public TQFrame Q_PROPERTY( int count READ count ) public: - TQToolBox( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + TQToolBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); ~TQToolBox(); int addItem( TQWidget *item, const TQString &label ); @@ -131,8 +131,8 @@ class TQToolBoxButton : public TQButton Q_OBJECT TQ_OBJECT public: - TQToolBoxButton( TQWidget *tqparent, const char *name ) - : TQButton( tqparent, name ), selected( FALSE ) + TQToolBoxButton( TQWidget *parent, const char *name ) + : TQButton( parent, name ), selected( FALSE ) { setBackgroundMode(TQt::PaletteBackground); tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp index 8c84a59e4..9f392ca95 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp @@ -135,16 +135,16 @@ public: /*! - Constructs an empty tool button called \a name, with tqparent \a - tqparent. + Constructs an empty tool button called \a name, with parent \a + parent. */ -TQToolButton::TQToolButton( TQWidget * tqparent, const char *name ) - : TQButton( tqparent, name ) +TQToolButton::TQToolButton( TQWidget * parent, const char *name ) + : TQButton( parent, name ) { init(); #ifndef TQT_NO_TOOLBAR - TQToolBar* tb = ::tqqt_cast<TQToolBar*>(tqparent); + TQToolBar* tb = ::tqqt_cast<TQToolBar*>(parent); if ( tb ) { setAutoRaise( TRUE ); if ( tb->mainWindow() ) { @@ -172,11 +172,11 @@ TQToolButton::TQToolButton( TQWidget * tqparent, const char *name ) An arrow button has auto-repeat turned on by default. - The \a tqparent and \a name arguments are sent to the TQWidget + The \a parent and \a name arguments are sent to the TQWidget constructor. */ -TQToolButton::TQToolButton( TQt::ArrowType type, TQWidget *tqparent, const char *name ) - : TQButton( tqparent, name ) +TQToolButton::TQToolButton( TQt::ArrowType type, TQWidget *parent, const char *name ) + : TQButton( parent, name ) { init(); setUsesBigPixmap( FALSE ); @@ -219,7 +219,7 @@ void TQToolButton::init() /*! Constructs a tool button called \a name, that is a child of \a - tqparent (which must be a TQToolBar). + parent (which must be a TQToolBar). The tool button will display \a iconSet, with its text label and tool tip set to \a textLabel and its status bar message set to \a @@ -230,8 +230,8 @@ void TQToolButton::init() TQToolButton::TQToolButton( const TQIconSet& iconSet, const TQString &textLabel, const TQString& grouptext, TQT_BASE_OBJECT_NAME * receiver, const char *slot, - TQToolBar * tqparent, const char *name ) - : TQButton( tqparent, name ) + TQToolBar * parent, const char *name ) + : TQButton( parent, name ) { init(); setAutoRaise( TRUE ); @@ -239,26 +239,26 @@ TQToolButton::TQToolButton( const TQIconSet& iconSet, const TQString &textLabel, setTextLabel( textLabel ); if ( receiver && slot ) connect( this, TQT_SIGNAL(clicked()), receiver, slot ); - if ( tqparent->mainWindow() ) { - connect( tqparent->mainWindow(), TQT_SIGNAL(pixmapSizeChanged(bool)), + if ( parent->mainWindow() ) { + connect( parent->mainWindow(), TQT_SIGNAL(pixmapSizeChanged(bool)), this, TQT_SLOT(setUsesBigPixmap(bool)) ); - setUsesBigPixmap( tqparent->mainWindow()->usesBigPixmaps() ); - connect( tqparent->mainWindow(), TQT_SIGNAL(usesTextLabelChanged(bool)), + setUsesBigPixmap( parent->mainWindow()->usesBigPixmaps() ); + connect( parent->mainWindow(), TQT_SIGNAL(usesTextLabelChanged(bool)), this, TQT_SLOT(setUsesTextLabel(bool)) ); - setUsesTextLabel( tqparent->mainWindow()->usesTextLabel() ); + setUsesTextLabel( parent->mainWindow()->usesTextLabel() ); } else { setUsesBigPixmap( FALSE ); } #ifndef TQT_NO_TOOLTIP if ( !textLabel.isEmpty() ) { - if ( !grouptext.isEmpty() && tqparent->mainWindow() ) + if ( !grouptext.isEmpty() && parent->mainWindow() ) TQToolTip::add( this, textLabel, - tqparent->mainWindow()->toolTipGroup(), grouptext ); + parent->mainWindow()->toolTipGroup(), grouptext ); else TQToolTip::add( this, textLabel ); - } else if ( !grouptext.isEmpty() && tqparent->mainWindow() ) + } else if ( !grouptext.isEmpty() && parent->mainWindow() ) TQToolTip::add( this, TQString::null, - tqparent->mainWindow()->toolTipGroup(), grouptext ); + parent->mainWindow()->toolTipGroup(), grouptext ); #endif } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.h b/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.h index 3cdb9c0ef..0d8c015d1 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.h @@ -82,14 +82,14 @@ public: Right = BesideIcon, // obsolete Under = BelowIcon // obsolete }; - TQToolButton( TQWidget * tqparent, const char* name=0 ); + TQToolButton( TQWidget * parent, const char* name=0 ); #ifndef TQT_NO_TOOLBAR TQToolButton( const TQIconSet& s, const TQString &textLabel, const TQString& grouptext, TQT_BASE_OBJECT_NAME * receiver, const char* slot, - TQToolBar * tqparent, const char* name=0 ); + TQToolBar * parent, const char* name=0 ); #endif - TQToolButton( TQt::ArrowType type, TQWidget *tqparent, const char* name=0 ); + TQToolButton( TQt::ArrowType type, TQWidget *parent, const char* name=0 ); ~TQToolButton(); TQSize tqsizeHint() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtooltip.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtooltip.cpp index 411487d85..5213e585b 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtooltip.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtooltip.cpp @@ -64,7 +64,7 @@ class TQTipLabel : public TQLabel Q_OBJECT TQ_OBJECT public: - TQTipLabel( TQWidget* tqparent, const TQString& text) : TQLabel( tqparent, "toolTipTip", + TQTipLabel( TQWidget* parent, const TQString& text) : TQLabel( parent, "toolTipTip", (WFlags)(TQt::WStyle_StaysOnTop | WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_Tool | WX11BypassWM) ) { setMargin(1); @@ -1067,7 +1067,7 @@ void TQToolTip::tip( const TQRect &rect, const TQString &text, const TQString& g /*! - Immediately removes all tool tips for this tooltip's tqparent + Immediately removes all tool tips for this tooltip's parent widget. */ @@ -1083,7 +1083,7 @@ void TQToolTip::clear() Returns the widget this TQToolTip applies to. - The tool tip is destroyed automatically when the tqparent widget is + The tool tip is destroyed automatically when the parent widget is destroyed. \sa group() @@ -1159,11 +1159,11 @@ void TQToolTip::clear() /*! - Constructs a tool tip group called \a name, with tqparent \a tqparent. + Constructs a tool tip group called \a name, with parent \a parent. */ -TQToolTipGroup::TQToolTipGroup( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +TQToolTipGroup::TQToolTipGroup( TQObject *parent, const char *name ) + : TQObject( parent, name ) { del = TRUE; ena = TRUE; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtooltip.h b/experimental/tqtinterface/qt4/src/widgets/tqtooltip.h index e9afb2288..c5c13f8e6 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtooltip.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtooltip.h @@ -61,7 +61,7 @@ class TQ_EXPORT TQToolTipGroup: public TQObject Q_PROPERTY( bool enabled READ enabled WRITE setEnabled ) public: - TQToolTipGroup( TQObject *tqparent, const char *name = 0 ); + TQToolTipGroup( TQObject *parent, const char *name = 0 ); ~TQToolTipGroup(); bool delay() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqvalidator.cpp b/experimental/tqtinterface/qt4/src/widgets/tqvalidator.cpp index 423e83761..18fffc7fd 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqvalidator.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqvalidator.cpp @@ -124,12 +124,12 @@ /*! - Sets up the validator. The \a tqparent and \a name parameters are + Sets up the validator. The \a parent and \a name parameters are passed on to the TQObject constructor. */ -TQValidator::TQValidator( TQObject * tqparent, const char *name ) - : TQObject( tqparent, name ) +TQValidator::TQValidator( TQObject * parent, const char *name ) + : TQObject( parent, name ) { } @@ -234,12 +234,12 @@ void TQValidator::fixup( TQString & ) const /*! - Constructs a validator called \a name with tqparent \a tqparent, that + Constructs a validator called \a name with parent \a parent, that accepts all integers. */ -TQIntValidator::TQIntValidator( TQObject * tqparent, const char *name ) - : TQValidator( tqparent, name ) +TQIntValidator::TQIntValidator( TQObject * parent, const char *name ) + : TQValidator( parent, name ) { b = INT_MIN; t = INT_MAX; @@ -247,13 +247,13 @@ TQIntValidator::TQIntValidator( TQObject * tqparent, const char *name ) /*! - Constructs a validator called \a name with tqparent \a tqparent, that + Constructs a validator called \a name with parent \a parent, that accepts integers from \a minimum to \a maximum inclusive. */ TQIntValidator::TQIntValidator( int minimum, int maximum, - TQObject * tqparent, const char* name ) - : TQValidator( tqparent, name ) + TQObject * parent, const char* name ) + : TQValidator( parent, name ) { b = minimum; t = maximum; @@ -369,12 +369,12 @@ void TQIntValidator::setTop( int top ) */ /*! - Constructs a validator object with tqparent \a tqparent, called \a + Constructs a validator object with parent \a parent, called \a name, which accepts any double. */ -TQDoubleValidator::TQDoubleValidator( TQObject * tqparent, const char *name ) - : TQValidator( tqparent, name ) +TQDoubleValidator::TQDoubleValidator( TQObject * parent, const char *name ) + : TQValidator( parent, name ) { b = -HUGE_VAL; t = HUGE_VAL; @@ -383,14 +383,14 @@ TQDoubleValidator::TQDoubleValidator( TQObject * tqparent, const char *name ) /*! - Constructs a validator object with tqparent \a tqparent, called \a + Constructs a validator object with parent \a parent, called \a name. This validator will accept doubles from \a bottom to \a top inclusive, with up to \a decimals digits after the decimal point. */ TQDoubleValidator::TQDoubleValidator( double bottom, double top, int decimals, - TQObject * tqparent, const char* name ) - : TQValidator( tqparent, name ) + TQObject * parent, const char* name ) + : TQValidator( parent, name ) { b = bottom; t = top; @@ -587,27 +587,27 @@ void TQDoubleValidator::setDecimals( int decimals ) /*! Constructs a validator that accepts any string (including an empty - one) as valid. The object's tqparent is \a tqparent and its name is \a + one) as valid. The object's parent is \a parent and its name is \a name. */ -TQRegExpValidator::TQRegExpValidator( TQObject *tqparent, const char *name ) - : TQValidator( tqparent, name ), r( TQString::tqfromLatin1(".*") ) +TQRegExpValidator::TQRegExpValidator( TQObject *parent, const char *name ) + : TQValidator( parent, name ), r( TQString::tqfromLatin1(".*") ) { } /*! Constructs a validator which accepts all strings that match the - regular expression \a rx. The object's tqparent is \a tqparent and its + regular expression \a rx. The object's parent is \a parent and its name is \a name. The match is made against the entire string, e.g. if the regexp is <b>[A-Fa-f0-9]+</b> it will be treated as <b>^[A-Fa-f0-9]+$</b>. */ -TQRegExpValidator::TQRegExpValidator( const TQRegExp& rx, TQObject *tqparent, +TQRegExpValidator::TQRegExpValidator( const TQRegExp& rx, TQObject *parent, const char *name ) - : TQValidator( tqparent, name ), r( rx ) + : TQValidator( parent, name ), r( rx ) { } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqvalidator.h b/experimental/tqtinterface/qt4/src/widgets/tqvalidator.h index 16f9db13e..5e18f6b56 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqvalidator.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqvalidator.h @@ -55,7 +55,7 @@ class TQ_EXPORT TQValidator : public TQObject Q_OBJECT TQ_OBJECT public: - TQValidator( TQObject * tqparent, const char *name = 0 ); + TQValidator( TQObject * parent, const char *name = 0 ); ~TQValidator(); enum State { Invalid, Intermediate, Valid=Intermediate, Acceptable }; @@ -79,9 +79,9 @@ class TQ_EXPORT TQIntValidator : public TQValidator Q_PROPERTY( int top READ top WRITE setTop ) public: - TQIntValidator( TQObject * tqparent, const char *name = 0 ); + TQIntValidator( TQObject * parent, const char *name = 0 ); TQIntValidator( int bottom, int top, - TQObject * tqparent, const char *name = 0 ); + TQObject * parent, const char *name = 0 ); ~TQIntValidator(); TQValidator::State validate( TQString &, int & ) const; @@ -113,9 +113,9 @@ class TQ_EXPORT TQDoubleValidator : public TQValidator Q_PROPERTY( int decimals READ decimals WRITE setDecimals ) public: - TQDoubleValidator( TQObject * tqparent, const char *name = 0 ); + TQDoubleValidator( TQObject * parent, const char *name = 0 ); TQDoubleValidator( double bottom, double top, int decimals, - TQObject * tqparent, const char *name = 0 ); + TQObject * parent, const char *name = 0 ); ~TQDoubleValidator(); TQValidator::State validate( TQString &, int & ) const; @@ -147,8 +147,8 @@ class TQ_EXPORT TQRegExpValidator : public TQValidator // Q_PROPERTY( TQRegExp regExp READ regExp WRITE setRegExp ) public: - TQRegExpValidator( TQObject *tqparent, const char *name = 0 ); - TQRegExpValidator( const TQRegExp& rx, TQObject *tqparent, + TQRegExpValidator( TQObject *parent, const char *name = 0 ); + TQRegExpValidator( const TQRegExp& rx, TQObject *parent, const char *name = 0 ); ~TQRegExpValidator(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqvbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqvbox.cpp index fbfba7909..11e273f9b 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqvbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqvbox.cpp @@ -61,11 +61,11 @@ /*! - Constructs a vbox widget called \a name with tqparent \a tqparent and + Constructs a vbox widget called \a name with parent \a parent and widget flags \a f. */ -TQVBox::TQVBox( TQWidget *tqparent, const char *name, WFlags f ) - :TQHBox( FALSE, tqparent, name, f ) +TQVBox::TQVBox( TQWidget *parent, const char *name, WFlags f ) + :TQHBox( FALSE, parent, name, f ) { } #endif diff --git a/experimental/tqtinterface/qt4/src/widgets/tqvbox.h b/experimental/tqtinterface/qt4/src/widgets/tqvbox.h index cccad24ce..8d0ab7df5 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqvbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqvbox.h @@ -52,7 +52,7 @@ class TQ_EXPORT TQVBox : public TQHBox Q_OBJECT TQ_OBJECT public: - TQVBox( TQWidget* tqparent=0, const char* name=0, WFlags f=0 ); + TQVBox( TQWidget* parent=0, const char* name=0, WFlags f=0 ); private: // Disabled copy constructor and operator= #if defined(TQ_DISABLE_COPY) diff --git a/experimental/tqtinterface/qt4/src/widgets/tqvbuttongroup.cpp b/experimental/tqtinterface/qt4/src/widgets/tqvbuttongroup.cpp index d7a44902b..01a807bb2 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqvbuttongroup.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqvbuttongroup.cpp @@ -62,24 +62,24 @@ /*! Constructs a vertical button group with no title. - The \a tqparent and \a name arguments are passed on to the TQWidget + The \a parent and \a name arguments are passed on to the TQWidget constructor. */ -TQVButtonGroup::TQVButtonGroup( TQWidget *tqparent, const char *name ) - : TQButtonGroup( 1, Qt::Horizontal /* sic! */, tqparent, name ) +TQVButtonGroup::TQVButtonGroup( TQWidget *parent, const char *name ) + : TQButtonGroup( 1, Qt::Horizontal /* sic! */, parent, name ) { } /*! Constructs a vertical button group with the title \a title. - The \a tqparent and \a name arguments are passed on to the TQWidget + The \a parent and \a name arguments are passed on to the TQWidget constructor. */ -TQVButtonGroup::TQVButtonGroup( const TQString &title, TQWidget *tqparent, +TQVButtonGroup::TQVButtonGroup( const TQString &title, TQWidget *parent, const char *name ) - : TQButtonGroup( 1, Qt::Horizontal /* sic! */, title, tqparent, name ) + : TQButtonGroup( 1, Qt::Horizontal /* sic! */, title, parent, name ) { } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqvbuttongroup.h b/experimental/tqtinterface/qt4/src/widgets/tqvbuttongroup.h index faccef26c..99cd8b0ef 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqvbuttongroup.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqvbuttongroup.h @@ -52,8 +52,8 @@ class TQ_EXPORT TQVButtonGroup : public TQButtonGroup Q_OBJECT TQ_OBJECT public: - TQVButtonGroup( TQWidget* tqparent=0, const char* name=0 ); - TQVButtonGroup( const TQString &title, TQWidget* tqparent=0, const char* name=0 ); + TQVButtonGroup( TQWidget* parent=0, const char* name=0 ); + TQVButtonGroup( const TQString &title, TQWidget* parent=0, const char* name=0 ); ~TQVButtonGroup(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqvgroupbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqvgroupbox.cpp index 38ccfa106..7c50c3ad0 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqvgroupbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqvgroupbox.cpp @@ -61,24 +61,24 @@ /*! Constructs a vertical group box with no title. - The \a tqparent and \a name arguments are passed on to the TQWidget + The \a parent and \a name arguments are passed on to the TQWidget constructor. */ -TQVGroupBox::TQVGroupBox( TQWidget *tqparent, const char *name ) - : TQGroupBox( 1, Qt::Horizontal, tqparent, name ) +TQVGroupBox::TQVGroupBox( TQWidget *parent, const char *name ) + : TQGroupBox( 1, Qt::Horizontal, parent, name ) { } /*! Constructs a vertical group box with the title \a title. - The \a tqparent and \a name arguments are passed on to the TQWidget + The \a parent and \a name arguments are passed on to the TQWidget constructor. */ -TQVGroupBox::TQVGroupBox( const TQString &title, TQWidget *tqparent, +TQVGroupBox::TQVGroupBox( const TQString &title, TQWidget *parent, const char *name ) - : TQGroupBox( 1, Qt::Horizontal, title, tqparent, name ) + : TQGroupBox( 1, Qt::Horizontal, title, parent, name ) { } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqvgroupbox.h b/experimental/tqtinterface/qt4/src/widgets/tqvgroupbox.h index 142172d95..be82c4a7f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqvgroupbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqvgroupbox.h @@ -52,8 +52,8 @@ class TQ_EXPORT TQVGroupBox : public TQGroupBox Q_OBJECT TQ_OBJECT public: - TQVGroupBox( TQWidget* tqparent=0, const char* name=0 ); - TQVGroupBox( const TQString &title, TQWidget* tqparent=0, const char* name=0 ); + TQVGroupBox( TQWidget* parent=0, const char* name=0 ); + TQVGroupBox( const TQString &title, TQWidget* parent=0, const char* name=0 ); ~TQVGroupBox(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwhatsthis.cpp b/experimental/tqtinterface/qt4/src/widgets/tqwhatsthis.cpp index 3ada61988..a3275b222 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwhatsthis.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqwhatsthis.cpp @@ -135,7 +135,7 @@ class TQWhatsThisButton: public TQToolButton TQ_OBJECT public: - TQWhatsThisButton( TQWidget * tqparent, const char * name ); + TQWhatsThisButton( TQWidget * parent, const char * name ); ~TQWhatsThisButton(); public Q_SLOTS: @@ -149,7 +149,7 @@ class TQWhatsThat : public TQWidget Q_OBJECT TQ_OBJECT public: - TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* tqparent, const char* name ); + TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, const char* name ); ~TQWhatsThat() ; public Q_SLOTS: @@ -243,8 +243,8 @@ void qWhatsThisBDH() } -TQWhatsThat::TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name, WType_Popup ), text( txt ), pressed( FALSE ), widget( w ) +TQWhatsThat::TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, const char* name ) + : TQWidget( parent, name, WType_Popup ), text( txt ), pressed( FALSE ), widget( w ) { setBackgroundMode( TQt::NoBackground ); @@ -448,8 +448,8 @@ static const char * const button_image[] = { " ooo "}; // the button class -TQWhatsThisButton::TQWhatsThisButton( TQWidget * tqparent, const char * name ) - : TQToolButton( tqparent, name ) +TQWhatsThisButton::TQWhatsThisButton( TQWidget * parent, const char * name ) + : TQToolButton( parent, name ) { TQPixmap p( (const char**)button_image ); setPixmap( p ); @@ -808,7 +808,7 @@ void TQWhatsThis::remove( TQWidget * widget ) the mouse position; this is useful, for example, if you've subclassed to make the text that is displayed position dependent. - If \a includeParents is TRUE, tqparent widgets are taken into + If \a includeParents is TRUE, parent widgets are taken into consideration as well when looking for what's this help text. \sa add() @@ -838,15 +838,15 @@ TQString TQWhatsThis::textFor( TQWidget * w, const TQPoint& pos, bool includePar /*! Creates a TQToolButton preconfigured to enter "What's this?" mode when clicked. You will often use this with a tool bar as \a - tqparent: + parent: \code (void) TQWhatsThis::whatsThisButton( my_help_tool_bar ); \endcode */ -TQToolButton * TQWhatsThis::whatsThisButton( TQWidget * tqparent ) +TQToolButton * TQWhatsThis::whatsThisButton( TQWidget * parent ) { TQWhatsThisPrivate::setUpWhatsThis(); - return new TQWhatsThisButton( tqparent, + return new TQWhatsThisButton( parent, "automatic what's this? button" ); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwhatsthis.h b/experimental/tqtinterface/qt4/src/widgets/tqwhatsthis.h index 7ef3e8dc9..dbc125909 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwhatsthis.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqwhatsthis.h @@ -67,7 +67,7 @@ public: static void remove( TQWidget * ); static TQString textFor( TQWidget *, const TQPoint & pos = TQPoint(), bool includeParents = FALSE ); - static TQToolButton * whatsThisButton( TQWidget * tqparent ); + static TQToolButton * whatsThisButton( TQWidget * parent ); static void enterWhatsThisMode(); static bool inWhatsThisMode(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetinterface_p.h b/experimental/tqtinterface/qt4/src/widgets/tqwidgetinterface_p.h index 022294de8..008fb3e70 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetinterface_p.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetinterface_p.h @@ -76,8 +76,8 @@ struct TQWidgetFactoryInterface : public TQFeatureListInterface public: /*! In the implementation create and return the widget \a widget - here, use \a tqparent and \a name when creating the widget */ - virtual TQWidget* create( const TQString &widget, TQWidget* tqparent = 0, const char* name = 0 ) = 0; + here, use \a parent and \a name when creating the widget */ + virtual TQWidget* create( const TQString &widget, TQWidget* parent = 0, const char* name = 0 ) = 0; /*! In the implementation return the name of the group of the widget \a widget */ diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetplugin.cpp b/experimental/tqtinterface/qt4/src/widgets/tqwidgetplugin.cpp index 9b4d106c2..57eed865c 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetplugin.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetplugin.cpp @@ -91,7 +91,7 @@ public: TQ_REFCOUNT; TQStringList featureList() const; - TQWidget *create( const TQString &key, TQWidget *tqparent, const char *name ); + TQWidget *create( const TQString &key, TQWidget *parent, const char *name ); TQString group( const TQString &widget ) const; TQIconSet iconSet( const TQString &widget ) const; TQString includeFile( const TQString &widget ) const; @@ -166,7 +166,7 @@ TQRESULT TQWidgetPluginPrivate::queryInterface( const TQUuid &iid, TQUnknownInte Creates and returns a TQWidget object for the widget key \a key. The widget key is the class name of the required widget. The \a - name and \a tqparent arguments are passed to the custom widget's + name and \a parent arguments are passed to the custom widget's constructor. \sa keys() @@ -182,9 +182,9 @@ TQStringList TQWidgetPluginPrivate::featureList() const return plugin->keys(); } -TQWidget *TQWidgetPluginPrivate::create( const TQString &key, TQWidget *tqparent, const char *name ) +TQWidget *TQWidgetPluginPrivate::create( const TQString &key, TQWidget *parent, const char *name ) { - TQWidget *w = plugin->create( key, tqparent, name ); + TQWidget *w = plugin->create( key, parent, name ); widgets.add( TQT_TQOBJECT(w) ); return w; } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetplugin.h b/experimental/tqtinterface/qt4/src/widgets/tqwidgetplugin.h index 554467774..b87939601 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetplugin.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetplugin.h @@ -70,7 +70,7 @@ public: ~TQWidgetPlugin(); virtual TQStringList keys() const = 0; - virtual TQWidget *create( const TQString &key, TQWidget *tqparent = 0, const char *name = 0 ) = 0; + virtual TQWidget *create( const TQString &key, TQWidget *parent = 0, const char *name = 0 ) = 0; virtual TQString group( const TQString &key ) const; virtual TQIconSet iconSet( const TQString &key ) const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp b/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp index d09353d10..beaf51fdb 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp @@ -54,8 +54,8 @@ static bool resizeHorizontalDirectionFixed = FALSE; static bool resizeVerticalDirectionFixed = FALSE; -TQWidgetResizeHandler::TQWidgetResizeHandler( TQWidget *tqparent, TQWidget *cw, const char *name ) - : TQObject( tqparent, name ), widget( tqparent ), childWidget( cw ? cw : tqparent ), +TQWidgetResizeHandler::TQWidgetResizeHandler( TQWidget *parent, TQWidget *cw, const char *name ) + : TQObject( parent, name ), widget( parent ), childWidget( cw ? cw : parent ), extrahei( 0 ), buttonDown( FALSE ), moveResizeMode( FALSE ), sizeprotect( TRUE ), moving( TRUE ) { mode = Nowhere; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler_p.h b/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler_p.h index bb2b1cb84..472f3e36c 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler_p.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler_p.h @@ -72,7 +72,7 @@ public: Any = Move|Resize }; - TQWidgetResizeHandler( TQWidget *tqparent, TQWidget *cw = 0, const char *name = 0 ); + TQWidgetResizeHandler( TQWidget *parent, TQWidget *cw = 0, const char *name = 0 ); void setActive( bool b ) { setActive( Any, b ); } void setActive( Action ac, bool b ); bool isActive() const { return isActive( Any ); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp b/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp index ff78a7ba1..93be95fff 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp @@ -200,7 +200,7 @@ int TQWidgetStack::addWidget(TQWidget * w, int id) } w->hide(); - if (w->parent() != this) + if (w->QWidget::parent() != this) w->reparent(this, contentsRect().topLeft(), false); w->setGeometry(contentsRect()); updateGeometry(); @@ -271,7 +271,7 @@ static bool isChildOf(TQWidget* child, TQWidget *parent) void TQWidgetStack::raiseWidget(TQWidget *w) { - if (!w || w == invisible || w->parent() != this || w == topWidget) + if (!w || w == invisible || w->QWidget::parent() != this || w == topWidget) return; if (id(w) == -1) @@ -629,7 +629,7 @@ public: class Invisible: public TQWidget { public: - Invisible( TQWidgetStack * tqparent ): TQWidget( tqparent, "qt_invisible_widgetstack" ) + Invisible( TQWidgetStack * parent ): TQWidget( parent, "qt_invisible_widgetstack" ) { setBackgroundMode( TQt::NoBackground ); } @@ -655,14 +655,14 @@ class TQWidgetStackEventFilter : public TQObject bool TQWidgetStack::event( TQEvent* e ) { if ( e->type() == TQEvent::LayoutHint ) - updateGeometry(); // propgate tqlayout hints to tqparent + updateGeometry(); // propgate tqlayout hints to parent return TQFrame::event( e ); } */ public: - TQWidgetStackEventFilter( TQObject *tqparent = 0, const char * name = 0 ) - : TQObject( tqparent, name ) {} + TQWidgetStackEventFilter( TQObject *parent = 0, const char * name = 0 ) + : TQObject( parent, name ) {} bool eventFilter( TQObject *o, TQEvent * e ) { if ( e->type() == TQEvent::LayoutHint && o->isWidgetType() ) ((TQWidget*)o)->updateGeometry(); @@ -682,7 +682,7 @@ public: The application programmer can move any widget to the top of the stack at any time using raiseWidget(), and add or remove widgets using addWidget() and removeWidget(). It is not sufficient to pass - the widget stack as tqparent to a widget which should be inserted into + the widget stack as parent to a widget which should be inserted into the widgetstack. visibleWidget() is the \e get equivalent of raiseWidget(); it @@ -709,12 +709,12 @@ public: /*! Constructs an empty widget stack. - The \a tqparent and \a name arguments are passed to the TQFrame + The \a parent and \a name arguments are passed to the TQFrame constructor. */ -TQWidgetStack::TQWidgetStack( TQWidget * tqparent, const char *name ) - : TQFrame( tqparent, name ) +TQWidgetStack::TQWidgetStack( TQWidget * parent, const char *name ) + : TQFrame( parent, name ) { init(); } @@ -722,11 +722,11 @@ TQWidgetStack::TQWidgetStack( TQWidget * tqparent, const char *name ) /*! Constructs an empty widget stack. - The \a tqparent, \a name and \a f arguments are passed to the TQFrame + The \a parent, \a name and \a f arguments are passed to the TQFrame constructor. */ -TQWidgetStack::TQWidgetStack( TQWidget * tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f ) //## merge constructors in 4.0 +TQWidgetStack::TQWidgetStack( TQWidget * parent, const char *name, WFlags f ) + : TQFrame( parent, name, f ) //## merge constructors in 4.0 { init(); } @@ -808,7 +808,7 @@ int TQWidgetStack::addWidget( TQWidget * w, int id ) } w->hide(); - if ( w->tqparent() != TQT_TQOBJECT(this) ) + if ( w->parent() != TQT_TQOBJECT(this) ) w->reparent( this, contentsRect().topLeft(), FALSE ); w->setGeometry( contentsRect() ); updateGeometry(); @@ -855,11 +855,11 @@ void TQWidgetStack::raiseWidget( int id ) raiseWidget( w ); } -static bool isChildOf( TQWidget* child, TQWidget *tqparent ) +static bool isChildOf( TQWidget* child, TQWidget *parent ) { - if ( !child || !tqparent->childrenListObject().isEmpty() ) + if ( !child || !parent->childrenListObject().isEmpty() ) return FALSE; - TQObjectListIt it(tqparent->childrenListObject()); + TQObjectListIt it(parent->childrenListObject()); TQObject *obj; while ( (obj = it.current()) ) { ++it; @@ -880,7 +880,7 @@ static bool isChildOf( TQWidget* child, TQWidget *tqparent ) void TQWidgetStack::raiseWidget( TQWidget *w ) { - if ( !w || w == invisible || w->tqparent() != TQT_TQOBJECT(this) || w == topWidget ) + if ( !w || w == invisible || w->parent() != TQT_TQOBJECT(this) || w == topWidget ) return; if ( id(w) == -1 ) diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.h b/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.h index 5c0acfde2..ce0347f28 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.h @@ -178,8 +178,8 @@ class TQ_EXPORT TQWidgetStack: public TQFrame Q_OBJECT TQ_OBJECT public: - TQWidgetStack( TQWidget* tqparent=0, const char* name=0 ); - TQWidgetStack( TQWidget* tqparent, const char* name, WFlags f); + TQWidgetStack( TQWidget* parent=0, const char* name=0 ); + TQWidgetStack( TQWidget* parent, const char* name, WFlags f); ~TQWidgetStack(); diff --git a/experimental/tqtinterface/qt4/src/workspace/tqworkspace.cpp b/experimental/tqtinterface/qt4/src/workspace/tqworkspace.cpp index a4e26876b..531a78e71 100644 --- a/experimental/tqtinterface/qt4/src/workspace/tqworkspace.cpp +++ b/experimental/tqtinterface/qt4/src/workspace/tqworkspace.cpp @@ -91,11 +91,11 @@ document windows, each of which is a widget. The workspace itself is an ordinary TQt widget. It has a standard - constructor that takes a tqparent widget and an object name. The - tqparent window is usually a TQMainWindow, but it need not be. + constructor that takes a parent widget and an object name. The + parent window is usually a TQMainWindow, but it need not be. Document windows (i.e. MDI windows) are also ordinary TQt widgets - which have the workspace as their tqparent widget. When you call + which have the workspace as their parent widget. When you call show(), hide(), showMaximized(), setCaption(), etc. on a document window, it is shown, hidden, etc. with a frame, caption, icon and icon text, just as you'd expect. You can provide widget flags @@ -146,7 +146,7 @@ class TQWorkspaceChild : public TQFrame public: TQWorkspaceChild( TQWidget* window, - TQWorkspace* tqparent=0, const char* name=0 ); + TQWorkspace* parent=0, const char* name=0 ); ~TQWorkspaceChild(); void setActive( bool ); @@ -249,34 +249,34 @@ public: TQPtrList<TQDockWindow> dockwindows, newdocks; }; -static bool isChildOf( TQWidget * child, TQWidget * tqparent ) +static bool isChildOf( TQWidget * child, TQWidget * parent ) { - if ( !tqparent || !child ) + if ( !parent || !child ) return FALSE; TQWidget * w = child; - while( w && w != tqparent ) + while( w && w != parent ) w = w->parentWidget(); return w != 0; } /*! - Constructs a workspace with a \a tqparent and a \a name. + Constructs a workspace with a \a parent and a \a name. */ -TQWorkspace::TQWorkspace( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +TQWorkspace::TQWorkspace( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { init(); } #ifdef TQT_WORKSPACE_WINDOWMODE /*! - Constructs a workspace with a \a tqparent and a \a name. This + Constructs a workspace with a \a parent and a \a name. This constructor will also set the WindowMode to \a mode. \sa windowMode() */ -TQWorkspace::TQWorkspace( TQWorkspace::WindowMode mode, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +TQWorkspace::TQWorkspace( TQWorkspace::WindowMode mode, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { init(); d->wmode = mode; @@ -1045,7 +1045,7 @@ void TQWorkspace::showEvent( TQShowEvent *e ) setGeometry(0, 0, w->width(), w->height()); #if 0 /* Hide really isn't acceptable because I need to make the rest of TQt - think it is visible, so instead I set it to an empty tqmask. I'm not + think it is visible, so instead I set it to an empty mask. I'm not sure what problems this is going to create, hopefully everything will be happy (or not even notice since this is mostly intended for TQt/Mac) */ // w->setMask(TQRegion()); @@ -1311,7 +1311,7 @@ TQWidgetList TQWorkspace::windowList( WindowOrder order ) const /*!\reimp*/ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e) { - if(d->wmode == TopLevel && d->mainwindow && TQT_BASE_OBJECT(TQT_TQOBJECT(o)->tqparent()) == TQT_BASE_OBJECT(d->mainwindow)) { + if(d->wmode == TopLevel && d->mainwindow && TQT_BASE_OBJECT(TQT_TQOBJECT(o)->parent()) == TQT_BASE_OBJECT(d->mainwindow)) { if((e->type() == TQEvent::ChildInserted || e->type() == TQEvent::Reparent) && ::tqqt_cast<TQDockArea*>(o) && !((TQWidget*)o)->isVisible()) { TQChildEvent *ce = (TQChildEvent*)e; @@ -1341,7 +1341,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e) switch ( e->type() ) { case TQEvent::MouseButtonPress: { - TQMenuBar* b = (TQMenuBar*)o->tqparent(); + TQMenuBar* b = (TQMenuBar*)o->parent(); if ( !t ) t = new TQTime; if ( tc != this || t->elapsed() > TQApplication::doubleClickInterval() ) { @@ -1473,7 +1473,7 @@ void TQWorkspace::showMaximizeControls() TQ_ASSERT(d->maxWindow); TQMenuBar* b = 0; - // Do a breadth-first search first on every tqparent, + // Do a breadth-first search first on every parent, TQWidget* w = parentWidget(); TQObjectList * l = 0; while ( !l && w ) { @@ -2026,10 +2026,10 @@ void TQWorkspace::tile() blockSignals(FALSE); } -TQWorkspaceChild::TQWorkspaceChild( TQWidget* window, TQWorkspace *tqparent, +TQWorkspaceChild::TQWorkspaceChild( TQWidget* window, TQWorkspace *parent, const char *name ) - : TQFrame( tqparent, name, - (WFlags)((tqparent->windowMode() == TQWorkspace::TopLevel ? (TQt::WStyle_MinMax | TQt::WStyle_SysMenu | TQt::WType_TopLevel) : + : TQFrame( parent, name, + (WFlags)((parent->windowMode() == TQWorkspace::TopLevel ? (TQt::WStyle_MinMax | TQt::WStyle_SysMenu | TQt::WType_TopLevel) : TQt::WStyle_NoBorder ) | WStyle_Customize | TQt::WDestructiveClose | TQt::WNoMousePropagation | TQt::WSubWindow) ) { statusbar = 0; @@ -2055,7 +2055,7 @@ TQWorkspaceChild::TQWorkspaceChild( TQWidget* window, TQWorkspace *tqparent, } } - if ( window && window->testWFlags( TQt::WStyle_Title ) && tqparent->windowMode() != TQWorkspace::TopLevel ) { + if ( window && window->testWFlags( TQt::WStyle_Title ) && parent->windowMode() != TQWorkspace::TopLevel ) { titlebar = new TQTitleBar( window, this, "qt_ws_titlebar" ); connect( titlebar, TQT_SIGNAL( doActivate() ), this, TQT_SLOT( activate() ) ); @@ -2135,14 +2135,14 @@ TQWorkspaceChild::TQWorkspaceChild( TQWidget* window, TQWorkspace *tqparent, childWidget->installEventFilter( this ); widgetResizeHandler = new TQWidgetResizeHandler( this, window ); - widgetResizeHandler->setSizeProtection( !tqparent->scrollBarsEnabled() ); + widgetResizeHandler->setSizeProtection( !parent->scrollBarsEnabled() ); connect( widgetResizeHandler, TQT_SIGNAL( activate() ), this, TQT_SLOT( activate() ) ); if ( !tqstyle().tqstyleHint( TQStyle::SH_TitleBar_NoBorder, titlebar ) ) widgetResizeHandler->setExtraHeight( th + contentsRect().y() - 2*frameWidth() ); else widgetResizeHandler->setExtraHeight( th + contentsRect().y() - frameWidth() ); - if(tqparent->windowMode() == TQWorkspace::TopLevel && isTopLevel()) { + if(parent->windowMode() == TQWorkspace::TopLevel && isTopLevel()) { move(0, 0); widgetResizeHandler->setActive( FALSE ); } @@ -2775,7 +2775,7 @@ void TQWorkspaceChild::internalRaise() return; } - TQPtrListIterator<TQWorkspaceChild> it( ((TQWorkspace*)tqparent())->d->windows ); + TQPtrListIterator<TQWorkspaceChild> it( ((TQWorkspace*)parent())->d->windows ); while ( it.current () ) { TQWorkspaceChild* c = it.current(); ++it; diff --git a/experimental/tqtinterface/qt4/src/workspace/tqworkspace.h b/experimental/tqtinterface/qt4/src/workspace/tqworkspace.h index b48f7fe04..745363dfa 100644 --- a/experimental/tqtinterface/qt4/src/workspace/tqworkspace.h +++ b/experimental/tqtinterface/qt4/src/workspace/tqworkspace.h @@ -77,9 +77,9 @@ private: public: #ifdef TQT_WORKSPACE_WINDOWMODE - TQWorkspace( WindowMode mode, TQWidget* tqparent=0, const char* name=0 ); + TQWorkspace( WindowMode mode, TQWidget* parent=0, const char* name=0 ); #endif - TQWorkspace( TQWidget* tqparent=0, const char* name=0 ); + TQWorkspace( TQWidget* parent=0, const char* name=0 ); ~TQWorkspace(); diff --git a/experimental/tqtinterface/qt4/src/xml/tqdom.cpp b/experimental/tqtinterface/qt4/src/xml/tqdom.cpp index 4b85e222c..ddc64de5a 100644 --- a/experimental/tqtinterface/qt4/src/xml/tqdom.cpp +++ b/experimental/tqtinterface/qt4/src/xml/tqdom.cpp @@ -58,7 +58,7 @@ which can not be deleted at this time. If a node dies and has direct tqchildren which can not be deleted, - then remove the pointer to the tqparent. + then remove the pointer to the parent. createElement and friends create double reference counts. */ @@ -119,7 +119,7 @@ public: class TQDomNodePrivate : public TQShared { public: - TQDomNodePrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent = 0 ); + TQDomNodePrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent = 0 ); TQDomNodePrivate( TQDomNodePrivate* n, bool deep ); virtual ~TQDomNodePrivate(); @@ -144,7 +144,7 @@ public: virtual void normalize(); virtual void clear(); - TQDomNodePrivate* tqparent() { return hasParent ? ownerNode : 0; } + TQDomNodePrivate* parent() { return hasParent ? ownerNode : 0; } void setParent( TQDomNodePrivate *p ) { ownerNode = p; hasParent = TRUE; } void setNoParent() { ownerNode = hasParent ? (TQDomNodePrivate*)ownerDocument() : 0; @@ -172,7 +172,7 @@ public: // Variables TQDomNodePrivate* prev; TQDomNodePrivate* next; - TQDomNodePrivate* ownerNode; // either the node's tqparent or the node's owner document + TQDomNodePrivate* ownerNode; // either the node's parent or the node's owner document TQDomNodePrivate* first; TQDomNodePrivate* last; @@ -231,7 +231,7 @@ public: bool isAppendToParent() { return appendToParent; } /** * If TRUE, then the node will redirect insert/remove calls - * to its tqparent by calling TQDomNodePrivate::appendChild or removeChild. + * to its parent by calling TQDomNodePrivate::appendChild or removeChild. * In addition the map wont increase or decrease the reference count * of the nodes it contains. * @@ -244,11 +244,11 @@ public: * Creates a copy of the map. It is a deep copy * that means that all tqchildren are cloned. */ - TQDomNamedNodeMapPrivate* clone( TQDomNodePrivate* tqparent ); + TQDomNamedNodeMapPrivate* clone( TQDomNodePrivate* parent ); // Variables TQDict<TQDomNodePrivate> map; - TQDomNodePrivate* tqparent; + TQDomNodePrivate* parent; bool readonly; bool appendToParent; }; @@ -256,7 +256,7 @@ public: class TQDomDocumentTypePrivate : public TQDomNodePrivate { public: - TQDomDocumentTypePrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent = 0 ); + TQDomDocumentTypePrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent = 0 ); TQDomDocumentTypePrivate( TQDomDocumentTypePrivate* n, bool deep ); ~TQDomDocumentTypePrivate(); void init(); @@ -285,7 +285,7 @@ public: class TQDomDocumentFragmentPrivate : public TQDomNodePrivate { public: - TQDomDocumentFragmentPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent = 0 ); + TQDomDocumentFragmentPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent = 0 ); TQDomDocumentFragmentPrivate( TQDomNodePrivate* n, bool deep ); ~TQDomDocumentFragmentPrivate(); @@ -298,7 +298,7 @@ public: class TQDomCharacterDataPrivate : public TQDomNodePrivate { public: - TQDomCharacterDataPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent, const TQString& data ); + TQDomCharacterDataPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent, const TQString& data ); TQDomCharacterDataPrivate( TQDomCharacterDataPrivate* n, bool deep ); ~TQDomCharacterDataPrivate(); @@ -319,7 +319,7 @@ public: class TQDomTextPrivate : public TQDomCharacterDataPrivate { public: - TQDomTextPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent, const TQString& value ); + TQDomTextPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent, const TQString& value ); TQDomTextPrivate( TQDomTextPrivate* n, bool deep ); ~TQDomTextPrivate(); @@ -357,8 +357,8 @@ public: class TQDomElementPrivate : public TQDomNodePrivate { public: - TQDomElementPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent, const TQString& name ); - TQDomElementPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent, const TQString& nsURI, const TQString& qName ); + TQDomElementPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent, const TQString& name ); + TQDomElementPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent, const TQString& nsURI, const TQString& qName ); TQDomElementPrivate( TQDomElementPrivate* n, bool deep ); ~TQDomElementPrivate(); @@ -393,7 +393,7 @@ public: class TQDomCommentPrivate : public TQDomCharacterDataPrivate { public: - TQDomCommentPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent, const TQString& value ); + TQDomCommentPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent, const TQString& value ); TQDomCommentPrivate( TQDomCommentPrivate* n, bool deep ); ~TQDomCommentPrivate(); @@ -408,7 +408,7 @@ public: class TQDomCDATASectionPrivate : public TQDomTextPrivate { public: - TQDomCDATASectionPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent, const TQString& value ); + TQDomCDATASectionPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent, const TQString& value ); TQDomCDATASectionPrivate( TQDomCDATASectionPrivate* n, bool deep ); ~TQDomCDATASectionPrivate(); @@ -423,7 +423,7 @@ public: class TQDomNotationPrivate : public TQDomNodePrivate { public: - TQDomNotationPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent, const TQString& name, + TQDomNotationPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent, const TQString& name, const TQString& pub, const TQString& sys ); TQDomNotationPrivate( TQDomNotationPrivate* n, bool deep ); ~TQDomNotationPrivate(); @@ -442,7 +442,7 @@ public: class TQDomEntityPrivate : public TQDomNodePrivate { public: - TQDomEntityPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent, const TQString& name, + TQDomEntityPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent, const TQString& name, const TQString& pub, const TQString& sys, const TQString& notation ); TQDomEntityPrivate( TQDomEntityPrivate* n, bool deep ); ~TQDomEntityPrivate(); @@ -462,7 +462,7 @@ public: class TQDomEntityReferencePrivate : public TQDomNodePrivate { public: - TQDomEntityReferencePrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent, const TQString& name ); + TQDomEntityReferencePrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent, const TQString& name ); TQDomEntityReferencePrivate( TQDomNodePrivate* n, bool deep ); ~TQDomEntityReferencePrivate(); @@ -476,7 +476,7 @@ public: class TQDomProcessingInstructionPrivate : public TQDomNodePrivate { public: - TQDomProcessingInstructionPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* tqparent, const TQString& target, + TQDomProcessingInstructionPrivate( TQDomDocumentPrivate*, TQDomNodePrivate* parent, const TQString& target, const TQString& data); TQDomProcessingInstructionPrivate( TQDomProcessingInstructionPrivate* n, bool deep ); ~TQDomProcessingInstructionPrivate(); @@ -860,9 +860,9 @@ void TQDomNodeListPrivate::createList() else if ( p->next ) p = p->next; else { - p = p->tqparent(); + p = p->parent(); while ( p && p != node_impl && !p->next ) - p = p->tqparent(); + p = p->parent(); if ( p && p != node_impl ) p = p->next; } @@ -877,9 +877,9 @@ void TQDomNodeListPrivate::createList() else if ( p->next ) p = p->next; else { - p = p->tqparent(); + p = p->parent(); while ( p && p != node_impl && !p->next ) - p = p->tqparent(); + p = p->parent(); if ( p && p != node_impl ) p = p->next; } @@ -1156,7 +1156,7 @@ TQDomNodePrivate* TQDomNodePrivate::insertBefore( TQDomNodePrivate* newChild, TQ return 0; // Error check - if ( refChild && refChild->tqparent() != this ) + if ( refChild && refChild->parent() != this ) return 0; // "mark lists as dirty" @@ -1169,7 +1169,7 @@ TQDomNodePrivate* TQDomNodePrivate::insertBefore( TQDomNodePrivate* newChild, TQ if ( newChild->first == 0 ) return newChild; - // New tqparent + // New parent TQDomNodePrivate* n = newChild->first; while ( n ) { n->setParent( this ); @@ -1205,8 +1205,8 @@ TQDomNodePrivate* TQDomNodePrivate::insertBefore( TQDomNodePrivate* newChild, TQ // ownership of the node. newChild->ref(); - if ( newChild->tqparent() ) - newChild->tqparent()->removeChild( newChild ); + if ( newChild->parent() ) + newChild->parent()->removeChild( newChild ); newChild->setParent( this ); @@ -1249,7 +1249,7 @@ TQDomNodePrivate* TQDomNodePrivate::insertAfter( TQDomNodePrivate* newChild, TQD return 0; // Error check - if ( refChild && refChild->tqparent() != this ) + if ( refChild && refChild->parent() != this ) return 0; // "mark lists as dirty" @@ -1262,7 +1262,7 @@ TQDomNodePrivate* TQDomNodePrivate::insertAfter( TQDomNodePrivate* newChild, TQD if ( newChild->first == 0 ) return newChild; - // New tqparent + // New parent TQDomNodePrivate* n = newChild->first; while ( n ) { n->setParent( this ); @@ -1293,9 +1293,9 @@ TQDomNodePrivate* TQDomNodePrivate::insertAfter( TQDomNodePrivate* newChild, TQD return newChild; } - // Release new node from its current tqparent - if ( newChild->tqparent() ) - newChild->tqparent()->removeChild( newChild ); + // Release new node from its current parent + if ( newChild->parent() ) + newChild->parent()->removeChild( newChild ); // No more errors can occur now, so we take // ownership of the node @@ -1334,7 +1334,7 @@ TQDomNodePrivate* TQDomNodePrivate::insertAfter( TQDomNodePrivate* newChild, TQD TQDomNodePrivate* TQDomNodePrivate::replaceChild( TQDomNodePrivate* newChild, TQDomNodePrivate* oldChild ) { - if ( oldChild->tqparent() != this ) + if ( oldChild->parent() != this ) return 0; if ( !newChild || !oldChild ) return 0; @@ -1351,7 +1351,7 @@ TQDomNodePrivate* TQDomNodePrivate::replaceChild( TQDomNodePrivate* newChild, TQ if ( newChild->first == 0 ) return newChild; - // New tqparent + // New parent TQDomNodePrivate* n = newChild->first; while ( n ) { n->setParent( this ); @@ -1393,9 +1393,9 @@ TQDomNodePrivate* TQDomNodePrivate::replaceChild( TQDomNodePrivate* newChild, TQ // ownership of the node newChild->ref(); - // Release new node from its current tqparent - if ( newChild->tqparent() ) - newChild->tqparent()->removeChild( newChild ); + // Release new node from its current parent + if ( newChild->parent() ) + newChild->parent()->removeChild( newChild ); newChild->setParent( this ); @@ -1425,14 +1425,14 @@ TQDomNodePrivate* TQDomNodePrivate::replaceChild( TQDomNodePrivate* newChild, TQ TQDomNodePrivate* TQDomNodePrivate::removeChild( TQDomNodePrivate* oldChild ) { // Error check - if ( oldChild->tqparent() != this ) + if ( oldChild->parent() != this ) return 0; // "mark lists as dirty" qt_nodeListTime++; // Perhaps oldChild was just created with "createElement" or that. In this case - // its tqparent is TQDomDocument but it is not part of the documents child list. + // its parent is TQDomDocument but it is not part of the documents child list. if ( oldChild->next == 0 && oldChild->prev == 0 && first != oldChild ) return 0; @@ -1468,7 +1468,7 @@ TQDomDocumentPrivate* TQDomNodePrivate::ownerDocument() while ( p && !p->isDocument() ) { if ( !p->hasParent ) return (TQDomDocumentPrivate*)p->ownerNode; - p = p->tqparent(); + p = p->parent(); } return (TQDomDocumentPrivate*)p; @@ -1794,14 +1794,14 @@ TQDomNode::NodeType TQDomNode::nodeType() const } /*! - Returns the tqparent node. If this node has no tqparent, a null node + Returns the parent node. If this node has no parent, a null node is returned (i.e. a node for which isNull() returns TRUE). */ TQDomNode TQDomNode::parentNode() const { if ( !impl ) return TQDomNode(); - return TQDomNode( IMPL->tqparent() ); + return TQDomNode( IMPL->parent() ); } /*! @@ -2492,7 +2492,7 @@ bool TQDomNode::isComment() const TQDomNamedNodeMapPrivate::TQDomNamedNodeMapPrivate( TQDomNodePrivate* n ) { readonly = FALSE; - tqparent = n; + parent = n; appendToParent = FALSE; } @@ -2558,7 +2558,7 @@ TQDomNodePrivate* TQDomNamedNodeMapPrivate::setNamedItem( TQDomNodePrivate* arg return 0; if ( appendToParent ) - return tqparent->appendChild( arg ); + return parent->appendChild( arg ); TQDomNodePrivate *n = map[ arg->nodeName() ]; // We take a reference @@ -2573,7 +2573,7 @@ TQDomNodePrivate* TQDomNamedNodeMapPrivate::setNamedItemNS( TQDomNodePrivate* ar return 0; if ( appendToParent ) - return tqparent->appendChild( arg ); + return parent->appendChild( arg ); if ( !arg->prefix.isNull() ) { // node has a namespace @@ -2597,7 +2597,7 @@ TQDomNodePrivate* TQDomNamedNodeMapPrivate::removeNamedItem( const TQString& nam if ( p == 0 ) return 0; if ( appendToParent ) - return tqparent->removeChild( p ); + return parent->removeChild( p ); map.remove( p->nodeName() ); // We took a reference, so we have to free one here @@ -2901,8 +2901,8 @@ bool TQDomNamedNodeMap::contains( const TQString& name ) const * **************************************************************/ -TQDomDocumentTypePrivate::TQDomDocumentTypePrivate( TQDomDocumentPrivate* doc, TQDomNodePrivate* tqparent ) - : TQDomNodePrivate( doc, tqparent ) +TQDomDocumentTypePrivate::TQDomDocumentTypePrivate( TQDomDocumentPrivate* doc, TQDomNodePrivate* parent ) + : TQDomNodePrivate( doc, parent ) { init(); } @@ -3221,8 +3221,8 @@ bool TQDomDocumentType::isDocumentType() const * **************************************************************/ -TQDomDocumentFragmentPrivate::TQDomDocumentFragmentPrivate( TQDomDocumentPrivate* doc, TQDomNodePrivate* tqparent ) - : TQDomNodePrivate( doc, tqparent ) +TQDomDocumentFragmentPrivate::TQDomDocumentFragmentPrivate( TQDomDocumentPrivate* doc, TQDomNodePrivate* parent ) + : TQDomNodePrivate( doc, parent ) { name = "#document-fragment"; } @@ -3594,8 +3594,8 @@ bool TQDomCharacterData::isCharacterData() const * **************************************************************/ -TQDomAttrPrivate::TQDomAttrPrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* tqparent, const TQString& name_ ) - : TQDomNodePrivate( d, tqparent ) +TQDomAttrPrivate::TQDomAttrPrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* parent, const TQString& name_ ) + : TQDomNodePrivate( d, parent ) { name = name_; m_specified = FALSE; @@ -3840,9 +3840,9 @@ bool TQDomAttr::specified() const */ TQDomElement TQDomAttr::ownerElement() const { - if ( !impl && !impl->tqparent()->isElement() ) + if ( !impl && !impl->parent()->isElement() ) return TQDomElement(); - return TQDomElement( (TQDomElementPrivate*)(impl->tqparent()) ); + return TQDomElement( (TQDomElementPrivate*)(impl->parent()) ); } /*! @@ -4625,8 +4625,8 @@ TQString TQDomElement::text() const * **************************************************************/ -TQDomTextPrivate::TQDomTextPrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* tqparent, const TQString& value ) - : TQDomCharacterDataPrivate( d, tqparent, value ) +TQDomTextPrivate::TQDomTextPrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* parent, const TQString& value ) + : TQDomCharacterDataPrivate( d, parent, value ) { name = "#text"; } @@ -4650,15 +4650,15 @@ TQDomNodePrivate* TQDomTextPrivate::cloneNode( bool deep) TQDomTextPrivate* TQDomTextPrivate::splitText( int offset ) { - if ( !tqparent() ) { - qWarning( "TQDomText::splitText The node has no tqparent. So I can not split" ); + if ( !parent() ) { + qWarning( "TQDomText::splitText The node has no parent. So I can not split" ); return 0; } TQDomTextPrivate* t = new TQDomTextPrivate( ownerDocument(), 0, value.mid( offset ) ); value.truncate( offset ); - tqparent()->insertAfter( t, this ); + parent()->insertAfter( t, this ); return t; } @@ -4784,8 +4784,8 @@ bool TQDomText::isText() const * **************************************************************/ -TQDomCommentPrivate::TQDomCommentPrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* tqparent, const TQString& value ) - : TQDomCharacterDataPrivate( d, tqparent, value ) +TQDomCommentPrivate::TQDomCommentPrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* parent, const TQString& value ) + : TQDomCharacterDataPrivate( d, parent, value ) { name = "#comment"; } @@ -4913,9 +4913,9 @@ bool TQDomComment::isComment() const * **************************************************************/ -TQDomCDATASectionPrivate::TQDomCDATASectionPrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* tqparent, +TQDomCDATASectionPrivate::TQDomCDATASectionPrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* parent, const TQString& value ) - : TQDomTextPrivate( d, tqparent, value ) + : TQDomTextPrivate( d, parent, value ) { name = "#cdata-section"; } @@ -5049,10 +5049,10 @@ bool TQDomCDATASection::isCDATASection() const * **************************************************************/ -TQDomNotationPrivate::TQDomNotationPrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* tqparent, +TQDomNotationPrivate::TQDomNotationPrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* parent, const TQString& aname, const TQString& pub, const TQString& sys ) - : TQDomNodePrivate( d, tqparent ) + : TQDomNodePrivate( d, parent ) { name = aname; m_pub = pub; @@ -5118,7 +5118,7 @@ void TQDomNotationPrivate::save( TQTextStream& s, int, int ) const DOM does not support editing notation nodes; they are therefore read-only. - A notation node does not have any tqparent. + A notation node does not have any parent. You can retrieve the publicId() and systemId() from a notation node. @@ -5219,10 +5219,10 @@ bool TQDomNotation::isNotation() const * **************************************************************/ -TQDomEntityPrivate::TQDomEntityPrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* tqparent, +TQDomEntityPrivate::TQDomEntityPrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* parent, const TQString& aname, const TQString& pub, const TQString& sys, const TQString& notation ) - : TQDomNodePrivate( d, tqparent ) + : TQDomNodePrivate( d, parent ) { name = aname; m_pub = pub; @@ -5334,7 +5334,7 @@ void TQDomEntityPrivate::save( TQTextStream& s, int, int ) const be made to each of the clones instead. All the descendents of an entity node are read-only. - An entity node does not have any tqparent. + An entity node does not have any parent. You can access the entity's publicId(), systemId() and notationName() when available. @@ -5450,8 +5450,8 @@ bool TQDomEntity::isEntity() const * **************************************************************/ -TQDomEntityReferencePrivate::TQDomEntityReferencePrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* tqparent, const TQString& aname ) - : TQDomNodePrivate( d, tqparent ) +TQDomEntityReferencePrivate::TQDomEntityReferencePrivate( TQDomDocumentPrivate* d, TQDomNodePrivate* parent, const TQString& aname ) + : TQDomNodePrivate( d, parent ) { name = aname; } @@ -5595,8 +5595,8 @@ bool TQDomEntityReference::isEntityReference() const **************************************************************/ TQDomProcessingInstructionPrivate::TQDomProcessingInstructionPrivate( TQDomDocumentPrivate* d, - TQDomNodePrivate* tqparent, const TQString& target, const TQString& data ) - : TQDomNodePrivate( d, tqparent ) + TQDomNodePrivate* parent, const TQString& target, const TQString& data ) + : TQDomNodePrivate( d, parent ) { name = target; value = data; @@ -6598,7 +6598,7 @@ TQDomNodeList TQDomDocument::elementsByTagName( const TQString& tagname ) const function creates a copy that can be used within this document. This function returns the imported node that belongs to this - document. The returned node has no tqparent. It is not possible to + document. The returned node has no parent. It is not possible to import TQDomDocument and TQDomDocumentType nodes. In those cases this function returns a \link TQDomNode::isNull() null node\endlink. @@ -6993,7 +6993,7 @@ bool TQDomHandler::endElement( const TQString&, const TQString&, const TQString& { if ( node == doc ) return FALSE; - node = node->tqparent(); + node = node->parent(); return TRUE; } diff --git a/experimental/tqtinterface/qt4/src/xml/tqsvgdevice.cpp b/experimental/tqtinterface/qt4/src/xml/tqsvgdevice.cpp index 3f3c863ae..78200aa14 100644 --- a/experimental/tqtinterface/qt4/src/xml/tqsvgdevice.cpp +++ b/experimental/tqtinterface/qt4/src/xml/tqsvgdevice.cpp @@ -964,7 +964,7 @@ bool TQSvgDevice::play( const TQDomNode &node ) c = c.nextSibling(); } if ( t == TSpanElement ) { - // move current text position in tqparent text element + // move current text position in parent text element StateList::Iterator it = --d->stack.fromLast(); (*it).textx = curr->textx; (*it).texty = curr->texty; diff --git a/experimental/tqtinterface/qt4/src/xml/tqxml.cpp b/experimental/tqtinterface/qt4/src/xml/tqxml.cpp index fa98822e4..8f4a4e3fa 100644 --- a/experimental/tqtinterface/qt4/src/xml/tqxml.cpp +++ b/experimental/tqtinterface/qt4/src/xml/tqxml.cpp @@ -330,9 +330,9 @@ TQXmlLocator::~TQXmlLocator() class TQXmlSimpleReaderLocator : public TQXmlLocator { public: - TQXmlSimpleReaderLocator( TQXmlSimpleReader* tqparent ) + TQXmlSimpleReaderLocator( TQXmlSimpleReader* parent ) { - reader = tqparent; + reader = parent; } ~TQXmlSimpleReaderLocator() { @@ -604,7 +604,7 @@ TQStringList TQXmlNamespaceSupport::prefixes( const TQString& uri ) const Normally, you should push a new context at the beginning of each XML element: the new context automatically inherits the - declarations of its tqparent context, and it also keeps track of + declarations of its parent context, and it also keeps track of which declarations were made within this context. \sa popContext() diff --git a/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui.h b/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui.h index 9204cd799..c95c41379 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui.h +++ b/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui.h @@ -90,7 +90,7 @@ void FindDialog::doFind(bool forward) MainWindow* FindDialog::mainWindow() { - return (MainWindow*) tqparent(); + return (MainWindow*) parent(); } bool FindDialog::hasFindExpression() @@ -103,6 +103,6 @@ void FindDialog::statusMessage(const TQString &message) if (isVisible()) sb->message(message); else - ((MainWindow*) tqparent())->statusBar()->message(message, 2000); + ((MainWindow*) parent())->statusBar()->message(message, 2000); } diff --git a/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp b/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp index 8c2e0df4b..db7b0af42 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp @@ -172,8 +172,8 @@ TQString HelpNavigationContentsItem::link() const -HelpDialog::HelpDialog( TQWidget *tqparent, MainWindow *h ) - : HelpDialogBase( tqparent, 0, FALSE ), lwClosed( FALSE ), help( h ) +HelpDialog::HelpDialog( TQWidget *parent, MainWindow *h ) + : HelpDialogBase( parent, 0, FALSE ), lwClosed( FALSE ), help( h ) { } diff --git a/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.h b/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.h index 13b4c518a..6dd5c6234 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.h +++ b/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.h @@ -69,8 +69,8 @@ class SearchValidator : public TQValidator Q_OBJECT TQ_OBJECT public: - SearchValidator( TQObject *tqparent, const char *name = 0 ) - : TQValidator( tqparent, name ) {} + SearchValidator( TQObject *parent, const char *name = 0 ) + : TQValidator( parent, name ) {} ~SearchValidator() {} TQValidator::State validate( TQString &str, int & ) const; }; @@ -94,7 +94,7 @@ class HelpDialog : public HelpDialogBase TQ_OBJECT public: - HelpDialog( TQWidget *tqparent, MainWindow *h ); + HelpDialog( TQWidget *parent, MainWindow *h ); TQString titleOfLink( const TQString &link ); bool eventFilter( TQObject *, TQEvent * ); diff --git a/experimental/tqtinterface/qt4/tools/assistant/helpwindow.cpp b/experimental/tqtinterface/qt4/tools/assistant/helpwindow.cpp index 25d774dc6..bf338a987 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/helpwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/assistant/helpwindow.cpp @@ -55,8 +55,8 @@ #include <windows.h> #endif -HelpWindow::HelpWindow( MainWindow *w, TQWidget *tqparent, const char *name ) - : TQTextBrowser( tqparent, name ), mw( w ), blockScroll( FALSE ), +HelpWindow::HelpWindow( MainWindow *w, TQWidget *parent, const char *name ) + : TQTextBrowser( parent, name ), mw( w ), blockScroll( FALSE ), shiftPressed( FALSE ), newWindow( FALSE ) { connect(this, TQT_SIGNAL(forwardAvailable(bool)), this, TQT_SLOT(updateForward(bool))); diff --git a/experimental/tqtinterface/qt4/tools/assistant/helpwindow.h b/experimental/tqtinterface/qt4/tools/assistant/helpwindow.h index a00774ffc..5ae2d5edf 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/helpwindow.h +++ b/experimental/tqtinterface/qt4/tools/assistant/helpwindow.h @@ -46,7 +46,7 @@ class HelpWindow : public TQTextBrowser Q_OBJECT TQ_OBJECT public: - HelpWindow( MainWindow *m, TQWidget *tqparent = 0, const char *name = 0 ); + HelpWindow( MainWindow *m, TQWidget *parent = 0, const char *name = 0 ); void setSource( const TQString &name ); TQPopupMenu *createPopupMenu( const TQPoint& pos ); void blockScrolling( bool b ); diff --git a/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.cpp b/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.cpp index 4478642d6..b642bc3f0 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.cpp +++ b/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.cpp @@ -128,11 +128,11 @@ static TQAssistantClientPrivate *data( const TQAssistantClient *client, bool cre path to the TQt Assistant executable. If \a path is an empty string the system path (\c{%PATH%} or \c $PATH) is used. - The assistant client object is a child of \a tqparent and is called + The assistant client object is a child of \a parent and is called \a name. */ -TQAssistantClient::TQAssistantClient( const TQString &path, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), host ( "localhost" ) +TQAssistantClient::TQAssistantClient( const TQString &path, TQObject *parent, const char *name ) + : TQObject( parent, name ), host ( "localhost" ) { if ( path.isEmpty() ) assistantCommand = "assistant"; diff --git a/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.h b/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.h index 64b95d99c..faf335171 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.h +++ b/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.h @@ -46,7 +46,7 @@ class TQAssistantClient : public TQObject Q_PROPERTY( bool open READ isOpen ) public: - TQAssistantClient( const TQString &path, TQObject *tqparent = 0, const char *name = 0 ); + TQAssistantClient( const TQString &path, TQObject *parent = 0, const char *name = 0 ); ~TQAssistantClient(); bool isOpen() const; diff --git a/experimental/tqtinterface/qt4/tools/assistant/main.cpp b/experimental/tqtinterface/qt4/tools/assistant/main.cpp index 8b60a9e79..2c861c88f 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/main.cpp +++ b/experimental/tqtinterface/qt4/tools/assistant/main.cpp @@ -61,7 +61,7 @@ class AssistantSocket : public TQSocket Q_OBJECT TQ_OBJECT public: - AssistantSocket( int sock, TQObject *tqparent = 0 ); + AssistantSocket( int sock, TQObject *parent = 0 ); ~AssistantSocket() {} Q_SIGNALS: @@ -78,7 +78,7 @@ class AssistantServer : public TQServerSocket Q_OBJECT TQ_OBJECT public: - AssistantServer( TQObject* tqparent = 0 ); + AssistantServer( TQObject* parent = 0 ); void newConnection( int socket ); TQ_UINT16 getPort() const; @@ -91,8 +91,8 @@ private: }; -AssistantSocket::AssistantSocket( int sock, TQObject *tqparent ) - : TQSocket( tqparent, 0 ) +AssistantSocket::AssistantSocket( int sock, TQObject *parent ) + : TQSocket( parent, 0 ) { connect( this, TQT_SIGNAL( readyRead() ), TQT_SLOT( readClient() ) ); @@ -118,8 +118,8 @@ void AssistantSocket::connectionClosed() delete this; } -AssistantServer::AssistantServer( TQObject *tqparent ) - : TQServerSocket( 0x7f000001, 0, 1, tqparent ) +AssistantServer::AssistantServer( TQObject *parent ) + : TQServerSocket( 0x7f000001, 0, 1, parent ) { if ( !ok() ) { TQMessageBox::critical( 0, tr( "TQt Assistant" ), diff --git a/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.cpp b/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.cpp index 39abaa7b0..287bb374c 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.cpp @@ -54,8 +54,8 @@ #include <tqmap.h> -SettingsDialog::SettingsDialog( TQWidget *tqparent, const char* name ) - : SettingsDialogBase( tqparent, name ) +SettingsDialog::SettingsDialog( TQWidget *parent, const char* name ) + : SettingsDialogBase( parent, name ) { init(); } diff --git a/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.h b/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.h index 3865630da..2e07a48ff 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.h +++ b/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.h @@ -46,7 +46,7 @@ class SettingsDialog : public SettingsDialogBase TQ_OBJECT public: - SettingsDialog( TQWidget *tqparent, const char* name = 0 ); + SettingsDialog( TQWidget *parent, const char* name = 0 ); protected Q_SLOTS: void selectColor(); diff --git a/experimental/tqtinterface/qt4/tools/assistant/tabbedbrowser.ui.h b/experimental/tqtinterface/qt4/tools/assistant/tabbedbrowser.ui.h index b059b544a..5f16dd1ea 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/tabbedbrowser.ui.h +++ b/experimental/tqtinterface/qt4/tools/assistant/tabbedbrowser.ui.h @@ -200,7 +200,7 @@ void TabbedBrowser::updateTitle( const TQString &title ) MainWindow* TabbedBrowser::mainWindow() { - return (MainWindow*) tqparent(); + return (MainWindow*) parent(); } void TabbedBrowser::newTab() diff --git a/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp b/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp index daeedc5ea..d6048d229 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp @@ -37,9 +37,9 @@ #include <tqlistbox.h> #include <tqpushbutton.h> -TopicChooser::TopicChooser( TQWidget *tqparent, const TQStringList &lnkNames, +TopicChooser::TopicChooser( TQWidget *parent, const TQStringList &lnkNames, const TQStringList &lnks, const TQString &title ) - : TopicChooserBase( tqparent, 0, TRUE ), links( lnks ), linkNames( lnkNames ) + : TopicChooserBase( parent, 0, TRUE ), links( lnks ), linkNames( lnkNames ) { label->setText( tr( "Choose a topic for <b>%1</b>" ).arg( title ) ); listbox->insertStringList( linkNames ); @@ -58,10 +58,10 @@ TQString TopicChooser::link() const return links[ i ]; } -TQString TopicChooser::getLink( TQWidget *tqparent, const TQStringList &lnkNames, +TQString TopicChooser::getLink( TQWidget *parent, const TQStringList &lnkNames, const TQStringList &lnks, const TQString &title ) { - TopicChooser *dlg = new TopicChooser( tqparent, lnkNames, lnks, title ); + TopicChooser *dlg = new TopicChooser( parent, lnkNames, lnks, title ); TQString lnk; if ( dlg->exec() == TQDialog::Accepted ) lnk = dlg->link(); diff --git a/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.h b/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.h index 1bfd10b47..8b3af6d5a 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.h +++ b/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.h @@ -43,12 +43,12 @@ class TopicChooser : public TopicChooserBase TQ_OBJECT public: - TopicChooser( TQWidget *tqparent, const TQStringList &lnkNames, + TopicChooser( TQWidget *parent, const TQStringList &lnkNames, const TQStringList &lnks, const TQString &title ); TQString link() const; - static TQString getLink( TQWidget *tqparent, const TQStringList &lnkNames, + static TQString getLink( TQWidget *parent, const TQStringList &lnkNames, const TQStringList &lnks, const TQString &title ); private: diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp index 605a264f6..d60a15607 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp @@ -148,14 +148,14 @@ public: }; -TQDesignerToolBarSeparator::TQDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent, +TQDesignerToolBarSeparator::TQDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *parent, const char* name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { - connect( tqparent, TQT_SIGNAL(orientationChanged(Qt::Orientation)), + connect( parent, TQT_SIGNAL(orientationChanged(Qt::Orientation)), this, TQT_SLOT(setOrientation(Qt::Orientation)) ); setOrientation( o ); - setBackgroundMode( tqparent->backgroundMode() ); + setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } @@ -194,8 +194,8 @@ void TQDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) -TQSeparatorAction::TQSeparatorAction( TQObject *tqparent ) - : TQAction( tqparent, "qt_designer_separator" ), wid( 0 ) +TQSeparatorAction::TQSeparatorAction( TQObject *parent ) + : TQAction( parent, "qt_designer_separator" ), wid( 0 ) { } @@ -292,8 +292,8 @@ void TQDesignerToolBar::addAction( TQAction *a ) static void fixObject( TQObject *&o ) { - while ( o && o->tqparent() && !::tqqt_cast<TQDesignerToolBar*>(o->tqparent()) ) - o = o->tqparent(); + while ( o && o->parent() && !::tqqt_cast<TQDesignerToolBar*>(o->parent()) ) + o = o->parent(); } bool TQDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) @@ -707,7 +707,7 @@ void TQDesignerToolBar::doInsertWidget( const TQPoint &p ) TQWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, TRUE ); installEventFilters( w ); MainWindow::self->formWindow()->insertWidget( w, TRUE ); - TQDesignerAction *a = new TQDesignerAction( w, tqparent() ); + TQDesignerAction *a = new TQDesignerAction( w, parent() ); int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h index e6ec52836..104544908 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h @@ -79,8 +79,8 @@ class TQDesignerActionGroup : public TQActionGroup TQ_OBJECT public: - TQDesignerActionGroup( TQObject *tqparent ) - : TQActionGroup( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ) { init(); } + TQDesignerActionGroup( TQObject *parent ) + : TQActionGroup( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ) { init(); } void init(); @@ -115,10 +115,10 @@ class TQDesignerAction : public TQAction TQ_OBJECT public: - TQDesignerAction( TQObject *tqparent ) - : TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); } - TQDesignerAction( TQWidget *w, TQObject *tqparent ) - : TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); } + TQDesignerAction( TQObject *parent ) + : TQAction( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); } + TQDesignerAction( TQWidget *w, TQObject *parent ) + : TQAction( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); } void init(); @@ -152,7 +152,7 @@ class TQDesignerToolBarSeparator : public TQWidget TQ_OBJECT public: - TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); + TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 ); TQSize tqsizeHint() const; Qt::Orientation orientation() const { return orient; } @@ -172,7 +172,7 @@ class TQSeparatorAction : public TQAction TQ_OBJECT public: - TQSeparatorAction( TQObject *tqparent ); + TQSeparatorAction( TQObject *parent ); bool addTo( TQWidget *w ); bool removeFrom( TQWidget *w ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.cpp index 8f4851cb2..c1302b10e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.cpp @@ -50,8 +50,8 @@ #include <tqpopupmenu.h> #include <tqobjectlist.h> -ActionEditor::ActionEditor( TQWidget* tqparent, const char* name, WFlags fl ) - : ActionEditorBase( tqparent, name, fl ), currentAction( 0 ), formWindow( 0 ), +ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) + : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ), explicitlyClosed(false) { listActions->addColumn( tr( "Actions" ) ); @@ -155,7 +155,7 @@ void ActionEditor::newAction() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) ) - actionParent = (ActionItem*)actionParent->tqparent(); + actionParent = (ActionItem*)actionParent->parent(); } ActionItem *i = 0; @@ -191,7 +191,7 @@ void ActionEditor::newActionGroup() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) ) - actionParent = (ActionItem*)actionParent->tqparent(); + actionParent = (ActionItem*)actionParent->parent(); } ActionItem *i = 0; @@ -236,7 +236,7 @@ void ActionEditor::setFormWindow( FormWindow *fw ) setEnabled( TRUE ); for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) { ActionItem *i = 0; - if ( ::tqqt_cast<TQAction*>(a->tqparent()) ) + if ( ::tqqt_cast<TQAction*>(a->parent()) ) continue; i = new ActionItem( listActions, a ); i->setText( 0, a->name() ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.h index 791bfae4a..40419bdba 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.h @@ -47,7 +47,7 @@ class ActionEditor : public ActionEditorBase TQ_OBJECT public: - ActionEditor( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + ActionEditor( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); void setFormWindow( FormWindow *fw ); void updateActionName( TQAction *a ); void updateActionIcon( TQAction *a ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.cpp index b3fb0d038..0103608ab 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.cpp @@ -35,8 +35,8 @@ #include "actionlistview.h" #include <tqheader.h> -ActionListView::ActionListView( TQWidget *tqparent, const char *name ) - : TQListView( tqparent, name ) +ActionListView::ActionListView( TQWidget *parent, const char *name ) + : TQListView( parent, name ) { setShowSortIndicator( TRUE ); setResizeMode( LastColumn ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.h b/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.h index 253761b57..5f2e8bf35 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.h @@ -46,10 +46,10 @@ public: g( group ? new TQDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); } ActionItem( TQListView *lv, TQAction *ac ); ActionItem( TQListViewItem *i, TQAction *ac ); - ActionItem( ActionItem *tqparent, bool group = FALSE ) - : TQListViewItem( tqparent ), - a( group ? 0 : new TQDesignerAction( tqparent->actionGroup() ) ), - g( group ? new TQDesignerActionGroup( tqparent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); } + ActionItem( ActionItem *parent, bool group = FALSE ) + : TQListViewItem( parent ), + a( group ? 0 : new TQDesignerAction( parent->actionGroup() ) ), + g( group ? new TQDesignerActionGroup( parent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); } TQDesignerAction *action() const { return a; } TQDesignerActionGroup *actionGroup() const { return g; } @@ -69,7 +69,7 @@ class ActionListView : public TQListView TQ_OBJECT public: - ActionListView( TQWidget *tqparent = 0, const char *name = 0 ); + ActionListView( TQWidget *parent = 0, const char *name = 0 ); protected: TQDragObject *dragObject(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp index 9c91def4c..b8126cf22 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp @@ -35,18 +35,18 @@ #include <tqstring.h> -AsciiValidator::AsciiValidator( TQObject * tqparent, const char *name ) - : TQValidator( tqparent, name ), functionName( FALSE ) +AsciiValidator::AsciiValidator( TQObject * parent, const char *name ) + : TQValidator( parent, name ), functionName( FALSE ) { } -AsciiValidator::AsciiValidator( bool funcName, TQObject * tqparent, const char *name ) - : TQValidator( tqparent, name ), functionName( funcName ) +AsciiValidator::AsciiValidator( bool funcName, TQObject * parent, const char *name ) + : TQValidator( parent, name ), functionName( funcName ) { } -AsciiValidator::AsciiValidator( const TQString &allow, TQObject * tqparent, const char *name ) - : TQValidator( tqparent, name ), functionName( FALSE ), allowedChars( allow ) +AsciiValidator::AsciiValidator( const TQString &allow, TQObject * parent, const char *name ) + : TQValidator( parent, name ), functionName( FALSE ), allowedChars( allow ) { } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.h b/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.h index 7b9275164..9201fc9c0 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.h @@ -42,9 +42,9 @@ class AsciiValidator: public TQValidator { TQ_OBJECT public: - AsciiValidator( TQObject * tqparent, const char *name = 0 ); - AsciiValidator( bool funcName, TQObject * tqparent, const char *name = 0 ); - AsciiValidator( const TQString &allow, TQObject * tqparent, const char *name = 0 ); + AsciiValidator( TQObject * parent, const char *name = 0 ); + AsciiValidator( bool funcName, TQObject * parent, const char *name = 0 ); + AsciiValidator( const TQString &allow, TQObject * parent, const char *name = 0 ); ~AsciiValidator(); TQValidator::State validate( TQString &, int & ) const; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/command.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/command.cpp index 10bf2919c..df5c8b8df 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/command.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/command.cpp @@ -548,7 +548,7 @@ bool SetPropertyCommand::checkProperty() return FALSE; } - if ( ::tqqt_cast<FormWindow*>(widget->tqparent()) ) + if ( ::tqqt_cast<FormWindow*>(widget->parent()) ) formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->parentWidget() ); } return TRUE; @@ -675,9 +675,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ // ------------------------------------------------------------ LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase ) { } @@ -698,9 +698,9 @@ void LayoutHorizontalCommand::unexecute() // ------------------------------------------------------------ LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TRUE, TRUE ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TRUE, TRUE ) { } @@ -721,9 +721,9 @@ void LayoutHorizontalSplitCommand::unexecute() // ------------------------------------------------------------ LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase ) { } @@ -744,9 +744,9 @@ void LayoutVerticalCommand::unexecute() // ------------------------------------------------------------ LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TRUE, TRUE ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TRUE, TRUE ) { } @@ -767,9 +767,9 @@ void LayoutVerticalSplitCommand::unexecute() // ------------------------------------------------------------ LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl, int xres, int yres ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) ) { } @@ -1618,7 +1618,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) from->setSorting( -1 ); for ( ; it.current(); ++it ) { TQListViewItem *i = it.current(); - if ( i->tqparent() == fromParents.top() ) { + if ( i->parent() == fromParents.top() ) { TQListViewItem *pi = toParents.top(); TQListViewItem *ni = 0; if ( pi ) @@ -1635,7 +1635,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) if ( pi ) pi->setOpen( TRUE ); } else { - if ( i->tqparent() == fromLast ) { + if ( i->parent() == fromLast ) { fromParents.push( fromLast ); toParents.push( toLasts.top() ); toLasts.push( 0 ); @@ -1655,7 +1655,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) if ( pi ) pi->setOpen( TRUE ); } else { - while ( fromParents.top() != i->tqparent() ) { + while ( fromParents.top() != i->parent() ) { fromParents.pop(); toParents.pop(); toLasts.pop(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/command.h b/experimental/tqtinterface/qt4/tools/designer/designer/command.h index 33af7e4b1..36e5041e1 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/command.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/command.h @@ -289,7 +289,7 @@ class LayoutHorizontalCommand : public Command { public: LayoutHorizontalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -305,7 +305,7 @@ class LayoutHorizontalSplitCommand : public Command { public: LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -321,7 +321,7 @@ class LayoutVerticalCommand : public Command { public: LayoutVerticalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -337,7 +337,7 @@ class LayoutVerticalSplitCommand : public Command { public: LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -353,7 +353,7 @@ class LayoutGridCommand : public Command { public: LayoutGridCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl, int xres, int yres ); void execute(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h b/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h index 2778f8bb1..47f8d929b 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h @@ -58,14 +58,14 @@ void ConfigToolboxDialog::init() a; a = MainWindow::self->toolActions.prev() ) { TQString grp = ( (WidgetAction*)a )->group(); - TQListViewItem *tqparent = groups.find( grp ); - if ( !tqparent ) { - tqparent = new TQListViewItem( listViewTools ); - tqparent->setText( 0, grp ); - tqparent->setOpen( TRUE ); - groups.insert( grp, tqparent ); + TQListViewItem *parent = groups.find( grp ); + if ( !parent ) { + parent = new TQListViewItem( listViewTools ); + parent->setText( 0, grp ); + parent->setOpen( TRUE ); + groups.insert( grp, parent ); } - TQListViewItem *i = new TQListViewItem( tqparent ); + TQListViewItem *i = new TQListViewItem( parent ); i->setText( 0, a->text() ); i->setPixmap( 0, a->iconSet().pixmap() ); } @@ -106,10 +106,10 @@ void ConfigToolboxDialog::addTool() // processing tqchildren...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); - nextParent = (*it)->tqparent(); + nextParent = (*it)->parent(); while ( nextParent && !nextSibling ) { nextSibling = nextParent->nextSibling(); - nextParent = nextParent->tqparent(); + nextParent = nextParent->parent(); } } } else if ( ((*it)->childCount() == 0) && addKids ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/connectionitems.h b/experimental/tqtinterface/qt4/tools/designer/designer/connectionitems.h index 7cbb883fb..10a0e43a7 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/connectionitems.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/connectionitems.h @@ -175,9 +175,9 @@ class ConnectionContainer : public TQObject TQ_OBJECT public: - ConnectionContainer( TQObject *tqparent, SenderItem *i1, SignalItem *i2, + ConnectionContainer( TQObject *parent, SenderItem *i1, SignalItem *i2, ReceiverItem *i3, SlotItem *i4, int r ) - : TQObject( tqparent ), mod( FALSE ), se( i1 ), si( i2 ), + : TQObject( parent ), mod( FALSE ), se( i1 ), si( i2 ), re( i3 ), sl( i4 ), rw ( r ) { i1->setConnection( this ); i2->setConnection( this ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.cpp index 529ff6793..13bd4e7e8 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.cpp @@ -33,8 +33,8 @@ #include "connectiontable.h" -ConnectionTable::ConnectionTable( TQWidget *tqparent, const char *name ) - : TQTable( 0, 4, tqparent, name ) +ConnectionTable::ConnectionTable( TQWidget *parent, const char *name ) + : TQTable( 0, 4, parent, name ) { setSorting( TRUE ); setShowGrid( FALSE ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.h b/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.h index 50f2731c8..e10648059 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.h @@ -42,7 +42,7 @@ class ConnectionTable : public TQTable TQ_OBJECT public: - ConnectionTable( TQWidget *tqparent, const char *name ); + ConnectionTable( TQWidget *parent, const char *name ); void sortColumn( int col, bool ascending, bool wholeRows ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp index 7d364c5da..dbe112997 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp @@ -58,8 +58,8 @@ #include <tqtextcodec.h> #include <tqcheckbox.h> -CustomWidgetEditor::CustomWidgetEditor( TQWidget *tqparent, MainWindow *mw ) - : CustomWidgetEditorBase( tqparent, 0, TRUE ), mainWindow( mw ) +CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw ) + : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); checkTimer = new TQTimer( this ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h index ed0caf94e..cad285b0f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h @@ -50,7 +50,7 @@ class CustomWidgetEditor : public CustomWidgetEditorBase TQ_OBJECT public: - CustomWidgetEditor( TQWidget *tqparent , MainWindow *mw); + CustomWidgetEditor( TQWidget *parent , MainWindow *mw); protected Q_SLOTS: void addWidgetClicked(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/database.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/database.cpp index 926528ff4..3c1c8a2c8 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/database.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/database.cpp @@ -53,7 +53,7 @@ DatabaseSupport::DatabaseSupport() { con = 0; frm = 0; - tqparent = 0; + parent = 0; } void DatabaseSupport::initPreview( const TQString &connection, const TQString &table, TQObject *o, @@ -61,7 +61,7 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t { tbl = table; dbControls = databaseControls; - tqparent = o; + parent = o; if ( connection != "(default)" ) con = TQSqlDatabase::database( connection ); @@ -69,15 +69,15 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t con = TQSqlDatabase::database(); frm = new TQSqlForm( o, table ); for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) { - TQObject *chld = tqparent->child( it.key(), "TQWidget" ); + TQObject *chld = parent->child( it.key(), "TQWidget" ); if ( !chld ) continue; frm->insert( (TQWidget*)chld, *it ); } } -TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *tqparent, const char *name ) - : TQDataBrowser( tqparent, name ) +TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *parent, const char *name ) + : TQDataBrowser( parent, name ) { } @@ -103,8 +103,8 @@ bool TQDesignerDataBrowser::event( TQEvent* e ) return b; } -TQDesignerDataView::TQDesignerDataView( TQWidget *tqparent, const char *name ) - : TQDataView( tqparent, name ) +TQDesignerDataView::TQDesignerDataView( TQWidget *parent, const char *name ) + : TQDataView( parent, name ) { } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/database.h b/experimental/tqtinterface/qt4/tools/designer/designer/database.h index 35423a3d1..324691748 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/database.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/database.h @@ -59,7 +59,7 @@ protected: TQSqlForm* frm; TQString tbl; TQMap<TQString, TQString> dbControls; - TQObject *tqparent; + TQObject *parent; }; @@ -69,7 +69,7 @@ class TQDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport TQ_OBJECT public: - TQDesignerDataBrowser( TQWidget *tqparent, const char *name ); + TQDesignerDataBrowser( TQWidget *parent, const char *name ); protected: bool event( TQEvent* e ); @@ -81,7 +81,7 @@ class TQDesignerDataView : public TQDataView, public DatabaseSupport TQ_OBJECT public: - TQDesignerDataView( TQWidget *tqparent, const char *name ); + TQDesignerDataView( TQWidget *parent, const char *name ); protected: bool event( TQEvent* e ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/database2.h b/experimental/tqtinterface/qt4/tools/designer/designer/database2.h index 3beae9edc..df91b3e63 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/database2.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/database2.h @@ -59,7 +59,7 @@ protected: TQSqlForm* frm; TQString tbl; TQMap<TQString, TQString> dbControls; - TQObject *tqparent; + TQObject *parent; }; @@ -68,7 +68,7 @@ class TQDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2 TQ_OBJECT public: - TQDesignerDataBrowser2( TQWidget *tqparent, const char *name ); + TQDesignerDataBrowser2( TQWidget *parent, const char *name ); protected: bool event( TQEvent* e ); @@ -79,7 +79,7 @@ class TQDesignerDataView2 : public TQDataView, public DatabaseSupport2 TQ_OBJECT public: - TQDesignerDataView2( TQWidget *tqparent, const char *name ); + TQDesignerDataView2( TQWidget *parent, const char *name ); protected: bool event( TQEvent* e ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.cpp index c6d7d986d..e9969e859 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.cpp @@ -42,9 +42,9 @@ #include <tqlayout.h> #include <tqsqldatabase.h> -DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* tqparent, +DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : DatabaseConnectionEditorBase( tqparent, name, modal, fl ), conn( connection ) + : DatabaseConnectionEditorBase( parent, name, modal, fl ), conn( connection ) { connectionWidget = new DatabaseConnectionWidget( grp ); grpLayout->addWidget( connectionWidget, 0, 0 ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.h index 3eecd0190..11bdb3db2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.h @@ -46,7 +46,7 @@ class DatabaseConnectionEditor : public DatabaseConnectionEditorBase TQ_OBJECT public: - DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* tqparent = 0, + DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~DatabaseConnectionEditor(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.cpp index 0ee44bc64..6170a2b47 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.cpp @@ -50,14 +50,14 @@ static bool blockChanges = FALSE; /* - * Constructs a DatabaseConnectionsEditor which is a child of 'tqparent', with the + * Constructs a DatabaseConnectionsEditor which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : DatabaseConnectionBase( tqparent, name, modal, fl ), project( pro ) +DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : DatabaseConnectionBase( parent, name, modal, fl ), project( pro ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); connectionWidget = new DatabaseConnectionWidget( grp ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.h index aec40470d..2a91923fb 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.h @@ -45,7 +45,7 @@ class DatabaseConnectionsEditor : public DatabaseConnectionBase TQ_OBJECT public: - DatabaseConnectionsEditor( Project *pro, TQWidget* tqparent = 0, + DatabaseConnectionsEditor( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~DatabaseConnectionsEditor(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/designer_de.ts b/experimental/tqtinterface/qt4/tools/designer/designer/designer_de.ts index ec81eced4..5345c5b69 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/designer_de.ts +++ b/experimental/tqtinterface/qt4/tools/designer/designer/designer_de.ts @@ -1445,7 +1445,7 @@ The name has been changed back to '%1'.</source> <translation type="unfinished"></translation> </message> <message> - <source>Retqparent Widgets</source> + <source>Reparent Widgets</source> <translation type="unfinished"></translation> </message> <message> @@ -2086,7 +2086,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Move the selected item one level up.</b><p>This will also change the level of the tqparent item.</p></source> + <source><b>Move the selected item one level up.</b><p>This will also change the level of the parent item.</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> @@ -2094,7 +2094,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Move the selected item one level down.</b><p>This will also change the level of the tqparent item.</p></source> + <source><b>Move the selected item one level down.</b><p>This will also change the level of the parent item.</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/designer_fr.ts b/experimental/tqtinterface/qt4/tools/designer/designer/designer_fr.ts index ec81eced4..5345c5b69 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/designer_fr.ts +++ b/experimental/tqtinterface/qt4/tools/designer/designer/designer_fr.ts @@ -1445,7 +1445,7 @@ The name has been changed back to '%1'.</source> <translation type="unfinished"></translation> </message> <message> - <source>Retqparent Widgets</source> + <source>Reparent Widgets</source> <translation type="unfinished"></translation> </message> <message> @@ -2086,7 +2086,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Move the selected item one level up.</b><p>This will also change the level of the tqparent item.</p></source> + <source><b>Move the selected item one level up.</b><p>This will also change the level of the parent item.</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> @@ -2094,7 +2094,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Move the selected item one level down.</b><p>This will also change the level of the tqparent item.</p></source> + <source><b>Move the selected item one level down.</b><p>This will also change the level of the parent item.</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp index a959d42d4..ce660a021 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp @@ -197,7 +197,7 @@ TQPtrList<DesignerFormWindow> DesignerProjectImpl::formList() const while ( it.current() ) { TQObject *obj = it.current(); ++it; - TQWidget *par = ::tqqt_cast<FormWindow*>(obj->tqparent()); + TQWidget *par = ::tqqt_cast<FormWindow*>(obj->parent()); if ( !obj->isWidgetType() || !par ) continue; @@ -589,9 +589,9 @@ void DesignerFormWindowImpl::insertWidget( TQWidget * ) { } -TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *tqparent, const char *name ) +TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *parent, const char *name ) { - TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, name ); + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, name ); formWindow->insertWidget( w, TRUE ); formWindow->killAccels( formWindow->mainContainer() ); return w; @@ -724,9 +724,9 @@ TQPtrList<TQAction> DesignerFormWindowImpl::actionList() const } TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, - TQObject* tqparent, const char* name, bool toggle ) + TQObject* parent, const char* name, bool toggle ) { - TQDesignerAction *a = new TQDesignerAction( tqparent ); + TQDesignerAction *a = new TQDesignerAction( parent ); a->setName( name ); a->setText( text ); if ( !icon.isNull() && !icon.pixmap().isNull() ) diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.h b/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.h index 7a58e237e..96b7d5df2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.h @@ -182,7 +182,7 @@ public: void save() const; bool isModified() const; void insertWidget( TQWidget * ); - TQWidget *create( const char *className, TQWidget *tqparent, const char *name ); + TQWidget *create( const char *className, TQWidget *parent, const char *name ); void removeWidget( TQWidget * ); TQWidgetList widgets() const; void undo(); @@ -212,7 +212,7 @@ public: void setCurrentWidget( TQWidget * ); TQPtrList<TQAction> actionList() const; TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, - TQObject* tqparent, const char* name = 0, bool toggle = FALSE ); + TQObject* parent, const char* name = 0, bool toggle = FALSE ); void addAction( TQAction * ); void removeAction( TQAction * ); void preview() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp index a8ee282be..975402a98 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp @@ -51,8 +51,8 @@ #include <tqheader.h> #include <tqcheckbox.h> -EditFunctions::EditFunctions( TQWidget *tqparent, FormWindow *fw, bool justSlots ) - : EditFunctionsBase( tqparent, 0, TRUE ), formWindow( fw ) +EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) + : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); @@ -118,7 +118,7 @@ EditFunctions::EditFunctions( TQWidget *tqparent, FormWindow *fw, bool justSlots TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "functionName" - TQObjectList *l = tqparent->queryList( "TQLineEdit", "functionName" ); + TQObjectList *l = parent->queryList( "TQLineEdit", "functionName" ); TQObject *obj; TQObjectListIt itemsLineEditIt( *l ); while ( (obj = itemsLineEditIt.current()) != 0 ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.h index 8d42af3f0..51fcfc517 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.h @@ -48,7 +48,7 @@ class EditFunctions : public EditFunctionsBase TQ_OBJECT public: - EditFunctions( TQWidget *tqparent, FormWindow *fw, bool showOnlySlots = FALSE ); + EditFunctions( TQWidget *parent, FormWindow *fw, bool showOnlySlots = FALSE ); void setCurrentFunction( const TQString &function ); void functionAdd( const TQString &access = TQString(), diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.cpp index 7fb6144ae..8d895b044 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.cpp @@ -47,8 +47,8 @@ #include <tqspinbox.h> #include <tqcheckbox.h> -FormSettings::FormSettings( TQWidget *tqparent, FormWindow *fw ) - : FormSettingsBase( tqparent, 0, TRUE ), formwindow( fw ) +FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) + : FormSettingsBase( parent, 0, TRUE ), formwindow( fw ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( fw ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.h index a936aab55..3d4322248 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.h @@ -44,7 +44,7 @@ class FormSettings : public FormSettingsBase TQ_OBJECT public: - FormSettings( TQWidget *tqparent, FormWindow *fw ); + FormSettings( TQWidget *parent, FormWindow *fw ); protected Q_SLOTS: void okClicked(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp index f3155eef3..8c5bc46b9 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp @@ -135,8 +135,8 @@ static void flickerfree_update( TQWidget *w ) event filter which is implemented in MainWindow::eventFilter(). */ -FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WDestructiveClose ), mainwindow( mw ), +FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WDestructiveClose ), mainwindow( mw ), commands( 100 ), pixInline( TRUE ), pixProject( FALSE ) { ff = f; @@ -144,8 +144,8 @@ FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const c initSlots(); } -FormWindow::FormWindow( FormFile *f, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WDestructiveClose ), mainwindow( 0 ), +FormWindow::FormWindow( FormFile *f, TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WDestructiveClose ), mainwindow( 0 ), commands( 100 ), pixInline( TRUE ) { ff = f; @@ -259,16 +259,16 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e ) if( !TQPixmapCache::find( grid_name, grid ) ) { grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) ); grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) ); - TQBitmap tqmask( grid.width(), grid.height() ); - tqmask.fill( Qt::color0 ); - TQPainter p( &tqmask ); + TQBitmap mask( grid.width(), grid.height() ); + mask.fill( Qt::color0 ); + TQPainter p( &mask ); p.setPen( Qt::color1 ); for ( int y = 0; y < grid.width(); y += mainWindow()->grid().y()) { for ( int x = 0; x < grid.height(); x += mainWindow()->grid().x() ) { p.drawPoint( x, y ); } } - grid.setMask( tqmask ); + grid.setMask( mask ); TQPixmapCache::insert( grid_name, grid ); } TQPainter p( w ); @@ -452,7 +452,7 @@ void FormWindow::insertWidget() np.append( pos ); } - MoveCommand *mv = new MoveCommand( tr( "Retqparent Widgets" ), this, + MoveCommand *mv = new MoveCommand( tr( "Reparent Widgets" ), this, lst, op, np, insertParent, pw ); if ( !toolFixed ) @@ -689,14 +689,14 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) break; default: // any insert widget tool if ( e->button() == Qt::LeftButton ) { - insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default tqparent for new widget is the formwindow - if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another tqparent + insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default parent for new widget is the formwindow + if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another parent TQWidget *wid = w; for (;;) { int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( wid ) ); if ( ( WidgetDatabase::isContainer( id ) || wid == mainContainer() ) && !::tqqt_cast<TQLayoutWidget*>(wid) && !::tqqt_cast<TQSplitter*>(wid) ) { - insertParent = WidgetFactory::containerOfWidget( wid ); // found another tqparent, store it + insertParent = WidgetFactory::containerOfWidget( wid ); // found another parent, store it break; } else { wid = wid->parentWidget(); @@ -804,7 +804,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) checkSelectionsForMove( w ); } - // check whether we would have to reparent the selection and highlight the possible new tqparent container + // check whether we would have to reparent the selection and highlight the possible new parent container TQMapConstIterator<TQWidget*, TQPoint> it = moving.begin(); TQWidget* wa = containerAt( e->globalPos(), it.key() ); if ( wa && !isMainContainer( wa ) && !isCentralWidget( wa ) ) { @@ -1630,7 +1630,7 @@ TQWidget *FormWindow::designerWidget( TQT_BASE_OBJECT_NAME *o ) const return 0; TQWidget *w = (TQWidget*)o; while ( (w && !isMainContainer( w ) && !insertedWidgets[ (void*)w ]) || isCentralWidget( w ) ) - w = (TQWidget*)w->tqparent(); + w = (TQWidget*)w->parent(); return w; } @@ -1962,12 +1962,12 @@ void FormWindow::raiseWidgets() commandHistory()->addCommand( cmd ); } -void FormWindow::paste( const TQString &cb, TQWidget *tqparent ) +void FormWindow::paste( const TQString &cb, TQWidget *parent ) { CHECK_MAINWINDOW; Resource resource( mainWindow() ); resource.setWidget( this ); - resource.paste( cb, tqparent ); + resource.paste( cb, parent ); } void FormWindow::selectAll() diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.h b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.h index a4dd567a3..359522ba5 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.h @@ -76,8 +76,8 @@ class FormWindow : public TQWidget Q_PROPERTY( TQString fileName READ fileName WRITE setFileName ) public: - FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name = 0 ); - FormWindow( FormFile *f, TQWidget *tqparent, const char *name = 0 ); + FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name = 0 ); + FormWindow( FormFile *f, TQWidget *parent, const char *name = 0 ); ~FormWindow(); void init(); @@ -94,7 +94,7 @@ public: virtual void undo(); virtual void redo(); virtual TQString copy(); - virtual void paste( const TQString &cb, TQWidget *tqparent ); + virtual void paste( const TQString &cb, TQWidget *parent ); virtual void lowerWidgets(); virtual void raiseWidgets(); virtual void checkAccels(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp index 11f6523a0..fddf30437 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp @@ -71,15 +71,15 @@ TQListViewItem *newItem = 0; static TQPluginManager<ClassBrowserInterface> *classBrowserInterfaceManager = 0; -HierarchyItem::HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after, +HierarchyItem::HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after, const TQString &txt1, const TQString &txt2, const TQString &txt3 ) - : TQListViewItem( tqparent, after, txt1, txt2, txt3 ), typ( type ) + : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type ) { } -HierarchyItem::HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after, +HierarchyItem::HierarchyItem( Type type, TQListView *parent, TQListViewItem *after, const TQString &txt1, const TQString &txt2, const TQString &txt3 ) - : TQListViewItem( tqparent, after, txt1, txt2, txt3 ), typ( type ) + : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type ) { } @@ -175,8 +175,8 @@ void HierarchyItem::cancelRename( int col ) -HierarchyList::HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects ) - : TQListView( tqparent ), formWindow( fw ) +HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects ) + : TQListView( parent ), formWindow( fw ) { init_colors(); @@ -256,20 +256,20 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) if ( o->isWidgetType() ) { TQWidget *w = (TQWidget*)o; if ( !formWindow->widgets()->find( w ) ) { - if ( ::tqqt_cast<TQWidgetStack*>(w->tqparent()) ) { - if (::tqqt_cast<TQTabWidget*>(w->tqparent()->tqparent()) ) { - ((TQTabWidget*)w->tqparent()->tqparent())->showPage( w ); - o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent()); + if ( ::tqqt_cast<TQWidgetStack*>(w->parent()) ) { + if (::tqqt_cast<TQTabWidget*>(w->parent()->parent()) ) { + ((TQTabWidget*)w->parent()->parent())->showPage( w ); + o = TQT_TQOBJECT((TQWidget*)w->parent()->parent()); formWindow->emitUpdateProperties( formWindow->currentWidget() ); - } else if ( ::tqqt_cast<TQWizard*>(w->tqparent()->tqparent()) ) { - ((TQDesignerWizard*)w->tqparent()->tqparent())-> - setCurrentPage( ( (TQDesignerWizard*)w->tqparent()->tqparent() )->pageNum( w ) ); - o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent()); + } else if ( ::tqqt_cast<TQWizard*>(w->parent()->parent()) ) { + ((TQDesignerWizard*)w->parent()->parent())-> + setCurrentPage( ( (TQDesignerWizard*)w->parent()->parent() )->pageNum( w ) ); + o = TQT_TQOBJECT((TQWidget*)w->parent()->parent()); formWindow->emitUpdateProperties( formWindow->currentWidget() ); } else { - ( (TQWidgetStack*)w->tqparent() )->raiseWidget( w ); - if ( (TQWidgetStack*)w->tqparent()->isA( "TQDesignerWidgetStack" ) ) - ( (TQDesignerWidgetStack*)w->tqparent() )->updateButtons(); + ( (TQWidgetStack*)w->parent() )->raiseWidget( w ); + if ( (TQWidgetStack*)w->parent()->isA( "TQDesignerWidgetStack" ) ) + ( (TQDesignerWidgetStack*)w->parent() )->updateButtons(); } } else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQDockWindow*>(w) ) { formWindow->setActiveObject( w ); @@ -395,7 +395,7 @@ void HierarchyList::setOpen( TQListViewItem *i, bool b ) TQListView::setOpen( i, b ); } -void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tqparent ) +void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *parent ) { TQObject* o = TQT_TQOBJECT(tqbo); if ( TQString( o->name() ).startsWith( "qt_dead_widget_" ) ) @@ -432,29 +432,29 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq #endif TQString name = o->name(); - if ( ::tqqt_cast<TQWidgetStack*>(o->tqparent()) ) { - if ( ::tqqt_cast<TQTabWidget*>(o->tqparent()->tqparent()) ) - name = ( (TQTabWidget*)o->tqparent()->tqparent() )->tabLabel( (TQWidget*)o ); - else if ( ::tqqt_cast<TQWizard*>(o->tqparent()->tqparent()) ) - name = ( (TQWizard*)o->tqparent()->tqparent() )->title( (TQWidget*)o ); + if ( ::tqqt_cast<TQWidgetStack*>(o->parent()) ) { + if ( ::tqqt_cast<TQTabWidget*>(o->parent()->parent()) ) + name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o ); + else if ( ::tqqt_cast<TQWizard*>(o->parent()->parent()) ) + name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o ); } TQToolBox *tb; - if ( o->tqparent() && o->tqparent()->tqparent() && - (tb = ::tqqt_cast<TQToolBox*>(o->tqparent()->tqparent()->tqparent())) ) + if ( o->parent() && o->parent()->parent() && + (tb = ::tqqt_cast<TQToolBox*>(o->parent()->parent()->parent())) ) name = tb->itemLabel( tb->indexOf((TQWidget*)o) ); if ( fakeMainWindow ) { - name = o->tqparent()->name(); + name = o->parent()->name(); className = "TQMainWindow"; } - if ( !tqparent ) + if ( !parent ) item = new HierarchyItem( HierarchyItem::Widget, this, 0, name, className, dbInfo ); else - item = new HierarchyItem( HierarchyItem::Widget, tqparent, 0, name, className, dbInfo ); + item = new HierarchyItem( HierarchyItem::Widget, parent, 0, name, className, dbInfo ); item->setOpen( TRUE ); - if ( !tqparent ) + if ( !parent ) item->setPixmap( 0, TQPixmap::fromMimeSource( "designer_form.png" ) ); else if ( ::tqqt_cast<TQLayoutWidget*>(o) ) item->setPixmap( 0, TQPixmap::fromMimeSource( "designer_layout.png" )); @@ -475,16 +475,16 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq ( (TQWidget*)it.current() )->isHidden() ) continue; if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { - if ( ::tqqt_cast<TQWidgetStack*>(it.current()->tqparent()) || + if ( ::tqqt_cast<TQWidgetStack*>(it.current()->parent()) || ::tqqt_cast<TQWidgetStack*>(it.current()) ) { TQObject *obj = it.current(); - TQDesignerTabWidget *tw = ::tqqt_cast<TQDesignerTabWidget*>(it.current()->tqparent()); - TQDesignerWizard *dw = ::tqqt_cast<TQDesignerWizard*>(it.current()->tqparent()); + TQDesignerTabWidget *tw = ::tqqt_cast<TQDesignerTabWidget*>(it.current()->parent()); + TQDesignerWizard *dw = ::tqqt_cast<TQDesignerWizard*>(it.current()->parent()); TQWidgetStack *stack = 0; if ( dw || tw || ::tqqt_cast<TQWidgetStack*>(obj) ) stack = (TQWidgetStack*)obj; else - stack = (TQWidgetStack*)obj->tqparent(); + stack = (TQWidgetStack*)obj->parent(); if ( widgetStacks->findRef( stack ) != -1 ) continue; widgetStacks->append( stack ); @@ -502,10 +502,10 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq insertObject( obj, item ); } delete l2; - } else if ( ::tqqt_cast<TQToolBox*>(it.current()->tqparent()) ) { + } else if ( ::tqqt_cast<TQToolBox*>(it.current()->parent()) ) { if ( !::tqqt_cast<TQScrollView*>(it.current()) ) continue; - TQToolBox *tb = (TQToolBox*)it.current()->tqparent(); + TQToolBox *tb = (TQToolBox*)it.current()->parent(); for ( int i = tb->count() - 1; i >= 0; --i ) insertObject( tb->item( i ), item ); } @@ -516,12 +516,12 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq } if ( fakeMainWindow ) { - TQObjectList *l = o->tqparent()->queryList( "TQDesignerToolBar" ); + TQObjectList *l = o->parent()->queryList( "TQDesignerToolBar" ); TQObject *obj; for ( obj = l->first(); obj; obj = l->next() ) insertObject( obj, item ); delete l; - l = o->tqparent()->queryList( "MenuBarEditor" ); + l = o->parent()->queryList( "MenuBarEditor" ); for ( obj = l->first(); obj; obj = l->next() ) insertObject( obj, item ); delete l; @@ -672,8 +672,8 @@ void HierarchyList::removeTabPage() // ------------------------------------------------------------ -FormDefinitionView::FormDefinitionView( TQWidget *tqparent, FormWindow *fw ) - : HierarchyList( tqparent, fw, TRUE ) +FormDefinitionView::FormDefinitionView( TQWidget *parent, FormWindow *fw ) + : HierarchyList( parent, fw, TRUE ) { header()->hide(); removeColumn( 1 ); @@ -968,7 +968,7 @@ void FormDefinitionView::contentsMouseDoubleClickEvent( TQMouseEvent *e ) HierarchyItem::Type t = getChildType( i->rtti() ); if ( (int)t == i->rtti() ) - i = i->tqparent(); + i = i->parent(); if ( formWindow->project()->isCpp() ) switch( i->rtti() ) { @@ -1092,7 +1092,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) if ( !lIface ) return; if ( i->rtti() == HierarchyItem::Definition ) - i = i->tqparent(); + i = i->parent(); ListEditor dia( this, 0, TRUE ); dia.setCaption( tqtr( "Edit %1" ).arg( i->text( 0 ) ) ); TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() ); @@ -1106,7 +1106,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) } else if ( res == NEW ) { HierarchyItem::Type t = getChildType( i->rtti() ); if ( (int)t == i->rtti() ) - i = i->tqparent(); + i = i->parent(); switch( i->rtti() ) { case HierarchyItem::SlotPublic: execFunctionDialog( "public", "slot", TRUE ); @@ -1145,7 +1145,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } else { - TQListViewItem *p = i->tqparent(); + TQListViewItem *p = i->parent(); delete i; save( p, 0 ); } @@ -1168,9 +1168,9 @@ void FormDefinitionView::renamed( TQListViewItem *i ) { if ( newItem == i ) newItem = 0; - if ( !i->tqparent() ) + if ( !i->parent() ) return; - save( i->tqparent(), i ); + save( i->parent(), i ); } @@ -1225,8 +1225,8 @@ void FormDefinitionView::addVariable( const TQString &varName, const TQString &a // ------------------------------------------------------------ -HierarchyView::HierarchyView( TQWidget *tqparent ) - : TQTabWidget( tqparent, 0, (WFlags)(WStyle_Customize | TQt::WStyle_NormalBorder | TQt::WStyle_Title | +HierarchyView::HierarchyView( TQWidget *parent ) + : TQTabWidget( parent, 0, (WFlags)(WStyle_Customize | TQt::WStyle_NormalBorder | TQt::WStyle_Title | TQt::WStyle_Tool | TQt::WStyle_MinMax | TQt::WStyle_SysMenu )) { formwindow = 0; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.h b/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.h index a9f2fae15..a7f2889eb 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.h @@ -75,9 +75,9 @@ public: Variable }; - HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after, + HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after, const TQString &txt1, const TQString &txt2, const TQString &txt3 ); - HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after, + HierarchyItem( Type type, TQListView *parent, TQListViewItem *after, const TQString &txt1, const TQString &txt2, const TQString &txt3 ); void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); @@ -108,7 +108,7 @@ class HierarchyList : public TQListView TQ_OBJECT public: - HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects = TRUE ); + HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects = TRUE ); virtual void setup(); virtual void setCurrent( TQT_BASE_OBJECT_NAME *o ); @@ -137,7 +137,7 @@ public Q_SLOTS: void removeTabPage(); private: - void insertObject( TQT_BASE_OBJECT_NAME *o, TQListViewItem *tqparent ); + void insertObject( TQT_BASE_OBJECT_NAME *o, TQListViewItem *parent ); TQObject *findObject( TQListViewItem *i ); TQListViewItem *findItem( TQT_BASE_OBJECT_NAME *o ); TQObject *current() const; @@ -161,7 +161,7 @@ class FormDefinitionView : public HierarchyList TQ_OBJECT public: - FormDefinitionView( TQWidget *tqparent, FormWindow *fw ); + FormDefinitionView( TQWidget *parent, FormWindow *fw ); void setup(); void setupVariables(); @@ -195,7 +195,7 @@ class HierarchyView : public TQTabWidget TQ_OBJECT public: - HierarchyView( TQWidget *tqparent ); + HierarchyView( TQWidget *parent ); ~HierarchyView(); void setFormWindow( FormWindow *fw, TQObject *o ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.cpp index 5d5619f6e..fa89c37e6 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.cpp @@ -42,8 +42,8 @@ #include <tqpushbutton.h> #include <tqcheckbox.h> -IconViewEditor::IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ) - : IconViewEditorBase( tqparent, 0, TRUE ), formwindow( fw ) +IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) + : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); iconview = (TQIconView*)editWidget; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.h index 2fc644110..2f1aeb677 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.h @@ -44,7 +44,7 @@ class IconViewEditor : public IconViewEditorBase TQ_OBJECT public: - IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); protected Q_SLOTS: void insertNewItem(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp index e6e34e1c0..db5c19594 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp @@ -59,17 +59,17 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> & */ -/*! \a p specifies the tqparent of the layoutBase \a lb. The tqparent +/*! \a p specifies the parent of the layoutBase \a lb. The parent might be changed in setup(). If the layoutBase is a - container, the tqparent and the layoutBase are the same. Also they + container, the parent and the layoutBase are the same. Also they always have to be a widget known to the designer (e.g. in the case - of the tabwidget tqparent and layoutBase are the tabwidget and not the + of the tabwidget parent and layoutBase are the tabwidget and not the page which actually gets laid out. For actual usage the correct widget is found later by Layout.) */ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup, bool splitter ) - : widgets( wl ), tqparent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter ) + : widgets( wl ), parent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter ) { widgets.setAutoDelete( FALSE ); layoutBase = lb; @@ -92,8 +92,8 @@ void Layout::setup() TQWidget *w = 0; // Go through all widgets of the list we got. As we can only - // tqlayout widgets which have the same tqparent, we first do some - // sorting which means create a list for each tqparent containing + // tqlayout widgets which have the same parent, we first do some + // sorting which means create a list for each parent containing // its child here. After that we keep working on the list of // childs which has the most entries. // Widgets which are already laid out are thrown away here too @@ -142,8 +142,8 @@ void Layout::setup() // Now we have a new and clean widget list, which makes sense // to tqlayout widgets = *lastList; - // Also use the only correct tqparent later, so store it - tqparent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() ); + // Also use the only correct parent later, so store it + parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() ); // Now calculate the position where the tqlayout-meta-widget should // be placed and connect to widgetDestroyed() Q_SIGNALS of the // widgets to get informed if one gets deleted to be able to @@ -167,21 +167,21 @@ void Layout::widgetDestroyed() widgets.removeRef( (TQWidget*)sender() ); } -bool Layout::prepareLayout( bool &needMove, bool &needRetqparent ) +bool Layout::prepareLayout( bool &needMove, bool &needReparent ) { if ( !widgets.count() ) return FALSE; for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->raise(); needMove = !layoutBase; - needRetqparent = needMove || ::tqqt_cast<TQLayoutWidget*>(layoutBase) || ::tqqt_cast<TQSplitter*>(layoutBase); + needReparent = needMove || ::tqqt_cast<TQLayoutWidget*>(layoutBase) || ::tqqt_cast<TQSplitter*>(layoutBase); if ( !layoutBase ) { if ( !useSplitter ) layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLayoutWidget" ), - WidgetFactory::containerOfWidget( tqparent ) ); + WidgetFactory::containerOfWidget( parent ) ); else layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQSplitter" ), - WidgetFactory::containerOfWidget( tqparent ) ); + WidgetFactory::containerOfWidget( parent ) ); } else { WidgetFactory::deleteLayout( layoutBase ); } @@ -218,12 +218,12 @@ void Layout::undoLayout() for ( ; it != geometries.end(); ++it ) { if ( !it.key() ) continue; - it.key()->reparent( WidgetFactory::containerOfWidget( tqparent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) ); + it.key()->reparent( WidgetFactory::containerOfWidget( parent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) ); it.key()->resize( ( *it ).size() ); } formWindow->selectWidget( layoutBase, FALSE ); WidgetFactory::deleteLayout( layoutBase ); - if ( tqparent != layoutBase && !::tqqt_cast<TQMainWindow*>(layoutBase) ) { + if ( parent != layoutBase && !::tqqt_cast<TQMainWindow*>(layoutBase) ) { layoutBase->hide(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); @@ -246,14 +246,14 @@ void Layout::breakLayout() rects.insert( w, w->tqgeometry() ); } WidgetFactory::deleteLayout( layoutBase ); - bool needRetqparent = qstrcmp( layoutBase->className(), "TQLayoutWidget" ) == 0 || + bool needReparent = qstrcmp( layoutBase->className(), "TQLayoutWidget" ) == 0 || qstrcmp( layoutBase->className(), "TQSplitter" ) == 0 || ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) && layoutBase != formWindow->mainContainer() ); bool needResize = qstrcmp( layoutBase->className(), "TQSplitter" ) == 0; bool add = geometries.isEmpty(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needRetqparent ) + if ( needReparent ) w->reparent( layoutBase->parentWidget(), 0, layoutBase->pos() + w->pos(), TRUE ); if ( needResize ) { @@ -264,14 +264,14 @@ void Layout::breakLayout() if ( add ) geometries.insert( w, TQRect( w->pos(), w->size() ) ); } - if ( needRetqparent ) { + if ( needReparent ) { layoutBase->hide(); - tqparent = layoutBase->parentWidget(); + parent = layoutBase->parentWidget(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); layoutBase->setName( n ); } else { - tqparent = layoutBase; + parent = layoutBase; } if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) ) formWindow->selectWidget( widgets.first() ); @@ -314,14 +314,14 @@ void HorizontalLayout::setup() void HorizontalLayout::doLayout() { - bool needMove, needRetqparent; - if ( !prepareLayout( needMove, needRetqparent ) ) + bool needMove, needReparent; + if ( !prepareLayout( needMove, needReparent ) ) return; TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needRetqparent && w->tqparent() != TQT_TQOBJECT(layoutBase) ) + if ( needReparent && w->parent() != TQT_TQOBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) @@ -378,14 +378,14 @@ void VerticalLayout::setup() void VerticalLayout::doLayout() { - bool needMove, needRetqparent; - if ( !prepareLayout( needMove, needRetqparent ) ) + bool needMove, needReparent; + if ( !prepareLayout( needMove, needReparent ) ) return; TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needRetqparent && w->tqparent() != TQT_TQOBJECT(layoutBase) ) + if ( needReparent && w->parent() != TQT_TQOBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) @@ -750,8 +750,8 @@ GridLayout::~GridLayout() void GridLayout::doLayout() { - bool needMove, needRetqparent; - if ( !prepareLayout( needMove, needRetqparent ) ) + bool needMove, needReparent; + if ( !prepareLayout( needMove, needReparent ) ) return; TQDesignerGridLayout *tqlayout = (TQDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid ); @@ -763,7 +763,7 @@ void GridLayout::doLayout() int r, c, rs, cs; for ( w = widgets.first(); w; w = widgets.next() ) { if ( grid->locateWidget( w, r, c, rs, cs) ) { - if ( needRetqparent && w->tqparent() != TQT_TQOBJECT(layoutBase) ) + if ( needReparent && w->parent() != TQT_TQOBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( rs * cs == 1 ) { tqlayout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 ); @@ -870,8 +870,8 @@ void GridLayout::buildGrid() -Spacer::Spacer( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WMouseNoMask ), +Spacer::Spacer( TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WMouseNoMask ), orient( Qt::Vertical ), interactive(TRUE), sh( TQSize(20,20) ) { setSizeType( Expanding ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/layout.h b/experimental/tqtinterface/qt4/tools/designer/designer/layout.h index 3b07fcc4b..34ca08319 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/layout.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/layout.h @@ -57,12 +57,12 @@ public: virtual void doLayout() = 0; virtual void undoLayout(); virtual void breakLayout(); - virtual bool prepareLayout( bool &needMove, bool &needRetqparent ); + virtual bool prepareLayout( bool &needMove, bool &needReparent ); virtual void finishLayout( bool needMove, TQLayout *tqlayout ); protected: TQWidgetList widgets; - TQWidget *tqparent; + TQWidget *parent; TQPoint startPoint; TQMap<TQGuardedPtr<TQWidget>, TQRect> geometries; TQWidget *layoutBase; @@ -147,7 +147,7 @@ public: MinimumExpanding = Minimum|ExpMask, Expanding = MinimumExpanding|MayShrink }; - Spacer( TQWidget *tqparent, const char *name ); + Spacer( TQWidget *parent, const char *name ); TQSize tqminimumSize() const; TQSize tqsizeHint() const; @@ -173,7 +173,7 @@ class TQDesignerGridLayout : public TQGridLayout Q_OBJECT TQ_OBJECT public: - TQDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){}; + TQDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){}; TQDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){}; void addWidget( TQWidget *, int row, int col, int align = 0 ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp index 83f02b5fd..c0ecd6d93 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp @@ -42,10 +42,10 @@ class ListBoxItemDrag : public TQStoredDrag { public: - ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * tqparent = 0, const char * name = 0 ); + ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * parent = 0, const char * name = 0 ); ~ListBoxItemDrag() {}; static bool canDecode( TQDragMoveEvent * event ); - static bool decode( TQDropEvent * event, TQListBox * tqparent, TQListBoxItem * insertPoint ); + static bool decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * insertPoint ); enum ItemType { ListBoxText = 1, ListBoxPixmap = 2 }; }; // ------------------------------------------------------------------ @@ -191,8 +191,8 @@ bool ListBoxDnd::canDecode( TQDragEnterEvent * event ) // The Dragobject Implementation ------------------------------------ // ------------------------------------------------------------------ -ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * tqparent, const char * name ) - : TQStoredDrag( "qt/listboxitem", tqparent, name ) +ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * parent, const char * name ) + : TQStoredDrag( "qt/listboxitem", parent, name ) { // ### FIX! TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListBoxItem ) * items.count() ); @@ -245,7 +245,7 @@ bool ListBoxItemDrag::canDecode( TQDragMoveEvent * event ) return event->provides( "qt/listboxitem" ); } -bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListBoxItem * after ) +bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * after ) { TQByteArray data = event->tqencodedData( "qt/listboxitem" ); @@ -269,7 +269,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListB stream >> p; item = (TQListBoxItem *) p; - tqparent->insertItem( item, after ); + parent->insertItem( item, after ); } @@ -295,9 +295,9 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListB stream >> isSelectable; if ( hasPixmap ) { - item = new TQListBoxPixmap( tqparent, pixmap, text, after ); + item = new TQListBoxPixmap( parent, pixmap, text, after ); } else { - item = new TQListBoxText( tqparent, text, after ); + item = new TQListBoxText( parent, text, after ); } item->setSelectable( isSelectable ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.cpp index b88ca1856..f80e66b93 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.cpp @@ -45,8 +45,8 @@ #include <tqpushbutton.h> #include <tqcheckbox.h> -ListBoxEditor::ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ) - : ListBoxEditorBase( tqparent, 0, TRUE ), formwindow( fw ) +ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) + : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); listbox = (TQListBox*)editWidget; @@ -75,7 +75,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWind ListBoxRename *editorRename = new ListBoxRename( preview ); - TQObjectList *l = tqparent->queryList( "TQLineEdit", "itemText" ); + TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" ); TQObjectListIt it( *l ); TQObject *obj; while ( (obj = it.current()) != 0 ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.h index 69a5ec132..e06aff5a7 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.h @@ -45,7 +45,7 @@ class ListBoxEditor : public ListBoxEditorBase TQ_OBJECT public: - ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); protected Q_SLOTS: void insertNewItem(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp index 6de076519..99f1510dc 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp @@ -43,10 +43,10 @@ class ListViewItemDrag : public TQStoredDrag { public: enum DropRelation { Sibling, Child }; - ListViewItemDrag( ListViewItemList & items, TQWidget * tqparent = 0, const char * name = 0 ); + ListViewItemDrag( ListViewItemList & items, TQWidget * parent = 0, const char * name = 0 ); ~ListViewItemDrag() {}; static bool canDecode( TQDragMoveEvent * event ); - static bool decode( TQDropEvent * event, TQListView * tqparent, TQListViewItem * insertPoint, DropRelation dr ); + static bool decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr ); }; // ------------------------------------------------------------------ @@ -81,7 +81,7 @@ bool ListViewDnd::dropEvent( TQDropEvent * event ) } else if ( dpos < item->depth() ) { // Parent(s) Sibling while ( item && (item->depth() > dpos) ) - item = item->tqparent(); + item = item->parent(); } } @@ -157,10 +157,10 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) // processing tqchildren...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); - nextParent = (*it)->tqparent(); + nextParent = (*it)->parent(); while ( nextParent && !nextSibling ) { nextSibling = nextParent->nextSibling(); - nextParent = nextParent->tqparent(); + nextParent = nextParent->parent(); } } } else if ( ((*it)->childCount() == 0) && addKids ) { @@ -216,13 +216,13 @@ TQListViewItem * ListViewDnd::itemAt( TQPoint pos ) if ( result && ( pos.ry() < (src->itemPos(result) + result->height()/2) ) ) result = result->itemAbove(); - // Wind back if has tqparent, and we're in flat mode - while ( result && result->tqparent() && (dMode & Flat) ) - result = result->tqparent(); + // Wind back if has parent, and we're in flat mode + while ( result && result->parent() && (dMode & Flat) ) + result = result->parent(); - // Wind back if has tqparent, and we're in flat mode - while ( result && !result->isVisible() && result->tqparent() ) - result = result->tqparent(); + // Wind back if has parent, and we're in flat mode + while ( result && !result->isVisible() && result->parent() ) + result = result->parent(); if ( !result && src->firstChild() && (pos.y() > src->tqitemRect(src->firstChild()).bottom()) ) { result = src->lastItem(); @@ -266,8 +266,8 @@ bool ListViewDnd::canDecode( TQDragEnterEvent * event ) TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item ); TQDataStream & operator>> ( TQDataStream & stream, TQListViewItem & item ); -ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * tqparent, const char * name ) - : TQStoredDrag( "qt/listviewitem", tqparent, name ) +ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * parent, const char * name ) + : TQStoredDrag( "qt/listviewitem", parent, name ) { // ### FIX! TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListViewItem ) * items.count() ); @@ -289,10 +289,10 @@ bool ListViewItemDrag::canDecode( TQDragMoveEvent * event ) return event->provides( "qt/listviewitem" ); } -bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * tqparent, TQListViewItem * insertPoint, DropRelation dr ) +bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr ) { TQByteArray data = event->tqencodedData( "qt/listviewitem" ); - TQListViewItem* itemParent = insertPoint ? insertPoint->tqparent() : 0; + TQListViewItem* itemParent = insertPoint ? insertPoint->parent() : 0; // Change from sibling (default) to child creation if ( insertPoint && dr == Child ) { @@ -311,8 +311,8 @@ bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * tqparent, TQLis if ( itemParent ) { insertPoint = new TQListViewItem( itemParent, insertPoint ); itemParent->setOpen( TRUE ); - } else { // No tqparent for insertPoint, use TQListView - insertPoint = new TQListViewItem( tqparent, insertPoint ); + } else { // No parent for insertPoint, use TQListView + insertPoint = new TQListViewItem( parent, insertPoint ); } stream >> *insertPoint; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp index 9d86a9f12..0f4cf2645 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp @@ -51,8 +51,8 @@ #include <tqpushbutton.h> #include <tqptrstack.h> -ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw ) - : ListViewEditorBase( tqparent, 0, TRUE ), listview( lv ), formwindow( fw ) +ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) + : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); itemText->setEnabled( FALSE ); @@ -91,7 +91,7 @@ ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow * TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "itemText" - TQObjectList *l = tqparent->queryList( "TQLineEdit", "itemText" ); + TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" ); TQObject *obj; TQObjectListIt itemsLineEditIt( *l ); while ( (obj = itemsLineEditIt.current()) != 0 ) { @@ -117,7 +117,7 @@ ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow * TQT_SLOT( columnTextChanged( const TQString & ) ) ); // Find TQLineEdit "colText" and connect - l = tqparent->queryList( "TQLineEdit", "colText" ); + l = parent->queryList( "TQLineEdit", "colText" ); TQObjectListIt columnsLineEditIt( *l ); while ( (obj = columnsLineEditIt.current()) != 0 ) { ++columnsLineEditIt; @@ -383,10 +383,10 @@ void ListViewEditor::itemDownClicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); + TQListViewItem *parent = i->parent(); it++; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; it++; } @@ -411,11 +411,11 @@ void ListViewEditor::itemNewClicked() void ListViewEditor::itemNewSubClicked() { - TQListViewItem *tqparent = itemsPreview->currentItem(); + TQListViewItem *parent = itemsPreview->currentItem(); TQListViewItem *item = 0; - if ( tqparent ) { - item = new TQListViewItem( tqparent ); - tqparent->setOpen( TRUE ); + if ( parent ) { + item = new TQListViewItem( parent ); + parent->setOpen( TRUE ); } else { item = new TQListViewItem( itemsPreview ); } @@ -471,10 +471,10 @@ void ListViewEditor::itemUpClicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); + TQListViewItem *parent = i->parent(); --it; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; --it; } @@ -493,13 +493,13 @@ void ListViewEditor::itemRightClicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); - tqparent = tqparent ? tqparent->firstChild() : itemsPreview->firstChild(); - if ( !tqparent ) + TQListViewItem *parent = i->parent(); + parent = parent ? parent->firstChild() : itemsPreview->firstChild(); + if ( !parent ) return; it++; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; it++; } @@ -533,13 +533,13 @@ void ListViewEditor::itemLeftClicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); - if ( !tqparent ) + TQListViewItem *parent = i->parent(); + if ( !parent ) return; - tqparent = tqparent->tqparent(); + parent = parent->parent(); --it; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; --it; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h index 24367cd07..8adf12435 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h @@ -48,7 +48,7 @@ class ListViewEditor : public ListViewEditorBase TQ_OBJECT public: - ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw ); + ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ); Q_SIGNALS: void itemRenamed(const TQString &); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp index c5c74851c..7629b2191 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp @@ -930,8 +930,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) { if ( ::tqqt_cast<MenuBarEditor*>(o) || ::tqqt_cast<PopupMenuEditor*>(o) || ( o && - ( ::tqqt_cast<MenuBarEditor*>(o->tqparent()) || - ::tqqt_cast<PopupMenuEditor*>(o->tqparent()) ) ) ) { + ( ::tqqt_cast<MenuBarEditor*>(o->parent()) || + ::tqqt_cast<PopupMenuEditor*>(o->parent()) ) ) ) { if ( e->type() == TQEvent::Accel && ::tqqt_cast<PopupMenuEditor*>(o) ) { return TRUE; // consume accel events @@ -992,9 +992,9 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ( ::tqqt_cast<TQComboBox*>(o) || ::tqqt_cast<TQToolButton*>(o) || ::tqqt_cast<TQDesignerToolBarSeparator*>(o) ) && - o->tqparent() - && ( ::tqqt_cast<TQDesignerToolBar*>(o->tqparent()) - || ::tqqt_cast<TQDesignerWidgetStack*>(o->tqparent())) ) ) { + o->parent() + && ( ::tqqt_cast<TQDesignerToolBar*>(o->parent()) + || ::tqqt_cast<TQDesignerWidgetStack*>(o->parent())) ) ) { TQWidget *w = (TQWidget*)o; if ( ::tqqt_cast<TQToolButton*>(w) || ::tqqt_cast<TQComboBox*>(w) || @@ -1107,7 +1107,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ::tqqt_cast<SizeHandle*>(o) || ::tqqt_cast<OrderIndicator*>(o) ) { if ( ::tqqt_cast<TQToolButton*>(o) && ((TQToolButton*)o)->isOn() && - o->tqparent() && ::tqqt_cast<TQToolBar*>(o->tqparent()) && formWindow() ) + o->parent() && ::tqqt_cast<TQToolBar*>(o->parent()) && formWindow() ) formWindow()->setToolFixed(); break; } @@ -1150,7 +1150,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ::tqqt_cast<SizeHandle*>(o) || ::tqqt_cast<OrderIndicator*>(o) ) break; - if ( WidgetFactory::layoutType( (TQWidget*)o->tqparent() ) != WidgetFactory::NoLayout ) { + if ( WidgetFactory::layoutType( (TQWidget*)o->parent() ) != WidgetFactory::NoLayout ) { ( (FormWindow*)w )->updateSelection( (TQWidget*)o ); if ( e->type() != TQEvent::Resize ) ( (FormWindow*)w )->updateChildSelections( (TQWidget*)o ); @@ -1232,12 +1232,12 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) TQWidget *MainWindow::isAFormWindowChild( TQT_BASE_OBJECT_NAME *o ) const { - if ( ::tqqt_cast<TQWizard*>(TQT_TQOBJECT(o)->tqparent()) && !::tqqt_cast<TQPushButton*>(o) ) + if ( ::tqqt_cast<TQWizard*>(TQT_TQOBJECT(o)->parent()) && !::tqqt_cast<TQPushButton*>(o) ) return 0; while ( o ) { if ( ::tqqt_cast<FormWindow*>(o) ) return (TQWidget*)o; - o = TQT_TQOBJECT(o)->tqparent(); + o = TQT_TQOBJECT(o)->parent(); } return 0; } @@ -1249,7 +1249,7 @@ TQWidget *MainWindow::isAToolBarChild( TQT_BASE_OBJECT_NAME *o ) const return (TQWidget*)o; if ( ::tqqt_cast<FormWindow*>(o) ) return 0; - o = TQT_TQOBJECT(o)->tqparent(); + o = TQT_TQOBJECT(o)->parent(); } return 0; } @@ -2266,7 +2266,7 @@ void MainWindow::readConfig() if ( !ok ) { if ( oWindow ) { oWindow->shuttingDown(); - ( (TQDockWindow*)oWindow->tqparent() )->hide(); + ( (TQDockWindow*)oWindow->parent() )->hide(); } TQPixmap pix; pix.load( backPixName ); @@ -2423,7 +2423,7 @@ void MainWindow::readConfig() } if ( readPreviousConfig && oWindow ) { oWindow->shuttingDown(); - ( (TQDockWindow*)oWindow->tqparent() )->hide(); + ( (TQDockWindow*)oWindow->parent() )->hide(); } rebuildCustomWidgetGUI(); @@ -2454,9 +2454,9 @@ HierarchyView *MainWindow::objectHierarchy() const return hierarchyView; } -TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *tqparent ) +TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *parent ) { - TQPopupMenu *menu = new TQPopupMenu( tqparent ); + TQPopupMenu *menu = new TQPopupMenu( parent ); actionEditCut->addTo( menu ); actionEditCopy->addTo( menu ); @@ -2466,12 +2466,12 @@ TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *tqparent ) return menu; } -TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot ) +TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot ) { - TQPopupMenu *menu = new TQPopupMenu( tqparent ); + TQPopupMenu *menu = new TQPopupMenu( parent ); - menu->insertItem( tr( "Add Page" ), tqparent, addSlot ); - menu->insertItem( tr( "Delete Page" ), tqparent, removeSlot ); + menu->insertItem( tr( "Add Page" ), parent, addSlot ); + menu->insertItem( tr( "Delete Page" ), parent, removeSlot ); menu->insertSeparator(); actionEditCut->addTo( menu ); actionEditCopy->addTo( menu ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.h b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.h index 901f6e0ee..06cd0ee27 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.h @@ -113,8 +113,8 @@ public: void popupFormWindowMenu( const TQPoint &gp, FormWindow *fw ); void popupWidgetMenu( const TQPoint &gp, FormWindow *fw, TQWidget *w ); - TQPopupMenu *setupNormalHierarchyMenu( TQWidget *tqparent ); - TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot ); + TQPopupMenu *setupNormalHierarchyMenu( TQWidget *parent ); + TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot ); FormWindow *openFormWindow( const TQString &fn, bool validFileName = TRUE, FormFile *ff = 0 ); bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp index 04fe15e97..93c66f4c5 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp @@ -1438,7 +1438,7 @@ void MainWindow::fileCreateTemplate() void MainWindow::createNewTemplate() { - CreateTemplate *dia = (CreateTemplate*)(TQT_TQOBJECT(sender())->tqparent()); + CreateTemplate *dia = (CreateTemplate*)(TQT_TQOBJECT(sender())->parent()); TQString fn = dia->editName->text(); TQString cn = dia->listClass->currentText(); if ( fn.isEmpty() || cn.isEmpty() ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp index 429dfb81e..b827f5c1a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp @@ -52,7 +52,7 @@ class MenuBarEditorItemPtrDrag : public TQStoredDrag { public: MenuBarEditorItemPtrDrag( MenuBarEditorItem * item, - TQWidget * tqparent = 0, + TQWidget * parent = 0, const char * name = 0 ); ~MenuBarEditorItemPtrDrag() {}; static bool canDecode( TQDragMoveEvent * e ); @@ -62,9 +62,9 @@ public: // Drag Object Implementation --------------------------------------- MenuBarEditorItemPtrDrag::MenuBarEditorItemPtrDrag( MenuBarEditorItem * item, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : TQStoredDrag( "qt/menubareditoritemptr", tqparent, name ) + : TQStoredDrag( "qt/menubareditoritemptr", parent, name ) { TQByteArray data( sizeof( TQ_LONG ) ); TQDataStream stream( data, IO_WriteOnly ); @@ -94,8 +94,8 @@ bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i ) // MenuBarEditorItem --------------------------------------------------- -MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( bar ), popupMenu( 0 ), visible( TRUE ), @@ -104,8 +104,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * tqparent, { } MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( bar ), popupMenu( menu ), visible( TRUE ), @@ -116,8 +116,8 @@ MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * ba } MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( bar ), popupMenu( 0 ), visible( TRUE ), @@ -129,8 +129,8 @@ MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor popupMenu->insert( actionGroup ); } -MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( item->menuBar ), popupMenu( 0 ), text( item->text ), @@ -146,8 +146,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * tqpar int MenuBarEditor::clipboardOperation = 0; MenuBarEditorItem * MenuBarEditor::clipboardItem = 0; -MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * tqparent, const char * name ) - : TQMenuBar( tqparent, name ), +MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * name ) + : TQMenuBar( parent, name ), formWnd( fw ), draggedItem( 0 ), currentIndex( 0 ), @@ -190,7 +190,7 @@ FormWindow * MenuBarEditor::formWindow() MenuBarEditorItem * MenuBarEditor::createItem( int index, bool addToCmdStack ) { MenuBarEditorItem * i = - new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) tqparent() ), this ); + new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) parent() ), this ); if ( addToCmdStack ) { AddMenuCommand * cmd = new AddMenuCommand( "Add Menu", formWnd, this, i, index ); formWnd->commandHistory()->addCommand( cmd ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h index 7ce2c35d3..8d6620786 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h @@ -48,15 +48,15 @@ class MenuBarEditorItem : public TQObject friend class MenuBarEditor; - MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * tqparent = 0, const char * name = 0 ); + MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * parent = 0, const char * name = 0 ); public: MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar, - TQObject * tqparent = 0, const char * name = 0); + TQObject * parent = 0, const char * name = 0); MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar, - TQObject * tqparent = 0, const char * name = 0); + TQObject * parent = 0, const char * name = 0); MenuBarEditorItem( MenuBarEditorItem * item, - TQObject * tqparent = 0, const char * name = 0); + TQObject * parent = 0, const char * name = 0); ~MenuBarEditorItem() { }; PopupMenuEditor * menu() { return popupMenu; } @@ -92,7 +92,7 @@ class MenuBarEditor : public TQMenuBar TQ_OBJECT public: - MenuBarEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 ); + MenuBarEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 ); ~MenuBarEditor(); FormWindow * formWindow(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp index 819712b92..b1a1422ac 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp @@ -48,10 +48,10 @@ #include <tqaction.h> #include <tqmetaobject.h> -ToolBarItem::ToolBarItem( TQWidget *tqparent, TQWidget *toolBar, +ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar, const TQString &label, const TQString &tagstr, const TQIconSet &icon, const TQKeySequence &key ) - : TQAction( tqparent ) + : TQAction( parent ) { setIconSet( icon ); setText( label ); @@ -71,8 +71,8 @@ void ToolBarItem::wasActivated() emit clicked( tag ); } -TextEdit::TextEdit( TQWidget *tqparent, const char *name ) - : TQTextEdit( tqparent, name ) +TextEdit::TextEdit( TQWidget *parent, const char *name ) + : TQTextEdit( parent, name ) { setTextFormat( TQt::PlainText ); } @@ -84,9 +84,9 @@ TQTextParagraph* TextEdit::paragraph() } -MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget, +MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget, FormWindow *fw, const TQString &text ) - : MultiLineEditorBase( tqparent, 0, (WFlags)(TQt::WType_Dialog | TQt::WShowModal) ), formwindow( fw ), doWrap( FALSE ) + : MultiLineEditorBase( parent, 0, (WFlags)(TQt::WType_Dialog | TQt::WShowModal) ), formwindow( fw ), doWrap( FALSE ) { callStatic = call_static; @@ -380,9 +380,9 @@ TQString MultiLineEditor::getStaticText() return staticText.stripWhiteSpace(); } -TQString MultiLineEditor::getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap ) +TQString MultiLineEditor::getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap ) { - MultiLineEditor medit( TRUE, richtextMode, tqparent, 0, 0, text ); + MultiLineEditor medit( TRUE, richtextMode, parent, 0, 0, text ); if ( richtextMode ) medit.setUseWrapping( *useWrap ); if ( medit.exec() == TQDialog::Accepted ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.h index 1af968075..c82c18264 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.h @@ -49,7 +49,7 @@ class TextEdit : public TQTextEdit TQ_OBJECT public: - TextEdit( TQWidget *tqparent = 0, const char *name = 0 ); + TextEdit( TQWidget *parent = 0, const char *name = 0 ); TQTextDocument *document() const { return TQTextEdit::document(); } TQTextParagraph *paragraph(); @@ -61,7 +61,7 @@ class ToolBarItem : public TQAction TQ_OBJECT public: - ToolBarItem( TQWidget *tqparent, TQWidget *toolBar, + ToolBarItem( TQWidget *parent, TQWidget *toolBar, const TQString &label, const TQString &tagstr, const TQIconSet &icon, const TQKeySequence &key = 0 ); ~ToolBarItem(); @@ -81,11 +81,11 @@ class MultiLineEditor : public MultiLineEditorBase TQ_OBJECT public: - MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget, + MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget, FormWindow *fw, const TQString &text = TQString() ); bool useWrapping() const; void setUseWrapping( bool ); - static TQString getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap ); + static TQString getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap ); int exec(); protected Q_SLOTS: diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp index 92a9b8725..d3d6b2b41 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp @@ -368,9 +368,9 @@ NewForm::NewForm( TQIconView *templateView, const TQString &templatePath ) projectChanged( tr( "<No Project>" ) ); } -NewForm::NewForm( TQWidget *tqparent, const TQStringList& projects, +NewForm::NewForm( TQWidget *parent, const TQStringList& projects, const TQString& currentProject, const TQString &templatePath ) - : NewFormBase( tqparent, 0, TRUE ) + : NewFormBase( parent, 0, TRUE ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.h index 89fbe11f8..bcb19e087 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.h @@ -154,7 +154,7 @@ class NewForm : public NewFormBase public: NewForm( TQIconView *templateView, const TQString &templatePath ); - NewForm( TQWidget *tqparent, const TQStringList& projects, + NewForm( TQWidget *parent, const TQStringList& projects, const TQString& currentProject, const TQString &templatePath ); void insertTemplates( TQIconView*, const TQString& ); void accept(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp index 8bc6ac30a..7ffb54182 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp @@ -49,8 +49,8 @@ bool debugToStderr = FALSE; TQtMsgHandler OutputWindow::oldMsgHandler = 0; -OutputWindow::OutputWindow( TQWidget *tqparent ) - : TQTabWidget( tqparent, "output_window" ), debugView( 0 ), errorView( 0 ) +OutputWindow::OutputWindow( TQWidget *parent ) + : TQTabWidget( parent, "output_window" ), debugView( 0 ), errorView( 0 ) { setupDebug(); setupError(); @@ -180,9 +180,9 @@ void OutputWindow::currentErrorChanged( TQListViewItem *i ) -ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line, +ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line, const TQString &locationString, TQObject *locationObject ) - : TQListViewItem( tqparent, after ) + : TQListViewItem( parent, after ) { setMultiLinesEnabled( TRUE ); TQString m( message ); @@ -195,8 +195,8 @@ ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQStrin object = locationObject; read = !after; if ( !after ) { - tqparent->setSelected( this, TRUE ); - tqparent->setCurrentItem( this ); + parent->setSelected( this, TRUE ); + parent->setCurrentItem( this ); } } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.h b/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.h index 8c34f9292..a054875be 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.h @@ -48,7 +48,7 @@ class ErrorItem : public TQListViewItem public: enum Type { Error, Warning }; - ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line, + ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line, const TQString &locationString, TQObject *locationObject ); void paintCell( TQPainter *, const TQColorGroup & cg, @@ -72,7 +72,7 @@ class OutputWindow : public TQTabWidget TQ_OBJECT public: - OutputWindow( TQWidget *tqparent ); + OutputWindow( TQWidget *parent ); ~OutputWindow(); void setErrorMessages( const TQStringList &errors, const TQValueList<uint> &lines, diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.cpp index 4d36ed99b..e8c29de97 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.cpp @@ -72,9 +72,9 @@ void BoldListBoxText::paint( TQPainter* painter ) TQListBoxText::paint( painter ); } -PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent, +PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) - : PaletteEditorAdvancedBase( tqparent, name, modal, f ), formWindow( fw ), selectedPalette(0) + : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); @@ -626,10 +626,10 @@ void PaletteEditorAdvanced::setupBackgroundMode( TQt::BackgroundMode mode ) } TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init, - TQt::BackgroundMode mode, TQWidget* tqparent, + TQt::BackgroundMode mode, TQWidget* parent, const char* name, FormWindow *fw ) { - PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, tqparent, name, TRUE ); + PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, parent, name, TRUE ); dlg->setupBackgroundMode( mode ); if ( init != TQPalette() ) diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.h index d345abb73..78993af77 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.h @@ -43,12 +43,12 @@ class PaletteEditorAdvanced : public PaletteEditorAdvancedBase Q_OBJECT TQ_OBJECT public: - PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent=0, const char * name=0, + PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); ~PaletteEditorAdvanced(); static TQPalette getPalette( bool *ok, const TQPalette &pal, TQt::BackgroundMode mode = TQt::PaletteBackground, - TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 ); + TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); protected Q_SLOTS: void paletteSelected(int); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.cpp index 879f6f915..ef9f8eb79 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.cpp @@ -43,8 +43,8 @@ #include <tqapplication.h> #include <tqpushbutton.h> -PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * tqparent, const char * name, bool modal, WFlags f ) - : PaletteEditorBase( tqparent, name, modal, f ), formWindow( fw ) +PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) + : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); @@ -288,9 +288,9 @@ TQPalette PaletteEditor::pal() const } TQPalette PaletteEditor::getPalette( bool *ok, const TQPalette &init, TQt::BackgroundMode mode, - TQWidget* tqparent, const char* name, FormWindow *fw ) + TQWidget* parent, const char* name, FormWindow *fw ) { - PaletteEditor* dlg = new PaletteEditor( fw, tqparent, name, TRUE ); + PaletteEditor* dlg = new PaletteEditor( fw, parent, name, TRUE ); dlg->setupBackgroundMode( mode ); if ( init != TQPalette() ) diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.h index c2eaeb3f0..55bdb08da 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.h @@ -44,11 +44,11 @@ class PaletteEditor : public PaletteEditorBase TQ_OBJECT public: - PaletteEditor( FormWindow *fw, TQWidget * tqparent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); + PaletteEditor( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); ~PaletteEditor(); static TQPalette getPalette( bool *ok, const TQPalette &pal, TQt::BackgroundMode mode = TQt::PaletteBackground, - TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 ); + TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); protected Q_SLOTS: void onChooseMainColor(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp index 8d0f41e06..1854e4ec5 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp @@ -56,8 +56,8 @@ static ImageIconProvider *imageIconProvider = 0; #endif -PixmapView::PixmapView( TQWidget *tqparent ) - : TQScrollView( tqparent ) +PixmapView::PixmapView( TQWidget *parent ) + : TQScrollView( parent ) { viewport()->setBackgroundMode( TQt::PaletteBase ); } @@ -105,7 +105,7 @@ static void buildImageFormatList( TQString &filter, TQString &all ) filter += tqApp->translate( "qChoosePixmap", "All Files (*)" ); } -TQStringList qChoosePixmaps( TQWidget *tqparent ) +TQStringList qChoosePixmaps( TQWidget *parent ) { if ( !imageIconProvider && !TQFileDialog::iconProvider() ) TQFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) ); @@ -114,7 +114,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent ) TQString all; buildImageFormatList( filter, all ); - TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE ); + TQFileDialog fd( TQString(), filter, parent, 0, TRUE ); fd.setMode( TQFileDialog::ExistingFiles ); fd.setContentsPreviewEnabled( TRUE ); PixmapView *pw = new PixmapView( &fd ); @@ -127,7 +127,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent ) return TQStringList(); } -TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, TQString *fn ) +TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, TQString *fn ) { #if defined(DESIGNER) if ( !fw || fw->savePixmapInline() ) { @@ -138,7 +138,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, TQString all; buildImageFormatList( filter, all ); - TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE ); + TQFileDialog fd( TQString(), filter, parent, 0, TRUE ); fd.setContentsPreviewEnabled( TRUE ); PixmapView *pw = new PixmapView( &fd ); fd.setContentsPreview( pw, pw ); @@ -153,7 +153,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, return pix; } } else if ( fw && fw->savePixmapInProject() ) { - PixmapCollectionEditor dia( tqparent, 0, TRUE ); + PixmapCollectionEditor dia( parent, 0, TRUE ); dia.setProject( fw->project() ); dia.setChooserMode( TRUE ); dia.setCurrentItem( MetaDataBase::pixmapKey( fw, old.serialNumber() ) ); @@ -163,7 +163,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, return pix; } } else { - PixmapFunction dia( tqparent, 0, TRUE ); + PixmapFunction dia( parent, 0, TRUE ); TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) ); @@ -178,15 +178,15 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, } } #else - TQ_UNUSED( tqparent ); + TQ_UNUSED( parent ); TQ_UNUSED( fw ); TQ_UNUSED( old ); #endif return TQPixmap(); } -ImageIconProvider::ImageIconProvider( TQWidget *tqparent, const char *name ) - : TQFileIconProvider( TQT_TQOBJECT(tqparent), name ), imagepm( TQPixmap::fromMimeSource( "designer_image.png" ) ) +ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name ) + : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( TQPixmap::fromMimeSource( "designer_image.png" ) ) { fmts = TQImage::inputFormats(); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.h b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.h index d2b988211..a8bc94cf2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.h @@ -47,7 +47,7 @@ class PixmapView : public TQScrollView, TQ_OBJECT public: - PixmapView( TQWidget *tqparent ); + PixmapView( TQWidget *parent ); void setPixmap( const TQPixmap &pix ); void drawContents( TQPainter *p, int, int, int, int ); void previewUrl( const TQUrl &u ); @@ -62,7 +62,7 @@ class ImageIconProvider : public TQFileIconProvider TQ_OBJECT public: - ImageIconProvider( TQWidget *tqparent = 0, const char *name = 0 ); + ImageIconProvider( TQWidget *parent = 0, const char *name = 0 ); ~ImageIconProvider(); const TQPixmap *pixmap( const TQFileInfo &fi ); @@ -73,7 +73,7 @@ private: }; -TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(), TQString *fn = 0 ); -TQStringList qChoosePixmaps( TQWidget *tqparent ); +TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(), TQString *fn = 0 ); +TQStringList qChoosePixmaps( TQWidget *parent ); #endif diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp index ee2eadcac..11954664d 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp @@ -59,7 +59,7 @@ class PopupMenuEditorItemPtrDrag : public TQStoredDrag { public: - PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * tqparent = 0, + PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * parent = 0, const char * name = 0 ); ~PopupMenuEditorItemPtrDrag() {}; static bool canDecode( TQDragMoveEvent * e ); @@ -69,8 +69,8 @@ public: // Drag Object Implementation --------------------------------------- PopupMenuEditorItemPtrDrag::PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, - TQWidget * tqparent, const char * name ) - : TQStoredDrag( "qt/popupmenueditoritemptr", tqparent, name ) + TQWidget * parent, const char * name ) + : TQStoredDrag( "qt/popupmenueditoritemptr", parent, name ) { TQByteArray data( sizeof( TQ_LONG ) ); TQDataStream stream( data, IO_WriteOnly ); @@ -100,8 +100,8 @@ bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem ** // PopupMenuEditorItem Implementation ----------------------------------- -PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * parent, const char * name ) + : TQObject( parent, name ), a( 0 ), s( 0 ), m( menu ), @@ -115,8 +115,8 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * tqp PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), a( action ), s( 0 ), m( menu ), @@ -131,8 +131,8 @@ PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * m } PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), a( item->a ), s( 0 ), m( menu ), @@ -259,10 +259,10 @@ PopupMenuEditorItem * PopupMenuEditor::draggedItem = 0; int PopupMenuEditor::clipboardOperation = 0; PopupMenuEditorItem * PopupMenuEditor::clipboardItem = 0; -PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * tqparent, const char * name ) +PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * parent, const char * name ) : TQWidget( 0, name, (WFlags)(WStyle_Customize | TQt::WStyle_NoBorder | WRepaintNoErase | TQt::WResizeNoErase) ), formWnd( fw ), - parentMenu( tqparent ), + parentMenu( parent ), iconWidth( 0 ), textWidth( 0 ), accelWidth( 0 ), @@ -275,10 +275,10 @@ PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * tqparent, const ch } PopupMenuEditor::PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, - TQWidget * tqparent, const char * name ) + TQWidget * parent, const char * name ) : TQWidget( 0, name, (WFlags)(WStyle_Customize | TQt::WStyle_NoBorder | WRepaintNoErase) ), formWnd( fw ), - parentMenu( tqparent ), + parentMenu( parent ), iconWidth( menu->iconWidth ), textWidth( menu->textWidth ), accelWidth( menu->accelWidth ), @@ -343,7 +343,7 @@ void PopupMenuEditor::insert( PopupMenuEditorItem * item, int index ) item->s->parentMenu = this; resizeToContents(); if ( isVisible() && parentMenu ) - parentMenu->update(); // draw arrow in tqparent menu + parentMenu->update(); // draw arrow in parent menu emit inserted( item->action() ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h b/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h index 1015b093c..c52124984 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h @@ -48,7 +48,7 @@ class PopupMenuEditorItem : public TQObject friend class PopupMenuEditor; - PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * tqparent = 0, const char * name = 0 ); + PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * parent = 0, const char * name = 0 ); public: enum ItemType { @@ -58,9 +58,9 @@ public: }; PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu, - TQObject * tqparent = 0, const char * name = 0 ); + TQObject * parent = 0, const char * name = 0 ); PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu, - TQObject * tqparent = 0, const char * name = 0 ); + TQObject * parent = 0, const char * name = 0 ); ~PopupMenuEditorItem(); void init(); @@ -115,8 +115,8 @@ class PopupMenuEditor : public TQWidget friend class Resource; public: - PopupMenuEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 ); - PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * tqparent, const char * name = 0 ); + PopupMenuEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 ); + PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * parent, const char * name = 0 ); ~PopupMenuEditor(); void init(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.cpp index 338a65f3e..676112c98 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.cpp @@ -36,8 +36,8 @@ #include "previewframe.h" -PreviewFrame::PreviewFrame( TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name ) +PreviewFrame::PreviewFrame( TQWidget *parent, const char *name ) + : TQVBox( parent, name ) { setMinimumSize(200, 200); setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.h b/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.h index 929d3b63d..9f79f4540 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.h @@ -43,8 +43,8 @@ class PreviewWorkspace : public TQWorkspace { TQ_OBJECT public: - PreviewWorkspace( TQWidget* tqparent = 0, const char* name = 0 ) - : TQWorkspace( tqparent, name ) {} + PreviewWorkspace( TQWidget* parent = 0, const char* name = 0 ) + : TQWorkspace( parent, name ) {} ~PreviewWorkspace() {} protected: @@ -56,7 +56,7 @@ class PreviewFrame : public TQVBox TQ_OBJECT public: - PreviewFrame( TQWidget *tqparent = 0, const char *name = 0 ); + PreviewFrame( TQWidget *parent = 0, const char *name = 0 ); void setPreviewPalette(TQPalette); private: diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.cpp index c13622385..9f6d16206 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.cpp @@ -34,8 +34,8 @@ #include "tqobjectlist.h" #include "previewwidgetimpl.h" -PreviewWidget::PreviewWidget( TQWidget *tqparent, const char *name ) - : PreviewWidgetBase( tqparent, name ) +PreviewWidget::PreviewWidget( TQWidget *parent, const char *name ) + : PreviewWidgetBase( parent, name ) { // install event filter on child widgets TQObjectList *l = queryList("TQWidget"); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.h index 5efe4abb0..0ac020346 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.h @@ -42,7 +42,7 @@ class PreviewWidget : public PreviewWidgetBase TQ_OBJECT public: - PreviewWidget( TQWidget *tqparent = 0, const char *name = 0 ); + PreviewWidget( TQWidget *parent = 0, const char *name = 0 ); void closeEvent(TQCloseEvent *); bool eventFilter(TQObject *, TQEvent *); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/project.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/project.cpp index 5e0ec5371..79f2d481a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/project.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/project.cpp @@ -1340,8 +1340,8 @@ void Project::addObject( TQObject *o ) fakeFormFiles.insert( (void*)o, ff ); MetaDataBase::addEntry( o ); if ( hasGUI() ) { - TQWidget *tqparent = MainWindow::self ? MainWindow::self->qWorkspace() : 0; - FormWindow *fw = new FormWindow( ff, MainWindow::self, tqparent, "qt_fakewindow" ); + TQWidget *parent = MainWindow::self ? MainWindow::self->qWorkspace() : 0; + FormWindow *fw = new FormWindow( ff, MainWindow::self, parent, "qt_fakewindow" ); fw->setProject( this ); if ( TQFile::exists( ff->absFileName() ) ) Resource::loadExtraSource( ff, ff->absFileName(), @@ -1500,12 +1500,12 @@ bool Project::hasParentObject( TQObject *o ) TQString Project::qualifiedName( TQObject *o ) { TQString name = o->name(); - TQObject *p = o->tqparent(); + TQObject *p = o->parent(); while ( p ) { name.prepend( TQString( p->name() ) + "." ); if ( objs.findRef( p ) != -1 ) break; - p = p->tqparent(); + p = p->parent(); } return name; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.cpp index 3c7f81399..3fe682c40 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.cpp @@ -52,14 +52,14 @@ #include <tqlabel.h> /* - * Constructs a ProjectSettings which is a child of 'tqparent', with the + * Constructs a ProjectSettings which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -ProjectSettings::ProjectSettings( Project *pro, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : ProjectSettingsBase( tqparent, name, modal, fl ), project( pro ) +ProjectSettings::ProjectSettings( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : ProjectSettingsBase( parent, name, modal, fl ), project( pro ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.h index 9bc743c53..b63607e81 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.h @@ -47,7 +47,7 @@ class ProjectSettings : public ProjectSettingsBase TQ_OBJECT public: - ProjectSettings( Project *pro, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ProjectSettings( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ProjectSettings(); protected Q_SLOTS: diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp index c93201d15..6507ab8b7 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp @@ -168,7 +168,7 @@ bool PropertyWhatsThis::clicked( const TQString& href ) */ /*! If this item should be a child of another property item, specify - \a prop as the tqparent item. + \a prop as the parent item. */ PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ) @@ -308,7 +308,7 @@ bool PropertyItem::hasSubItems() const return FALSE; } -/*! Returns the tqparent property item here if this is a child or 0 +/*! Returns the parent property item here if this is a child or 0 otherwise. */ @@ -2581,8 +2581,8 @@ void PropertyKeysequenceItem::setValue( const TQVariant &v ) // -------------------------------------------------------------- -EnumPopup::EnumPopup( TQWidget *tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f ) +EnumPopup::EnumPopup( TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f ) { setLineWidth( 1 ); setFrameStyle( Panel | Plain ); @@ -2643,8 +2643,8 @@ TQValueList<EnumItem> EnumPopup::enumList() const return itemList; } -EnumBox::EnumBox( TQWidget *tqparent, const char *name ) - : TQComboBox( tqparent, name ) +EnumBox::EnumBox( TQWidget *parent, const char *name ) + : TQComboBox( parent, name ) { pop = new EnumPopup( this, "popup", (WFlags)WType_Popup ); connect( pop, TQT_SIGNAL( hidden() ), this, TQT_SLOT( popupHidden() ) ); @@ -2719,7 +2719,7 @@ void EnumBox::popup() popupShown = FALSE; return; } - pop->move( ((TQWidget*)tqparent())->mapToGlobal( tqgeometry().bottomLeft() ) ); + pop->move( ((TQWidget*)parent())->mapToGlobal( tqgeometry().bottomLeft() ) ); pop->setMinimumWidth( width() ); emit aboutToShowPopup(); pop->show(); @@ -3142,8 +3142,8 @@ void PropertyList::setupProperties() continue; if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in Q_PROPERTY can take a function (isInButtonGroup() in this case) if ( !editor->widget()->isWidgetType() || - !editor->widget()->tqparent() || - !::tqqt_cast<TQButtonGroup*>(editor->widget()->tqparent()) ) + !editor->widget()->parent() || + !::tqqt_cast<TQButtonGroup*>(editor->widget()->parent()) ) continue; } @@ -3905,8 +3905,8 @@ PropertyList::LastEventType PropertyList::lastEvent() } // ------------------------------------------------------------ -EventList::EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e ) - : HierarchyList( tqparent, fw, TRUE ), editor( e ) +EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) + : HierarchyList( parent, fw, TRUE ), editor( e ) { header()->hide(); removeColumn( 1 ); @@ -3977,7 +3977,7 @@ extern TQListViewItem *newItem; void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); - if ( !i || i->tqparent() ) + if ( !i || i->parent() ) return; TQString s; if ( !formWindow->project()->isCpp() ) { @@ -3999,7 +3999,7 @@ void EventList::setCurrent( TQWidget * ) void EventList::objectClicked( TQListViewItem *i ) { - if ( !i || !i->tqparent() ) + if ( !i || !i->parent() ) return; formWindow->mainWindow()->editFunction( i->text( 0 ) ); } @@ -4017,20 +4017,20 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) if ( res == NEW_ITEM ) { TQString s; if ( !formWindow->project()->isCpp() ) { - TQString s1 = ( i->tqparent() ? i->tqparent() : i )->text( 0 ); + TQString s1 = ( i->parent() ? i->parent() : i )->text( 0 ); int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); s = TQString( editor->widget()->name() ) + "_" + s1; } else { - s = TQString( editor->widget()->name() ) + "_" + ( i->tqparent() ? i->tqparent() : i )->text( 0 ); + s = TQString( editor->widget()->name() ) + "_" + ( i->parent() ? i->parent() : i )->text( 0 ); } - insertEntry( i->tqparent() ? i->tqparent() : i, TQPixmap::fromMimeSource( "designer_editTslots.png" ), s ); - } else if ( res == DEL_ITEM && i->tqparent() ) { + insertEntry( i->parent() ? i->parent() : i, TQPixmap::fromMimeSource( "designer_editTslots.png" ), s ); + } else if ( res == DEL_ITEM && i->parent() ) { MetaDataBase::Connection conn; conn.sender = editor->widget(); conn.receiver = TQT_TQOBJECT(formWindow->mainContainer()); - conn.signal = i->tqparent()->text( 0 ); + conn.signal = i->parent()->text( 0 ); conn.slot = i->text( 0 ); delete i; RemoveConnectionCommand *cmd = new RemoveConnectionCommand( tr( "Remove connection" ), @@ -4046,9 +4046,9 @@ void EventList::renamed( TQListViewItem *i ) { if ( newItem == i ) newItem = 0; - if ( !i->tqparent() ) + if ( !i->parent() ) return; - TQListViewItem *itm = i->tqparent()->firstChild(); + TQListViewItem *itm = i->parent()->firstChild(); bool del = FALSE; while ( itm ) { if ( itm != i && itm->text( 0 ) == i->text( 0 ) ) { @@ -4064,7 +4064,7 @@ void EventList::renamed( TQListViewItem *i ) MetaDataBase::Connection conn; conn.sender = editor->widget(); conn.receiver = TQT_TQOBJECT(formWindow->mainContainer()); - conn.signal = i->tqparent()->text( 0 ); + conn.signal = i->parent()->text( 0 ); conn.slot = i->text( 0 ); AddConnectionCommand *cmd = new AddConnectionCommand( tr( "Add connection" ), formWindow, @@ -4074,7 +4074,7 @@ void EventList::renamed( TQListViewItem *i ) // exists and if we can connect to this one TQString funcname = i->text( 0 ).latin1(); if ( funcname.find( '(' ) == -1 ) { // try to create a signature - TQString sig = i->tqparent()->text( 0 ); + TQString sig = i->parent()->text( 0 ); sig = sig.mid( sig.find( '(' ) + 1 ); sig.remove( (int)sig.length() - 1, 1 ); LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); @@ -4112,8 +4112,8 @@ void EventList::save( TQListViewItem *p ) listview for editing properties. */ -PropertyEditor::PropertyEditor( TQWidget *tqparent ) - : TQTabWidget( tqparent, 0, (WFlags)( WStyle_Customize | TQt::WStyle_NormalBorder | TQt::WStyle_Title | +PropertyEditor::PropertyEditor( TQWidget *parent ) + : TQTabWidget( parent, 0, (WFlags)( WStyle_Customize | TQt::WStyle_NormalBorder | TQt::WStyle_Title | TQt::WStyle_StaysOnTop | TQt::WStyle_Tool | TQt::WStyle_MinMax | TQt::WStyle_SysMenu )) { setCaption( tr( "Property Editor" ) ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.h b/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.h index 2e9aee4be..0ba81407a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.h @@ -600,7 +600,7 @@ class EnumPopup : public TQFrame TQ_OBJECT public: - EnumPopup( TQWidget *tqparent, const char *name, WFlags f=0 ); + EnumPopup( TQWidget *parent, const char *name, WFlags f=0 ); ~EnumPopup(); void insertEnums( TQValueList<EnumItem> lst ); TQValueList<EnumItem> enumList() const; @@ -625,7 +625,7 @@ class EnumBox : public TQComboBox TQ_OBJECT public: - EnumBox( TQWidget *tqparent, const char *name = 0 ); + EnumBox( TQWidget *parent, const char *name = 0 ); ~EnumBox() {} void setText( const TQString &text ); void insertEnums( TQValueList<EnumItem> lst ); @@ -750,7 +750,7 @@ class EventList : public HierarchyList TQ_OBJECT public: - EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e ); + EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ); void setup(); void setCurrent( TQWidget *w ); @@ -778,7 +778,7 @@ class PropertyEditor : public TQTabWidget TQ_OBJECT public: - PropertyEditor( TQWidget *tqparent ); + PropertyEditor( TQWidget *parent ); TQObject *widget() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp index 0439dcb7e..f295c875c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp @@ -37,8 +37,8 @@ #include <tqapplication.h> #include <tqvbox.h> -TQCompletionEdit::TQCompletionEdit( TQWidget *tqparent, const char *name ) - : TQLineEdit( tqparent, name ), aAdd( FALSE ), caseSensitive( FALSE ) +TQCompletionEdit::TQCompletionEdit( TQWidget *parent, const char *name ) + : TQLineEdit( parent, name ), aAdd( FALSE ), caseSensitive( FALSE ) { popup = new TQVBox( 0, 0, (WFlags)WType_Popup ); popup->setFrameStyle( TQFrame::Box | TQFrame::Plain ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.h b/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.h index f6e7f501a..33b9900c3 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.h @@ -48,7 +48,7 @@ class TQCompletionEdit : public TQLineEdit Q_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive ) public: - TQCompletionEdit( TQWidget *tqparent = 0, const char *name = 0 ); + TQCompletionEdit( TQWidget *parent = 0, const char *name = 0 ); bool autoAdd() const; TQStringList completionList() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp index 8ceca3728..e4943d746 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp @@ -762,7 +762,7 @@ TQString Resource::copy() } -void Resource::paste( const TQString &cb, TQWidget *tqparent ) +void Resource::paste( const TQString &cb, TQWidget *parent ) { if ( !formwindow ) return; @@ -796,30 +796,30 @@ void Resource::paste( const TQString &cb, TQWidget *tqparent ) formwindow->clearSelection( FALSE ); while ( !firstWidget.isNull() ) { if ( firstWidget.tagName() == "widget" ) { - TQWidget *w = (TQWidget*)createObject( firstWidget, tqparent, 0 ); + TQWidget *w = (TQWidget*)createObject( firstWidget, parent, 0 ); if ( !w ) continue; widgets.append( w ); int x = w->x() + formwindow->grid().x(); int y = w->y() + formwindow->grid().y(); - if ( w->x() + w->width() > tqparent->width() ) - x = TQMAX( 0, tqparent->width() - w->width() ); - if ( w->y() + w->height() > tqparent->height() ) - y = TQMAX( 0, tqparent->height() - w->height() ); + if ( w->x() + w->width() > parent->width() ) + x = TQMAX( 0, parent->width() - w->width() ); + if ( w->y() + w->height() > parent->height() ) + y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); formwindow->selectWidget( w ); } else if ( firstWidget.tagName() == "spacer" ) { - TQWidget *w = createSpacer( firstWidget, tqparent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); + TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); if ( !w ) continue; widgets.append( w ); int x = w->x() + formwindow->grid().x(); int y = w->y() + formwindow->grid().y(); - if ( w->x() + w->width() > tqparent->width() ) - x = TQMAX( 0, tqparent->width() - w->width() ); - if ( w->y() + w->height() > tqparent->height() ) - y = TQMAX( 0, tqparent->height() - w->height() ); + if ( w->x() + w->width() > parent->width() ) + x = TQMAX( 0, parent->width() - w->width() ); + if ( w->y() + w->height() > parent->height() ) + y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); formwindow->selectWidget( w ); @@ -1787,7 +1787,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c ) ts << makeIndent( indent ) << "<blue>" << TQString::number( c.blue() ) << "</blue>" << endl; } -TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout ) +TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout ) { lastItem = 0; TQDomElement n = e.firstChild().toElement(); @@ -1805,7 +1805,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL TQString className = e.attribute( "class", "TQWidget" ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS - TQString parentClassName = WidgetFactory::classNameOf( tqparent ); + TQString parentClassName = WidgetFactory::classNameOf( parent ); bool isPlugin = WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( parentClassName ) ); if ( isPlugin ) @@ -1813,7 +1813,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL // ### TODO loading for custom container widgets without pages #endif if ( !className.isNull() ) { - obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, 0, FALSE )); + obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, FALSE )); if ( !obj ) { TQMessageBox::critical( MainWindow::self, MainWindow::tr( "Loading File" ), MainWindow::tr( "Error loading %1.\n" @@ -1852,21 +1852,21 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL tqlayout = 0; if ( w && formwindow ) { - if ( !tqparent || - ( !::tqqt_cast<TQTabWidget*>(tqparent) && - !::tqqt_cast<TQWidgetStack*>(tqparent) && - !::tqqt_cast<TQToolBox*>(tqparent) && - !::tqqt_cast<TQWizard*>(tqparent) + if ( !parent || + ( !::tqqt_cast<TQTabWidget*>(parent) && + !::tqqt_cast<TQWidgetStack*>(parent) && + !::tqqt_cast<TQToolBox*>(parent) && + !::tqqt_cast<TQWizard*>(parent) #ifdef TQT_CONTAINER_CUSTOM_WIDGETS && !isPlugin #endif ) ) formwindow->insertWidget( w, pasting ); - else if ( tqparent && - ( ::tqqt_cast<TQTabWidget*>(tqparent) || - ::tqqt_cast<TQWidgetStack*>(tqparent) || - ::tqqt_cast<TQToolBox*>(tqparent) || - ::tqqt_cast<TQWizard*>(tqparent) + else if ( parent && + ( ::tqqt_cast<TQTabWidget*>(parent) || + ::tqqt_cast<TQWidgetStack*>(parent) || + ::tqqt_cast<TQToolBox*>(parent) || + ::tqqt_cast<TQWizard*>(parent) #ifdef TQT_CONTAINER_CUSTOM_WIDGETS || isPlugin #endif @@ -1909,18 +1909,18 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( ::tqqt_cast<TQTabWidget*>(tqparent) ) { + if ( ::tqqt_cast<TQTabWidget*>(parent) ) { if ( attrib == "title" ) - ( (TQTabWidget*)tqparent )->insertTab( w, v.toString() ); - } else if ( ::tqqt_cast<TQWidgetStack*>(tqparent) ) { + ( (TQTabWidget*)parent )->insertTab( w, v.toString() ); + } else if ( ::tqqt_cast<TQWidgetStack*>(parent) ) { if ( attrib == "id" ) - ( (TQDesignerWidgetStack*)tqparent )->insertPage( w, v.toInt() ); - } else if ( ::tqqt_cast<TQToolBox*>(tqparent) ) { + ( (TQDesignerWidgetStack*)parent )->insertPage( w, v.toInt() ); + } else if ( ::tqqt_cast<TQToolBox*>(parent) ) { if ( attrib == "label" ) - ( (TQToolBox*)tqparent )->addItem( w, v.toString() ); - } else if ( ::tqqt_cast<TQWizard*>(tqparent) ) { + ( (TQToolBox*)parent )->addItem( w, v.toString() ); + } else if ( ::tqqt_cast<TQWizard*>(parent) ) { if ( attrib == "title" ) - ( (TQWizard*)tqparent )->addPage( w, v.toString() ); + ( (TQWizard*)parent )->addPage( w, v.toString() ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS } else if ( isPlugin ) { if ( attrib == "label" ) { @@ -1931,7 +1931,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 ); if ( iface2 ) { iface2->insertPage( parentClassName, - (TQWidget*)tqparent, v.toString(), -1, w ); + (TQWidget*)parent, v.toString(), -1, w ); iface2->release(); } iface->release(); @@ -2142,7 +2142,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } } -TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o ) +TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o ) { TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); @@ -2155,7 +2155,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQL colspan = 1; Spacer *spacer = (Spacer*) WidgetFactory::create( WidgetDatabase::idFromClassName("Spacer"), - tqparent, "spacer", FALSE); + parent, "spacer", FALSE); spacer->setOrientation( o ); spacer->setInteraciveMode( FALSE ); while ( !n.isNull() ) { @@ -3040,11 +3040,11 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts void Resource::loadChildAction( TQT_BASE_OBJECT_NAME *bobj, const TQDomElement &e ) { - TQObject* tqparent = TQT_TQOBJECT(bobj); + TQObject* parent = TQT_TQOBJECT(bobj); TQDomElement n = e; TQAction *a = 0; if ( n.tagName() == "action" ) { - a = new TQDesignerAction( tqparent ); + a = new TQDesignerAction( parent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); bool hasMenuText = FALSE; @@ -3061,10 +3061,10 @@ void Resource::loadChildAction( TQT_BASE_OBJECT_NAME *bobj, const TQDomElement & } n2 = n2.nextSibling().toElement(); } - if ( !::tqqt_cast<TQAction*>(tqparent) ) + if ( !::tqqt_cast<TQAction*>(parent) ) formwindow->actionList().append( a ); } else if ( n.tagName() == "actiongroup" ) { - a = new TQDesignerActionGroup( tqparent ); + a = new TQDesignerActionGroup( parent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); bool hasMenuText = FALSE; @@ -3084,7 +3084,7 @@ void Resource::loadChildAction( TQT_BASE_OBJECT_NAME *bobj, const TQDomElement & } n2 = n2.nextSibling().toElement(); } - if ( !::tqqt_cast<TQAction*>(tqparent) ) + if ( !::tqqt_cast<TQAction*>(parent) ) formwindow->actionList().append( a ); } } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/resource.h b/experimental/tqtinterface/qt4/tools/designer/designer/resource.h index e506fe765..fa2057d60 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/resource.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/resource.h @@ -84,7 +84,7 @@ public: bool save( const TQString& filename, bool formCodeOnly = FALSE); bool save( TQIODevice* ); - void paste( const TQString &cb, TQWidget *tqparent ); + void paste( const TQString &cb, TQWidget *parent ); static void saveImageData( const TQImage &img, TQTextStream &ts, int indent ); static void loadCustomWidgets( const TQDomElement &e, Resource *r ); @@ -118,8 +118,8 @@ private: void saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ); void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent ); - TQObject *createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout = 0 ); - TQWidget *createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o ); + TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout = 0 ); + TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); void createColumn( const TQDomElement &e, TQWidget *widget ); void setObjectProperty( TQT_BASE_OBJECT_NAME* widget, const TQString &prop, const TQDomElement &e); @@ -132,7 +132,7 @@ private: void loadTabOrder( const TQDomElement &e ); void loadItem( const TQDomElement &n, TQPixmap &pix, TQString &txt, bool &hasPixmap ); void loadActions( const TQDomElement &n ); - void loadChildAction( TQT_BASE_OBJECT_NAME *tqparent, const TQDomElement &e ); + void loadChildAction( TQT_BASE_OBJECT_NAME *parent, const TQDomElement &e ); void loadToolBars( const TQDomElement &n ); void loadMenuBar( const TQDomElement &n ); void loadPopupMenu( PopupMenuEditor *pm, const TQDomElement &e ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp index f0c6ef32a..5b66758a2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp @@ -41,8 +41,8 @@ #include <tqapplication.h> #include <tqlabel.h> -SizeHandle::SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s ) - : TQWidget( tqparent ) +SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s ) + : TQWidget( parent ) { active = TRUE; setBackgroundMode( active ? TQt::PaletteText : TQt::PaletteDark ); @@ -50,7 +50,7 @@ SizeHandle::SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s ) widget = 0; dir =d ; setMouseTracking( FALSE ); - formWindow = tqparent; + formWindow = parent; sel = s; updateCursor(); } @@ -272,10 +272,10 @@ void SizeHandle::tryResize( TQWidget *w, int width, int height ) // ------------------------------------------------------------------------ -WidgetSelection::WidgetSelection( FormWindow *tqparent, TQPtrDict<WidgetSelection> *selDict ) +WidgetSelection::WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict ) : selectionDict( selDict ) { - formWindow = tqparent; + formWindow = parent; for ( int i = SizeHandle::LeftTop; i <= SizeHandle::Left; ++i ) { handles.insert( i, new SizeHandle( formWindow, (SizeHandle::Direction)i, this ) ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.h b/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.h index 2f3ce9f50..ccc70760b 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.h @@ -51,7 +51,7 @@ class SizeHandle : public TQWidget public: enum Direction { LeftTop, Top, RightTop, Right, RightBottom, Bottom, LeftBottom, Left }; - SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s ); + SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s ); void setWidget( TQWidget *w ); void setActive( bool a ); void updateCursor(); @@ -82,7 +82,7 @@ private: class WidgetSelection { public: - WidgetSelection( FormWindow *tqparent, TQPtrDict<WidgetSelection> *selDict ); + WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict ); void setWidget( TQWidget *w, bool updateDict = TRUE ); bool isUsed() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.cpp index 1f147ab0c..87c84de06 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.cpp @@ -45,8 +45,8 @@ #include <tqmessagebox.h> #include <tqtextstream.h> -SourceEditor::SourceEditor( TQWidget *tqparent, EditorInterface *iface, LanguageInterface *liface ) - : TQVBox( tqparent, 0, (WFlags)TQt::WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 ) +SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface ) + : TQVBox( parent, 0, (WFlags)TQt::WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 ) { iFace->addRef(); lIface->addRef(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.h b/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.h index cd54cba2d..ae6f9644f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.h @@ -50,7 +50,7 @@ class SourceEditor : public TQVBox TQ_OBJECT public: - SourceEditor( TQWidget *tqparent, EditorInterface *iface, LanguageInterface *liface ); + SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface ); ~SourceEditor(); void setObject( TQObject *fw, Project *p ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp index 79a73537d..3dd8f7ac9 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp @@ -145,9 +145,9 @@ bool SourceFile::saveAs( bool ignoreModified ) ed->setCaption( tr( "Edit %1" ).arg( filename ) ); setModified( TRUE ); if ( pro->isDummy() ) { - TQObject *o = ed->tqparent(); + TQObject *o = ed->parent(); while ( o && !o->isA( "MainWindow" ) ) - o = o->tqparent(); + o = o->parent(); if ( o ) ((MainWindow *)o)->addRecentlyOpenedFile( fn ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp index f736f78b2..a517da239 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp @@ -21,8 +21,8 @@ #include "startdialogimpl.h" #include "designerapp.h" -FileDialog::FileDialog( const TQString &dir, TQWidget *tqparent ) - : TQFileDialog( dir, TQString(), tqparent ) +FileDialog::FileDialog( const TQString &dir, TQWidget *parent ) + : TQFileDialog( dir, TQString(), parent ) { } @@ -32,8 +32,8 @@ void FileDialog::accept() } -StartDialog::StartDialog( TQWidget *tqparent, const TQString &templatePath ) - : StartDialogBase( tqparent, 0 ) +StartDialog::StartDialog( TQWidget *parent, const TQString &templatePath ) + : StartDialogBase( parent, 0 ) { newForm = new NewForm( templateView, templatePath ); recentFiles.clear(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.h index 757a1b40b..dc43fae32 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.h @@ -50,7 +50,7 @@ class FileDialog : public TQFileDialog TQ_OBJECT public: - FileDialog( const TQString &dir, TQWidget *tqparent ); + FileDialog( const TQString &dir, TQWidget *parent ); protected Q_SLOTS: void accept(); @@ -66,7 +66,7 @@ class StartDialog : public StartDialogBase TQ_OBJECT public: - StartDialog( TQWidget *tqparent, const TQString &templatePath ); + StartDialog( TQWidget *parent, const TQString &templatePath ); void setRecentlyFiles( TQStringList& ); void setRecentlyProjects( TQStringList& ); bool showDialogInFuture() const { return showInFuture; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp index c2419c379..c9dbdfb97 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp @@ -45,8 +45,8 @@ #include <tqdragobject.h> #include <tqstyle.h> -StyledButton::StyledButton(TQWidget* tqparent, const char* name) - : TQButton( tqparent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE ) +StyledButton::StyledButton(TQWidget* parent, const char* name) + : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE ) { setMinimumSize( tqminimumSizeHint() ); setAcceptDrops( TRUE ); @@ -56,8 +56,8 @@ StyledButton::StyledButton(TQWidget* tqparent, const char* name) setEditor( ColorEditor ); } -StyledButton::StyledButton( const TQBrush& b, TQWidget* tqparent, const char* name, WFlags f ) - : TQButton( tqparent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 ) +StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name, WFlags f ) + : TQButton( parent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 ) { col = b.color(); pix = b.pixmap(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.h b/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.h index 68a4adcb9..17f65fce3 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.h @@ -56,8 +56,8 @@ class StyledButton : public TQButton public: enum EditorType { ColorEditor, PixmapEditor }; - StyledButton( TQWidget* tqparent = 0, const char* name = 0 ); - StyledButton( const TQBrush& b, TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 ); + StyledButton( TQWidget* parent = 0, const char* name = 0 ); + StyledButton( const TQBrush& b, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); ~StyledButton(); void setEditor( EditorType ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp index af20d200f..d3b2513aa 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp @@ -51,8 +51,8 @@ #include "metadatabase.h" #include "mainwindow.h" -TableEditor::TableEditor( TQWidget* tqparent, TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl ) - : TableEditorBase( tqparent, name, modal, fl ), +TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl ) + : TableEditorBase( parent, name, modal, fl ), #ifndef TQT_NO_TABLE editTable( (TQTable*)editWidget ), #endif diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.h index 9d32ec2ce..a5496d66a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.h @@ -47,7 +47,7 @@ class TableEditor : public TableEditorBase TQ_OBJECT public: - TableEditor( TQWidget* tqparent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0, + TableEditor( TQWidget* parent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~TableEditor(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.cpp index 61f554da9..4acf25f0a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.cpp @@ -37,8 +37,8 @@ class TQTimer; -TimeStamp::TimeStamp( TQObject *tqparent, const TQString &f ) - : TQObject( tqparent ), filename( f ), autoCheck( FALSE ) +TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) + : TQObject( parent ), filename( f ), autoCheck( FALSE ) { timer = new TQTimer( this ); connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.h b/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.h index aa1468e99..dbcb64d8c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.h @@ -44,7 +44,7 @@ class TimeStamp : public TQObject TQ_OBJECT public: - TimeStamp( TQObject *tqparent, const TQString &f ); + TimeStamp( TQObject *parent, const TQString &f ); void setFileName( const TQString &f ); TQString fileName() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp index 312fcb758..1c2d0a9ef 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp @@ -45,8 +45,8 @@ #include "variabledialogimpl.h" -VariableDialog::VariableDialog( FormWindow *fw, TQWidget *tqparent ) - : VariableDialogBase( tqparent ), formWindow( fw ) +VariableDialog::VariableDialog( FormWindow *fw, TQWidget *parent ) + : VariableDialogBase( parent ), formWindow( fw ) { varView->setSorting( -1 ); TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( formWindow ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.h index 0ce9f8ee6..60f39e372 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.h @@ -44,7 +44,7 @@ class VariableDialog : public VariableDialogBase Q_OBJECT TQ_OBJECT public: - VariableDialog( FormWindow *fw, TQWidget* tqparent = 0 ); + VariableDialog( FormWindow *fw, TQWidget* parent = 0 ); ~VariableDialog(); void setCurrentItem( TQString text ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.cpp index 3435e4457..243fe9b2c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.cpp @@ -42,7 +42,7 @@ static TQStyle *windowsStyle = 0; void WidgetAction::addedTo( TQWidget *w, TQWidget *container ) { - if ( ::tqqt_cast<TQToolButton*>(w) && ::tqqt_cast<TQScrollView*>(container->tqparent()->tqparent()) ) { + if ( ::tqqt_cast<TQToolButton*>(w) && ::tqqt_cast<TQScrollView*>(container->parent()->parent()) ) { if ( !windowsStyle ) windowsStyle = TQStyleFactory::create( "windows" ); w->setStyle( windowsStyle ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.h b/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.h index b1658f57f..a6ac037d2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.h @@ -41,17 +41,17 @@ class WidgetAction : public TQAction TQ_OBJECT public: - WidgetAction( const TQString &grp, TQObject* tqparent, + WidgetAction( const TQString &grp, TQObject* parent, const char* name = 0, bool toggle = FALSE ) - : TQAction( tqparent, name, toggle ) { init( grp ); } + : TQAction( parent, name, toggle ) { init( grp ); } WidgetAction( const TQString &grp, const TQString& text, const TQIconSet& icon, const TQString& menuText, TQKeySequence accel, - TQObject* tqparent, const char* name = 0, bool toggle = FALSE ) - : TQAction( text, icon, menuText, accel, tqparent, name, toggle ) { init( grp ); } + TQObject* parent, const char* name = 0, bool toggle = FALSE ) + : TQAction( text, icon, menuText, accel, parent, name, toggle ) { init( grp ); } WidgetAction( const TQString &grp, const TQString& text, - const TQString& menuText, TQKeySequence accel, TQObject* tqparent, + const TQString& menuText, TQKeySequence accel, TQObject* parent, const char* name = 0, bool toggle = FALSE ) - : TQAction( text, menuText, accel, tqparent, name, toggle ) { init( grp ); } + : TQAction( text, menuText, accel, parent, name, toggle ) { init( grp ); } ~WidgetAction(); #if !defined(TQ_NO_USING_KEYWORD) diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp index edd455fb7..c3fef53c8 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp @@ -124,8 +124,8 @@ void TQLayoutWidget::paintEvent( TQPaintEvent* ) } -TQDesignerTabWidget::TQDesignerTabWidget( TQWidget *tqparent, const char *name ) - : TQTabWidget( tqparent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE ) +TQDesignerTabWidget::TQDesignerTabWidget( TQWidget *parent, const char *name ) + : TQTabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE ) { tabBar()->setAcceptDrops( TRUE ); tabBar()->installEventFilter( this ); @@ -291,8 +291,8 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) } -TQDesignerWidgetStack::TQDesignerWidgetStack( TQWidget *tqparent, const char *name ) - : TQWidgetStack( tqparent, name ) +TQDesignerWidgetStack::TQDesignerWidgetStack( TQWidget *parent, const char *name ) + : TQWidgetStack( parent, name ) { prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" ); prev->setAutoRaise( TRUE ); @@ -519,12 +519,12 @@ void WidgetFactory::saveChangedProperties( TQT_BASE_OBJECT_NAME *w, int id ) } /*! Creates a widget of the type which is registered as \a id as - child of \a tqparent. The \a name is optional. If \a init is TRUE, the + child of \a parent. The \a name is optional. If \a init is TRUE, the widget is initialized with some defaults, else the plain widget is created. */ -TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) +TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) { TQString n = WidgetDatabase::className( id ); if ( n.isEmpty() ) @@ -538,11 +538,11 @@ TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, b TQWidget *w = 0; TQString str = WidgetDatabase::createWidgetName( id ); const char *s = str.latin1(); - w = createWidget( n, tqparent, name ? name : s, init, r, orient ); + w = createWidget( n, parent, name ? name : s, init, r, orient ); if ( ::tqqt_cast<TQScrollView*>(w) ) ( (TQScrollView*)w )->disableSizeHintCaching(); if ( !w && WidgetDatabase::isCustomWidget( id ) ) - w = createCustomWidget( tqparent, name ? name : s, MetaDataBase::customWidget( id ) ); + w = createCustomWidget( parent, name ? name : s, MetaDataBase::customWidget( id ) ); if ( !w ) return 0; MetaDataBase::addEntry( w ); @@ -679,30 +679,30 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) } /*! Factory functions for creating a widget of the type \a className - as child of \a tqparent with the name \a name. + as child of \a parent with the name \a name. If \a init is TRUE, some initial default properties are set. This has to be in sync with the initChangedProperties() function! */ -TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init, +TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) { if ( className == "TQPushButton" ) { TQPushButton *b = 0; if ( init ) { - b = new TQDesignerPushButton( tqparent, name ); + b = new TQDesignerPushButton( parent, name ); b->setText( TQString::tqfromLatin1( name ) ); } else { - b = new TQDesignerPushButton( tqparent, name ); + b = new TQDesignerPushButton( parent, name ); } TQWidget *w = find_formwindow( b ); b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) ); return b; } else if ( className == "TQToolButton" ) { if ( init ) { - TQDesignerToolButton *tb = new TQDesignerToolButton( tqparent, name ); - if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(tqparent))) { + TQDesignerToolButton *tb = new TQDesignerToolButton( parent, name ); + if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(parent))) { tb->setUsesTextLabel(TRUE); tb->setTextLabel("..."); tb->setAutoRaise(TRUE); @@ -712,32 +712,32 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return tb; } - return new TQDesignerToolButton( tqparent, name ); + return new TQDesignerToolButton( parent, name ); } else if ( className == "TQCheckBox" ) { if ( init ) { - TQDesignerCheckBox *cb = new TQDesignerCheckBox( tqparent, name ); + TQDesignerCheckBox *cb = new TQDesignerCheckBox( parent, name ); cb->setText( TQString::tqfromLatin1( name ) ); return cb; } - return new TQDesignerCheckBox( tqparent, name ); + return new TQDesignerCheckBox( parent, name ); } else if ( className == "TQRadioButton" ) { if ( init ) { - TQDesignerRadioButton *rb = new TQDesignerRadioButton( tqparent, name ); + TQDesignerRadioButton *rb = new TQDesignerRadioButton( parent, name ); rb->setText( TQString::tqfromLatin1( name ) ); return rb; } - return new TQDesignerRadioButton( tqparent, name ); + return new TQDesignerRadioButton( parent, name ); } else if ( className == "TQGroupBox" ) { if ( init ) - return new TQGroupBox( TQString::tqfromLatin1( name ), tqparent, name ); - return new TQGroupBox( tqparent, name ); + return new TQGroupBox( TQString::tqfromLatin1( name ), parent, name ); + return new TQGroupBox( parent, name ); } else if ( className == "TQButtonGroup" ) { if ( init ) - return new TQButtonGroup( TQString::tqfromLatin1( name ), tqparent, name ); - return new TQButtonGroup( tqparent, name ); + return new TQButtonGroup( TQString::tqfromLatin1( name ), parent, name ); + return new TQButtonGroup( parent, name ); } else if ( className == "TQIconView" ) { #if !defined(TQT_NO_ICONVIEW) - TQIconView* iv = new TQIconView( tqparent, name ); + TQIconView* iv = new TQIconView( parent, name ); if ( init ) (void) new TQIconViewItem( iv, MainWindow::tr( "New Item" ) ); return iv; @@ -747,31 +747,31 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else if ( className == "TQTable" ) { #if !defined(TQT_NO_TABLE) if ( init ) - return new TQTable( 3, 3, tqparent, name ); - return new TQTable( tqparent, name ); + return new TQTable( 3, 3, parent, name ); + return new TQTable( parent, name ); #else return 0; #endif #ifndef TQT_NO_SQL } else if ( className == "TQDataTable" ) { - return new TQDataTable( tqparent, name ); + return new TQDataTable( parent, name ); #endif //TQT_NO_SQL } else if ( className == "TQDateEdit" ) { - return new TQDateEdit( tqparent, name ); + return new TQDateEdit( parent, name ); } else if ( className == "TQTimeEdit" ) { - return new TQTimeEdit( tqparent, name ); + return new TQTimeEdit( parent, name ); } else if ( className == "TQDateTimeEdit" ) { - return new TQDateTimeEdit( tqparent, name ); + return new TQDateTimeEdit( parent, name ); } else if ( className == "TQListBox" ) { - TQListBox* lb = new TQListBox( tqparent, name ); + TQListBox* lb = new TQListBox( parent, name ); if ( init ) { lb->insertItem( MainWindow::tqtr( "New Item" ) ); lb->setCurrentItem( 0 ); } return lb; } else if ( className == "TQListView" ) { - TQListView *lv = new TQListView( tqparent, name ); + TQListView *lv = new TQListView( parent, name ); lv->setSorting( -1 ); if ( init ) { lv->addColumn( MainWindow::tr( "Column 1" ) ); @@ -779,17 +779,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return lv; } else if ( className == "TQLineEdit" ) - return new TQLineEdit( tqparent, name ); + return new TQLineEdit( parent, name ); else if ( className == "TQSpinBox" ) - return new TQSpinBox( tqparent, name ); + return new TQSpinBox( parent, name ); else if ( className == "TQSplitter" ) - return new TQSplitter( tqparent, name ); + return new TQSplitter( parent, name ); else if ( className == "TQMultiLineEdit" ) - return new TQMultiLineEdit( tqparent, name ); + return new TQMultiLineEdit( parent, name ); else if ( className == "TQTextEdit" ) - return new TQTextEdit( tqparent, name ); + return new TQTextEdit( parent, name ); else if ( className == "TQLabel" || className == "TextLabel" ) { - TQDesignerLabel *l = new TQDesignerLabel( tqparent, name ); + TQDesignerLabel *l = new TQDesignerLabel( parent, name ); if ( init ) { l->setText( TQString::tqfromLatin1( name ) ); MetaDataBase::addEntry( l ); @@ -797,7 +797,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return l; } else if ( className == "PixmapLabel" ) { - TQDesignerLabel *l = new TQDesignerLabel( tqparent, name ); + TQDesignerLabel *l = new TQDesignerLabel( parent, name ); if ( init ) { l->setPixmap( TQPixmap::fromMimeSource( "designer_qtlogo.png" ) ); l->setScaledContents( TRUE ); @@ -807,11 +807,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return l; } else if ( className == "TQLayoutWidget" ) - return new TQLayoutWidget( tqparent, name ); + return new TQLayoutWidget( parent, name ); else if ( className == "TQTabWidget" ) { - TQTabWidget *tw = new TQDesignerTabWidget( tqparent, name ); + TQTabWidget *tw = new TQDesignerTabWidget( parent, name ); if ( init ) { - FormWindow *fw = find_formwindow( tqparent ); + FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, MainWindow::tr("Tab 1") ); MetaDataBase::addEntry( w ); @@ -822,9 +822,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return tw; } else if ( className == "TQWidgetStack" ) { - TQDesignerWidgetStack *ws = new TQDesignerWidgetStack( tqparent, name ); + TQDesignerWidgetStack *ws = new TQDesignerWidgetStack( parent, name ); if ( init ) { - FormWindow *fw = find_formwindow( tqparent ); + FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new TQDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" ); ws->insertPage( w ); MetaDataBase::addEntry( w ); @@ -832,53 +832,53 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return ws; } else if ( className == "TQComboBox" ) { - return new TQComboBox( FALSE, tqparent, name ); + return new TQComboBox( FALSE, parent, name ); } else if ( className == "TQWidget" ) { - if ( tqparent && - ( ::tqqt_cast<FormWindow*>(tqparent) || - ::tqqt_cast<TQWizard*>(tqparent) || - ::tqqt_cast<TQTabWidget*>(tqparent) || - ::tqqt_cast<TQWidgetStack*>(tqparent) || - ::tqqt_cast<TQToolBox*>(tqparent) || - ::tqqt_cast<TQMainWindow*>(tqparent) ) ) { - FormWindow *fw = find_formwindow( tqparent ); + if ( parent && + ( ::tqqt_cast<FormWindow*>(parent) || + ::tqqt_cast<TQWizard*>(parent) || + ::tqqt_cast<TQTabWidget*>(parent) || + ::tqqt_cast<TQWidgetStack*>(parent) || + ::tqqt_cast<TQToolBox*>(parent) || + ::tqqt_cast<TQMainWindow*>(parent) ) ) { + FormWindow *fw = find_formwindow( parent ); if ( fw ) { - TQDesignerWidget *dw = new TQDesignerWidget( fw, tqparent, name ); + TQDesignerWidget *dw = new TQDesignerWidget( fw, parent, name ); MetaDataBase::addEntry( dw ); return dw; } } - return new TQWidget( tqparent, name ); + return new TQWidget( parent, name ); } else if ( className == "TQDialog" ) { TQDialog *dia = 0; - if ( ::tqqt_cast<FormWindow*>(tqparent) ) - dia = new TQDesignerDialog( (FormWindow*)tqparent, tqparent, name ); + if ( ::tqqt_cast<FormWindow*>(parent) ) + dia = new TQDesignerDialog( (FormWindow*)parent, parent, name ); else - dia = new TQDialog( tqparent, name ); + dia = new TQDialog( parent, name ); #if defined(TQT_NON_COMMERCIAL) - if ( ::tqqt_cast<MainWindow*>(tqparent) ) + if ( ::tqqt_cast<MainWindow*>(parent) ) #else - if ( tqparent ) + if ( parent ) #endif - dia->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); + dia->reparent( parent, TQPoint( 0, 0 ), TRUE ); return dia; } else if ( className == "TQWizard" ) { - TQWizard *wiz = new TQDesignerWizard( tqparent, name ); + TQWizard *wiz = new TQDesignerWizard( parent, name ); #if defined(TQT_NON_COMMERCIAL) - if ( ::tqqt_cast<MainWindow*>(tqparent) ) + if ( ::tqqt_cast<MainWindow*>(parent) ) #else - if ( tqparent ) + if ( parent ) #endif - wiz->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); - if ( init && ::tqqt_cast<FormWindow*>(tqparent) ) { - TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)tqparent, wiz, "WizardPage" ); + wiz->reparent( parent, TQPoint( 0, 0 ), TRUE ); + if ( init && ::tqqt_cast<FormWindow*>(parent) ) { + TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" ); MetaDataBase::addEntry( dw ); wiz->addPage( dw, FormWindow::tr( "Page" ) ); TQTimer::singleShot( 0, wiz, TQT_SLOT( next() ) ); } return wiz; } else if ( className == "Spacer" ) { - Spacer *s = new Spacer( tqparent, name ); + Spacer *s = new Spacer( parent, name ); MetaDataBase::addEntry( s ); MetaDataBase::setPropertyChanged( s, "orientation", TRUE ); MetaDataBase::setPropertyChanged( s, "sizeType", TRUE ); @@ -892,17 +892,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa s->setOrientation( Qt::Horizontal ); return s; } else if ( className == "TQLCDNumber" ) - return new TQLCDNumber( tqparent, name ); + return new TQLCDNumber( parent, name ); else if ( className == "TQProgressBar" ) - return new TQProgressBar( tqparent, name ); + return new TQProgressBar( parent, name ); else if ( className == "TQTextView" ) - return new TQTextView( tqparent, name ); + return new TQTextView( parent, name ); else if ( className == "TQTextBrowser" ) - return new TQTextBrowser( tqparent, name ); + return new TQTextBrowser( parent, name ); else if ( className == "TQDial" ) - return new TQDial( tqparent, name ); + return new TQDial( parent, name ); else if ( className == "TQSlider" ) { - TQSlider *s = new TQSlider( tqparent, name ); + TQSlider *s = new TQSlider( parent, name ); if ( !r ) return s; if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) @@ -913,7 +913,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa MetaDataBase::setPropertyChanged( s, "orientation", TRUE ); return s; } else if ( className == "TQScrollBar" ) { - TQScrollBar *s = new TQScrollBar( tqparent, name ); + TQScrollBar *s = new TQScrollBar( parent, name ); if ( !r ) return s; if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) @@ -925,12 +925,12 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return s; } else if ( className == "TQFrame" ) { if ( !init ) - return new TQFrame( tqparent, name ); - TQFrame *f = new TQFrame( tqparent, name ); + return new TQFrame( parent, name ); + TQFrame *f = new TQFrame( parent, name ); f->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); return f; } else if ( className == "Line" ) { - Line *l = new Line( tqparent, name ); + Line *l = new Line( parent, name ); MetaDataBase::addEntry( l ); MetaDataBase::setPropertyChanged( l, "orientation", TRUE ); MetaDataBase::setPropertyChanged( l, "frameShadow", TRUE ); @@ -943,9 +943,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa l->setOrientation( Qt::Vertical ); return l; } else if ( className == "TQMainWindow" ) { - TQMainWindow *mw = new TQMainWindow( tqparent, name, 0 ); + TQMainWindow *mw = new TQMainWindow( parent, name, 0 ); mw->setDockEnabled( TQt::TQt::DockMinimized, FALSE ); - TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)tqparent, mw, "central widget" ); + TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)parent, mw, "central widget" ); mw->setDockMenuEnabled( FALSE ); MetaDataBase::addEntry( dw ); mw->setCentralWidget( dw ); @@ -954,9 +954,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return mw; } else if ( className == "TQToolBox" ) { if ( !init ) - return new TQDesignerToolBox( tqparent, name ); - TQToolBox *tb = new TQDesignerToolBox( tqparent, name ); - FormWindow *fw = find_formwindow( tqparent ); + return new TQDesignerToolBox( parent, name ); + TQToolBox *tb = new TQDesignerToolBox( parent, name ); + FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new TQDesignerWidget( fw, tb, "page1" ) : new TQWidget( tb, "page1" ); tb->addItem( w, MainWindow::tr("Page 1") ); @@ -969,14 +969,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } #ifndef TQT_NO_SQL else if ( className == "TQDataBrowser" ) { - TQWidget *w = new TQDesignerDataBrowser( tqparent, name ); - if ( tqparent ) - w->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); + TQWidget *w = new TQDesignerDataBrowser( parent, name ); + if ( parent ) + w->reparent( parent, TQPoint( 0, 0 ), TRUE ); return w; } else if ( className == "TQDataView" ) { - TQWidget *w = new TQDesignerDataView( tqparent, name ); - if ( tqparent ) - w->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); + TQWidget *w = new TQDesignerDataView( parent, name ); + if ( parent ) + w->reparent( parent, TQPoint( 0, 0 ), TRUE ); return w; } #endif @@ -986,7 +986,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa if ( !iface ) return 0; - TQWidget *w = iface->create( className, tqparent, name ); + TQWidget *w = iface->create( className, parent, name ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS if ( init && WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( className ) ) ) { TQWidgetContainerInterfacePrivate *iface2 = 0; @@ -1077,7 +1077,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout ) while ( o ) { if ( o->isWidgetType() ) return (TQWidget*)o; - o = o->tqparent(); + o = o->parent(); } return 0; } @@ -1126,10 +1126,10 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) } /*! Returns the actual designer widget of the container \a w. This is - normally \a w itself, but might be a tqparent or grand tqparent of \a w + normally \a w itself, but might be a parent or grand parent of \a w (e.g. when working with a tabwidget and \a w is the container which contains and layouts childs, but the actual widget known to the - designer is the tabwidget which is the tqparent of \a w. So this + designer is the tabwidget which is the parent of \a w. So this function returns the tabwidget then.) */ @@ -1173,11 +1173,11 @@ bool WidgetFactory::isPassiveInteractor( TQT_BASE_OBJECT_NAME* tqbo ) else if ( ::tqqt_cast<TQSizeGrip*>(o) ) return ( lastWasAPassiveInteractor = TRUE ); else if ( ::tqqt_cast<TQButton*>(o) && - ( ::tqqt_cast<TQTabBar*>(o->tqparent()) || ::tqqt_cast<TQToolBox*>(o->tqparent()) ) ) + ( ::tqqt_cast<TQTabBar*>(o->parent()) || ::tqqt_cast<TQToolBox*>(o->parent()) ) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::tqqt_cast<TQPushButton*>(o) && ::tqqt_cast<TQWizard*>(o->tqparent()) ) + else if ( ::tqqt_cast<TQPushButton*>(o) && ::tqqt_cast<TQWizard*>(o->parent()) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::tqqt_cast<TQMenuBar*>(o) && ::tqqt_cast<TQMainWindow*>(o->tqparent()) ) + else if ( ::tqqt_cast<TQMenuBar*>(o) && ::tqqt_cast<TQMainWindow*>(o->parent()) ) return ( lastWasAPassiveInteractor = TRUE ); // else if ( ::tqqt_cast<TQDockWindowHandle*>(o) ) else if ( o->inherits( "TQDockWindowHandle" ) ) @@ -1320,7 +1320,7 @@ void WidgetFactory::initChangedProperties( TQT_BASE_OBJECT_NAME *tqbo ) ::tqqt_cast<TQRadioButton*>(o) || ::tqqt_cast<TQCheckBox*>(o) || ::tqqt_cast<TQToolButton*>(o) ) { - if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->tqparent()))) { + if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "textLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE ); @@ -1406,14 +1406,14 @@ bool WidgetFactory::hasItems( int id, TQObject *editorWidget ) return FALSE; } -void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ) +void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) { TQString className = WidgetDatabase::className( id ); if ( className.contains( "ListBox" ) ) { if ( !::tqqt_cast<TQListBox*>(editWidget) ) return; - ListBoxEditor *e = new ListBoxEditor( tqparent, editWidget, fw ); + ListBoxEditor *e = new ListBoxEditor( parent, editWidget, fw ); e->exec(); delete e; return; @@ -1428,7 +1428,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget lb = new TQListBox(cb); cb->setListBox(lb); } - ListBoxEditor *e = new ListBoxEditor( tqparent, lb, fw ); + ListBoxEditor *e = new ListBoxEditor( parent, lb, fw ); e->exec(); delete e; cb->update(); @@ -1439,7 +1439,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if ( !::tqqt_cast<TQListView*>(editWidget) ) return; TQListView *lv = (TQListView*)editWidget; - ListViewEditor *e = new ListViewEditor( tqparent, lv, fw ); + ListViewEditor *e = new ListViewEditor( parent, lv, fw ); e->exec(); delete e; return; @@ -1448,21 +1448,21 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if ( className.contains( "IconView" ) ) { if ( !::tqqt_cast<TQIconView*>(editWidget) ) return; - IconViewEditor *e = new IconViewEditor( tqparent, editWidget, fw ); + IconViewEditor *e = new IconViewEditor( parent, editWidget, fw ); e->exec(); delete e; return; } if ( className == "TQMultiLineEdit" || className == "TQTextEdit" ) { - MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, tqparent, editWidget, fw ); + MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, parent, editWidget, fw ); e->exec(); delete e; return; } #ifndef TQT_NO_TABLE if (::tqqt_cast<TQTable*>(editWidget) != 0) { - TableEditor *e = new TableEditor( tqparent, editWidget, fw ); + TableEditor *e = new TableEditor( parent, editWidget, fw ); e->exec(); delete e; return; @@ -1540,11 +1540,11 @@ TQString WidgetFactory::defaultCurrentItem( TQT_BASE_OBJECT_NAME *tqbo, const TQ return p->valueToKey( defaultValue( w, propName ).toInt() ); } -TQWidget *WidgetFactory::createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w ) +TQWidget *WidgetFactory::createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w ) { if ( !w ) return 0; - return new CustomWidget( tqparent, name, w ); + return new CustomWidget( parent, name, w ); } TQVariant WidgetFactory::property( TQT_BASE_OBJECT_NAME *tqbo, const char *name ) @@ -1615,7 +1615,7 @@ bool TQLayoutWidget::event( TQEvent *e ) /* This function must be called on TQLayoutWidget creation and whenever - the TQLayoutWidget's tqparent tqlayout changes (e.g., from a TQHBoxLayout + the TQLayoutWidget's parent tqlayout changes (e.g., from a TQHBoxLayout to a TQVBoxLayout), because of the (illogical) way layouting works. */ void TQLayoutWidget::updateSizePolicy() @@ -1640,12 +1640,12 @@ void TQLayoutWidget::updateSizePolicy() if ( tqlayout() ) { /* - parentLayout is set to the tqparent tqlayout if there is one and if it is + parentLayout is set to the parent tqlayout if there is one and if it is top level, in which case layouting is illogical. */ TQLayout *parentLayout = 0; - if ( tqparent() && tqparent()->isWidgetType() ) { - parentLayout = ((TQWidget *)tqparent())->tqlayout(); + if ( parent() && parent()->isWidgetType() ) { + parentLayout = ((TQWidget *)parent())->tqlayout(); if ( parentLayout && ::tqqt_cast<TQLayoutWidget*>(parentLayout->mainWidget()) ) parentLayout = 0; @@ -1754,12 +1754,12 @@ CustomWidgetFactory::CustomWidgetFactory() { } -TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const +TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name ) const { MetaDataBase::CustomWidget *w = MetaDataBase::customWidget( WidgetDatabase::idFromClassName( className ) ); if ( !w ) return 0; - return WidgetFactory::createCustomWidget( tqparent, name, w ); + return WidgetFactory::createCustomWidget( parent, name, w ); } void TQDesignerRadioButton::setFocusPolicy( Qt::FocusPolicy policy ) @@ -1781,8 +1781,8 @@ void TQDesignerRadioButton::setFocusPolicy( Qt::FocusPolicy policy ) TQRadioButton::setFocusPolicy( Qt::NoFocus ); } -TQDesignerToolBox::TQDesignerToolBox( TQWidget *tqparent, const char *name ) - : TQToolBox( tqparent, name ) +TQDesignerToolBox::TQDesignerToolBox( TQWidget *parent, const char *name ) + : TQToolBox( parent, name ) { } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h index 9a672da0d..76b8f4aa0 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h @@ -67,7 +67,7 @@ class CustomWidgetFactory : public TQWidgetFactory { public: CustomWidgetFactory(); - TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const; + TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const; }; @@ -83,7 +83,7 @@ public: NoLayout }; - static TQWidget *create( int id, TQWidget *tqparent, const char *name = 0, bool init = TRUE, + static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE, const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal ); static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type ); static void deleteLayout( TQWidget *widget ); @@ -103,7 +103,7 @@ public: static bool hasSpecialEditor( int id, TQObject *editorWidget ); static bool hasItems( int id, TQObject *editorWidget ); - static void editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + static void editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); static bool canResetProperty( TQT_BASE_OBJECT_NAME *w, const TQString &propName ); static bool resetProperty( TQT_BASE_OBJECT_NAME *w, const TQString &propName ); @@ -117,9 +117,9 @@ public: static TQString defaultSignal( TQT_BASE_OBJECT_NAME *w ); private: - static TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init, + static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, const TQRect *r = 0, Qt::Orientation orient = Qt::Horizontal ); - static TQWidget *createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w ); + static TQWidget *createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w ); static TQGuardedPtr<TQObject> *lastPassiveInteractor; static bool lastWasAPassiveInteractor; @@ -134,7 +134,7 @@ class TQDesignerTabWidget : public TQTabWidget Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - TQDesignerTabWidget( TQWidget *tqparent, const char *name ); + TQDesignerTabWidget( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -163,7 +163,7 @@ class TQDesignerWidgetStack : public TQWidgetStack Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - TQDesignerWidgetStack( TQWidget *tqparent, const char *name ); + TQDesignerWidgetStack( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -210,8 +210,8 @@ class TQDesignerWizard : public TQWizard TQ_OVERRIDE( bool modal READ isModal WRITE setModal ) public: - TQDesignerWizard( TQWidget *tqparent, const char *name ) - : TQWizard( tqparent, name ), modal(FALSE) {} + TQDesignerWizard( TQWidget *parent, const char *name ) + : TQWizard( parent, name ), modal(FALSE) {} int currentPageNum() const; void setCurrentPage( int i ); @@ -249,7 +249,7 @@ class TQLayoutWidget : public TQWidget TQ_OBJECT public: - TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( TQWidget::tqsizePolicy() ) {} + TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::tqsizePolicy() ) {} TQSizePolicy sizePolicy() const; void updateSizePolicy(); @@ -268,8 +268,8 @@ class CustomWidget : public TQWidget TQ_OBJECT public: - CustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *cw ) - : TQWidget( tqparent, name ), cusw( cw ) { + CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw ) + : TQWidget( parent, name ), cusw( cw ) { alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" ); tqsetSizePolicy( cw->sizePolicy ); if ( !alwaysExpand ) @@ -306,8 +306,8 @@ class Line : public TQFrame TQ_OVERRIDE( TQRect frameRect DESIGNABLE false ) TQ_OVERRIDE( TQRect contentsRect DESIGNABLE false ) public: - Line( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, TQt::WMouseNoMask ) { + Line( TQWidget *parent, const char *name ) + : TQFrame( parent, name, TQt::WMouseNoMask ) { setFrameStyle( HLine | Sunken ); } @@ -330,8 +330,8 @@ class TQDesignerLabel : public TQLabel Q_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget ) public: - TQDesignerLabel( TQWidget *tqparent = 0, const char *name = 0 ) - : TQLabel( tqparent, name ) { myBuddy = 0; } + TQDesignerLabel( TQWidget *parent = 0, const char *name = 0 ) + : TQLabel( parent, name ) { myBuddy = 0; } void setBuddyWidget( const TQCString &b ) { myBuddy = b; @@ -361,9 +361,9 @@ class TQDesignerWidget : public TQWidget TQ_OBJECT public: - TQDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WResizeNoErase ), formwindow( fw ) { - need_frame = tqparent && tqparent->inherits("TQDesignerWidgetStack" ); + TQDesignerWidget( FormWindow *fw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WResizeNoErase ), formwindow( fw ) { + need_frame = parent && parent->inherits("TQDesignerWidgetStack" ); } protected: @@ -383,8 +383,8 @@ class TQDesignerDialog : public TQDialog TQ_OVERRIDE( bool modal READ isModal WRITE setModal ) public: - TQDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name ) - : TQDialog( tqparent, name, FALSE, (WFlags)TQt::WResizeNoErase ), formwindow( fw ), modal(FALSE) {} + TQDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name ) + : TQDialog( parent, name, FALSE, (WFlags)TQt::WResizeNoErase ), formwindow( fw ), modal(FALSE) {} bool isModal() const { return modal; } void setModal(bool b) { modal = b; } @@ -405,8 +405,8 @@ class TQDesignerToolButton : public TQToolButton Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - TQDesignerToolButton( TQWidget *tqparent, const char *name ) - : TQToolButton( tqparent, name ) {} + TQDesignerToolButton( TQWidget *parent, const char *name ) + : TQToolButton( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); @@ -429,8 +429,8 @@ class TQDesignerRadioButton : public TQRadioButton Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - TQDesignerRadioButton( TQWidget *tqparent, const char *name ) - : TQRadioButton( tqparent, name ) {} + TQDesignerRadioButton( TQWidget *parent, const char *name ) + : TQRadioButton( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); @@ -455,8 +455,8 @@ class TQDesignerPushButton : public TQPushButton Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - TQDesignerPushButton( TQWidget *tqparent, const char *name ) - : TQPushButton( tqparent, name ) {} + TQDesignerPushButton( TQWidget *parent, const char *name ) + : TQPushButton( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); @@ -480,8 +480,8 @@ class TQDesignerCheckBox : public TQCheckBox Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - TQDesignerCheckBox( TQWidget *tqparent, const char *name ) - : TQCheckBox( tqparent, name ) {} + TQDesignerCheckBox( TQWidget *parent, const char *name ) + : TQCheckBox( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); @@ -507,7 +507,7 @@ class TQDesignerToolBox : public TQToolBox Q_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true ) public: - TQDesignerToolBox( TQWidget *tqparent, const char *name ); + TQDesignerToolBox( TQWidget *parent, const char *name ); TQString itemLabel() const; void setItemLabel( const TQString &l ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.cpp index 594a2777a..0265b50a7 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.cpp @@ -43,8 +43,8 @@ #include <tqpushbutton.h> #include <tqinputdialog.h> -WizardEditor::WizardEditor( TQWidget *tqparent, TQWizard *w, FormWindow *fw ) - : WizardEditorBase( tqparent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 ) +WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) + : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); fillListBox(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.h index 8a08e617d..16eb4a6c1 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.h @@ -48,7 +48,7 @@ class WizardEditor : public WizardEditorBase TQ_OBJECT public: - WizardEditor( TQWidget *tqparent, TQWizard *wizard, FormWindow *fw ); + WizardEditor( TQWidget *parent, TQWizard *wizard, FormWindow *fw ); ~WizardEditor(); protected Q_SLOTS: diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/workspace.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/workspace.cpp index d22a0867c..4725b9a45 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/workspace.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/workspace.cpp @@ -55,8 +55,8 @@ #include <tqtextstream.h> #include "qcompletionedit.h" -WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p ) + : TQListViewItem( parent ) { init(); project = p; @@ -65,8 +65,8 @@ WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p ) setExpandable( FALSE ); } -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf ) + : TQListViewItem( parent ) { init(); sourceFile = sf; @@ -74,8 +74,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ) setPixmap( 0, TQPixmap::fromMimeSource( "designer_filenew.png" ) ); } -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ) + : TQListViewItem( parent ) { init(); object = o; @@ -86,8 +86,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p listView(), TQT_SLOT( update() ) ); } -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type type ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) + : TQListViewItem( parent ) { init(); formFile = ff; @@ -121,8 +121,8 @@ void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, if ( type() == FormSourceType && ( !formFile->hasFormCode() || ( formFile->codeFileState() == FormFile::Deleted && formFile->formWindow() ) ) && - tqparent() && tqparent()->tqparent() && ( (WorkspaceItem*)tqparent()->tqparent() )->project && - ( (WorkspaceItem*)tqparent()->tqparent() )->project->isCpp() ) { + parent() && parent()->parent() && ( (WorkspaceItem*)parent()->parent() )->project && + ( (WorkspaceItem*)parent()->parent() )->project->isCpp() ) { g.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().color( TQColorGroup::Text) ); g.setColor( TQColorGroup::HighlightedText, listView()->tqpalette().disabled().color( TQColorGroup::Text) ); } else { @@ -254,8 +254,8 @@ TQString WorkspaceItem::key( int column, bool ) const TQColor WorkspaceItem::backgroundColor() { bool b = useOddColor; - if ( t == FormSourceType && tqparent() ) - b = ( ( WorkspaceItem*)tqparent() )->useOddColor; + if ( t == FormSourceType && parent() ) + b = ( ( WorkspaceItem*)parent() )->useOddColor; return b ? *backColor2 : *backColor1; } @@ -272,8 +272,8 @@ void WorkspaceItem::setAutoOpen( bool b ) autoOpen = b; } -Workspace::Workspace( TQWidget *tqparent, MainWindow *mw ) - : TQListView( tqparent, 0, (WFlags)(WStyle_Customize | TQt::WStyle_NormalBorder | TQt::WStyle_Title | +Workspace::Workspace( TQWidget *parent, MainWindow *mw ) + : TQListView( parent, 0, (WFlags)(WStyle_Customize | TQt::WStyle_NormalBorder | TQt::WStyle_Title | TQt::WStyle_Tool | TQt::WStyle_MinMax | TQt::WStyle_SysMenu) ), mainWindow( mw ), project( 0 ), completionDirty( FALSE ) { @@ -501,7 +501,7 @@ void Workspace::closeAutoOpenItems() TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { WorkspaceItem* i = (WorkspaceItem*) it.current(); - WorkspaceItem* ip = (WorkspaceItem*) i->tqparent(); + WorkspaceItem* ip = (WorkspaceItem*) i->parent(); if ( i->type() == WorkspaceItem::FormSourceType ) { if ( !i->isSelected() && !ip->isSelected() && ip->isAutoOpen() ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/workspace.h b/experimental/tqtinterface/qt4/tools/designer/designer/workspace.h index de96e9601..b2cf3bfb8 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/workspace.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/workspace.h @@ -54,10 +54,10 @@ class WorkspaceItem : public TQListViewItem public: enum Type { ProjectType, FormFileType, FormSourceType, SourceFileType, ObjectType }; - WorkspaceItem( TQListView *tqparent, Project* p ); - WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ); - WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type t = FormFileType ); - WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p ); + WorkspaceItem( TQListView *parent, Project* p ); + WorkspaceItem( TQListViewItem *parent, SourceFile* sf ); + WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type t = FormFileType ); + WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ); void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); @@ -97,7 +97,7 @@ class Workspace : public TQListView TQ_OBJECT public: - Workspace( TQWidget *tqparent , MainWindow *mw ); + Workspace( TQWidget *parent , MainWindow *mw ); void setCurrentProject( Project *pro ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp b/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp index 34e1ff610..1f5a7c9e2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp @@ -133,7 +133,7 @@ class ArrowButton : public TQButton public: enum Dir { Left, Right }; - ArrowButton( TQWidget *tqparent, const char *name, Dir d ); + ArrowButton( TQWidget *parent, const char *name, Dir d ); void drawButton( TQPainter *p ); private: @@ -141,8 +141,8 @@ private: }; -ArrowButton::ArrowButton( TQWidget *tqparent, const char *name, Dir d ) - : TQButton( tqparent, name ) +ArrowButton::ArrowButton( TQWidget *parent, const char *name, Dir d ) + : TQButton( parent, name ) { setFixedSize( 16, 16 ); if ( d == Left ) { @@ -167,8 +167,8 @@ void ArrowButton::drawButton( TQPainter *p ) } -ArgHintWidget::ArgHintWidget( TQWidget *tqparent, const char*name ) - : TQFrame( tqparent, name, WType_Popup ), curFunc( 0 ), numFuncs( 0 ) +ArgHintWidget::ArgHintWidget( TQWidget *parent, const char*name ) + : TQFrame( parent, name, WType_Popup ), curFunc( 0 ), numFuncs( 0 ) { setFrameStyle( TQFrame::Box | TQFrame::Plain ); setLineWidth( 1 ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.h b/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.h index 0986c556c..d5c6d4359 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.h +++ b/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.h @@ -44,7 +44,7 @@ class ArgHintWidget : public TQFrame TQ_OBJECT public: - ArgHintWidget( TQWidget *tqparent, const char*name ); + ArgHintWidget( TQWidget *parent, const char*name ); void setFunctionText( int func, const TQString &text ); void setNumFunctions( int num ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/browser.cpp b/experimental/tqtinterface/qt4/tools/designer/editor/browser.cpp index 129d463b0..32eba0cac 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/browser.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/editor/browser.cpp @@ -57,7 +57,7 @@ EditorBrowser::~EditorBrowser() bool EditorBrowser::eventFilter( TQObject *o, TQEvent *e ) { - if ( ::tqqt_cast<Editor*>(o->tqparent()) || ::tqqt_cast<Editor*>(o) ) { + if ( ::tqqt_cast<Editor*>(o->parent()) || ::tqqt_cast<Editor*>(o) ) { TQMouseEvent *me; TQKeyEvent *ke; switch ( e->type() ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/editor.cpp b/experimental/tqtinterface/qt4/tools/designer/editor/editor.cpp index 626df22eb..9a1ee42b4 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/editor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/editor/editor.cpp @@ -40,8 +40,8 @@ #include <tqpopupmenu.h> #include <tqaccel.h> -Editor::Editor( const TQString &fn, TQWidget *tqparent, const char *name ) - : TQTextEdit( tqparent, name ), hasError( FALSE ) +Editor::Editor( const TQString &fn, TQWidget *parent, const char *name ) + : TQTextEdit( parent, name ), hasError( FALSE ) { document()->setFormatter( new TQTextFormatterBreakInWords ); if ( !fn.isEmpty() ) diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/editor.h b/experimental/tqtinterface/qt4/tools/designer/editor/editor.h index 782ea9799..8926c25d1 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/editor.h +++ b/experimental/tqtinterface/qt4/tools/designer/editor/editor.h @@ -52,7 +52,7 @@ public: Step = 4 }; - Editor( const TQString &fn, TQWidget *tqparent, const char *name ); + Editor( const TQString &fn, TQWidget *parent, const char *name ); ~Editor(); virtual void load( const TQString &fn ); virtual void save( const TQString &fn ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.cpp b/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.cpp index 1164d8b90..a6d82ae99 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.cpp @@ -286,8 +286,8 @@ static TQPixmap *breakpointPixmap = 0; static TQPixmap *stepPixmap = 0; static TQPixmap *stackFrame = 0; -MarkerWidget::MarkerWidget( ViewManager *tqparent, const char*name ) - : TQWidget( tqparent, name, WRepaintNoErase | WStaticContents | WResizeNoErase ), viewManager( tqparent ) +MarkerWidget::MarkerWidget( ViewManager *parent, const char*name ) + : TQWidget( parent, name, WRepaintNoErase | WStaticContents | WResizeNoErase ), viewManager( parent ) { if ( !errorPixmap ) { errorPixmap = new TQPixmap( error_xpm ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.h b/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.h index 6e124c1c8..431f0d393 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.h +++ b/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.h @@ -45,7 +45,7 @@ class MarkerWidget : public TQWidget TQ_OBJECT public: - MarkerWidget( ViewManager *tqparent, const char*name ); + MarkerWidget( ViewManager *parent, const char*name ); Q_SIGNALS: void markersChanged(); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp b/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp index b0b0186fc..50760d422 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp @@ -41,8 +41,8 @@ #include <tqlabel.h> #include <tqtimer.h> -ViewManager::ViewManager( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), curView( 0 ) +ViewManager::ViewManager( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), curView( 0 ) { TQHBoxLayout *l = new TQHBoxLayout( this ); markerWidget = new MarkerWidget( this, "editor_markerwidget" ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.h b/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.h index 2677fb993..c6402db1e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.h +++ b/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.h @@ -50,7 +50,7 @@ class ViewManager : public TQWidget TQ_OBJECT public: - ViewManager( TQWidget *tqparent, const char *name ); + ViewManager( TQWidget *parent, const char *name ); void addView( TQWidget *view ); TQWidget *currentView() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.cpp index 2a0b52ea1..3a2afa342 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.cpp @@ -2,9 +2,9 @@ #include <tqspinbox.h> #include "creditform.h" -CreditForm::CreditForm( TQWidget* tqparent, const char* name, +CreditForm::CreditForm( TQWidget* parent, const char* name, bool modal, WFlags fl ) - : CreditFormBase( tqparent, name, modal, fl ) + : CreditFormBase( parent, name, modal, fl ) { setAmount(); } diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.h b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.h index b8998a287..fb5b07121 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.h @@ -4,7 +4,7 @@ class CreditForm : public CreditFormBase { TQ_OBJECT public: - CreditForm( TQWidget* tqparent = 0, const char* name = 0, + CreditForm( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreditForm(); public Q_SLOTS: diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.cpp index 07543beac..ab81bcb9c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.cpp @@ -32,14 +32,14 @@ static TQPixmap uic_load_pixmap_CreditFormBase( const TQString &name ) return pix; } /* - * Constructs a CreditFormBase which is a child of 'tqparent', with the + * Constructs a CreditFormBase which is a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -CreditFormBase::CreditFormBase( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : TQDialog( tqparent, name, modal, fl ) +CreditFormBase::CreditFormBase( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ) { if ( !name ) setName( "CreditFormBase" ); diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.h b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.h index 87c32d484..4c9ed5176 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.h @@ -24,7 +24,7 @@ class CreditFormBase : public TQDialog TQ_OBJECT public: - CreditFormBase( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreditFormBase( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreditFormBase(); TQButtonGroup* creditButtonGroup; diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.cpp index f256dc927..97334372e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.cpp @@ -46,10 +46,10 @@ TQStringList CustomWidgetPlugin::keys() const return list; } -TQWidget* CustomWidgetPlugin::create( const TQString &key, TQWidget* tqparent, const char* name ) +TQWidget* CustomWidgetPlugin::create( const TQString &key, TQWidget* parent, const char* name ) { if ( key == "FileChooser" ) - return new FileChooser( tqparent, name ); + return new FileChooser( parent, name ); return 0; } diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.h b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.h index e2bd12fda..929cba207 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.h @@ -6,7 +6,7 @@ public: CustomWidgetPlugin(); TQStringList keys() const; - TQWidget* create( const TQString &classname, TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* create( const TQString &classname, TQWidget* parent = 0, const char* name = 0 ); TQString group( const TQString& ) const; TQIconSet iconSet( const TQString& ) const; TQString includeFile( const TQString& ) const; diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.cpp index f3f986b5f..ba39dc73e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.cpp @@ -4,8 +4,8 @@ #include <tqfiledialog.h> #include <tqlayout.h> -FileChooser::FileChooser( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), md( File ) +FileChooser::FileChooser( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), md( File ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); tqlayout->setMargin( 0 ); diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.h b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.h index 0062e5b30..58d68cecc 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.h @@ -21,7 +21,7 @@ class TQT_WIDGET_PLUGIN_EXPORT FileChooser : public TQWidget Q_PROPERTY( TQString fileName READ fileName WRITE setFileName ) public: - FileChooser( TQWidget *tqparent = 0, const char *name = 0); + FileChooser( TQWidget *parent = 0, const char *name = 0); enum Mode { File, Directory }; diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.cpp index 1109807c9..7cd1105c0 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.cpp @@ -38,8 +38,8 @@ Create a GLWidget widget */ -GLWidget::GLWidget( TQWidget* tqparent, const char* name ) - : TQGLWidget( tqparent, name ) +GLWidget::GLWidget( TQWidget* parent, const char* name ) + : TQGLWidget( parent, name ) { xrot = yrot = zrot = 25; // default object rotation scale_ = 1.25; // default object scale diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.h b/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.h index 7efe6587b..53e62a45a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.h @@ -46,7 +46,7 @@ class GLWidget : public TQGLWidget Q_PROPERTY( double scale READ scale WRITE setScale ) public: - GLWidget( TQWidget* tqparent, const char* name ); + GLWidget( TQWidget* parent, const char* name ); ~GLWidget(); double xRot() const { return xrot; } diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/opengl/main.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/opengl/main.cpp index ec2ebbd1c..593e23ba8 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/opengl/main.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/opengl/main.cpp @@ -206,7 +206,7 @@ public: TQStringList featureList() const; - TQWidget* create( const TQString &classname, TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* create( const TQString &classname, TQWidget* parent = 0, const char* name = 0 ); TQString group( const TQString& ) const; TQIconSet iconSet( const TQString& ) const; TQString includeFile( const TQString& ) const; @@ -231,12 +231,12 @@ TQStringList OpenGLWidgetInterface::featureList() const return list; } -TQWidget* OpenGLWidgetInterface::create( const TQString &description, TQWidget* tqparent, const char* name ) +TQWidget* OpenGLWidgetInterface::create( const TQString &description, TQWidget* parent, const char* name ) { TQWidget* w = 0; if ( description == "GLWidget" ) - w = new GLWidget( tqparent, name ); + w = new GLWidget( parent, name ); objects.add( w ); return w; diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.cpp index dd40459f5..2f6f1153a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.cpp @@ -2,9 +2,9 @@ #include <tqspinbox.h> #include "receiver.h" -void Receiver::setParent( TQDialog *tqparent ) +void Receiver::setParent( TQDialog *parent ) { - p = tqparent; + p = parent; setAmount(); } diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.h b/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.h index 5d0867f5a..31572c2ca 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.h @@ -5,7 +5,7 @@ class Receiver : public TQObject { TQ_OBJECT public: - void setParent( TQDialog *tqparent ); + void setParent( TQDialog *parent ); public Q_SLOTS: void setAmount(); private: diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.cpp index 45c568e09..1fe02528c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.cpp @@ -2,8 +2,8 @@ #include <tqsettings.h> -SizeAware::SizeAware( TQDialog *tqparent, const char *name, bool modal ) - : TQDialog( tqparent, name, modal ) +SizeAware::SizeAware( TQDialog *parent, const char *name, bool modal ) + : TQDialog( parent, name, modal ) { if ( company().isEmpty() ) setCompany( "UnknownCompany" ); diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.h b/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.h index 7cdca8fea..9e943dc02 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.h @@ -8,7 +8,7 @@ class SizeAware : public TQDialog Q_PROPERTY( TQString company READ company WRITE setCompany ) Q_PROPERTY( TQString settingsFile READ settingsFile WRITE setSettingsFile ) public: - SizeAware( TQDialog *tqparent = 0, const char *name = 0, bool modal = FALSE ); + SizeAware( TQDialog *parent = 0, const char *name = 0, bool modal = FALSE ); ~SizeAware(); void setCompany( TQString company ) { m_company = company; } TQString company() const { return m_company; } diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.cpp index c22fb1d33..da943679c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.cpp @@ -91,8 +91,8 @@ static const char * stop_xpm[] = { "................"}; -Vcr::Vcr( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +Vcr::Vcr( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); tqlayout->setMargin( 0 ); diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.h b/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.h index 1dccc8cf0..d3f6459f7 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.h @@ -6,7 +6,7 @@ class Vcr : public TQWidget { TQ_OBJECT public: - Vcr( TQWidget *tqparent = 0, const char *name = 0 ); + Vcr( TQWidget *parent = 0, const char *name = 0 ); ~Vcr() {} Q_SIGNALS: void rewind(); diff --git a/experimental/tqtinterface/qt4/tools/designer/interfaces/actioninterface.h b/experimental/tqtinterface/qt4/tools/designer/interfaces/actioninterface.h index 14fa5b1fd..bf77e59d9 100644 --- a/experimental/tqtinterface/qt4/tools/designer/interfaces/actioninterface.h +++ b/experimental/tqtinterface/qt4/tools/designer/interfaces/actioninterface.h @@ -62,12 +62,12 @@ public: }; /*! This functions is called to create the action with the name \a - name. \a tqparent should be used as tqparent of the action. + name. \a parent should be used as parent of the action. In the implementation return the TQAction object for the action \a name. */ - virtual TQAction* create( const TQString &name, TQObject* tqparent = 0 ) = 0; + virtual TQAction* create( const TQString &name, TQObject* parent = 0 ) = 0; /*! In the implementation of the interface return the name of the group of the action \a name. diff --git a/experimental/tqtinterface/qt4/tools/designer/interfaces/classbrowserinterface.h b/experimental/tqtinterface/qt4/tools/designer/interfaces/classbrowserinterface.h index 7e86ca898..6af8755f0 100644 --- a/experimental/tqtinterface/qt4/tools/designer/interfaces/classbrowserinterface.h +++ b/experimental/tqtinterface/qt4/tools/designer/interfaces/classbrowserinterface.h @@ -60,7 +60,7 @@ struct ClassBrowserInterface : public TQUnknownInterface { enum Type { Class, Function }; - virtual TQListView *createClassBrowser( TQWidget *tqparent ) const = 0; + virtual TQListView *createClassBrowser( TQWidget *parent ) const = 0; virtual void update( const TQString &code ) const = 0; virtual void clear() const = 0; diff --git a/experimental/tqtinterface/qt4/tools/designer/interfaces/designerinterface.h b/experimental/tqtinterface/qt4/tools/designer/interfaces/designerinterface.h index 279d7faae..222045144 100644 --- a/experimental/tqtinterface/qt4/tools/designer/interfaces/designerinterface.h +++ b/experimental/tqtinterface/qt4/tools/designer/interfaces/designerinterface.h @@ -187,7 +187,7 @@ struct DesignerFormWindow virtual bool isModified() const = 0; virtual void insertWidget( TQWidget * ) = 0; virtual void removeWidget( TQWidget * ) = 0; - virtual TQWidget *create( const char *className, TQWidget *tqparent, const char *name ) = 0; + virtual TQWidget *create( const char *className, TQWidget *parent, const char *name ) = 0; virtual TQWidgetList widgets() const = 0; virtual void undo() = 0; virtual void redo() = 0; @@ -216,7 +216,7 @@ struct DesignerFormWindow virtual void setCurrentWidget( TQWidget * ) = 0; virtual TQPtrList<TQAction> actionList() const = 0; virtual TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, - TQObject* tqparent, const char* name = 0, bool toggle = FALSE ) = 0; + TQObject* parent, const char* name = 0, bool toggle = FALSE ) = 0; virtual void addAction( TQAction * ) = 0; virtual void removeAction( TQAction * ) = 0; virtual void preview() const = 0; diff --git a/experimental/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h b/experimental/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h index 9e273cb94..2349cc058 100644 --- a/experimental/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h +++ b/experimental/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h @@ -69,7 +69,7 @@ struct EditorInterface : public TQUnknownInterface }; virtual TQWidget *editor( bool readOnly, - TQWidget *tqparent, + TQWidget *parent, TQUnknownInterface *designerIface ) = 0; virtual void setText( const TQString &txt ) = 0; diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.cpp index b82495973..8b5d7870a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.cpp @@ -43,8 +43,8 @@ #include <tqinputdialog.h> #include <designerinterface.h> -CppEditor::CppEditor( const TQString &fn, TQWidget *tqparent, const char *name, DesignerInterface *i ) - : Editor( fn, tqparent, name ), dIface( i ) +CppEditor::CppEditor( const TQString &fn, TQWidget *parent, const char *name, DesignerInterface *i ) + : Editor( fn, parent, name ), dIface( i ) { if ( dIface ) dIface->addRef(); diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.h b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.h index 1b4aa62fe..eb72bbd28 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.h @@ -47,7 +47,7 @@ class CppEditor : public Editor TQ_OBJECT public: - CppEditor( const TQString &fn, TQWidget *tqparent, const char *name, DesignerInterface *i ); + CppEditor( const TQString &fn, TQWidget *parent, const char *name, DesignerInterface *i ); ~CppEditor(); virtual EditorCompletion *completionManager() { return completion; } diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp index 9d34421aa..d7969ce22 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp @@ -72,10 +72,10 @@ TQRESULT EditorInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInter } TQWidget *EditorInterfaceImpl::editor( bool readonly, - TQWidget *tqparent, TQUnknownInterface *iface ) + TQWidget *parent, TQUnknownInterface *iface ) { if ( !viewManager ) { - ( (EditorInterfaceImpl*)this )->viewManager = new ViewManager( tqparent, 0 ); + ( (EditorInterfaceImpl*)this )->viewManager = new ViewManager( parent, 0 ); ( (EditorInterfaceImpl*)this )->viewManager->showMarkerWidget( FALSE ); if ( iface ) iface->queryInterface( IID_Designer, (TQUnknownInterface**) &dIface ); diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h index 5bae76495..23d4e6ead 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h @@ -54,7 +54,7 @@ public: TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); TQ_REFCOUNT; - TQWidget *editor( bool readonly, TQWidget *tqparent, TQUnknownInterface *designerIface ); + TQWidget *editor( bool readonly, TQWidget *parent, TQUnknownInterface *designerIface ); void setText( const TQString &txt ); TQString text() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp index da857b540..a053b81c5 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp @@ -40,19 +40,19 @@ #include <tqmetaobject.h> LanguageInterfaceImpl::LanguageInterfaceImpl( TQUnknownInterface *outer ) - : tqparent( outer ), ref( 0 ) + : parent( outer ), ref( 0 ) { } ulong LanguageInterfaceImpl::addRef() { - return tqparent ? tqparent->addRef() : ref++; + return parent ? parent->addRef() : ref++; } ulong LanguageInterfaceImpl::release() { - if ( tqparent ) - return tqparent->release(); + if ( parent ) + return parent->release(); if ( !--ref ) { delete this; return 0; @@ -62,8 +62,8 @@ ulong LanguageInterfaceImpl::release() TQRESULT LanguageInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface** iface ) { - if ( tqparent ) - return tqparent->queryInterface( uuid, iface ); + if ( parent ) + return parent->queryInterface( uuid, iface ); *iface = 0; if ( uuid == IID_TQUnknown ) diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.h b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.h index a998dc629..e60cf3bcf 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.h @@ -82,7 +82,7 @@ public: TQStrList signalNames( TQObject *obj ) const; private: - TQUnknownInterface *tqparent; + TQUnknownInterface *parent; ulong ref; }; diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp index a9d38e860..ff285e084 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp @@ -36,7 +36,7 @@ #include <preferences.h> PreferenceInterfaceImpl::PreferenceInterfaceImpl( TQUnknownInterface *outer ) - : tqparent( outer ), + : parent( outer ), ref( 0 ), cppEditorSyntax( 0 ) { @@ -48,13 +48,13 @@ PreferenceInterfaceImpl::~PreferenceInterfaceImpl() ulong PreferenceInterfaceImpl::addRef() { - return tqparent ? tqparent->addRef() : ref++; + return parent ? parent->addRef() : ref++; } ulong PreferenceInterfaceImpl::release() { - if ( tqparent ) - return tqparent->release(); + if ( parent ) + return parent->release(); if ( !--ref ) { delete this; return 0; @@ -64,8 +64,8 @@ ulong PreferenceInterfaceImpl::release() TQRESULT PreferenceInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface** iface ) { - if ( tqparent ) - return tqparent->queryInterface( uuid, iface ); + if ( parent ) + return parent->queryInterface( uuid, iface ); *iface = 0; if ( uuid == IID_TQUnknown ) diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.h b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.h index af2c8389c..aacc9f607 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.h @@ -54,7 +54,7 @@ public: void deletePreferenceObject( Preference * ); private: - TQUnknownInterface *tqparent; + TQUnknownInterface *parent; int ref; TQWidget *cppEditorSyntax; diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp index 279a35047..372dd0532 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp @@ -36,7 +36,7 @@ #include "projectsettings.h" ProjectSettingsInterfaceImpl::ProjectSettingsInterfaceImpl( TQUnknownInterface *outer ) - : tqparent( outer ), + : parent( outer ), ref( 0 ), settingsTab( 0 ) { @@ -44,13 +44,13 @@ ProjectSettingsInterfaceImpl::ProjectSettingsInterfaceImpl( TQUnknownInterface * ulong ProjectSettingsInterfaceImpl::addRef() { - return tqparent ? tqparent->addRef() : ref++; + return parent ? parent->addRef() : ref++; } ulong ProjectSettingsInterfaceImpl::release() { - if ( tqparent ) - return tqparent->release(); + if ( parent ) + return parent->release(); if ( !--ref ) { delete this; return 0; @@ -90,8 +90,8 @@ void ProjectSettingsInterfaceImpl::deleteProjectSettingsObject( ProjectSettings TQRESULT ProjectSettingsInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface ) { - if ( tqparent ) - return tqparent->queryInterface( uuid, iface ); + if ( parent ) + return parent->queryInterface( uuid, iface ); *iface = 0; if ( uuid == IID_TQUnknown ) diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.h b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.h index 5dd062542..1b4009e06 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.h @@ -54,7 +54,7 @@ public: TQRESULT queryInterface( const TQUuid &uuid, TQUnknownInterface **iface ); private: - TQUnknownInterface *tqparent; + TQUnknownInterface *parent; int ref; CppProjectSettings *settingsTab; }; diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp index f8f2dd3b5..aa763cf13 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp @@ -60,8 +60,8 @@ #endif SqlFormWizard::SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, - TQWidget* tqparent, DesignerFormWindow *fw, const char* name, bool modal, WFlags fl ) - : SqlFormWizardBase( tqparent, name, modal, fl ), widget( w ), appIface( aIface ), + TQWidget* parent, DesignerFormWindow *fw, const char* name, bool modal, WFlags fl ) + : SqlFormWizardBase( parent, name, modal, fl ), widget( w ), appIface( aIface ), mode( None ) { appIface->addRef(); @@ -307,10 +307,10 @@ void SqlFormWizard::setupPage1() setNextEnabled( databasePage, FALSE ); } -static TQPushButton *create_widget( TQWidget *tqparent, const char *name, +static TQPushButton *create_widget( TQWidget *parent, const char *name, const TQString &txt, const TQRect &r, DesignerFormWindow *fw ) { - TQPushButton *pb = (TQPushButton*)fw->create( "TQPushButton", tqparent, name ); + TQPushButton *pb = (TQPushButton*)fw->create( "TQPushButton", parent, name ); pb->setText( txt ); pb->setGeometry( r ); fw->setPropertyChanged( pb, "text", TRUE ); diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.h b/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.h index eb6558c14..9093a1b7f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.h @@ -44,7 +44,7 @@ class SqlFormWizard : public SqlFormWizardBase TQ_OBJECT public: - SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, TQWidget* tqparent = 0, DesignerFormWindow *fw = 0, + SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, TQWidget* parent = 0, DesignerFormWindow *fw = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SqlFormWizard(); diff --git a/experimental/tqtinterface/qt4/tools/designer/uic/form.cpp b/experimental/tqtinterface/qt4/tools/designer/uic/form.cpp index 728a1fdf7..30b56af0f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uic/form.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uic/form.cpp @@ -381,14 +381,14 @@ void Uic::createFormDecl( const TQDomElement &e ) // constructor if ( objClass == "TQDialog" || objClass == "TQWizard" ) { - out << " " << bareNameOfClass << "( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );" << endl; + out << " " << bareNameOfClass << "( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );" << endl; } else if ( objClass == "TQWidget" ) { - out << " " << bareNameOfClass << "( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );" << endl; + out << " " << bareNameOfClass << "( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );" << endl; } else if ( objClass == "TQMainWindow" ) { - out << " " << bareNameOfClass << "( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = (WFlags)TQt::WType_TopLevel );" << endl; + out << " " << bareNameOfClass << "( TQWidget* parent = 0, const char* name = 0, WFlags fl = (WFlags)TQt::WType_TopLevel );" << endl; isMainWindow = TRUE; } else { - out << " " << bareNameOfClass << "( TQWidget* tqparent = 0, const char* name = 0 );" << endl; + out << " " << bareNameOfClass << "( TQWidget* parent = 0, const char* name = 0 );" << endl; } // destructor @@ -945,37 +945,37 @@ void Uic::createFormImpl( const TQDomElement &e ) // constructor if ( objClass == "TQDialog" || objClass == "TQWizard" ) { out << "/*" << endl; - out << " * Constructs a " << nameOfClass << " as a child of 'tqparent', with the" << endl; + out << " * Constructs a " << nameOfClass << " as a child of 'parent', with the" << endl; out << " * name 'name' and widget flags set to 'f'." << endl; out << " *" << endl; out << " * The " << objClass.mid(2).lower() << " will by default be modeless, unless you set 'modal' to" << endl; out << " * TRUE to construct a modal " << objClass.mid(2).lower() << "." << endl; out << " */" << endl; - out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* tqparent, const char* name, bool modal, WFlags fl )" << endl; - out << " : " << objClass << "( tqparent, name, modal, fl )"; + out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* parent, const char* name, bool modal, WFlags fl )" << endl; + out << " : " << objClass << "( parent, name, modal, fl )"; } else if ( objClass == "TQWidget" ) { out << "/*" << endl; - out << " * Constructs a " << nameOfClass << " as a child of 'tqparent', with the" << endl; + out << " * Constructs a " << nameOfClass << " as a child of 'parent', with the" << endl; out << " * name 'name' and widget flags set to 'f'." << endl; out << " */" << endl; - out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* tqparent, const char* name, WFlags fl )" << endl; - out << " : " << objClass << "( tqparent, name, fl )"; + out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* parent, const char* name, WFlags fl )" << endl; + out << " : " << objClass << "( parent, name, fl )"; } else if ( objClass == "TQMainWindow" ) { out << "/*" << endl; - out << " * Constructs a " << nameOfClass << " as a child of 'tqparent', with the" << endl; + out << " * Constructs a " << nameOfClass << " as a child of 'parent', with the" << endl; out << " * name 'name' and widget flags set to 'f'." << endl; out << " *" << endl; out << " */" << endl; - out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* tqparent, const char* name, WFlags fl )" << endl; - out << " : " << objClass << "( tqparent, name, fl )"; + out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* parent, const char* name, WFlags fl )" << endl; + out << " : " << objClass << "( parent, name, fl )"; isMainWindow = TRUE; } else { out << "/*" << endl; - out << " * Constructs a " << nameOfClass << " which is a child of 'tqparent', with the" << endl; + out << " * Constructs a " << nameOfClass << " which is a child of 'parent', with the" << endl; out << " * name 'name'.' " << endl; out << " */" << endl; - out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* tqparent, const char* name )" << endl; - out << " : " << objClass << "( tqparent, name )"; + out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* parent, const char* name )" << endl; + out << " : " << objClass << "( parent, name )"; } // create pixmaps for all images diff --git a/experimental/tqtinterface/qt4/tools/designer/uic/object.cpp b/experimental/tqtinterface/qt4/tools/designer/uic/object.cpp index 77ca635d9..1a7ed9c6a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uic/object.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uic/object.cpp @@ -92,12 +92,12 @@ static bool createdCentralWidget = FALSE; TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& par, const TQString& tqlayout ) { - TQString tqparent( par ); - if ( tqparent == "this" && isMainWindow ) { + TQString parent( par ); + if ( parent == "this" && isMainWindow ) { if ( !createdCentralWidget ) out << indent << "setCentralWidget( new TQWidget( this, \"qt_central_widget\" ) );" << endl; createdCentralWidget = TRUE; - tqparent = "centralWidget()"; + parent = "centralWidget()"; } TQDomElement n; TQString objClass, objName; @@ -106,7 +106,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla int numRows = 0; if ( layouts.contains( e.tagName() ) ) - return createLayoutImpl( e, parentClass, tqparent, tqlayout ); + return createLayoutImpl( e, parentClass, parent, tqlayout ); objClass = getClassName( e ); if ( objClass.isEmpty() ) @@ -132,13 +132,13 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla if ( tqlayout.isEmpty() ) { // register the object and unify its name objName = registerObject( objName ); - out << " TQWidget* " << objName << " = new TQWidget( " << tqparent << ", \"" << definedName << "\" );" << endl; + out << " TQWidget* " << objName << " = new TQWidget( " << parent << ", \"" << definedName << "\" );" << endl; } else { - // the tqlayout widget is not necessary, hide it by creating its child in the tqparent + // the tqlayout widget is not necessary, hide it by creating its child in the parent TQString result; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if (tags.contains( n.tagName() ) ) - result = createObjectImpl( n, parentClass, tqparent, tqlayout ); + result = createObjectImpl( n, parentClass, parent, tqlayout ); } return result; } @@ -148,7 +148,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla out << " "; if ( isTmpObject ) out << objClass << "* "; - out << objName << " = new " << createObjectInstance( objClass, tqparent, objName ) << ";" << endl; + out << objName << " = new " << createObjectInstance( objClass, parent, objName ) << ";" << endl; } if ( objClass == "TQAxWidget" ) { @@ -197,7 +197,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla } if ( prop == "buttonGroupId" ) { if ( parentClass == "TQButtonGroup" ) - out << indent << tqparent << "->insert( " << objName << ", " << value << " );" << endl; + out << indent << parent << "->insert( " << objName << ", " << value << " );" << endl; continue; } if ( prop == "frameworkCode" ) diff --git a/experimental/tqtinterface/qt4/tools/designer/uic/subclassing.cpp b/experimental/tqtinterface/qt4/tools/designer/uic/subclassing.cpp index 3677b7800..aaabee661 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uic/subclassing.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uic/subclassing.cpp @@ -71,9 +71,9 @@ void Uic::createSubDecl( const TQDomElement &e, const TQString& subClass ) // constructor if ( objClass == "TQDialog" || objClass == "TQWizard" ) { - out << " " << subClass << "( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );" << endl; + out << " " << subClass << "( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );" << endl; } else { // standard TQWidget - out << " " << subClass << "( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );" << endl; + out << " " << subClass << "( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );" << endl; } // destructor @@ -212,21 +212,21 @@ void Uic::createSubImpl( const TQDomElement &e, const TQString& subClass ) // constructor if ( objClass == "TQDialog" || objClass == "TQWizard" ) { out << "/* " << endl; - out << " * Constructs a " << subClass << " which is a child of 'tqparent', with the " << endl; + out << " * Constructs a " << subClass << " which is a child of 'parent', with the " << endl; out << " * name 'name' and widget flags set to 'f' " << endl; out << " *" << endl; out << " * The " << objClass.mid(2).lower() << " will by default be modeless, unless you set 'modal' to" << endl; out << " * TRUE to construct a modal " << objClass.mid(2).lower() << "." << endl; out << " */" << endl; - out << subClass << "::" << subClass << "( TQWidget* tqparent, const char* name, bool modal, WFlags fl )" << endl; - out << " : " << nameOfClass << "( tqparent, name, modal, fl )" << endl; + out << subClass << "::" << subClass << "( TQWidget* parent, const char* name, bool modal, WFlags fl )" << endl; + out << " : " << nameOfClass << "( parent, name, modal, fl )" << endl; } else { // standard TQWidget out << "/* " << endl; - out << " * Constructs a " << subClass << " which is a child of 'tqparent', with the " << endl; + out << " * Constructs a " << subClass << " which is a child of 'parent', with the " << endl; out << " * name 'name' and widget flags set to 'f' " << endl; out << " */" << endl; - out << subClass << "::" << subClass << "( TQWidget* tqparent, const char* name, WFlags fl )" << endl; - out << " : " << nameOfClass << "( tqparent, name, fl )" << endl; + out << subClass << "::" << subClass << "( TQWidget* parent, const char* name, WFlags fl )" << endl; + out << " : " << nameOfClass << "( parent, name, fl )" << endl; } out << "{" << endl; out << "}" << endl; diff --git a/experimental/tqtinterface/qt4/tools/designer/uic/uic.cpp b/experimental/tqtinterface/qt4/tools/designer/uic/uic.cpp index 7a71eaf62..ea1bc1417 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uic/uic.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uic/uic.cpp @@ -397,14 +397,14 @@ void Uic::createPopupMenuDecl( const TQDomElement &e ) } } -void Uic::createActionImpl( const TQDomElement &n, const TQString &tqparent ) +void Uic::createActionImpl( const TQDomElement &n, const TQString &parent ) { for ( TQDomElement ae = n; !ae.isNull(); ae = ae.nextSibling().toElement() ) { TQString objName = registerObject( getObjectName( ae ) ); if ( ae.tagName() == "action" ) - out << indent << objName << " = new TQAction( " << tqparent << ", \"" << objName << "\" );" << endl; + out << indent << objName << " = new TQAction( " << parent << ", \"" << objName << "\" );" << endl; else if ( ae.tagName() == "actiongroup" ) - out << indent << objName << " = new TQActionGroup( " << tqparent << ", \"" << objName << "\" );" << endl; + out << indent << objName << " = new TQActionGroup( " << parent << ", \"" << objName << "\" );" << endl; else continue; bool subActionsDone = FALSE; @@ -470,7 +470,7 @@ TQString get_dock( const TQString &d ) return ""; } -void Uic::createToolbarImpl( const TQDomElement &n, const TQString &parentClass, const TQString &tqparent ) +void Uic::createToolbarImpl( const TQDomElement &n, const TQString &parentClass, const TQString &parent ) { TQDomNodeList nl = n.elementsByTagName( "toolbar" ); for ( int i = 0; i < (int) nl.length(); i++ ) { @@ -478,7 +478,7 @@ void Uic::createToolbarImpl( const TQDomElement &n, const TQString &parentClass, TQString dock = get_dock( ae.attribute( "dock" ) ); TQString objName = getObjectName( ae ); out << indent << objName << " = new TQToolBar( TQString(\"\"), this, " << dock << " ); " << endl; - createObjectImpl( ae, parentClass, tqparent ); + createObjectImpl( ae, parentClass, parent ); for ( TQDomElement n2 = ae.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { if ( n2.tagName() == "action" ) { out << indent << n2.attribute( "name" ) << "->addTo( " << objName << " );" << endl; @@ -488,7 +488,7 @@ void Uic::createToolbarImpl( const TQDomElement &n, const TQString &parentClass, if ( n2.attribute( "class" ) != "Spacer" ) { createObjectImpl( n2, "TQToolBar", objName ); } else { - TQString child = createSpacerImpl( n2, parentClass, tqparent, objName ); + TQString child = createSpacerImpl( n2, parentClass, parent, objName ); out << indent << "TQApplication::sendPostedEvents( " << objName << ", TQEvent::ChildInserted );" << endl; out << indent << objName << "->boxLayout()->addItem( " << child << " );" << endl; @@ -498,11 +498,11 @@ void Uic::createToolbarImpl( const TQDomElement &n, const TQString &parentClass, } } -void Uic::createMenuBarImpl( const TQDomElement &n, const TQString &parentClass, const TQString &tqparent ) +void Uic::createMenuBarImpl( const TQDomElement &n, const TQString &parentClass, const TQString &parent ) { TQString objName = getObjectName( n ); out << indent << objName << " = new TQMenuBar( this, \"" << objName << "\" );" << endl; - createObjectImpl( n, parentClass, tqparent ); + createObjectImpl( n, parentClass, parent ); int i = 0; TQDomElement c = n.firstChild().toElement(); while ( !c.isNull() ) { @@ -525,7 +525,7 @@ void Uic::createMenuBarImpl( const TQDomElement &n, const TQString &parentClass, } } -void Uic::createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &tqparent ) +void Uic::createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ) { int i = 0; for ( TQDomElement n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { @@ -535,17 +535,17 @@ void Uic::createPopupMenuImpl( const TQDomElement &e, const TQString &parentClas TQString itemName = n2.attribute( "name" ); TQString itemText = n2.attribute( "text" ); out << indent << itemName << " = new TQPopupMenu( this );" << endl; - out << indent << tqparent << "->insertItem( " << n.attribute( "name" ) << "->iconSet(), "; + out << indent << parent << "->insertItem( " << n.attribute( "name" ) << "->iconSet(), "; out << trcall( itemText ) << ", " << itemName << " );" << endl; - trout << indent << tqparent << "->changeItem( " << tqparent << "->idAt( " << i << " ), "; + trout << indent << parent << "->changeItem( " << parent << "->idAt( " << i << " ), "; trout << trcall( itemText ) << " );" << endl; createPopupMenuImpl( n2, parentClass, itemName ); n = n2; } else { - out << indent << n.attribute( "name" ) << "->addTo( " << tqparent << " );" << endl; + out << indent << n.attribute( "name" ) << "->addTo( " << parent << " );" << endl; } } else if ( n.tagName() == "separator" ) { - out << indent << tqparent << "->insertSeparator();" << endl; + out << indent << parent << "->insertSeparator();" << endl; } ++i; } @@ -555,7 +555,7 @@ void Uic::createPopupMenuImpl( const TQDomElement &e, const TQString &parentClas Creates implementation of an listbox item tag. */ -TQString Uic::createListBoxItemImpl( const TQDomElement &e, const TQString &tqparent, +TQString Uic::createListBoxItemImpl( const TQDomElement &e, const TQString &parent, TQString *value ) { TQDomElement n = e.firstChild().toElement(); @@ -584,9 +584,9 @@ TQString Uic::createListBoxItemImpl( const TQDomElement &e, const TQString &tqpa *value = trcall( txt, com ); if ( pix.isEmpty() ) { - return tqparent + "->insertItem( " + trcall( txt, com ) + " );"; + return parent + "->insertItem( " + trcall( txt, com ) + " );"; } else { - return tqparent + "->insertItem( " + pix + ", " + trcall( txt, com ) + " );"; + return parent + "->insertItem( " + pix + ", " + trcall( txt, com ) + " );"; } } @@ -594,7 +594,7 @@ TQString Uic::createListBoxItemImpl( const TQDomElement &e, const TQString &tqpa Creates implementation of an iconview item tag. */ -TQString Uic::createIconViewItemImpl( const TQDomElement &e, const TQString &tqparent ) +TQString Uic::createIconViewItemImpl( const TQDomElement &e, const TQString &parent ) { TQDomElement n = e.firstChild().toElement(); TQString txt; @@ -619,16 +619,16 @@ TQString Uic::createIconViewItemImpl( const TQDomElement &e, const TQString &tqp } if ( pix.isEmpty() ) - return "(void) new TQIconViewItem( " + tqparent + ", " + trcall( txt, com ) + " );"; + return "(void) new TQIconViewItem( " + parent + ", " + trcall( txt, com ) + " );"; else - return "(void) new TQIconViewItem( " + tqparent + ", " + trcall( txt, com ) + ", " + pix + " );"; + return "(void) new TQIconViewItem( " + parent + ", " + trcall( txt, com ) + ", " + pix + " );"; } /*! Creates implementation of an listview item tag. */ -TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &tqparent, +TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &parent, const TQString &parentItem ) { TQString s; @@ -653,7 +653,7 @@ TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &tqp if ( !parentItem.isEmpty() ) s += "new TQListViewItem( " + parentItem + ", " + lastItem + " );\n"; else - s += "new TQListViewItem( " + tqparent + ", " + lastItem + " );\n"; + s += "new TQListViewItem( " + parent + ", " + lastItem + " );\n"; TQStringList texts; TQStringList pixmaps; @@ -673,7 +673,7 @@ TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &tqp } } else if ( n.tagName() == "item" ) { s += indent + item + "->setOpen( TRUE );\n"; - s += createListViewItemImpl( n, tqparent, item ); + s += createListViewItemImpl( n, parent, item ); } n = n.nextSibling().toElement(); } @@ -693,7 +693,7 @@ TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &tqp Creates implementation of an listview column tag. */ -TQString Uic::createListViewColumnImpl( const TQDomElement &e, const TQString &tqparent, +TQString Uic::createListViewColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value ) { TQDomElement n = e.firstChild().toElement(); @@ -726,17 +726,17 @@ TQString Uic::createListViewColumnImpl( const TQDomElement &e, const TQString &t *value = trcall( txt, com ); TQString s; - s = indent + tqparent + "->addColumn( " + trcall( txt, com ) + " );\n"; + s = indent + parent + "->addColumn( " + trcall( txt, com ) + " );\n"; if ( !pix.isEmpty() ) - s += indent + tqparent + "->header()->setLabel( " + tqparent + "->header()->count() - 1, " + pix + ", " + trcall( txt, com ) + " );\n"; + s += indent + parent + "->header()->setLabel( " + parent + "->header()->count() - 1, " + pix + ", " + trcall( txt, com ) + " );\n"; if ( !clickable ) - s += indent + tqparent + "->header()->setClickEnabled( FALSE, " + tqparent + "->header()->count() - 1 );\n"; + s += indent + parent + "->header()->setClickEnabled( FALSE, " + parent + "->header()->count() - 1 );\n"; if ( !resizable ) - s += indent + tqparent + "->header()->setResizeEnabled( FALSE, " + tqparent + "->header()->count() - 1 );\n"; + s += indent + parent + "->header()->setResizeEnabled( FALSE, " + parent + "->header()->count() - 1 );\n"; return s; } -TQString Uic::createTableRowColumnImpl( const TQDomElement &e, const TQString &tqparent, +TQString Uic::createTableRowColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value ) { TQString objClass = getClassName( e.parentNode().toElement() ); @@ -774,28 +774,28 @@ TQString Uic::createTableRowColumnImpl( const TQDomElement &e, const TQString &t TQString s; if ( isRow ) { - s = indent + tqparent + "->setNumRows( " + tqparent + "->numRows() + 1 );\n"; + s = indent + parent + "->setNumRows( " + parent + "->numRows() + 1 );\n"; if ( pix.isEmpty() ) - s += indent + tqparent + "->verticalHeader()->setLabel( " + tqparent + "->numRows() - 1, " + s += indent + parent + "->verticalHeader()->setLabel( " + parent + "->numRows() - 1, " + trcall( txt, com ) + " );\n"; else - s += indent + tqparent + "->verticalHeader()->setLabel( " + tqparent + "->numRows() - 1, " + s += indent + parent + "->verticalHeader()->setLabel( " + parent + "->numRows() - 1, " + pix + ", " + trcall( txt, com ) + " );\n"; } else { if ( objClass == "TQTable" ) { - s = indent + tqparent + "->setNumCols( " + tqparent + "->numCols() + 1 );\n"; + s = indent + parent + "->setNumCols( " + parent + "->numCols() + 1 );\n"; if ( pix.isEmpty() ) - s += indent + tqparent + "->horizontalHeader()->setLabel( " + tqparent + "->numCols() - 1, " + s += indent + parent + "->horizontalHeader()->setLabel( " + parent + "->numCols() - 1, " + trcall( txt, com ) + " );\n"; else - s += indent + tqparent + "->horizontalHeader()->setLabel( " + tqparent + "->numCols() - 1, " + s += indent + parent + "->horizontalHeader()->setLabel( " + parent + "->numCols() - 1, " + pix + ", " + trcall( txt, com ) + " );\n"; } else if ( objClass == "TQDataTable" ) { if ( !txt.isEmpty() && !field.isEmpty() ) { if ( pix.isEmpty() ) - out << indent << tqparent << "->addColumn( " << fixString( field ) << ", " << trcall( txt, com ) << " );" << endl; + out << indent << parent << "->addColumn( " << fixString( field ) << ", " << trcall( txt, com ) << " );" << endl; else - out << indent << tqparent << "->addColumn( " << fixString( field ) << ", " << trcall( txt, com ) << ", " << pix << " );" << endl; + out << indent << parent << "->addColumn( " << fixString( field ) << ", " << trcall( txt, com ) << ", " << pix << " );" << endl; } } } @@ -805,7 +805,7 @@ TQString Uic::createTableRowColumnImpl( const TQDomElement &e, const TQString &t /*! Creates the implementation of a tqlayout tag. Called from createObjectImpl(). */ -TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& tqparent, const TQString& tqlayout ) +TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& tqlayout ) { TQDomElement n; TQString objClass, objName; @@ -830,15 +830,15 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla optcells = "1, 1, "; if ( (parentClass == "TQGroupBox" || parentClass == "TQButtonGroup") && tqlayout.isEmpty() ) { // special case for group box - out << indent << tqparent << "->setColumnLayout(0, Qt::Vertical );" << endl; - out << indent << tqparent << "->tqlayout()->setSpacing( " << spacing << " );" << endl; - out << indent << tqparent << "->tqlayout()->setMargin( " << margin << " );" << endl; - out << indent << objName << " = new " << qtqlayout << "( " << tqparent << "->tqlayout() );" << endl; + out << indent << parent << "->setColumnLayout(0, Qt::Vertical );" << endl; + out << indent << parent << "->tqlayout()->setSpacing( " << spacing << " );" << endl; + out << indent << parent << "->tqlayout()->setMargin( " << margin << " );" << endl; + out << indent << objName << " = new " << qtqlayout << "( " << parent << "->tqlayout() );" << endl; out << indent << objName << "->tqsetAlignment( TQt::AlignTop );" << endl; } else { out << indent << objName << " = new " << qtqlayout << "( "; if ( tqlayout.isEmpty() ) - out << tqparent; + out << parent; else { out << "0"; if ( !DomTool::hasProperty( e, "margin" ) ) @@ -852,10 +852,10 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla if ( !isGrid ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "spacer" ) { - TQString child = createSpacerImpl( n, parentClass, tqparent, objName ); + TQString child = createSpacerImpl( n, parentClass, parent, objName ); out << indent << objName << "->addItem( static_cast<TQLayoutItem*>(static_cast<QLayoutItem*>( " << child << " )) );" << endl; } else if ( tags.contains( n.tagName() ) ) { - TQString child = createObjectImpl( n, parentClass, tqparent, objName ); + TQString child = createObjectImpl( n, parentClass, parent, objName ); if ( isLayout( child ) ) out << indent << objName << "->addLayout( static_cast<TQLayout*>(static_cast<QLayout*>( " << child << " )) );" << endl; else @@ -874,7 +874,7 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla if ( colspan < 1 ) colspan = 1; if ( n.tagName() == "spacer" ) { - TQString child = createSpacerImpl( n, parentClass, tqparent, objName ); + TQString child = createSpacerImpl( n, parentClass, parent, objName ); if ( rowspan * colspan != 1 ) out << indent << objName << "->addMultiCell( " << child << ", " << row << ", " << ( row + rowspan - 1 ) << ", " << col << ", " << ( col + colspan - 1 ) << " );" << endl; @@ -882,7 +882,7 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla out << indent << objName << "->addItem( " << child << ", " << row << ", " << col << " );" << endl; } else if ( tags.contains( n.tagName() ) ) { - TQString child = createObjectImpl( n, parentClass, tqparent, objName ); + TQString child = createObjectImpl( n, parentClass, parent, objName ); out << endl; TQString o = "Widget"; if ( isLayout( child ) ) @@ -902,7 +902,7 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla -TQString Uic::createSpacerImpl( const TQDomElement &e, const TQString& /*parentClass*/, const TQString& /*tqparent*/, const TQString& /*tqlayout*/) +TQString Uic::createSpacerImpl( const TQDomElement &e, const TQString& /*parentClass*/, const TQString& /*parent*/, const TQString& /*tqlayout*/) { TQDomElement n; TQString objClass, objName; @@ -1109,15 +1109,15 @@ TQStringList Uic::unique( const TQStringList& list ) /*! - Creates an instance of class \a objClass, with tqparent \a tqparent and name \a objName + Creates an instance of class \a objClass, with parent \a parent and name \a objName */ -TQString Uic::createObjectInstance( const TQString& objClass, const TQString& tqparent, const TQString& objName ) +TQString Uic::createObjectInstance( const TQString& objClass, const TQString& parent, const TQString& objName ) { if ( objClass.mid( 2 ) == "ComboBox" ) { - return objClass + "( FALSE, " + tqparent + ", \"" + objName + "\" )"; + return objClass + "( FALSE, " + parent + ", \"" + objName + "\" )"; } - return objClass + "( " + tqparent + ", \"" + objName + "\" )"; + return objClass + "( " + parent + ", \"" + objName + "\" )"; } bool Uic::isLayout( const TQString& name ) const diff --git a/experimental/tqtinterface/qt4/tools/designer/uic/uic.h b/experimental/tqtinterface/qt4/tools/designer/uic/uic.h index 00af1d845..6f240fd1e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uic/uic.h +++ b/experimental/tqtinterface/qt4/tools/designer/uic/uic.h @@ -60,20 +60,20 @@ public: void createToolbarDecl( const TQDomElement &e ); void createMenuBarDecl( const TQDomElement &e ); void createPopupMenuDecl( const TQDomElement &e ); - void createActionImpl( const TQDomElement &e, const TQString &tqparent ); - void createToolbarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &tqparent ); - void createMenuBarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &tqparent ); - void createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &tqparent ); - TQString createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& tqparent, const TQString& tqlayout = TQString() ); - TQString createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& tqparent, const TQString& tqlayout = TQString() ); - TQString createObjectInstance( const TQString& objClass, const TQString& tqparent, const TQString& objName ); - TQString createSpacerImpl( const TQDomElement &e, const TQString& parentClass, const TQString& tqparent, const TQString& tqlayout = TQString() ); + void createActionImpl( const TQDomElement &e, const TQString &parent ); + void createToolbarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ); + void createMenuBarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ); + void createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ); + TQString createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& tqlayout = TQString() ); + TQString createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& tqlayout = TQString() ); + TQString createObjectInstance( const TQString& objClass, const TQString& parent, const TQString& objName ); + TQString createSpacerImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& tqlayout = TQString() ); void createExclusiveProperty( const TQDomElement & e, const TQString& exclusiveProp ); - TQString createListBoxItemImpl( const TQDomElement &e, const TQString &tqparent, TQString *value = 0 ); - TQString createIconViewItemImpl( const TQDomElement &e, const TQString &tqparent ); - TQString createListViewColumnImpl( const TQDomElement &e, const TQString &tqparent, TQString *value = 0 ); - TQString createTableRowColumnImpl( const TQDomElement &e, const TQString &tqparent, TQString *value = 0 ); - TQString createListViewItemImpl( const TQDomElement &e, const TQString &tqparent, + TQString createListBoxItemImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 ); + TQString createIconViewItemImpl( const TQDomElement &e, const TQString &parent ); + TQString createListViewColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 ); + TQString createTableRowColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 ); + TQString createListViewItemImpl( const TQDomElement &e, const TQString &parent, const TQString &parentItem ); void createColorGroupImpl( const TQString& cg, const TQDomElement& e ); TQColorGroup loadColorGroup( const TQDomElement &e ); diff --git a/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp b/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp index ef46eea9d..b8bd67421 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp @@ -271,7 +271,7 @@ TQWidgetFactory::~TQWidgetFactory() /*! Loads the \e{TQt Designer} user interface description file \a uiFile - and returns the top-level widget in that description. \a tqparent and + and returns the top-level widget in that description. \a parent and \a name are passed to the constructor of the top-level widget. This function also performs signal and slot connections, tab @@ -289,7 +289,7 @@ TQWidgetFactory::~TQWidgetFactory() */ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) { setupPluginDir(); TQFile f( uiFile ); @@ -306,7 +306,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, return 0; qwf_currFileName = uiFile; - TQWidget *w = TQWidgetFactory::create( &f, connector, tqparent, name ); + TQWidget *w = TQWidgetFactory::create( &f, connector, parent, name ); if ( !qwf_forms ) qwf_forms = new TQMap<TQWidget*, TQString>; qwf_forms->insert( w, uiFile ); @@ -319,7 +319,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, Loads the user interface description from tqdevice \a dev. */ -TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *tqparent, const char *name ) +TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *parent, const char *name ) { setupPluginDir(); TQWidget *w = 0; @@ -337,12 +337,12 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge TQDataStream in( dev ); in >> magic; if ( magic == UibMagic ) { - w = widgetFactory->createFromUibFile( in, connector, tqparent, name ); + w = widgetFactory->createFromUibFile( in, connector, parent, name ); } else { in.unsetDevice(); dev->at( start ); if ( doc.setContent( dev, &errMsg, &errLine ) ) { - w = widgetFactory->createFromUiFile( doc, connector, tqparent, name ); + w = widgetFactory->createFromUiFile( doc, connector, parent, name ); } else { // qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); } @@ -416,7 +416,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge } TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connector, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) { DomTool::fixDocument( doc ); @@ -477,7 +477,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec if ( !imageCollection.isNull() ) loadImageCollection( imageCollection ); - createWidgetInternal( widget, tqparent, 0, widget.attribute("class", "TQWidget") ); + createWidgetInternal( widget, parent, 0, widget.attribute("class", "TQWidget") ); TQWidget *w = toplevel; if ( !w ) return 0; @@ -663,7 +663,7 @@ void TQWidgetFactory::unpackVariant( const UibStrTable& strings, TQDataStream& i } void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, - TQLayout *tqparent ) + TQLayout *parent ) { TQCString name; TQVariant value; @@ -706,7 +706,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, in >> objectTag; } - if ( tqparent != 0 ) { + if ( parent != 0 ) { TQSpacerItem *spacer; if ( vertical ) { spacer = new TQSpacerItem( w, h, TQSizePolicy::Minimum, sizeType ); @@ -714,18 +714,18 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, spacer = new TQSpacerItem( w, h, sizeType, TQSizePolicy::Minimum ); } - if ( tqparent->inherits("TQGridLayout") ) { - ((TQGridLayout *) tqparent)->addMultiCell( spacer, row, + if ( parent->inherits("TQGridLayout") ) { + ((TQGridLayout *) parent)->addMultiCell( spacer, row, row + rowspan - 1, column, column + colspan - 1, vertical ? Qt::AlignHCenter : Qt::AlignVCenter ); } else { - tqparent->addItem( spacer ); + parent->addItem( spacer ); } } } void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, - TQDataStream& in, TQObject *tqparent, + TQDataStream& in, TQObject *parent, bool isRow ) { TQString text; @@ -773,13 +773,13 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, in >> objectTag; } - if ( tqparent != 0 ) { - if ( tqparent->inherits("TQListView") ) { - createListViewColumn( (TQListView *) tqparent, text, pixmap, clickable, + if ( parent != 0 ) { + if ( parent->inherits("TQListView") ) { + createListViewColumn( (TQListView *) parent, text, pixmap, clickable, resizable ); #ifndef TQT_NO_TABLE - } else if ( tqparent->inherits("TQTable") ) { - createTableColumnOrRow( (TQTable *) tqparent, text, pixmap, field, + } else if ( parent->inherits("TQTable") ) { + createTableColumnOrRow( (TQTable *) parent, text, pixmap, field, isRow ); #endif } @@ -787,7 +787,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, } void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, - TQObject *tqparent, TQListViewItem *parentItem ) + TQObject *parent, TQListViewItem *parentItem ) { TQStringList texts; TQValueList<TQPixmap> pixmaps; @@ -797,8 +797,8 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, TQ_UINT8 objectTag; TQListView *listView = 0; - if ( tqparent != 0 && tqparent->inherits("TQListView") ) - tqparent = TQT_TQOBJECT((TQListView *) tqparent); + if ( parent != 0 && parent->inherits("TQListView") ) + parent = TQT_TQOBJECT((TQListView *) parent); TQListViewItem *item = 0; if ( listView != 0 ) { if ( parentItem == 0 ) { @@ -815,7 +815,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, case Object_Item: if ( listView != 0 ) d->lastItem->setOpen( TRUE ); - inputItem( strings, in, tqparent, item ); + inputItem( strings, in, parent, item ); break; case Object_TextProperty: unpackCString( strings, in, name ); @@ -858,12 +858,12 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, TQString text = texts.last(); TQPixmap pixmap = pixmaps.last(); - if ( tqparent != 0 ) { - if ( tqparent->inherits("TQComboBox") || - tqparent->inherits("TQListBox") ) { - TQListBox *listBox = (TQListBox *) tqparent->tqqt_cast( "TQListBox" ); + if ( parent != 0 ) { + if ( parent->inherits("TQComboBox") || + parent->inherits("TQListBox") ) { + TQListBox *listBox = (TQListBox *) parent->tqqt_cast( "TQListBox" ); if ( listBox == 0 ) - listBox = ((TQComboBox *) tqparent)->listBox(); + listBox = ((TQComboBox *) parent)->listBox(); if ( pixmap.isNull() ) { (void) new TQListBoxText( listBox, text ); @@ -871,8 +871,8 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, (void) new TQListBoxPixmap( listBox, pixmap, text ); } #ifndef TQT_NO_ICONVIEW - } else if ( tqparent->inherits("TQIconView") ) { - (void) new TQIconViewItem( (TQIconView *) tqparent, text, pixmap ); + } else if ( parent->inherits("TQIconView") ) { + (void) new TQIconViewItem( (TQIconView *) parent, text, pixmap ); #endif } } @@ -914,7 +914,7 @@ void TQWidgetFactory::inputMenuItem( TQObject **objects, TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, const UibStrTable& strings, TQDataStream& in, TQWidget *ancestorWidget, - TQObject *tqparent, TQCString className ) + TQObject *parent, TQCString className ) { TQObject *obj = 0; TQWidget *widget = 0; @@ -924,15 +924,15 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, bool isTQObject = !className.isEmpty(); if ( isTQObject ) { - if ( tqparent != 0 ) { - if ( tqparent->isWidgetType() ) { - if ( tqparent->inherits("TQMainWindow") ) { - parentWidget = ((TQMainWindow *) tqparent)->centralWidget(); + if ( parent != 0 ) { + if ( parent->isWidgetType() ) { + if ( parent->inherits("TQMainWindow") ) { + parentWidget = ((TQMainWindow *) parent)->centralWidget(); } else { - parentWidget = (TQWidget *) tqparent; + parentWidget = (TQWidget *) parent; } - } else if ( tqparent->inherits("TQLayout") ) { - parentLayout = (TQLayout *) tqparent; + } else if ( parent->inherits("TQLayout") ) { + parentLayout = (TQLayout *) parent; parentWidget = ancestorWidget; } } @@ -940,9 +940,9 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( className == "TQAction" ) { unpackCString( strings, in, className ); if ( className == "TQActionGroup" ) { - obj = TQT_TQOBJECT(new TQActionGroup( tqparent )); + obj = TQT_TQOBJECT(new TQActionGroup( parent )); } else { - obj = TQT_TQOBJECT(new TQAction( tqparent )); + obj = TQT_TQOBJECT(new TQAction( parent )); } } else if ( className == "TQLayout" ) { unpackCString( strings, in, className ); @@ -960,13 +960,13 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, obj = TQT_TQOBJECT(tqlayout); } else if ( className == "TQMenuBar" ) { unpackCString( strings, in, className ); - widget = ((TQMainWindow *) tqparent)->menuBar(); + widget = ((TQMainWindow *) parent)->menuBar(); obj = TQT_TQOBJECT(widget); } else if ( className == "TQToolBar" ) { TQ_UINT8 dock; in >> dock; unpackCString( strings, in, className ); - widget = new TQToolBar( TQString(), (TQMainWindow *) tqparent, + widget = new TQToolBar( TQString(), (TQMainWindow *) parent, (TQt::TQt::Dock) dock ); obj = TQT_TQOBJECT(widget); } else if ( className == "TQWidget" ) { @@ -1110,7 +1110,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, break; case Object_SubAction: inputObject( objects, numObjects, strings, in, parentWidget, - obj != 0 ? obj : tqparent, "TQAction" ); + obj != 0 ? obj : parent, "TQAction" ); break; case Object_SubLayout: inputObject( objects, numObjects, strings, in, parentWidget, obj, @@ -1128,11 +1128,11 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( metAttribute > 0 ) { if ( name == "title" ) { - if ( tqparent != 0 ) { - if ( tqparent->inherits("TQTabWidget") ) { - ((TQTabWidget *) tqparent)->insertTab( widget, str ); - } else if ( tqparent->inherits("TQWizard") ) { - ((TQWizard *) tqparent)->addPage( widget, str ); + if ( parent != 0 ) { + if ( parent->inherits("TQTabWidget") ) { + ((TQTabWidget *) parent)->insertTab( widget, str ); + } else if ( parent->inherits("TQWizard") ) { + ((TQWizard *) parent)->addPage( widget, str ); } } } @@ -1147,8 +1147,8 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( metAttribute > 0 ) { if ( name == "id" ) { - if ( tqparent != 0 && tqparent->inherits("TQWidgetStack") ) - ((TQWidgetStack *) tqparent)->addWidget( widget, value.toInt() ); + if ( parent != 0 && parent->inherits("TQWidgetStack") ) + ((TQWidgetStack *) parent)->addWidget( widget, value.toInt() ); } } else { if ( obj != 0 ) @@ -1183,7 +1183,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, } TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, - TQObject * /* connector */ , TQWidget *tqparent, const char *name ) + TQObject * /* connector */ , TQWidget *parent, const char *name ) { #define END_OF_BLOCK() \ ( in.atEnd() || in.tqdevice()->at() >= nextBlock ) @@ -1355,7 +1355,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, break; case Block_Widget: toplevel = (TQWidget *) - inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(tqparent), + inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(parent), "TQWidget" ); if ( toplevel != 0 ) toplevel->setName( name ); @@ -1381,7 +1381,7 @@ void TQWidgetFactory::addWidgetFactory( TQWidgetFactory *factory ) } /*! - Creates a widget of the type \a className passing \a tqparent and \a + Creates a widget of the type \a className passing \a parent and \a name to its constructor. If \a className is a widget in the TQt library, it is directly @@ -1417,106 +1417,106 @@ void TQWidgetFactory::addWidgetFactory( TQWidgetFactory *factory ) \endlist */ -TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, +TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name ) const { // create widgets we know if ( className == "TQPushButton" ) { - return new TQPushButton( tqparent, name ); + return new TQPushButton( parent, name ); } else if ( className == "TQToolButton" ) { - return new TQToolButton( tqparent, name ); + return new TQToolButton( parent, name ); } else if ( className == "TQCheckBox" ) { - return new TQCheckBox( tqparent, name ); + return new TQCheckBox( parent, name ); } else if ( className == "TQRadioButton" ) { - return new TQRadioButton( tqparent, name ); + return new TQRadioButton( parent, name ); } else if ( className == "TQGroupBox" ) { - return new TQGroupBox( tqparent, name ); + return new TQGroupBox( parent, name ); } else if ( className == "TQButtonGroup" ) { - return new TQButtonGroup( tqparent, name ); + return new TQButtonGroup( parent, name ); } else if ( className == "TQIconView" ) { #if !defined(TQT_NO_ICONVIEW) - return new TQIconView( tqparent, name ); + return new TQIconView( parent, name ); #endif } else if ( className == "TQTable" ) { #if !defined(TQT_NO_TABLE) - return new TQTable( tqparent, name ); + return new TQTable( parent, name ); #endif } else if ( className == "TQListBox" ) { - return new TQListBox( tqparent, name ); + return new TQListBox( parent, name ); } else if ( className == "TQListView" ) { - return new TQListView( tqparent, name ); + return new TQListView( parent, name ); } else if ( className == "TQLineEdit" ) { - return new TQLineEdit( tqparent, name ); + return new TQLineEdit( parent, name ); } else if ( className == "TQSpinBox" ) { - return new TQSpinBox( tqparent, name ); + return new TQSpinBox( parent, name ); } else if ( className == "TQMultiLineEdit" ) { - return new TQMultiLineEdit( tqparent, name ); + return new TQMultiLineEdit( parent, name ); } else if ( className == "TQLabel" || className == "TextLabel" || className == "PixmapLabel" ) { - return new TQLabel( tqparent, name ); + return new TQLabel( parent, name ); } else if ( className == "TQLayoutWidget" ) { - return new TQWidget( tqparent, name ); + return new TQWidget( parent, name ); } else if ( className == "TQTabWidget" ) { - return new TQTabWidget( tqparent, name ); + return new TQTabWidget( parent, name ); } else if ( className == "TQComboBox" ) { - return new TQComboBox( FALSE, tqparent, name ); + return new TQComboBox( FALSE, parent, name ); } else if ( className == "TQWidget" ) { if ( !qwf_stays_on_top ) - return new TQWidget( tqparent, name ); - return new TQWidget( tqparent, name, TQt::WStyle_StaysOnTop ); + return new TQWidget( parent, name ); + return new TQWidget( parent, name, TQt::WStyle_StaysOnTop ); } else if ( className == "TQDialog" ) { if ( !qwf_stays_on_top ) - return new TQDialog( tqparent, name ); - return new TQDialog( tqparent, name, FALSE, (WFlags)TQt::WStyle_StaysOnTop ); + return new TQDialog( parent, name ); + return new TQDialog( parent, name, FALSE, (WFlags)TQt::WStyle_StaysOnTop ); } else if ( className == "TQWizard" ) { - return new TQWizard( tqparent, name ); + return new TQWizard( parent, name ); } else if ( className == "TQLCDNumber" ) { - return new TQLCDNumber( tqparent, name ); + return new TQLCDNumber( parent, name ); } else if ( className == "TQProgressBar" ) { - return new TQProgressBar( tqparent, name ); + return new TQProgressBar( parent, name ); } else if ( className == "TQTextView" ) { - return new TQTextView( tqparent, name ); + return new TQTextView( parent, name ); } else if ( className == "TQTextBrowser" ) { - return new TQTextBrowser( tqparent, name ); + return new TQTextBrowser( parent, name ); } else if ( className == "TQDial" ) { - return new TQDial( tqparent, name ); + return new TQDial( parent, name ); } else if ( className == "TQSlider" ) { - return new TQSlider( tqparent, name ); + return new TQSlider( parent, name ); } else if ( className == "TQFrame" ) { - return new TQFrame( tqparent, name ); + return new TQFrame( parent, name ); } else if ( className == "TQSplitter" ) { - return new TQSplitter( tqparent, name ); + return new TQSplitter( parent, name ); } else if ( className == "Line" ) { - TQFrame *f = new TQFrame( tqparent, name ); + TQFrame *f = new TQFrame( parent, name ); f->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); return f; } else if ( className == "TQTextEdit" ) { - return new TQTextEdit( tqparent, name ); + return new TQTextEdit( parent, name ); } else if ( className == "TQDateEdit" ) { - return new TQDateEdit( tqparent, name ); + return new TQDateEdit( parent, name ); } else if ( className == "TQTimeEdit" ) { - return new TQTimeEdit( tqparent, name ); + return new TQTimeEdit( parent, name ); } else if ( className == "TQDateTimeEdit" ) { - return new TQDateTimeEdit( tqparent, name ); + return new TQDateTimeEdit( parent, name ); } else if ( className == "TQScrollBar" ) { - return new TQScrollBar( tqparent, name ); + return new TQScrollBar( parent, name ); } else if ( className == "TQPopupMenu" ) { - return new TQPopupMenu( tqparent, name ); + return new TQPopupMenu( parent, name ); } else if ( className == "TQWidgetStack" ) { - return new TQWidgetStack( tqparent, name ); + return new TQWidgetStack( parent, name ); } else if ( className == "TQToolBox" ) { - return new TQToolBox( tqparent, name ); + return new TQToolBox( parent, name ); } else if ( className == "TQVBox" ) { - return new TQVBox( tqparent, name ); + return new TQVBox( parent, name ); } else if ( className == "TQHBox" ) { - return new TQHBox( tqparent, name ); + return new TQHBox( parent, name ); } else if ( className == "TQGrid" ) { - return new TQGrid( 4, tqparent, name ); + return new TQGrid( 4, parent, name ); } else if ( className == "TQMainWindow" ) { TQMainWindow *mw = 0; if ( !qwf_stays_on_top ) - mw = new TQMainWindow( tqparent, name ); + mw = new TQMainWindow( parent, name ); else - mw = new TQMainWindow( tqparent, name, (WFlags)(TQt::WType_TopLevel | TQt::WStyle_StaysOnTop) ); + mw = new TQMainWindow( parent, name, (WFlags)(TQt::WType_TopLevel | TQt::WStyle_StaysOnTop) ); mw->setCentralWidget( new TQWidget( mw, "qt_central_widget" ) ); mw->centralWidget()->show(); (void)mw->statusBar(); @@ -1525,11 +1525,11 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq } #if !defined(TQT_NO_SQL) else if ( className == "TQDataTable" ) { - return new TQDataTable( tqparent, name ); + return new TQDataTable( parent, name ); } else if ( className == "TQDataBrowser" ) { - return new TQDesignerDataBrowser2( tqparent, name ); + return new TQDesignerDataBrowser2( parent, name ); } else if ( className == "TQDataView" ) { - return new TQDesignerDataView2( tqparent, name ); + return new TQDesignerDataView2( parent, name ); } #endif @@ -1543,7 +1543,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq TQInterfacePtr<WidgetInterface> iface = 0; widgetInterfaceManager->queryInterface( className, &iface ); if ( iface ) { - TQWidget *w = iface->create( className, tqparent, name ); + TQWidget *w = iface->create( className, parent, name ); if ( w ) { d->customWidgets.replace( className.latin1(), new bool(TRUE) ); return w; @@ -1552,7 +1552,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq // hope we have a factory which can do it for ( TQWidgetFactory* f = widgetFactories.first(); f; f = widgetFactories.next() ) { - TQWidget *w = f->createWidget( className, tqparent, name ); + TQWidget *w = f->createWidget( className, parent, name ); if ( w ) return w; } @@ -1578,7 +1578,7 @@ bool TQWidgetFactory::supportsWidget( const TQString &widget ) return ( availableWidgetMap->find( widget ) != availableWidgetMap->end() ); } -TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, +TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg ) { d->lastItem = 0; @@ -1606,9 +1606,9 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } if ( tqlayout && className == "TQLayoutWidget" ) { // hide tqlayout widgets - w = tqparent; + w = parent; } else { - obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, tqparent, 0 )); + obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, parent, 0 )); if ( !obj ) return 0; w = (TQWidget*)obj; @@ -1637,8 +1637,8 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } } #ifdef TQT_CONTAINER_CUSTOM_WIDGETS - TQString parentClassName = tqparent ? tqparent->className() : 0; - bool isPlugin = tqparent ? !!d->customWidgets.find( tqparent->className() ) : FALSE; + TQString parentClassName = parent ? parent->className() : 0; + bool isPlugin = parent ? !!d->customWidgets.find( parent->className() ) : FALSE; if ( isPlugin ) qWarning( "####### loading custom container widgets without page support not implemented!" ); // ### TODO loading for custom container widgets without pages @@ -1693,19 +1693,19 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( tqparent ) { - if ( tqparent->inherits( "TQTabWidget" ) ) { + if ( parent ) { + if ( parent->inherits( "TQTabWidget" ) ) { if ( attrib == "title" ) - ( (TQTabWidget*)tqparent )->insertTab( w, translate( v.toString() ) ); - } else if ( tqparent->inherits( "TQWidgetStack" ) ) { + ( (TQTabWidget*)parent )->insertTab( w, translate( v.toString() ) ); + } else if ( parent->inherits( "TQWidgetStack" ) ) { if ( attrib == "id" ) - ( (TQWidgetStack*)tqparent )->addWidget( w, v.toInt() ); - } else if ( tqparent->inherits( "TQToolBox" ) ) { + ( (TQWidgetStack*)parent )->addWidget( w, v.toInt() ); + } else if ( parent->inherits( "TQToolBox" ) ) { if ( attrib == "label" ) - ( (TQToolBox*)tqparent )->addItem( w, v.toString() ); - } else if ( tqparent->inherits( "TQWizard" ) ) { + ( (TQToolBox*)parent )->addItem( w, v.toString() ); + } else if ( parent->inherits( "TQWizard" ) ) { if ( attrib == "title" ) - ( (TQWizard*)tqparent )->addPage( w, translate( v.toString() ) ); + ( (TQWizard*)parent )->addPage( w, translate( v.toString() ) ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS } else if ( isPlugin ) { if ( attrib == "label" ) { @@ -1717,7 +1717,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget (TQUnknownInterface**)&iface2 ); if ( iface2 ) { iface2->insertPage( parentClassName, - (TQWidget*)tqparent, translate( v.toString() ), -1, w ); + (TQWidget*)parent, translate( v.toString() ), -1, w ); iface2->release(); } iface->release(); @@ -1861,8 +1861,8 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, } else if ( prop == "buddy" ) { buddies.insert( obj->name(), value.toCString() ); } else if ( prop == "buttonGroupId" ) { - if ( obj->inherits( "TQButton" ) && obj->tqparent()->inherits( "TQButtonGroup" ) ) - ( (TQButtonGroup*)obj->tqparent() )->insert( (TQButton*)obj, value.toInt() ); + if ( obj->inherits( "TQButton" ) && obj->parent()->inherits( "TQButtonGroup" ) ) + ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, value.toInt() ); #ifndef TQT_NO_SQL } else if ( prop == "database" && !obj->inherits( "TQDataView" ) && !obj->inherits( "TQDataBrowser" ) ) { @@ -2416,13 +2416,13 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis -void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e ) +void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e ) { TQDomElement n = e; TQAction *a = 0; bool hasMenuText = FALSE; if ( n.tagName() == "action" ) { - a = new TQAction( tqparent ); + a = new TQAction( parent ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { @@ -2434,10 +2434,10 @@ void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( "TQAction" ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } else if ( n.tagName() == "actiongroup" ) { - a = new TQActionGroup( tqparent ); + a = new TQActionGroup( parent ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "property" ) { @@ -2452,7 +2452,7 @@ void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( "TQAction" ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h b/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h index 0ce05e9b7..bc4bd7cff 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h +++ b/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h @@ -61,13 +61,13 @@ public: TQWidgetFactory(); virtual ~TQWidgetFactory(); - static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 ); - static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 ); - inline static TQWidget *create( TQFile *dev, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 ) { return create(TQT_TQIODEVICE(dev), connector, tqparent, name); } + static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 ); + static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 ); + inline static TQWidget *create( TQFile *dev, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 ) { return create(TQT_TQIODEVICE(dev), connector, parent, name); } static void addWidgetFactory( TQWidgetFactory *factory ); static void loadImages( const TQString &dir ); - virtual TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const; + virtual TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const; static TQStringList widgets(); static bool supportsWidget( const TQString &widget ); @@ -76,7 +76,7 @@ private: void loadImageCollection( const TQDomElement &e ); void loadConnections( const TQDomElement &e, TQObject *connector ); void loadTabOrder( const TQDomElement &e ); - TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg ); + TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg ); TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type, bool isTQLayoutWidget = FALSE ); LayoutType layoutType( TQLayout *l ) const; void setProperty( TQObject* widget, const TQString &prop, TQVariant value ); @@ -97,7 +97,7 @@ private: void createColumn( const TQDomElement &e, TQWidget *widget ); void loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); - void loadChildAction( TQObject *tqparent, const TQDomElement &e ); + void loadChildAction( TQObject *parent, const TQDomElement &e ); void loadActions( const TQDomElement &e ); void loadToolBars( const TQDomElement &e ); void loadMenuBar( const TQDomElement &e ); @@ -120,21 +120,21 @@ private: void unpackVariant( const UibStrTable& strings, TQDataStream& in, TQVariant& value ); void inputSpacer( const UibStrTable& strings, TQDataStream& in, - TQLayout *tqparent ); + TQLayout *parent ); void inputColumnOrRow( const UibStrTable& strings, TQDataStream& in, - TQObject *tqparent, bool isRow ); + TQObject *parent, bool isRow ); void inputItem( const UibStrTable& strings, TQDataStream& in, - TQObject *tqparent, TQListViewItem *parentItem = 0 ); + TQObject *parent, TQListViewItem *parentItem = 0 ); void inputMenuItem( TQObject **objects, const UibStrTable& strings, TQDataStream& in, TQMenuBar *menuBar ); TQObject *inputObject( TQObject **objects, int& numObjects, const UibStrTable& strings, TQDataStream& in, - TQWidget *ancestorWidget, TQObject *tqparent, + TQWidget *ancestorWidget, TQObject *parent, TQCString className = "" ); TQWidget *createFromUiFile( TQDomDocument doc, TQObject *connector, - TQWidget *tqparent, const char *name ); + TQWidget *parent, const char *name ); TQWidget *createFromUibFile( TQDataStream& in, TQObject *connector, - TQWidget *tqparent, const char *name ); + TQWidget *parent, const char *name ); private: struct Image { diff --git a/experimental/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf b/experimental/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf index 7cec63194..b20c2cd9a 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf +++ b/experimental/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf @@ -343,7 +343,7 @@ Objects of this class provide translations for user-visible text. \skipto QTranslator \printuntil tor -Creates a \l QTranslator object without a tqparent. +Creates a \l QTranslator object without a parent. \printline load diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp index fe8129a16..0e13762c2 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp @@ -46,9 +46,9 @@ #include <tqpushbutton.h> #include <tqwhatsthis.h> -FindDialog::FindDialog( bool replace, TQWidget *tqparent, const char *name, +FindDialog::FindDialog( bool replace, TQWidget *parent, const char *name, bool modal ) - : TQDialog( tqparent, name, modal ) + : TQDialog( parent, name, modal ) { sourceText = 0; diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.h b/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.h index 47d0ec53c..f2c534d59 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.h +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.h @@ -46,7 +46,7 @@ class FindDialog : public TQDialog public: enum { SourceText = 0x1, Translations = 0x2, Comments = 0x4 }; - FindDialog( bool replace, TQWidget *tqparent = 0, const char *name = 0, bool modal = FALSE ); + FindDialog( bool replace, TQWidget *parent = 0, const char *name = 0, bool modal = FALSE ); Q_SIGNALS: void findNext( const TQString& text, int where, bool matchCase ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp index 5c3c747b8..66484e3c2 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp @@ -51,14 +51,14 @@ static TQString rho( int n ) int LVI::count = 0; -LVI::LVI( TQListView * tqparent, TQString text ) - : TQListViewItem( tqparent, text ) +LVI::LVI( TQListView * parent, TQString text ) + : TQListViewItem( parent, text ) { setText( 0, rho(count++) ); } -LVI::LVI( TQListViewItem * tqparent, TQString text ) - : TQListViewItem( tqparent, text ) +LVI::LVI( TQListViewItem * parent, TQString text ) + : TQListViewItem( parent, text ) { setText( 0, rho(count++) ); } @@ -137,11 +137,11 @@ static TQString fixEllipsis( const TQString & str, int len ) /* MessageLVI implementation */ -MessageLVI::MessageLVI( TQListView *tqparent, +MessageLVI::MessageLVI( TQListView *parent, const MetaTranslatorMessage & message, const TQString& text, const TQString& comment, ContextLVI * c ) - : LVI( tqparent ), m( message ), tx( text ), com( comment ), ctxt( c ) + : LVI( parent ), m( message ), tx( text ), com( comment ), ctxt( c ) { if ( m.translation().isEmpty() ) { TQString t = ""; diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.h b/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.h index de37b6658..ba2104fdb 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.h +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.h @@ -44,8 +44,8 @@ class LVI : public TQListViewItem { public: - LVI( TQListView *tqparent, TQString text = TQString() ); - LVI( TQListViewItem *tqparent, TQString text = TQString() ); + LVI( TQListView *parent, TQString text = TQString() ); + LVI( TQListViewItem *parent, TQString text = TQString() ); virtual int compare( TQListViewItem *other, int column, bool ascending ) const; virtual bool danger() const { return FALSE; } @@ -101,7 +101,7 @@ private: class MessageLVI : public LVI { public: - MessageLVI( TQListView *tqparent, const MetaTranslatorMessage & message, + MessageLVI( TQListView *parent, const MetaTranslatorMessage & message, const TQString& text, const TQString& comment, ContextLVI * c ); virtual bool danger() const { return d; } diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp index 5e2987550..75733c32a 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp @@ -70,8 +70,8 @@ static const int MaxCandidates = 5; class MED : public TQTextEdit { public: - MED( TQWidget *tqparent, const char *name = 0 ) - : TQTextEdit( tqparent, name ) {} + MED( TQWidget *parent, const char *name = 0 ) + : TQTextEdit( parent, name ) {} int cursorX() const { return textCursor()->x(); } int cursorY() const { return textCursor()->paragraph()->rect().y() + @@ -133,14 +133,14 @@ TQString richText( const TQString& text ) Used to create a shadow like effect for a widget */ -ShadowWidget::ShadowWidget( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ), sWidth( 10 ), wMargin( 3 ), childWgt( 0 ) +ShadowWidget::ShadowWidget( TQWidget * parent, const char * name ) + : TQWidget( parent, name ), sWidth( 10 ), wMargin( 3 ), childWgt( 0 ) { } -ShadowWidget::ShadowWidget( TQWidget * child, TQWidget * tqparent, +ShadowWidget::ShadowWidget( TQWidget * child, TQWidget * parent, const char * name ) - : TQWidget( tqparent, name ), sWidth( 10 ), wMargin( 3 ), childWgt( 0 ) + : TQWidget( parent, name ), sWidth( 10 ), wMargin( 3 ), childWgt( 0 ) { setWidget( child ); } @@ -148,7 +148,7 @@ ShadowWidget::ShadowWidget( TQWidget * child, TQWidget * tqparent, void ShadowWidget::setWidget( TQWidget * child ) { childWgt = child; - if ( childWgt && TQT_BASE_OBJECT(childWgt->tqparent()) != TQT_BASE_OBJECT(this) ) { + if ( childWgt && TQT_BASE_OBJECT(childWgt->parent()) != TQT_BASE_OBJECT(this) ) { childWgt->reparent( this, TQPoint( 0, 0 ), TRUE ); } } @@ -198,8 +198,8 @@ void ShadowWidget::paintEvent( TQPaintEvent * e ) A frame that contains the source text, translated text and any source code comments and hints. */ -EditorPage::EditorPage( TQWidget * tqparent, const char * name ) - : TQFrame( tqparent, name ) +EditorPage::EditorPage( TQWidget * parent, const char * name ) + : TQFrame( parent, name ) { setLineWidth( 1 ); setFrameStyle( TQFrame::Box | TQFrame::Plain ); @@ -396,9 +396,9 @@ void EditorPage::fontChange( const TQFont & ) Handle tqlayout of dock windows and the editor page. */ -MessageEditor::MessageEditor( MetaTranslator * t, TQWidget * tqparent, +MessageEditor::MessageEditor( MetaTranslator * t, TQWidget * parent, const char * name ) - : TQWidget( tqparent, name ), + : TQWidget( parent, name ), tor( t ) { doGuesses = TRUE; diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.h b/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.h index 21e6710e3..40749bc98 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.h +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.h @@ -66,13 +66,13 @@ class PageCurl : public TQWidget Q_OBJECT TQ_OBJECT public: - PageCurl( TQWidget * tqparent = 0, const char * name = 0, + PageCurl( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) - : TQWidget( tqparent, name, f ) + : TQWidget( parent, name, f ) { TQPixmap px = TrWindow::pageCurl(); - if ( px.tqmask() ) { - setMask( *px.tqmask() ); + if ( px.mask() ) { + setMask( *px.mask() ); } setBackgroundPixmap( px ); setFixedSize( px.size() ); @@ -105,8 +105,8 @@ Q_SIGNALS: class ShadowWidget : public TQWidget { public: - ShadowWidget( TQWidget * tqparent = 0, const char * name = 0 ); - ShadowWidget( TQWidget * child, TQWidget * tqparent = 0, const char * name = 0 ); + ShadowWidget( TQWidget * parent = 0, const char * name = 0 ); + ShadowWidget( TQWidget * child, TQWidget * parent = 0, const char * name = 0 ); void setShadowWidth( int width ) { sWidth = width; } int shadowWidth() const { return sWidth; } @@ -129,7 +129,7 @@ class EditorPage : public TQFrame Q_OBJECT TQ_OBJECT public: - EditorPage( TQWidget * tqparent = 0, const char * name = 0 ); + EditorPage( TQWidget * parent = 0, const char * name = 0 ); protected: void resizeEvent( TQResizeEvent * ); @@ -162,7 +162,7 @@ class MessageEditor : public TQWidget Q_OBJECT TQ_OBJECT public: - MessageEditor( MetaTranslator * t, TQWidget * tqparent = 0, + MessageEditor( MetaTranslator * t, TQWidget * parent = 0, const char * name = 0 ); TQListView * sourceTextList() const; TQListView * phraseList() const; diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.cpp index 2c0c6404c..51b02cba0 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.cpp @@ -49,9 +49,9 @@ #include <tqwhatsthis.h> PhraseBookBox::PhraseBookBox( const TQString& filename, - const PhraseBook& phraseBook, TQWidget *tqparent, + const PhraseBook& phraseBook, TQWidget *parent, const char *name, bool modal ) - : TQDialog( tqparent, name, modal ), fn( filename ), pb( phraseBook ) + : TQDialog( parent, name, modal ), fn( filename ), pb( phraseBook ) { TQGridLayout *gl = new TQGridLayout( this, 4, 3, 11, 11, "phrase book outer tqlayout" ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.h b/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.h index bf3261b45..847006e18 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.h +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.h @@ -51,7 +51,7 @@ class PhraseBookBox : public TQDialog TQ_OBJECT public: PhraseBookBox( const TQString& filename, const PhraseBook& phraseBook, - TQWidget *tqparent = 0, const char *name = 0, + TQWidget *parent = 0, const char *name = 0, bool modal = FALSE ); const PhraseBook& phraseBook() const { return pb; } diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp index 15177c06e..6aab76dce 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp @@ -51,18 +51,18 @@ public: virtual TQString text( const TQPoint& p ); private: - PhraseLV *tqparent; + PhraseLV *parent; }; WhatPhrase::WhatPhrase( PhraseLV *w ) : TQWhatsThis( w ) { - tqparent = w; + parent = w; } TQString WhatPhrase::text( const TQPoint& p ) { - TQListViewItem *item = tqparent->itemAt( p ); + TQListViewItem *item = parent->itemAt( p ); if ( item == 0 ) return PhraseLV::tr( "This is a list of phrase entries relevant to the" " source text. Each phrase is supplemented with a suggested" @@ -71,16 +71,16 @@ TQString WhatPhrase::text( const TQPoint& p ) return TQString( PhraseLV::tr("<p><u>%1:</u> %2</p>" "<p><u>%3:</u> %4</p>" "<p><u>%5:</u> %6</p>") ) - .arg( tqparent->columnText(PhraseLVI::SourceTextShown) ) + .arg( parent->columnText(PhraseLVI::SourceTextShown) ) .arg( item->text(PhraseLVI::SourceTextShown) ) - .arg( tqparent->columnText(PhraseLVI::TargetTextShown) ) + .arg( parent->columnText(PhraseLVI::TargetTextShown) ) .arg( item->text(PhraseLVI::TargetTextShown) ) - .arg( tqparent->columnText(PhraseLVI::DefinitionText) ) + .arg( parent->columnText(PhraseLVI::DefinitionText) ) .arg( item->text(PhraseLVI::DefinitionText) ); } -PhraseLVI::PhraseLVI( PhraseLV *tqparent, const Phrase& phrase, int accelKey ) - : TQListViewItem( tqparent ), +PhraseLVI::PhraseLVI( PhraseLV *parent, const Phrase& phrase, int accelKey ) + : TQListViewItem( parent ), akey( accelKey ) { setPhrase( phrase ); @@ -146,8 +146,8 @@ TQString PhraseLVI::makeKey( const TQString& text ) const return key; } -PhraseLV::PhraseLV( TQWidget *tqparent, const char *name ) - : TQListView( tqparent, name ) +PhraseLV::PhraseLV( TQWidget *parent, const char *name ) + : TQListView( parent, name ) { setAllColumnsShowFocus( TRUE ); setShowSortIndicator( TRUE ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.h b/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.h index e6fedd622..3c9bad140 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.h +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.h @@ -50,7 +50,7 @@ public: enum { SourceTextShown, TargetTextShown, DefinitionText, SourceTextOriginal, TargetTextOriginal }; - PhraseLVI( PhraseLV *tqparent, const Phrase& phrase, int accelKey = 0 ); + PhraseLVI( PhraseLV *parent, const Phrase& phrase, int accelKey = 0 ); virtual void setText( int column, const TQString& text ); virtual TQString key( int column, bool ascending ) const; @@ -71,7 +71,7 @@ class PhraseLV : public TQListView { TQ_OBJECT public: - PhraseLV( TQWidget *tqparent, const char *name ); + PhraseLV( TQWidget *parent, const char *name ); ~PhraseLV(); virtual TQSize tqsizeHint() const; diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp index 564845f1d..a198f64ec 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp @@ -176,7 +176,7 @@ public: Action::Action( TQPopupMenu *pop, const TQString& menuText, TQObject *receiver, const char *member, const TQString &imageName, int accel, bool toggle ) - : TQAction( pop->tqparent(), (const char *) 0, toggle ) + : TQAction( pop->parent(), (const char *) 0, toggle ) { setMenuText( menuText ); setAccel( accel ); @@ -196,7 +196,7 @@ Action::Action( TQPopupMenu *pop, const TQString& menuText, TQObject *receiver, Action::Action( TQPopupMenu *pop, const TQString& menuText, int accel, bool toggle ) - : TQAction( pop->tqparent(), (const char *) 0, toggle ) + : TQAction( pop->parent(), (const char *) 0, toggle ) { TQAction::addTo( pop ); setMenuText( menuText ); @@ -1871,7 +1871,7 @@ void TrWindow::readConfig() } TQDockWindow * dw; - dw = (TQDockWindow *) lv->tqparent(); + dw = (TQDockWindow *) lv->parent(); int place; place = config.readNumEntry( keybase + "Geometry/ContextwindowInTQt::Dock" ); r.setX( config.readNumEntry( keybase + "Geometry/ContextwindowX" ) ); @@ -1886,7 +1886,7 @@ void TrWindow::readConfig() } dw->setGeometry( r ); - dw = (TQDockWindow *) slv->tqparent(); + dw = (TQDockWindow *) slv->parent(); place = config.readNumEntry( keybase + "Geometry/SourcewindowInTQt::Dock" ); r.setX( config.readNumEntry( keybase + "Geometry/SourcewindowX" ) ); r.setY( config.readNumEntry( keybase + "Geometry/SourcewindowY" ) ); @@ -1900,7 +1900,7 @@ void TrWindow::readConfig() } dw->setGeometry( r ); - dw = (TQDockWindow *) plv->tqparent()->tqparent(); + dw = (TQDockWindow *) plv->parent()->parent(); place = config.readNumEntry( keybase + "Geometry/PhrasewindowInTQt::Dock" ); r.setX( config.readNumEntry( keybase + "Geometry/PhrasewindowX" ) ); r.setY( config.readNumEntry( keybase + "Geometry/PhrasewindowY" ) ); @@ -1931,14 +1931,14 @@ void TrWindow::writeConfig() config.writeEntry( keybase + "Geometry/MainwindowWidth", width() ); config.writeEntry( keybase + "Geometry/MainwindowHeight", height() ); - TQDockWindow * dw =(TQDockWindow *) lv->tqparent(); + TQDockWindow * dw =(TQDockWindow *) lv->parent(); config.writeEntry( keybase + "Geometry/ContextwindowInTQt::Dock", dw->place() ); config.writeEntry( keybase + "Geometry/ContextwindowX", dw->x() ); config.writeEntry( keybase + "Geometry/ContextwindowY", dw->y() ); config.writeEntry( keybase + "Geometry/ContextwindowWidth", dw->width() ); config.writeEntry( keybase + "Geometry/ContextwindowHeight", dw->height() ); - dw =(TQDockWindow *) slv->tqparent(); + dw =(TQDockWindow *) slv->parent(); config.writeEntry( keybase + "Geometry/SourcewindowInTQt::Dock", dw->place() ); config.writeEntry( keybase + "Geometry/SourcewindowX", dw->tqgeometry().x() ); @@ -1946,7 +1946,7 @@ void TrWindow::writeConfig() config.writeEntry( keybase + "Geometry/SourcewindowWidth", dw->width() ); config.writeEntry( keybase + "Geometry/SourcewindowHeight", dw->height() ); - dw =(TQDockWindow *) plv->tqparent()->tqparent(); + dw =(TQDockWindow *) plv->parent()->parent(); config.writeEntry( keybase + "Geometry/PhrasewindowInTQt::Dock", dw->place() ); config.writeEntry( keybase + "Geometry/PhrasewindowX", dw->tqgeometry().x() ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph index 906f5479e..c4926bd7e 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph @@ -579,7 +579,7 @@ <target>rude</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>overordnet vindue</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/dutch.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/dutch.qph index bd94682fd..0e9b5d689 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/dutch.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/dutch.qph @@ -599,7 +599,7 @@ <target>deelvenster</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>hoofdvenster</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/finnish.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/finnish.qph index 914c72274..0612c8275 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/finnish.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/finnish.qph @@ -598,7 +598,7 @@ <target>ruutu</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>ylemmän tason ikkuna</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/french.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/french.qph index 834f29b41..569f7bacf 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/french.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/french.qph @@ -657,8 +657,8 @@ <target>volet</target> </phrase> <phrase> - <source>tqparent window</source> - <target>fenêtre tqparent</target> + <source>parent window</source> + <target>fenêtre parent</target> </phrase> <phrase> <source>password</source> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/german.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/german.qph index be8d30d69..544138b04 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/german.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/german.qph @@ -634,7 +634,7 @@ <target>Fensterbereich</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>Übergeordnetes Fenster</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/italian.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/italian.qph index 534214d0e..2aa3d7a40 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/italian.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/italian.qph @@ -650,7 +650,7 @@ <target>riquadro</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>finestra principale</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/norwegian.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/norwegian.qph index ca16dbc42..d01187cfe 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/norwegian.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/norwegian.qph @@ -576,7 +576,7 @@ <target>rute</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>hovedvindu</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/russian.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/russian.qph index 5bb250315..ec64aae65 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/russian.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/russian.qph @@ -568,7 +568,7 @@ <target>панель</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>родительское окно</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/spanish.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/spanish.qph index 8c21be69f..978a43dcd 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/spanish.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/spanish.qph @@ -634,7 +634,7 @@ <target>panel</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>ventana principal</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/swedish.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/swedish.qph index 409317500..9c44071e8 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/swedish.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/swedish.qph @@ -578,7 +578,7 @@ <target>fönsterruta</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>moderfönster</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.cpp b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.cpp index 722320d78..8c48018c6 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.cpp @@ -8,8 +8,8 @@ #include <tqpushbutton.h> -ArrowPad::ArrowPad( TQWidget *tqparent, const char *name ) - : TQGrid( 3, Qt::Horizontal, tqparent, name ) +ArrowPad::ArrowPad( TQWidget *parent, const char *name ) + : TQGrid( 3, Qt::Horizontal, parent, name ) { setMargin( 10 ); setSpacing( 10 ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.h b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.h index b27379129..13c061d5d 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.h +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.h @@ -13,7 +13,7 @@ class ArrowPad : public TQGrid { TQ_OBJECT public: - ArrowPad( TQWidget *tqparent = 0, const char *name = 0 ); + ArrowPad( TQWidget *parent = 0, const char *name = 0 ); private: void skip(); diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.cpp b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.cpp index e91a4ce18..41dd7d19e 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.cpp @@ -12,8 +12,8 @@ #include <tqmenubar.h> #include <tqpopupmenu.h> -MainWindow::MainWindow( TQWidget *tqparent, const char *name ) - : TQMainWindow( tqparent, name ) +MainWindow::MainWindow( TQWidget *parent, const char *name ) + : TQMainWindow( parent, name ) { ArrowPad *ap = new ArrowPad( this, "arrow pad" ); setCentralWidget( ap ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.h b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.h index 46bdf50d0..38209c619 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.h +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.h @@ -13,7 +13,7 @@ class MainWindow : public TQMainWindow { TQ_OBJECT public: - MainWindow( TQWidget *tqparent = 0, const char *name = 0 ); + MainWindow( TQWidget *parent = 0, const char *name = 0 ); }; #endif diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.cpp b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.cpp index c5333444c..97adb8d10 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.cpp @@ -13,8 +13,8 @@ #include <tqmessagebox.h> #include <tqpopupmenu.h> -MainWindow::MainWindow( TQWidget *tqparent, const char *name ) - : TQMainWindow( tqparent, name ) +MainWindow::MainWindow( TQWidget *parent, const char *name ) + : TQMainWindow( parent, name ) { setCaption( tqtr("Troll Print 1.0") ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.h b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.h index 723072c5e..b1425666c 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.h +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.h @@ -14,7 +14,7 @@ class MainWindow : public TQMainWindow Q_OBJECT TQ_OBJECT public: - MainWindow( TQWidget *tqparent = 0, const char *name = 0 ); + MainWindow( TQWidget *parent = 0, const char *name = 0 ); private Q_SLOTS: void about(); diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.cpp b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.cpp index 85c507b61..2eef0cbc3 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.cpp @@ -10,8 +10,8 @@ #include <tqradiobutton.h> #include <tqhbuttongroup.h> -PrintPanel::PrintPanel( TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name ) +PrintPanel::PrintPanel( TQWidget *parent, const char *name ) + : TQVBox( parent, name ) { setMargin( 10 ); setSpacing( 10 ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.h b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.h index 07bd83fcc..906e8994e 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.h +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.h @@ -13,7 +13,7 @@ class PrintPanel : public TQVBox { TQ_OBJECT public: - PrintPanel( TQWidget *tqparent = 0, const char *name = 0 ); + PrintPanel( TQWidget *parent = 0, const char *name = 0 ); }; #endif diff --git a/experimental/tqtinterface/qt4/tools/makeqpf/main.cpp b/experimental/tqtinterface/qt4/tools/makeqpf/main.cpp index 98f548eb6..4b4364e6f 100644 --- a/experimental/tqtinterface/qt4/tools/makeqpf/main.cpp +++ b/experimental/tqtinterface/qt4/tools/makeqpf/main.cpp @@ -58,8 +58,8 @@ class FontViewItem : public TQListViewItem { TQFont font; public: - FontViewItem(const TQString& f, int pt, int w, bool ital, TQListView* tqparent) : - TQListViewItem(tqparent), + FontViewItem(const TQString& f, int pt, int w, bool ital, TQListView* parent) : + TQListViewItem(parent), family(f), pointSize(pt), weight(w), italic(ital) { } diff --git a/experimental/tqtinterface/qt4/tools/qconfig/main.cpp b/experimental/tqtinterface/qt4/tools/qconfig/main.cpp index 39ee580d9..c304f3ec4 100644 --- a/experimental/tqtinterface/qt4/tools/qconfig/main.cpp +++ b/experimental/tqtinterface/qt4/tools/qconfig/main.cpp @@ -184,8 +184,8 @@ static const char*forward_xpm[]={ class ChoiceItem : public TQCheckListItem { public: TQString id; - ChoiceItem(const TQString& i, TQListViewItem* tqparent) : - TQCheckListItem(tqparent, + ChoiceItem(const TQString& i, TQListViewItem* parent) : + TQCheckListItem(parent, i.mid(6), // strip "TQT_NO_" as we reverse the logic CheckBox), id(i) @@ -542,19 +542,19 @@ void Main::createItem(const TQString& ch) if ( !item[ch] ) { TQStringList deps = dependencies[ch]; TQString sec = section[ch]; - TQListViewItem* tqparent = 0; + TQListViewItem* parent = 0; for (TQStringList::Iterator dp = deps.begin(); dp != deps.end(); ++dp) { TQString dsec = section[*dp]; if ( dsec.isEmpty() ) qDebug("No section for %s",(*dp).latin1()); - if ( !tqparent && dsec == sec ) { + if ( !parent && dsec == sec ) { createItem(*dp); - tqparent = item[*dp]; + parent = item[*dp]; } } - if ( !tqparent ) - tqparent = sectionitem[section[ch]]; - ChoiceItem* ci = new ChoiceItem(ch,tqparent); + if ( !parent ) + parent = sectionitem[section[ch]]; + ChoiceItem* ci = new ChoiceItem(ch,parent); item[ch] = ci; if ( !label[ch].isEmpty() ) ci->setInfo(label[ch],documentation[ch]); @@ -590,7 +590,7 @@ void Main::loadConfig(const TQString& filename) void Main::updateAvailability(TQListViewItem* i) { - if ( !i || !i->tqparent() ) { + if ( !i || !i->parent() ) { // section. do nothing for now } else { ChoiceItem* choice = (ChoiceItem*)i; @@ -624,7 +624,7 @@ void Main::showInfo(TQListViewItem* i) { if ( !i ) return; - if ( !i->tqparent() ) { + if ( !i->parent() ) { // section. do nothing for now } else { ChoiceItem* choice = (ChoiceItem*)i; @@ -671,8 +671,8 @@ void Main::selectId(const TQString& id) } } -Info::Info( TQWidget* tqparent, const char* name ) : - TQTextBrowser(tqparent, name) +Info::Info( TQWidget* parent, const char* name ) : + TQTextBrowser(parent, name) { } diff --git a/experimental/tqtinterface/qt4/tools/qconfig/main.h b/experimental/tqtinterface/qt4/tools/qconfig/main.h index c4e515030..7d8536bb4 100644 --- a/experimental/tqtinterface/qt4/tools/qconfig/main.h +++ b/experimental/tqtinterface/qt4/tools/qconfig/main.h @@ -44,7 +44,7 @@ class TQLabel; class Info : public TQTextBrowser { TQ_OBJECT public: - Info( TQWidget* tqparent, const char* name=0 ); + Info( TQWidget* parent, const char* name=0 ); Q_SIGNALS: void idClicked(const TQString& name); diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp index 4dd152f6e..bab9b9767 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp +++ b/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp @@ -40,8 +40,8 @@ #include <tqstyle.h> -ColorButton::ColorButton(TQWidget *tqparent, const char *name) - : TQButton(tqparent, name), mousepressed(FALSE) +ColorButton::ColorButton(TQWidget *parent, const char *name) + : TQButton(parent, name), mousepressed(FALSE) { setAcceptDrops(TRUE); col = Qt::black; @@ -49,8 +49,8 @@ ColorButton::ColorButton(TQWidget *tqparent, const char *name) } -ColorButton::ColorButton(const TQColor &c, TQWidget *tqparent, const char *name) - : TQButton(tqparent, name) +ColorButton::ColorButton(const TQColor &c, TQWidget *parent, const char *name) + : TQButton(parent, name) { setAcceptDrops(TRUE); col = c; diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.cpp index 6939ceffb..36a5927ba 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.cpp +++ b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.cpp @@ -70,9 +70,9 @@ void BoldListBoxText::paint( TQPainter* painter ) TQListBoxText::paint( painter ); } -PaletteEditorAdvanced::PaletteEditorAdvanced( TQWidget * tqparent, +PaletteEditorAdvanced::PaletteEditorAdvanced( TQWidget * parent, const char * name, bool modal, WFlags f ) - : PaletteEditorAdvancedBase( tqparent, name, modal, f ), selectedPalette(0) + : PaletteEditorAdvancedBase( parent, name, modal, f ), selectedPalette(0) { editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); @@ -591,10 +591,10 @@ void PaletteEditorAdvanced::setupBackgroundMode( TQt::BackgroundMode mode ) } TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init, - TQt::BackgroundMode mode, TQWidget* tqparent, + TQt::BackgroundMode mode, TQWidget* parent, const char* name ) { - PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( tqparent, name, TRUE ); + PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( parent, name, TRUE ); dlg->setupBackgroundMode( mode ); if ( init != TQPalette() ) diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.h b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.h index be78f5bf0..d78bc8561 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.h +++ b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.h @@ -41,12 +41,12 @@ class PaletteEditorAdvanced : public PaletteEditorAdvancedBase Q_OBJECT TQ_OBJECT public: - PaletteEditorAdvanced( TQWidget * tqparent=0, const char * name=0, + PaletteEditorAdvanced( TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); ~PaletteEditorAdvanced(); static TQPalette getPalette( bool *ok, const TQPalette &pal, TQt::BackgroundMode mode = TQt::PaletteBackground, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); protected Q_SLOTS: void paletteSelected(int); diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.cpp index 212978769..5f926cac3 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.cpp +++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.cpp @@ -36,8 +36,8 @@ #include <tqvbox.h> #include <tqpainter.h> -PreviewFrame::PreviewFrame( TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name ) +PreviewFrame::PreviewFrame( TQWidget *parent, const char *name ) + : TQVBox( parent, name ) { setMinimumSize(200, 200); setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.h b/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.h index bbb03ac53..bb919aad4 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.h +++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.h @@ -45,8 +45,8 @@ class Workspace : public TQWorkspace TQ_OBJECT public: - Workspace( TQWidget* tqparent = 0, const char* name = 0 ) - : TQWorkspace( tqparent, name ) {} + Workspace( TQWidget* parent = 0, const char* name = 0 ) + : TQWorkspace( parent, name ) {} ~Workspace() {} protected: @@ -59,7 +59,7 @@ class PreviewFrame : public TQVBox TQ_OBJECT public: - PreviewFrame( TQWidget *tqparent = 0, const char *name = 0 ); + PreviewFrame( TQWidget *parent = 0, const char *name = 0 ); void setPreviewPalette(TQPalette); private: diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.cpp index 9ab05547b..70f536c88 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.cpp +++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.cpp @@ -35,8 +35,8 @@ #include <tqobjectlist.h> -PreviewWidget::PreviewWidget( TQWidget *tqparent, const char *name ) - : PreviewWidgetBase( tqparent, name ) +PreviewWidget::PreviewWidget( TQWidget *parent, const char *name ) + : PreviewWidgetBase( parent, name ) { // install event filter on child widgets TQObjectList *l = queryList("TQWidget"); diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.h b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.h index 8fb12d664..8533a4794 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.h +++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.h @@ -42,7 +42,7 @@ class PreviewWidget : public PreviewWidgetBase TQ_OBJECT public: - PreviewWidget( TQWidget *tqparent = 0, const char *name = 0 ); + PreviewWidget( TQWidget *parent = 0, const char *name = 0 ); void closeEvent(TQCloseEvent *); bool eventFilter(TQObject *, TQEvent *); diff --git a/experimental/tqtinterface/qt4/tools/qvfb/README b/experimental/tqtinterface/qt4/tools/qvfb/README index a4fac5895..c62704129 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/README +++ b/experimental/tqtinterface/qt4/tools/qvfb/README @@ -10,7 +10,7 @@ framebuffer consists of a shared memory region (the virtual frame buffer) and a utility to display the framebuffer in a window. The display is updated periodically, so you will see discrete snapshots of the framebuffer rather than each individual drawing operation. For this reason drawing problems -such as flickering may not be aptqparent until the program is run using a real +such as flickering may not be apparent until the program is run using a real framebuffer. To use the virtual framebuffer: diff --git a/experimental/tqtinterface/qt4/tools/qvfb/gammaview.h b/experimental/tqtinterface/qt4/tools/qvfb/gammaview.h index 2acd3dab5..b60ae357a 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/gammaview.h +++ b/experimental/tqtinterface/qt4/tools/qvfb/gammaview.h @@ -40,9 +40,9 @@ class GammaView: public TQWidget { TQ_OBJECT public: - GammaView( TQWidget *tqparent = 0, + GammaView( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ) : - TQWidget(tqparent,name,f) + TQWidget(parent,name,f) { } }; diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp index 2c7712cc5..93d5e8e71 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp @@ -53,9 +53,9 @@ #include <tqdragobject.h> #include <tqcheckbox.h> -TQVFb::TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *tqparent, +TQVFb::TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *parent, const char *name, uint flags ) - : TQMainWindow( tqparent, name, flags ) + : TQMainWindow( parent, name, flags ) { const TQMimeSource *m = TQMimeSourceFactory::defaultFactory()->data( "logo.png" ); if ( m ) { diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.h b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.h index 5906232c3..c36c385a3 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.h +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.h @@ -44,7 +44,7 @@ class TQVFb: public TQMainWindow { TQ_OBJECT public: - TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *tqparent = 0, + TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *parent = 0, const char *name = 0, uint wflags = 0 ); ~TQVFb(); diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.cpp b/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.cpp index 9a61c3749..23020f0ae 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.cpp +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.cpp @@ -38,9 +38,9 @@ #include <tqslider.h> #include <tqpushbutton.h> -TQVFbRateDialog::TQVFbRateDialog( int rate, TQWidget *tqparent, const char *name, +TQVFbRateDialog::TQVFbRateDialog( int rate, TQWidget *parent, const char *name, bool modal ) - : TQDialog( tqparent, name, modal ) + : TQDialog( parent, name, modal ) { oldRate = rate; diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.h b/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.h index 387c28bfc..9a2938441 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.h +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.h @@ -40,7 +40,7 @@ class TQVFbRateDialog : public TQDialog { TQ_OBJECT public: - TQVFbRateDialog( int value, TQWidget *tqparent=0, const char *name=0, + TQVFbRateDialog( int value, TQWidget *parent=0, const char *name=0, bool modal=FALSE ); Q_SIGNALS: diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp index bc02db737..fe49df11e 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp @@ -65,9 +65,9 @@ //#define TQT_TQWS_EXPERIMENTAL_REVERSE_BIT_ENDIANNESS -TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *tqparent, +TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *parent, const char *name, uint flags ) - : TQScrollView( tqparent, name, flags ), emulateTouchscreen(FALSE), qwslock(NULL) + : TQScrollView( parent, name, flags ), emulateTouchscreen(FALSE), qwslock(NULL) { displayid = display_id; viewport()->setMouseTracking( TRUE ); diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h index df5adcc6c..5f0cb074a 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h @@ -43,7 +43,7 @@ class TQVFbView : public TQScrollView { TQ_OBJECT public: - TQVFbView( int display_id, int w, int h, int d, TQWidget *tqparent = 0, + TQVFbView( int display_id, int w, int h, int d, TQWidget *parent = 0, const char *name = 0, uint wflags = 0 ); ~TQVFbView(); diff --git a/experimental/tqtinterface/qt4/tools/qvfb/skin.cpp b/experimental/tqtinterface/qt4/tools/qvfb/skin.cpp index 795de3a58..2ef9ac385 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/skin.cpp +++ b/experimental/tqtinterface/qt4/tools/qvfb/skin.cpp @@ -73,16 +73,16 @@ Skin::Skin( TQVFb *p, const TQString &skinFile, int &viewW, int &viewH ) : TQWid // areas[i].keyCode, areas[i].x1, areas[i].y1, areas[i].x2, areas[i].y2 ); } - tqparent = p; + parent = p; skinImageUp = new TQPixmap( skinImageUpFileName ); skinImageDown = new TQPixmap( skinImageDownFileName ); // setPixmap( ipaq ); setFixedSize( skinImageUp->size() ); - TQBitmap tqmask = skinImageUp->createHeuristicMask(); + TQBitmap mask = skinImageUp->createHeuristicMask(); int wf = WStyle_Customize | WType_TopLevel | WStyle_NoBorder; - tqparent->reparent( 0, wf, pos(), TRUE ); - tqparent->setMask( tqmask ); - tqparent->setFixedSize( skinImageUp->size() ); + parent->reparent( 0, wf, pos(), TRUE ); + parent->setMask( mask ); + parent->setFixedSize( skinImageUp->size() ); buttonPressed = FALSE; buttonIndex = 0; } @@ -120,7 +120,7 @@ void Skin::paintEvent( TQPaintEvent * ) void Skin::mousePressEvent( TQMouseEvent *e ) { if (e->button() == RightButton) { - tqparent->popupMenu(); + parent->popupMenu(); } else { buttonPressed = FALSE; @@ -154,7 +154,7 @@ void Skin::mouseMoveEvent( TQMouseEvent *e ) { if ( buttonPressed == FALSE ) { TQPoint newpos = e->globalPos() - clickPos; - tqparent->move( newpos ); + parent->move( newpos ); } } diff --git a/experimental/tqtinterface/qt4/tools/qvfb/skin.h b/experimental/tqtinterface/qt4/tools/qvfb/skin.h index 5c5d112aa..d9dab3b89 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/skin.h +++ b/experimental/tqtinterface/qt4/tools/qvfb/skin.h @@ -50,7 +50,7 @@ protected: virtual void mouseMoveEvent( TQMouseEvent *e ); virtual void mouseReleaseEvent( TQMouseEvent * ); private: - TQVFb *tqparent; + TQVFb *parent; TQVFbView *view; TQPoint clickPos; bool buttonPressed; diff --git a/experimental/tqtinterface/qt4/translations/qt_fr.ts b/experimental/tqtinterface/qt4/translations/qt_fr.ts index 44d6234b8..7e78f6b15 100644 --- a/experimental/tqtinterface/qt4/translations/qt_fr.ts +++ b/experimental/tqtinterface/qt4/translations/qt_fr.ts @@ -512,7 +512,7 @@ </message> <message> <source>One directory up</source> - <translation>Aller au dossier tqparent</translation> + <translation>Aller au dossier parent</translation> </message> <message> <source>Create New Folder</source> |