diff options
Diffstat (limited to 'filters')
31 files changed, 236 insertions, 236 deletions
diff --git a/filters/chalk/xcf/xcf/xcf-load.cpp b/filters/chalk/xcf/xcf/xcf-load.cpp index 3209e1811..034e5261a 100644 --- a/filters/chalk/xcf/xcf/xcf-load.cpp +++ b/filters/chalk/xcf/xcf/xcf-load.cpp @@ -139,11 +139,11 @@ xcf_load_image (XcfInfo * info) gimp_parasite_list_remove (GIMP_IMAGE (gimage)->parasites, gimp_parasite_name (parasite)); - gimp_image_set_grid (GIMP_IMAGE (gimage), grid, FALSE); + gimp_image_set_grid (GIMP_IMAGE (gimage), grid, false); } } - while (TRUE) + while (true) { /* read in the offset of the next layer */ info->cp += xcf_read_int32 (info->fp, &offset, 1); @@ -182,7 +182,7 @@ xcf_load_image (XcfInfo * info) goto error; } - while (TRUE) + while (true) { /* read in the offset of the next channel */ info->cp += xcf_read_int32 (info->fp, &offset, 1); @@ -264,15 +264,15 @@ xcf_load_image_props (XcfInfo * info, KisImage * gimage) PropType prop_type; TQ_INT32 prop_size; - while (TRUE) + while (true) { if (!xcf_load_prop (info, &prop_type, &prop_size)) - return FALSE; + return false; switch (prop_type) { case PROP_END: - return TRUE; + return true; case PROP_COLORMAP: if (info->file_version == 0) @@ -286,7 +286,7 @@ xcf_load_image_props (XcfInfo * info, KisImage * gimage) xcf_read_int32 (info->fp, (TQ_INT32 *) & gimage->num_cols, 1); gimage->cmap = g_new (guchar, gimage->num_cols * 3); if (!xcf_seek_pos (info, info->cp + gimage->num_cols, NULL)) - return FALSE; + return false; for (i = 0; i < gimage->num_cols; i++) { @@ -331,7 +331,7 @@ xcf_load_image_props (XcfInfo * info, KisImage * gimage) (compression != COMPRESS_FRACTAL)) { g_message ("unknown compression type: %d", (int) compression); - return FALSE; + return false; } info->compression = compression; @@ -359,11 +359,11 @@ xcf_load_image_props (XcfInfo * info, KisImage * gimage) switch (orientation) { case XCF_ORIENTATION_HORIZONTAL: - gimp_image_add_hguide (gimage, position, FALSE); + gimp_image_add_hguide (gimage, position, false); break; case XCF_ORIENTATION_VERTICAL: - gimp_image_add_vguide (gimage, position, FALSE); + gimp_image_add_vguide (gimage, position, false); break; default: @@ -540,7 +540,7 @@ xcf_load_image_props (XcfInfo * info, KisImage * gimage) } } - return FALSE; + return false; } static bool @@ -554,15 +554,15 @@ xcf_load_layer_props (XcfInfo * info, PropType prop_type; TQ_INT32 prop_size; - while (TRUE) + while (true) { if (!xcf_load_prop (info, &prop_type, &prop_size)) - return FALSE; + return false; switch (prop_type) { case PROP_END: - return TRUE; + return true; case PROP_ACTIVE_LAYER: info->active_layer = layer; @@ -592,7 +592,7 @@ xcf_load_layer_props (XcfInfo * info, info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) & visible, 1); gimp_item_set_visible (GIMP_ITEM (layer), - visible ? TRUE : FALSE, FALSE); + visible ? true : false, false); } break; @@ -602,7 +602,7 @@ xcf_load_layer_props (XcfInfo * info, info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) & linked, 1); gimp_item_set_linked (GIMP_ITEM (layer), - linked ? TRUE : FALSE, FALSE); + linked ? true : false, false); } break; @@ -682,7 +682,7 @@ xcf_load_layer_props (XcfInfo * info, } } - return FALSE; + return false; } static bool @@ -692,15 +692,15 @@ xcf_load_channel_props (XcfInfo * info, PropType prop_type; TQ_INT32 prop_size; - while (TRUE) + while (true) { if (!xcf_load_prop (info, &prop_type, &prop_size)) - return FALSE; + return false; switch (prop_type) { case PROP_END: - return TRUE; + return true; case PROP_ACTIVE_CHANNEL: info->active_channel = *channel; @@ -721,8 +721,8 @@ xcf_load_channel_props (XcfInfo * info, GIMP_DRAWABLE (*channel)->tiles = NULL; g_object_unref (*channel); *channel = gimage->selection_mask; - (*channel)->boundary_known = FALSE; - (*channel)->bounds_known = FALSE; + (*channel)->boundary_known = false; + (*channel)->bounds_known = false; break; case PROP_OPACITY: @@ -740,7 +740,7 @@ xcf_load_channel_props (XcfInfo * info, info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) & visible, 1); gimp_item_set_visible (GIMP_ITEM (*channel), - visible ? TRUE : FALSE, FALSE); + visible ? true : false, false); } break; @@ -750,7 +750,7 @@ xcf_load_channel_props (XcfInfo * info, info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) & linked, 1); gimp_item_set_linked (GIMP_ITEM (*channel), - linked ? TRUE : FALSE, FALSE); + linked ? true : false, false); } break; @@ -816,7 +816,7 @@ xcf_load_channel_props (XcfInfo * info, } } - return FALSE; + return false; } static bool @@ -824,7 +824,7 @@ xcf_load_prop (XcfInfo * info, PropType * prop_type, TQ_INT32 * prop_size) { info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) prop_type, 1); info->cp += xcf_read_int32 (info->fp, (TQ_INT32 *) prop_size, 1); - return TRUE; + return true; } static KisLayer * @@ -834,9 +834,9 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage) GimpLayerMask *layer_mask; TQ_INT32 hierarchy_offset; TQ_INT32 layer_mask_offset; - bool apply_mask = TRUE; - bool edit_mask = FALSE; - bool show_mask = FALSE; + bool apply_mask = true; + bool edit_mask = false; + bool show_mask = false; bool active; bool floating; TQ_INT32 text_layer_flags = 0; @@ -910,7 +910,7 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage) layer_mask->edit_mask = edit_mask; layer_mask->show_mask = show_mask; - gimp_layer_add_mask (layer, layer_mask, FALSE); + gimp_layer_add_mask (layer, layer_mask, false); } /* attach the floating selection... */ @@ -1049,7 +1049,7 @@ xcf_load_hierarchy (XcfInfo * info, TileManager * tiles) if (width != tile_manager_width (tiles) || height != tile_manager_height (tiles) || bpp != tile_manager_bpp (tiles)) - return FALSE; + return false; /* load in the levels...we make sure that the number of levels * calculated when the TileManager was created is the same @@ -1073,19 +1073,19 @@ xcf_load_hierarchy (XcfInfo * info, TileManager * tiles) /* seek to the level offset */ if (!xcf_seek_pos (info, offset, NULL)) - return FALSE; + return false; /* read in the level */ if (!xcf_load_level (info, tiles)) - return FALSE; + return false; /* restore the saved position so we'll be ready to * read the next offset. */ if (!xcf_seek_pos (info, saved_pos, NULL)) - return FALSE; + return false; - return TRUE; + return true; } @@ -1107,7 +1107,7 @@ xcf_load_level (XcfInfo * info, TileManager * tiles) if (width != tile_manager_width (tiles) || height != tile_manager_height (tiles)) - return FALSE; + return false; /* read in the first tile offset. * if it is '0', then this tile level is empty @@ -1115,7 +1115,7 @@ xcf_load_level (XcfInfo * info, TileManager * tiles) */ info->cp += xcf_read_int32 (info->fp, &offset, 1); if (offset == 0) - return TRUE; + return true; /* Initialise the reference for the in-memory tile-compression */ @@ -1124,12 +1124,12 @@ xcf_load_level (XcfInfo * info, TileManager * tiles) ntiles = tiles->ntile_rows * tiles->ntile_cols; for (i = 0; i < ntiles; i++) { - fail = FALSE; + fail = false; if (offset == 0) { g_message ("not enough tiles found in level"); - return FALSE; + return false; } /* save the current position as it is where the @@ -1150,36 +1150,36 @@ xcf_load_level (XcfInfo * info, TileManager * tiles) /* seek to the tile offset */ if (!xcf_seek_pos (info, offset, NULL)) - return FALSE; + return false; /* get the tile from the tile manager */ - tile = tile_manager_get (tiles, i, TRUE, TRUE); + tile = tile_manager_get (tiles, i, true, true); /* read in the tile */ switch (info->compression) { case COMPRESS_NONE: if (!xcf_load_tile (info, tile)) - fail = TRUE; + fail = true; break; case COMPRESS_RLE: if (!xcf_load_tile_rle (info, tile, offset2 - offset)) - fail = TRUE; + fail = true; break; case COMPRESS_ZLIB: g_error ("xcf: zlib compression unimplemented"); - fail = TRUE; + fail = true; break; case COMPRESS_FRACTAL: g_error ("xcf: fractal compression unimplemented"); - fail = TRUE; + fail = true; break; } if (fail) { - tile_release (tile, TRUE); - return FALSE; + tile_release (tile, true); + return false; } /* To potentially save memory, we compare the @@ -1197,16 +1197,16 @@ xcf_load_level (XcfInfo * info, TileManager * tiles) tile_data_pointer (previous, 0, 0), tile_size (tile)) == 0) tile_manager_map (tiles, i, previous); - tile_release (previous, FALSE); + tile_release (previous, false); } - tile_release (tile, TRUE); - previous = tile_manager_get (tiles, i, FALSE, FALSE); + tile_release (tile, true); + previous = tile_manager_get (tiles, i, false, false); /* restore the saved position so we'll be ready to * read the next offset. */ if (!xcf_seek_pos (info, saved_pos, NULL)) - return FALSE; + return false; /* read in the offset of the next tile */ info->cp += xcf_read_int32 (info->fp, &offset, 1); @@ -1215,10 +1215,10 @@ xcf_load_level (XcfInfo * info, TileManager * tiles) if (offset != 0) { g_message ("encountered garbage after reading level: %d", offset); - return FALSE; + return false; } - return TRUE; + return true; } static bool @@ -1244,7 +1244,7 @@ xcf_load_tile (XcfInfo * info, Tile * tile) #endif - return TRUE; + return true; } static bool @@ -1360,12 +1360,12 @@ xcf_load_tile_rle (XcfInfo * info, Tile * tile, int data_length) } } g_free (xcfodata); - return TRUE; + return true; bogus_rle: if (xcfodata) g_free (xcfodata); - return FALSE; + return false; } static KisAnnotation * @@ -1402,7 +1402,7 @@ xcf_load_old_paths (XcfInfo * info, KisImage * gimage) if (active_vectors) gimp_image_set_active_vectors (gimage, active_vectors); - return TRUE; + return true; } static bool @@ -1445,12 +1445,12 @@ xcf_load_old_path (XcfInfo * info, KisImage * gimage) { g_warning ("Unknown path type. Possibly corrupt XCF file"); - return FALSE; + return false; } /* skip empty compatibility paths */ if (num_points == 0) - return FALSE; + return false; points = g_new0 (GimpVectorsCompatPoint, num_points); @@ -1496,7 +1496,7 @@ xcf_load_old_path (XcfInfo * info, KisImage * gimage) gimp_image_add_vectors (gimage, vectors, gimp_container_num_children (gimage->vectors)); - return TRUE; + return true; } static bool @@ -1519,7 +1519,7 @@ xcf_load_vectors (XcfInfo * info, KisImage * gimage) if (version != 1) { g_message ("Unknown vectors version: %d (skipping)", version); - return FALSE; + return false; } info->cp += xcf_read_int32 (info->fp, &active_index, 1); @@ -1531,7 +1531,7 @@ xcf_load_vectors (XcfInfo * info, KisImage * gimage) while (num_paths-- > 0) if (!xcf_load_vector (info, gimage)) - return FALSE; + return false; active_vectors = (GimpVectors *) gimp_container_get_child_by_index (gimage->vectors, active_index); @@ -1542,7 +1542,7 @@ xcf_load_vectors (XcfInfo * info, KisImage * gimage) #ifdef GIMP_XCF_PATH_DEBUG g_printerr ("xcf_load_vectors: loaded %d bytes\n", info->cp - base); #endif - return TRUE; + return true; } static bool @@ -1577,8 +1577,8 @@ xcf_load_vector (XcfInfo * info, KisImage * gimage) vectors = gimp_vectors_new (gimage, name); - GIMP_ITEM (vectors)->visible = visible ? TRUE : FALSE; - GIMP_ITEM (vectors)->linked = linked ? TRUE : FALSE; + GIMP_ITEM (vectors)->visible = visible ? true : false; + GIMP_ITEM (vectors)->linked = linked ? true : false; if (tattoo) GIMP_ITEM (vectors)->tattoo = tattoo; @@ -1590,7 +1590,7 @@ xcf_load_vector (XcfInfo * info, KisImage * gimage) parasite = xcf_load_parasite (info); if (!parasite) - return FALSE; + return false; gimp_item_parasite_attach (GIMP_ITEM (vectors), parasite); gimp_parasite_free (parasite); @@ -1639,7 +1639,7 @@ xcf_load_vector (XcfInfo * info, KisImage * gimage) control_points = g_value_array_new (num_control_points); - anchor.selected = FALSE; + anchor.selected = false; for (j = 0; j < num_control_points; j++) { @@ -1676,7 +1676,7 @@ xcf_load_vector (XcfInfo * info, KisImage * gimage) gimp_image_add_vectors (gimage, vectors, gimp_container_num_children (gimage->vectors)); - return TRUE; + return true; } #ifdef SWAP_FROM_FILE @@ -1710,7 +1710,7 @@ xcf_swap_func (TQ_INT32 fd, Tile * tile, TQ_INT32 cmd, gpointer user_data) { g_message ("unable to read tile data from xcf file: " "%d ( %d ) bytes read", err, nleft); - return FALSE; + return false; } nleft -= err; @@ -1731,10 +1731,10 @@ xcf_swap_func (TQ_INT32 fd, Tile * tile, TQ_INT32 cmd, gpointer user_data) tile->swap_num = 1; tile->swap_offset = -1; - return TRUE; + return true; } - return FALSE; + return false; } #endif diff --git a/filters/chalk/xcf/xcf/xcf-save.cpp b/filters/chalk/xcf/xcf/xcf-save.cpp index a0dbb9b5a..25abdfa6a 100644 --- a/filters/chalk/xcf/xcf/xcf-save.cpp +++ b/filters/chalk/xcf/xcf/xcf-save.cpp @@ -119,7 +119,7 @@ static bool xcf_save_vectors (XcfInfo *info, if (tmp_error) \ { \ g_propagate_error (error, tmp_error); \ - return FALSE; \ + return false; \ } \ } G_STMT_END @@ -128,7 +128,7 @@ static bool xcf_save_vectors (XcfInfo *info, if (tmp_error) \ { \ g_propagate_error (error, tmp_error); \ - return FALSE; \ + return false; \ } \ } G_STMT_END @@ -137,7 +137,7 @@ static bool xcf_save_vectors (XcfInfo *info, if (tmp_error) \ { \ g_propagate_error (error, tmp_error); \ - return FALSE; \ + return false; \ } \ } G_STMT_END @@ -146,7 +146,7 @@ static bool xcf_save_vectors (XcfInfo *info, if (tmp_error) \ { \ g_propagate_error (error, tmp_error); \ - return FALSE; \ + return false; \ } \ } G_STMT_END @@ -156,7 +156,7 @@ static bool xcf_save_vectors (XcfInfo *info, { \ g_message (_("Error saving XCF file: %s"), \ error->message); \ - return FALSE; \ + return false; \ } \ } G_STMT_END @@ -166,7 +166,7 @@ static bool xcf_save_vectors (XcfInfo *info, { \ g_message (_("Error saving XCF file: %s"), \ error->message); \ - return FALSE; \ + return false; \ } \ } G_STMT_END @@ -176,7 +176,7 @@ static bool xcf_save_vectors (XcfInfo *info, { \ g_message (_("Error saving XCF file: %s"), \ error->message); \ - return FALSE; \ + return false; \ } \ } G_STMT_END @@ -186,7 +186,7 @@ static bool xcf_save_vectors (XcfInfo *info, { \ g_message (_("Error saving XCF file: %s"), \ error->message); \ - return FALSE; \ + return false; \ } \ } G_STMT_END @@ -202,7 +202,7 @@ static bool xcf_save_vectors (XcfInfo *info, #define xcf_check_error(x) G_STMT_START { \ if (! (x)) \ - return FALSE; \ + return false; \ } G_STMT_END #define xcf_print_error(x) G_STMT_START { \ @@ -210,7 +210,7 @@ static bool xcf_save_vectors (XcfInfo *info, { \ g_message (_("Error saving XCF file: %s"), \ error->message); \ - return FALSE; \ + return false; \ } \ } G_STMT_END @@ -366,7 +366,7 @@ xcf_save_image (XcfInfo *info, else { channel = gimage->selection_mask; - have_selection = FALSE; + have_selection = false; } /* save the start offset of where we are writing @@ -476,7 +476,7 @@ xcf_save_image_props (XcfInfo *info, xcf_check_error (xcf_save_prop (info, gimage, PROP_END, error)); - return TRUE; + return true; } static bool @@ -561,7 +561,7 @@ xcf_save_layer_props (XcfInfo *info, xcf_check_error (xcf_save_prop (info, gimage, PROP_END, error)); - return TRUE; + return true; } static bool @@ -599,7 +599,7 @@ xcf_save_channel_props (XcfInfo *info, xcf_check_error (xcf_save_prop (info, gimage, PROP_END, error)); - return TRUE; + return true; } static bool @@ -929,7 +929,7 @@ xcf_save_prop (XcfInfo *info, if (tmp_error) { g_propagate_error (error, tmp_error); - return FALSE; + return false; } xcf_check_error (xcf_seek_end (info, error)); @@ -976,7 +976,7 @@ xcf_save_prop (XcfInfo *info, if (tmp_error) { g_propagate_error (error, tmp_error); - return FALSE; + return false; } xcf_check_error (xcf_seek_end (info, error)); @@ -1042,7 +1042,7 @@ xcf_save_prop (XcfInfo *info, if (tmp_error) { g_propagate_error (error, tmp_error); - return FALSE; + return false; } xcf_check_error (xcf_seek_end (info, error)); @@ -1065,7 +1065,7 @@ xcf_save_prop (XcfInfo *info, va_end (args); - return TRUE; + return true; } static bool @@ -1136,7 +1136,7 @@ xcf_save_layer (XcfInfo *info, xcf_check_error (xcf_seek_pos (info, saved_pos, error)); xcf_write_int32_check_error (info, &offset, 1); - return TRUE; + return true; } static bool @@ -1189,7 +1189,7 @@ xcf_save_channel (XcfInfo *info, xcf_write_int32_check_error (info, &offset, 1); saved_pos = info->cp; - return TRUE; + return true; } static TQ_INT32 @@ -1285,7 +1285,7 @@ xcf_save_hierarchy (XcfInfo *info, xcf_check_error (xcf_seek_pos (info, saved_pos, error)); xcf_write_int32_check_error (info, &offset, 1); - return TRUE; + return true; } static bool @@ -1373,7 +1373,7 @@ xcf_save_level (XcfInfo *info, xcf_check_error (xcf_seek_pos (info, saved_pos, error)); xcf_write_int32_check_error (info, &offset, 1); - return TRUE; + return true; } @@ -1387,9 +1387,9 @@ xcf_save_tile (XcfInfo *info, tile_lock (tile); xcf_write_int8_check_error (info, tile_data_pointer (tile, 0, 0), tile_size (tile)); - tile_release (tile, FALSE); + tile_release (tile, false); - return TRUE; + return true; } static bool @@ -1503,9 +1503,9 @@ xcf_save_tile_rle (XcfInfo *info, g_message ("xcf: uh oh! xcf rle tile saving error: %d", count); } xcf_write_int8_check_error (info, rlebuf, len); - tile_release (tile, FALSE); + tile_release (tile, false); - return TRUE; + return true; } static bool @@ -1523,7 +1523,7 @@ xcf_save_parasite (XcfInfo *info, xcf_write_int8_check_error (info, parasite->data, parasite->size); } - return TRUE; + return true; } typedef struct @@ -1556,10 +1556,10 @@ xcf_save_parasite_list (XcfInfo *info, if (data.error) { g_propagate_error (error, data.error); - return FALSE; + return false; } - return TRUE; + return true; } static bool @@ -1665,7 +1665,7 @@ xcf_save_old_paths (XcfInfo *info, g_free (points); } - return TRUE; + return true; } static bool @@ -1818,9 +1818,9 @@ xcf_save_vectors (XcfInfo *info, xcf_write_float_check_error (info, coords, num_axes); } - g_array_free (control_points, TRUE); + g_array_free (control_points, true); } } - return TRUE; + return true; } diff --git a/filters/chalk/xcf/xcf/xcf-seek.cpp b/filters/chalk/xcf/xcf/xcf-seek.cpp index a24271f5e..fb72d392c 100644 --- a/filters/chalk/xcf/xcf/xcf-seek.cpp +++ b/filters/chalk/xcf/xcf/xcf-seek.cpp @@ -44,11 +44,11 @@ xcf_seek_pos (XcfInfo *info, _("Could not seek in XCF file: %s"), g_strerror (errno)); - return FALSE; + return false; } } - return TRUE; + return true; } bool @@ -61,7 +61,7 @@ xcf_seek_end (XcfInfo *info, _("Could not seek in XCF file: %s"), g_strerror (errno)); - return FALSE; + return false; } info->cp = ftell (info->fp); @@ -72,8 +72,8 @@ xcf_seek_end (XcfInfo *info, _("Could not seek in XCF file: %s"), g_strerror (errno)); - return FALSE; + return false; } - return TRUE; + return true; } diff --git a/filters/karbon/ai/aielement.cpp b/filters/karbon/ai/aielement.cpp index f6f451640..89e4d7162 100644 --- a/filters/karbon/ai/aielement.cpp +++ b/filters/karbon/ai/aielement.cpp @@ -670,7 +670,7 @@ TQByteArray& AIElement::asByteArray() } /*! - Returns TRUE if the aielement's type can be cast to the requested + Returns true if the aielement's type can be cast to the requested type, \p t. Such casting is done automatically when calling the toInt(), ... or asInt(), ... methods. @@ -686,19 +686,19 @@ TQByteArray& AIElement::asByteArray() bool AIElement::canCast( Type t ) const { if ( d->typ == t ) - return TRUE; + return true; if ( t == Int && ( d->typ == String || d->typ == Double || d->typ == UInt || d->typ == Byte) ) - return TRUE; + return true; if ( t == UInt && ( d->typ == String || d->typ == Double || d->typ == Int || d->typ == Byte) ) - return TRUE; + return true; if ( t == Double && ( d->typ == String || d->typ == Int || d->typ == UInt || d->typ == Byte) ) - return TRUE; + return true; if ( t == CString && d->typ == String ) - return TRUE; + return true; if ( t == String && ( d->typ == CString || d->typ == Int || d->typ == UInt || d->typ == Double || d->typ == Byte) ) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -710,8 +710,8 @@ bool AIElement::canCast( Type t ) const AIElement::String, an empty point array if the requested type \p t is AIElement::PointArray, etc). - \returns TRUE if the current type of the - aielement was successfully casted; otherwise returns FALSE. + \returns true if the current type of the + aielement was successfully casted; otherwise returns false. \see canCast() */ @@ -756,14 +756,14 @@ bool AIElement::cast( Type t ) return canCast( t ); } -/*! Compares this AIElement with \a v and returns TRUE if they are - equal; otherwise returns FALSE. +/*! Compares this AIElement with \a v and returns true if they are + equal; otherwise returns false. */ bool AIElement::operator==( const AIElement &v ) const { if ( !v.canCast( type() ) ) - return FALSE; + return false; switch( d->typ ) { /* case List: return v.toList() == toList(); */ @@ -791,11 +791,11 @@ bool AIElement::operator==( const AIElement &v ) const case Invalid: break; } - return FALSE; + return false; } -/*! Compares this AIElement with \a v and returns TRUE if they are - not equal; otherwise returns FALSE. +/*! Compares this AIElement with \a v and returns true if they are + not equal; otherwise returns false. */ bool AIElement::operator!=( const AIElement &v ) const diff --git a/filters/karbon/wmf/wmfimportparser.h b/filters/karbon/wmf/wmfimportparser.h index a297c9967..490eb13c8 100644 --- a/filters/karbon/wmf/wmfimportparser.h +++ b/filters/karbon/wmf/wmfimportparser.h @@ -88,12 +88,12 @@ private: void drawPie( int x, int y, int w, int h, int a, int alen ); void drawChord( int x, int y, int w, int h, int a, int alen ); void drawPolyline( const TQPointArray &pa ); - void drawPolygon( const TQPointArray &pa, bool winding=FALSE ); + void drawPolygon( const TQPointArray &pa, bool winding=false ); /** * drawPolyPolygon draw the XOR of a list of polygons * listPa : list of polygons */ - void drawPolyPolygon( TQPtrList<TQPointArray>& listPa, bool winding=FALSE ); + void drawPolyPolygon( TQPtrList<TQPointArray>& listPa, bool winding=false ); void drawImage( int x, int y, const TQImage &, int sx = 0, int sy = 0, int sw = -1, int sh = -1 ); // Text drawing @@ -102,7 +102,7 @@ private: void drawText( int x, int y, int w, int h, int flags, const TQString &s, double rotation ); // matrix transformation : only used in some bitmap manipulation - void setWorldMatrix( const TQWMatrix &, bool combine=FALSE ); + void setWorldMatrix( const TQWMatrix &, bool combine=false ); //----------------------------------------------------------------------------- // Utilities diff --git a/filters/kspread/gnumeric/gnumericexport.cpp b/filters/kspread/gnumeric/gnumericexport.cpp index dd0df8624..85a912176 100644 --- a/filters/kspread/gnumeric/gnumericexport.cpp +++ b/filters/kspread/gnumeric/gnumericexport.cpp @@ -1407,7 +1407,7 @@ KoFilter::ConversionStatus GNUMERICExport::convert( const TQCString& from, const TQString tmp = cell->text(); if ( tmp =="==" ) tmp=replace( "==", "=" ); - /* cell->calc( TRUE ); // Incredible, cells are not calculated if the document was just opened text = cell->valueString(); */ + /* cell->calc( true ); // Incredible, cells are not calculated if the document was just opened text = cell->valueString(); */ text = tmp; break; } diff --git a/filters/kspread/html/htmlexport.cpp b/filters/kspread/html/htmlexport.cpp index 68f4081cf..17d5484e4 100644 --- a/filters/kspread/html/htmlexport.cpp +++ b/filters/kspread/html/htmlexport.cpp @@ -288,7 +288,7 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int text = cell->text(); // untested break; case Cell::Formula: - cell->calc( TRUE ); // Incredible, cells are not calculated if the document was just opened + cell->calc( true ); // Incredible, cells are not calculated if the document was just opened text = cell->valueString(); break; } diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp index b088afe14..a100b040a 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp @@ -53,7 +53,7 @@ * 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. + * true to construct a modal dialog. */ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* parent, const char* name_, bool modal, WFlags fl ) diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h index 1aad9d931..3b163c900 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h @@ -42,7 +42,7 @@ class KSpreadLatexExportDiaImpl : public LatexExportDia public: KSpreadLatexExportDiaImpl( KoStore*, TQWidget* parent = 0, - const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + const char* name = 0, bool modal = false, WFlags fl = 0 ); virtual ~KSpreadLatexExportDiaImpl(); void setOutputFile(TQString file) { _fileOut = file; } diff --git a/filters/kspread/latex/export/latexexportIface.cpp b/filters/kspread/latex/export/latexexportIface.cpp index f99e6745b..1d95ae62d 100644 --- a/filters/kspread/latex/export/latexexportIface.cpp +++ b/filters/kspread/latex/export/latexexportIface.cpp @@ -26,7 +26,7 @@ * 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. + * true to construct a modal dialog. */ LatexExportIface::LatexExportIface(KSpreadLatexExportDiaImpl* dia) : DCOPObject("FilterConfigDia") diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.cpp b/filters/kspread/libkspreadexport/KSpreadLeader.cpp index 3e8441b0c..760d05de6 100644 --- a/filters/kspread/libkspreadexport/KSpreadLeader.cpp +++ b/filters/kspread/libkspreadexport/KSpreadLeader.cpp @@ -342,14 +342,14 @@ void Leader::updateMaxCells(KSpreadSheet *spreadSheet) { // Maybe we should have something which does that in the KSpreadSheet class, // it would be easy to keep track of this each time a new Cellis instanciated. for (int row = 1; row < maxRow; ++row) { - bool usedColumn = FALSE; + bool usedColumn = false; for (int column = 1; column < maxColumn; ++column) { Cell*cell = spreadSheet->cellAt(column, row); if (!cell->isDefault() && !cell->isEmpty()) { if (column > m_maxCellColumn) { m_maxCellColumn = column; } - usedColumn = TRUE; + usedColumn = true; } } if (usedColumn) { diff --git a/filters/kspread/qpro/qproimport.cpp b/filters/kspread/qpro/qproimport.cpp index ea989f9a6..00d955a36 100644 --- a/filters/kspread/qpro/qproimport.cpp +++ b/filters/kspread/qpro/qproimport.cpp @@ -171,7 +171,7 @@ KoFilter::ConversionStatus QpImport::convert( const TQCString& from, const TQCSt table=ksdoc->map()->addNewSheet(); // set up a default name for the table table->setSheetName( lTableNames.name(lPageIdx) - , TRUE + , true ); lTableNames.table(lPageIdx, table); } @@ -208,7 +208,7 @@ KoFilter::ConversionStatus QpImport::convert( const TQCString& from, const TQCSt // set up a default name for the table lNewTable->setSheetName( lTableNames.name(lIdx) - , TRUE + , true ); lTableNames.table(lIdx, lNewTable); } @@ -236,7 +236,7 @@ KoFilter::ConversionStatus QpImport::convert( const TQCString& from, const TQCSt if( lTableNames.allocated(lPageIdx) && lTableNames.table(lPageIdx) ) { lTableNames.table(lPageIdx)->setSheetName( lRecPageName->pageName() -// , TRUE +// , true ); lTableNames.name(lPageIdx, lRecPageName->pageName()); } diff --git a/filters/kword/amipro/amiproexport.cpp b/filters/kword/amipro/amiproexport.cpp index 6fef9654d..6d46bb60b 100644 --- a/filters/kword/amipro/amiproexport.cpp +++ b/filters/kword/amipro/amiproexport.cpp @@ -63,18 +63,18 @@ bool AmiProWorker::doOpenFile(const TQString& filenameOut, const TQString& /*to* { filename = filenameOut; - return TRUE; + return true; } bool AmiProWorker::doCloseFile(void) { TQFile out( filename ); if( !out.open( IO_WriteOnly ) ) - return FALSE; + return false; TQTextStream stream; stream.setDevice( &out ); stream << result; - return TRUE; + return true; } bool AmiProWorker::doOpenDocument(void) @@ -98,15 +98,15 @@ bool AmiProWorker::doOpenDocument(void) result += "[edoc]\n"; m_bold = m_italic = m_underline = m_underlineDouble = - m_strike = m_subscript = m_superscript = FALSE; + m_strike = m_subscript = m_superscript = false; - return TRUE; + return true; } bool AmiProWorker::doCloseDocument(void) { result += ">\n\n"; - return TRUE; + return true; } static TQString AmiProEscape( const TQString& text ) @@ -172,7 +172,7 @@ bool AmiProWorker::doFullParagraph(const TQString& paraText, result += amiproText + "\n\n"; - return TRUE; + return true; } AmiProExport::AmiProExport( KoFilter *, const char *, const TQStringList& ): diff --git a/filters/kword/amipro/amiproparser.cpp b/filters/kword/amipro/amiproparser.cpp index a73e7456b..d9f38d7bc 100644 --- a/filters/kword/amipro/amiproparser.cpp +++ b/filters/kword/amipro/amiproparser.cpp @@ -579,7 +579,7 @@ AmiProFormat::AmiProFormat() pos = len = 0; bold = italic = underline = word_underline = double_underline = - subscript = superscript = strikethrough = FALSE; + subscript = superscript = strikethrough = false; fontFamily = ""; fontSize = 12; fontColor = TQt::black; @@ -637,7 +637,7 @@ AmiProLayout::AmiProLayout() fontColor = TQt::black; bold = italic = underline = word_underline = double_underline = - subscript = superscript = strikethrough = FALSE; + subscript = superscript = strikethrough = false; align = TQt::AlignLeft; linespace = AmiPro::LS_Single; spaceBefore = spaceAfter = 0; @@ -702,7 +702,7 @@ AmiProStyle::AmiProStyle() fontColor = TQt::black; bold = italic = underline = word_underline = double_underline = - subscript = superscript = strikethrough = FALSE; + subscript = superscript = strikethrough = false; linespace = AmiPro::LS_Single; spaceBefore = spaceAfter = 0; } diff --git a/filters/kword/latex/export/kwordlatexexportdia.cpp b/filters/kword/latex/export/kwordlatexexportdia.cpp index 3498bcdb9..8d0a5ff62 100644 --- a/filters/kword/latex/export/kwordlatexexportdia.cpp +++ b/filters/kword/latex/export/kwordlatexexportdia.cpp @@ -54,7 +54,7 @@ * 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. + * true to construct a modal dialog. */ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent, const char* name_, bool modal, WFlags fl ) diff --git a/filters/kword/latex/export/latexexportIface.cpp b/filters/kword/latex/export/latexexportIface.cpp index 102845b10..9b715463d 100644 --- a/filters/kword/latex/export/latexexportIface.cpp +++ b/filters/kword/latex/export/latexexportIface.cpp @@ -26,7 +26,7 @@ * 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. + * true to construct a modal dialog. */ LatexExportIface::LatexExportIface(KWordLatexExportDia* dia) : DCOPObject("FilterConfigDia") diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp index 0e6dfdc45..d195756fa 100644 --- a/filters/kword/msword/texthandler.cpp +++ b/filters/kword/msword/texthandler.cpp @@ -515,7 +515,7 @@ TQString KWordTextHandler::getFont(unsigned fc) const for (i = 0; i < ENTRIES; i++) { // The loop will leave unchanged any MS font name not fuzzy-matched. - if (font.find(fuzzyLookup[i][0], 0, FALSE) != -1) + if (font.find(fuzzyLookup[i][0], 0, false) != -1) { font = fuzzyLookup[i][1]; break; diff --git a/filters/kword/palmdoc/palmdb.cpp b/filters/kword/palmdoc/palmdb.cpp index 50471ede1..f411adabe 100644 --- a/filters/kword/palmdoc/palmdb.cpp +++ b/filters/kword/palmdoc/palmdb.cpp @@ -45,7 +45,7 @@ PalmDB::PalmDB() setCreator( TQString() ); // crash if autodelete ? - records.setAutoDelete( TRUE ); + records.setAutoDelete( true ); } PalmDB::~PalmDB() @@ -58,13 +58,13 @@ bool PalmDB::load( const char* filename ) // open input file TQFile in (filename); if (!in.open (IO_ReadOnly)) - return FALSE; + return false; TQDataStream stream; stream.setDevice (&in); unsigned filesize = stream.device()->size(); - if( filesize < 72 ) return FALSE; + if( filesize < 72 ) return false; // always big-endian stream.setByteOrder (TQDataStream::BigEndian); @@ -194,7 +194,7 @@ bool PalmDB::load( const char* filename ) // close input file in.close(); - return TRUE; + return true; } bool PalmDB::save( const char* filename ) @@ -202,7 +202,7 @@ bool PalmDB::save( const char* filename ) // open output file TQFile out( filename ); if( !out.open( IO_WriteOnly ) ) - return FALSE; + return false; TQDataStream stream; stream.setDevice( &out ); @@ -321,7 +321,7 @@ bool PalmDB::save( const char* filename ) // close output file out.close(); - return TRUE; + return true; } void PalmDB::setType( const TQString& t ) diff --git a/filters/kword/palmdoc/palmdoc.cpp b/filters/kword/palmdoc/palmdoc.cpp index 9898ad00c..1d62dfa78 100644 --- a/filters/kword/palmdoc/palmdoc.cpp +++ b/filters/kword/palmdoc/palmdoc.cpp @@ -42,14 +42,14 @@ bool PalmDoc::load( const char* filename ) if( !ok ) { m_result = PalmDoc::ReadError; - return FALSE; + return false; } if( type() != "TEXt" ) { tqDebug( "Type is \"%s\", not \"TEXt\", so this is not Palm DOC!", type().latin1() ); m_result = PalmDoc::InvalidFormat; - return FALSE; + return false; } if( creator() != "REAd" ) @@ -57,7 +57,7 @@ bool PalmDoc::load( const char* filename ) tqDebug( "Creator is \"%s\", not \"REAd\", so this is not Palm DOC!", creator().latin1() ); m_result = PalmDoc::InvalidFormat; - return FALSE; + return false; } // must have at least two records @@ -65,7 +65,7 @@ bool PalmDoc::load( const char* filename ) { tqDebug( "Palm DOC has at least 2 records!" ); m_result = PalmDoc::InvalidFormat; - return FALSE; + return false; } // the very first record is DOC header @@ -82,7 +82,7 @@ bool PalmDoc::load( const char* filename ) { tqDebug( "Unknown format of document!" ); m_result = PalmDoc::InvalidFormat; - return FALSE; + return false; } // initialize @@ -110,7 +110,7 @@ bool PalmDoc::load( const char* filename ) // done m_result = OK; - return TRUE; + return true; } bool PalmDoc::save( const char* filename ) @@ -165,12 +165,12 @@ bool PalmDoc::save( const char* filename ) if( !ok ) { m_result = WriteError; - return FALSE; + return false; } // done m_result = OK; - return TRUE; + return true; } // TODO describe in brief about compression algorithm diff --git a/filters/kword/palmdoc/palmdocexport.cpp b/filters/kword/palmdoc/palmdocexport.cpp index 37f8d9cf2..f4e88b179 100644 --- a/filters/kword/palmdoc/palmdocexport.cpp +++ b/filters/kword/palmdoc/palmdocexport.cpp @@ -64,7 +64,7 @@ private: bool PalmDocWorker::doOpenFile(const TQString& filenameOut, const TQString& /*to*/) { outfile = filenameOut; - return TRUE; + return true; } bool PalmDocWorker::doCloseFile(void) @@ -80,24 +80,24 @@ bool PalmDocWorker::doCloseFile(void) doc.setText( text ); doc.save( outfile.latin1() ); - return TRUE; + return true; } bool PalmDocWorker::doOpenDocument(void) { text = TQString(); - return TRUE; + return true; } bool PalmDocWorker::doCloseDocument(void) { - return TRUE; + return true; } bool PalmDocWorker::doFullDocumentInfo( const KWEFDocumentInfo& docInfo ) { title = docInfo.title; - return TRUE; + return true; } bool PalmDocWorker::doFullParagraph(const TQString& paraText, @@ -107,7 +107,7 @@ bool PalmDocWorker::doFullParagraph(const TQString& paraText, text.append( paraText ); text.append( "\n\n" ); - return TRUE; + return true; } PalmDocExport::PalmDocExport( KoFilter *, const char *, const TQStringList& ): diff --git a/filters/kword/palmdoc/palmdocimport.cpp b/filters/kword/palmdoc/palmdocimport.cpp index a1e8107bc..fa420eaed 100644 --- a/filters/kword/palmdoc/palmdocimport.cpp +++ b/filters/kword/palmdoc/palmdocimport.cpp @@ -156,7 +156,7 @@ TQString PalmDocImport::processPlainDocument( TQString plaindoc ) TQString prolog, content, epilog; TQStringList paragraphs; - paragraphs = TQStringList::split( "\n\n", plaindoc, TRUE ); + paragraphs = TQStringList::split( "\n\n", plaindoc, true ); for( unsigned int i = 0; i < paragraphs.count(); i++ ) { TQString text = paragraphs[i]; diff --git a/filters/kword/wml/wmlexport.cpp b/filters/kword/wml/wmlexport.cpp index df6dd3d5a..b2ed27119 100644 --- a/filters/kword/wml/wmlexport.cpp +++ b/filters/kword/wml/wmlexport.cpp @@ -62,18 +62,18 @@ class WMLWorker : public KWEFBaseWorker bool WMLWorker::doOpenFile(const TQString& filenameOut, const TQString& /*to*/) { filename = filenameOut; - return TRUE; + return true; } bool WMLWorker::doCloseFile(void) { TQFile out( filename ); if( !out.open( IO_WriteOnly ) ) - return FALSE; + return false; TQTextStream stream; stream.setDevice( &out ); stream << result; - return TRUE; + return true; } bool WMLWorker::doOpenDocument(void) @@ -84,16 +84,16 @@ bool WMLWorker::doOpenDocument(void) result += "<wml>\n"; result += "<card>\n"; - m_bold = m_italic = m_underline = FALSE; + m_bold = m_italic = m_underline = false; - return TRUE; + return true; } bool WMLWorker::doCloseDocument(void) { result += "</card>\n"; result += "</wml>"; - return TRUE; + return true; } bool WMLWorker::doFullParagraph(const TQString& paraText, @@ -114,7 +114,7 @@ bool WMLWorker::doFullParagraph(const TQString& paraText, partialText = text.mid( formatData.pos, formatData.len ); // escape the text - partialText = KWEFUtil::EscapeSgmlText( NULL, partialText, TRUE, TRUE ); + partialText = KWEFUtil::EscapeSgmlText( NULL, partialText, true, true ); // apply formatting m_bold = formatData.text.weight >= 75; @@ -137,7 +137,7 @@ bool WMLWorker::doFullParagraph(const TQString& paraText, result += "<p align=\"" + align + "\">" + wmlText + "</p>\n"; - return TRUE; + return true; } WMLExport::WMLExport( KoFilter *, const char *, const TQStringList& ): diff --git a/filters/kword/wml/wmlimport.cpp b/filters/kword/wml/wmlimport.cpp index 83e14d9f0..b713bec60 100644 --- a/filters/kword/wml/wmlimport.cpp +++ b/filters/kword/wml/wmlimport.cpp @@ -150,7 +150,7 @@ bool WMLConverter::doOpenCard( TQString id, TQString title ) if( m_title.isEmpty() ) m_title = ( !title.isEmpty() ) ? title : id; - return TRUE; + return true; } // FIXME is this right ? @@ -186,7 +186,7 @@ bool WMLConverter::doParagraph( TQString atext, WMLFormatList formatList, root.append( WMLLayoutAsXML( layout) ); root.append( "</PARAGRAPH>\n" ); - return TRUE; + return true; } void WMLConverter::parse( const char* filename ) diff --git a/filters/kword/wml/wmlparser.cpp b/filters/kword/wml/wmlparser.cpp index e704061a7..3054cf9dc 100644 --- a/filters/kword/wml/wmlparser.cpp +++ b/filters/kword/wml/wmlparser.cpp @@ -125,7 +125,7 @@ bool WMLHandler::startElement( const TQString&, const TQString&, if( tag == "p" ) { m_state.currentLayout = WMLLayout(); - m_inBlock = TRUE; + m_inBlock = true; if( m_state.currentFormat.bold || m_state.currentFormat.italic || m_state.currentFormat.underline || @@ -138,31 +138,31 @@ bool WMLHandler::startElement( const TQString&, const TQString&, if( align == "center" ) m_state.currentLayout.align = WMLLayout::Center; - return TRUE; + return true; } if(( tag == "b" ) || (tag == "strong") ) { - m_state.currentFormat.bold = TRUE; + m_state.currentFormat.bold = true; m_state.currentFormat.pos = m_text.length(); m_state.formatList.append( m_state.currentFormat ); - return TRUE; + return true; } if(( tag == "i" ) || (tag == "em") ) { - m_state.currentFormat.italic = TRUE; + m_state.currentFormat.italic = true; m_state.currentFormat.pos = m_text.length(); m_state.formatList.append( m_state.currentFormat ); - return TRUE; + return true; } if( tag == "u" ) { - m_state.currentFormat.underline = TRUE; + m_state.currentFormat.underline = true; m_state.currentFormat.pos = m_text.length(); m_state.formatList.append( m_state.currentFormat ); - return TRUE; + return true; } if( tag == "big" ) @@ -170,7 +170,7 @@ bool WMLHandler::startElement( const TQString&, const TQString&, m_state.currentFormat.fontsize = WMLFormat::Big; m_state.currentFormat.pos = m_text.length(); m_state.formatList.append( m_state.currentFormat ); - return TRUE; + return true; } if( tag == "small" ) @@ -178,7 +178,7 @@ bool WMLHandler::startElement( const TQString&, const TQString&, m_state.currentFormat.fontsize = WMLFormat::Small; m_state.currentFormat.pos = m_text.length(); m_state.formatList.append( m_state.currentFormat ); - return TRUE; + return true; } if( tag == "a" ) @@ -208,7 +208,7 @@ bool WMLHandler::startElement( const TQString&, const TQString&, if( tag == "tr" ) { m_state.tableRow++; - return TRUE; + return true; } // open table cell, keep in sync with <p> above @@ -216,13 +216,13 @@ bool WMLHandler::startElement( const TQString&, const TQString&, { m_state.tableCol++; m_state.currentLayout = WMLLayout(); - m_inBlock = TRUE; + m_inBlock = true; m_state.formatList.append( m_state.currentFormat ); return m_parser->doTableCell( m_state.tableRow, m_state.tableCol ); } // unhandled element - return TRUE; + return true; } bool WMLHandler::endElement( const TQString&, const TQString&, @@ -236,7 +236,7 @@ bool WMLHandler::endElement( const TQString&, const TQString&, if( tag == "card" ) { // forget </p> before </card> ? - m_inBlock = FALSE; + m_inBlock = false; if( !m_text.isEmpty() ) flushParagraph(); return m_parser->doCloseCard(); @@ -244,32 +244,32 @@ bool WMLHandler::endElement( const TQString&, const TQString&, if( tag == "p" ) { - m_inBlock = FALSE; + m_inBlock = false; return flushParagraph(); } if(( tag == "b" ) || (tag == "strong") ) { - m_state.currentFormat.bold = FALSE; + m_state.currentFormat.bold = false; m_state.currentFormat.pos = m_text.length(); m_state.formatList.append( m_state.currentFormat ); - return TRUE; + return true; } if(( tag == "i" ) || (tag == "em") ) { - m_state.currentFormat.italic = FALSE; + m_state.currentFormat.italic = false; m_state.currentFormat.pos = m_text.length(); m_state.formatList.append( m_state.currentFormat ); - return TRUE; + return true; } if( tag == "u" ) { - m_state.currentFormat.underline = FALSE; + m_state.currentFormat.underline = false; m_state.currentFormat.pos = m_text.length(); m_state.formatList.append( m_state.currentFormat ); - return TRUE; + return true; } if( tag == "big" ) @@ -277,7 +277,7 @@ bool WMLHandler::endElement( const TQString&, const TQString&, m_state.currentFormat.fontsize = WMLFormat::Normal; m_state.currentFormat.pos = m_text.length(); m_state.formatList.append( m_state.currentFormat ); - return TRUE; + return true; } if( tag == "small" ) @@ -285,7 +285,7 @@ bool WMLHandler::endElement( const TQString&, const TQString&, m_state.currentFormat.fontsize = WMLFormat::Normal; m_state.currentFormat.pos = m_text.length(); m_state.formatList.append( m_state.currentFormat ); - return TRUE; + return true; } if( tag == "a" ) @@ -305,17 +305,17 @@ bool WMLHandler::endElement( const TQString&, const TQString&, // close table row if( tag == "tr" ) - return TRUE; //skip + return true; //skip // close table cell, like </p> if( tag == "td" ) { - m_inBlock = FALSE; + m_inBlock = false; return flushParagraph(); } // unhandled - return TRUE; + return true; } bool WMLHandler::characters( const TQString& ch ) @@ -326,7 +326,7 @@ bool WMLHandler::characters( const TQString& ch ) if( m_inLink ) m_state.currentFormat.link.append( ch ); - return TRUE; + return true; } bool WMLHandler::flushParagraph() @@ -375,7 +375,7 @@ WMLFormat::WMLFormat() { pos = len = 0; fontsize = Normal; - bold = italic = underline = FALSE; + bold = italic = underline = false; link = ""; href = ""; } @@ -438,40 +438,40 @@ void WMLParser::parse( const char* filename ) bool WMLParser::doOpenDocument() { - return TRUE; + return true; } bool WMLParser::doCloseDocument() { - return TRUE; + return true; } bool WMLParser::doOpenCard( TQString, TQString ) { - return TRUE; + return true; } bool WMLParser::doCloseCard() { - return TRUE; + return true; } bool WMLParser::doParagraph( TQString, WMLFormatList, WMLLayout ) { - return TRUE; + return true; } bool WMLParser::doBeginTable() { - return TRUE; + return true; } bool WMLParser::doEndTable() { - return TRUE; + return true; } bool WMLParser::doTableCell( unsigned, unsigned ) { - return TRUE; + return true; } diff --git a/filters/kword/wordperfect/import/kwordfilter.cpp b/filters/kword/wordperfect/import/kwordfilter.cpp index 1b3b83df2..3a0701757 100644 --- a/filters/kword/wordperfect/import/kwordfilter.cpp +++ b/filters/kword/wordperfect/import/kwordfilter.cpp @@ -52,9 +52,9 @@ class KWordFormat KWordFormat::KWordFormat() { - bold = italic = underline = doubleunderline = FALSE; - striked = superscript = subscript = redline = FALSE; - color = highlight = FALSE; + bold = italic = underline = doubleunderline = false; + striked = superscript = subscript = redline = false; + color = highlight = false; red = green = blue = 0; bgred = bggreen = bgblue = 255; fontsize = 0.0; @@ -122,7 +122,7 @@ KWordFilter::parse (const TQString & filename) int frameLeftMargin = 36, frameRightMargin = 36; // quick hack if (!Parser::parse (filename)) - return FALSE; + return false; // this will force very last text and formatting to be flushed as well tokens.append( new Token( Token::HardReturn ) ); @@ -418,5 +418,5 @@ KWordFilter::parse (const TQString & filename) documentInfo += "</document-info>"; - return TRUE; + return true; } diff --git a/filters/kword/wordperfect/import/parser.cpp b/filters/kword/wordperfect/import/parser.cpp index 96a2559cc..95e899474 100644 --- a/filters/kword/wordperfect/import/parser.cpp +++ b/filters/kword/wordperfect/import/parser.cpp @@ -91,8 +91,8 @@ mapToAlign (int data) Parser::Parser () { - tokens.setAutoDelete( TRUE ); - packets.setAutoDelete( TRUE ); + tokens.setAutoDelete( true ); + packets.setAutoDelete( true ); } bool @@ -107,7 +107,7 @@ Parser::parse (const TQString & filename) TQDataStream stream; TQFile in (filename); if (!in.open (IO_ReadOnly)) - return FALSE; + return false; stream.setDevice (&in); // must be little-endian @@ -121,19 +121,19 @@ Parser::parse (const TQString & filename) // check first 4 bytes, must be (in hex): 0xFF, 0x57, 0x50, 0x43 if ((header[0] != 0xFF) || (header[1] != 0x57) || (header[2] != 0x50) || (header[3] != 0x43)) - return FALSE; + return false; // get document start unsigned m_docstart = header[4] + (header[5] << 8) + (header[6] << 16) + (header[7] << 24); if (m_docstart > stream.device ()->size ()) - return FALSE; + return false; // check document type unsigned product_type = header[8]; unsigned file_type = header[9]; if ((product_type != 1) || (file_type != 10)) - return FALSE; + return false; // check document format version: for WP 5.x or WP 6/7/8 // major 0 means WP 5.x, otherwise WP 6/7/8 @@ -143,11 +143,11 @@ Parser::parse (const TQString & filename) // do not accept other than 0 (WP 5.x) and 2 (WP 6/7/8) if ( (major_version != 0) && (major_version != 2) ) - return FALSE; + return false; // check if this is encrypted unsigned encrypt_hash = header[12] + (header[13] << 8); - if ( encrypt_hash ) return FALSE; + if ( encrypt_hash ) return false; in.close (); @@ -159,7 +159,7 @@ Parser::parse (const TQString & filename) if ( major_version == 0 ) parseDocWP5 ( filename, m_docstart ); else parseDocWP6 ( filename, m_docstart ); - return TRUE; + return true; } void diff --git a/filters/kword/wordperfect/import/parser.h b/filters/kword/wordperfect/import/parser.h index 9fa880527..4ead85f7c 100644 --- a/filters/kword/wordperfect/import/parser.h +++ b/filters/kword/wordperfect/import/parser.h @@ -170,7 +170,7 @@ namespace WP /** * Parses given filename. - * @returns TRUE if parsing was successful, otherwise FALSE. + * @returns true if parsing was successful, otherwise false. * */ bool parse (const TQString & filename); diff --git a/filters/xsltfilter/export/xsltexportdia.cpp b/filters/xsltfilter/export/xsltexportdia.cpp index bf141f903..f8c991f2c 100644 --- a/filters/xsltfilter/export/xsltexportdia.cpp +++ b/filters/xsltfilter/export/xsltexportdia.cpp @@ -46,7 +46,7 @@ * 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. + * true to construct a modal dialog. */ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidget* parent, const char* name_, bool modal, WFlags fl ) : XSLTDialog( parent, name_, modal, fl ) diff --git a/filters/xsltfilter/export/xsltexportdia.h b/filters/xsltfilter/export/xsltexportdia.h index 21c16398b..0bb0f0e90 100644 --- a/filters/xsltfilter/export/xsltexportdia.h +++ b/filters/xsltfilter/export/xsltexportdia.h @@ -47,7 +47,7 @@ class XSLTExportDia : public XSLTDialog TQStringList _namesList; public: - XSLTExportDia( KoStoreDevice*, const TQCString &format, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + XSLTExportDia( KoStoreDevice*, const TQCString &format, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~XSLTExportDia(); void setOutputFile(TQString file) { _fileOut = file; } diff --git a/filters/xsltfilter/import/xsltimportdia.cpp b/filters/xsltfilter/import/xsltimportdia.cpp index 9052e4ecc..6ce247716 100644 --- a/filters/xsltfilter/import/xsltimportdia.cpp +++ b/filters/xsltfilter/import/xsltimportdia.cpp @@ -43,7 +43,7 @@ * 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. + * true to construct a modal dialog. */ XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* parent, const char* name_, bool modal, WFlags fl ) : XSLTDialog( parent, name_, modal, fl ) diff --git a/filters/xsltfilter/import/xsltimportdia.h b/filters/xsltfilter/import/xsltimportdia.h index 2a1496119..9ad3543a1 100644 --- a/filters/xsltfilter/import/xsltimportdia.h +++ b/filters/xsltfilter/import/xsltimportdia.h @@ -47,7 +47,7 @@ class XSLTImportDia : public XSLTDialog TQStringList _namesList; public: - XSLTImportDia(KoStore*, const TQCString &format, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + XSLTImportDia(KoStore*, const TQCString &format, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~XSLTImportDia(); void setInputFile(TQString file) { _fileIn = file; } |