diff --git a/chalk/colorspaces/wetsticky/ws/ogl_interface.c b/chalk/colorspaces/wetsticky/ws/ogl_interface.c index 391a41942..83e4532d8 100644 --- a/chalk/colorspaces/wetsticky/ws/ogl_interface.c +++ b/chalk/colorspaces/wetsticky/ws/ogl_interface.c @@ -254,7 +254,7 @@ void evolve_paint() }*/ for (k=0; k < STEP_LIMIT; k++) single_step(); - while (TRUE) { + while (1) { next_cell_for_repaint(&cell, &p); if (cell == NIL) return; paint_cell(cell, p.x, p.y); diff --git a/chalk/colorspaces/wetsticky/ws/x_interface.c b/chalk/colorspaces/wetsticky/ws/x_interface.c index b15d3ec25..b070f9faf 100644 --- a/chalk/colorspaces/wetsticky/ws/x_interface.c +++ b/chalk/colorspaces/wetsticky/ws/x_interface.c @@ -699,7 +699,7 @@ void evolve_paint() for (k=0; k < STEP_LIMIT; k++) single_step(); - while (TRUE) { + while (1) { next_cell_for_repaint(&cell, &p); if (cell == NIL) return; paint_cell(cell, p.x, p.y); diff --git a/chalk/core/kis_scale_visitor.cpp b/chalk/core/kis_scale_visitor.cpp index a06d674d1..f89f03ae4 100644 --- a/chalk/core/kis_scale_visitor.cpp +++ b/chalk/core/kis_scale_visitor.cpp @@ -117,7 +117,7 @@ void KisScaleWorker::run() { for(int channel = 0; channel < m_pixelSize; channel++){ weight[channel] = 0.0; - bPelDelta[channel] = FALSE; + bPelDelta[channel] = false; pel[channel]=tmpRows[contribY.p[0].m_pixel][ x * m_pixelSize + channel ]; } for(int srcpos = 0; srcpos < contribY.n; srcpos++) @@ -126,7 +126,7 @@ void KisScaleWorker::run() for(int channel = 0; channel < m_pixelSize; channel++) { pel2[channel]=tmpRows[contribY.p[srcpos].m_pixel][ x * m_pixelSize + channel ]; - if(pel2[channel] != pel[channel]) bPelDelta[channel] = TRUE; + if(pel2[channel] != pel[channel]) bPelDelta[channel] = true; weight[channel] += pel2[channel] * contribY.p[srcpos].m_weight; } } @@ -143,7 +143,7 @@ void KisScaleWorker::run() { for(int channel = 0; channel < m_pixelSize; channel++){ weight[channel] = 0.0; - bPelDelta[channel] = FALSE; + bPelDelta[channel] = false; pel[channel] = tmp[ contribX[x].p[0].m_pixel * m_pixelSize + channel ]; } for(int srcpos = 0; srcpos < contribX[x].n; srcpos++) @@ -151,7 +151,7 @@ void KisScaleWorker::run() for(int channel = 0; channel < m_pixelSize; channel++){ pel2[channel] = tmp[ contribX[x].p[srcpos].m_pixel * m_pixelSize + channel ]; if(pel2[channel] != pel[channel]) - bPelDelta[channel] = TRUE; + bPelDelta[channel] = true; weight[channel] += pel2[channel] * contribX[x].p[srcpos].m_weight; } } diff --git a/chalk/ui/kis_canvas_painter.h b/chalk/ui/kis_canvas_painter.h index 00a197fd9..104763559 100644 --- a/chalk/ui/kis_canvas_painter.h +++ b/chalk/ui/kis_canvas_painter.h @@ -79,7 +79,7 @@ public: virtual void setWorldXForm(bool); virtual const TQWMatrix&worldMatrix() const; - virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); + virtual void setWorldMatrix(const TQWMatrix&, bool combine=false); virtual void saveWorldMatrix(); virtual void restoreWorldMatrix(); @@ -136,7 +136,7 @@ public: virtual void drawChord(const TQRect&, int a, int alen); virtual void drawLineSegments(const TQPointArray&, int index=0, int nlines=-1); virtual void drawPolyline(const TQPointArray&, int index=0, int npoints=-1); - virtual void drawPolygon(const TQPointArray&, bool winding=FALSE, int index=0, int npoints=-1); + virtual void drawPolygon(const TQPointArray&, bool winding=false, int index=0, int npoints=-1); virtual void drawConvexPolygon(const TQPointArray&, int index=0, int npoints=-1); virtual void drawCubicBezier(const TQPointArray&, int index=0); virtual void drawPixmap(int x, int y, const TQPixmap&, int sx=0, int sy=0, int sw=-1, int sh=-1); @@ -242,7 +242,7 @@ public: void setWorldXForm(bool); const TQWMatrix&worldMatrix() const; - void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); + void setWorldMatrix(const TQWMatrix&, bool combine=false); void saveWorldMatrix(); void restoreWorldMatrix(); @@ -299,7 +299,7 @@ public: void drawChord(const TQRect&, int a, int alen); void drawLineSegments(const TQPointArray&, int index=0, int nlines=-1); void drawPolyline(const TQPointArray&, int index=0, int npoints=-1); - void drawPolygon(const TQPointArray&, bool winding=FALSE, int index=0, int npoints=-1); + void drawPolygon(const TQPointArray&, bool winding=false, int index=0, int npoints=-1); void drawConvexPolygon(const TQPointArray&, int index=0, int npoints=-1); void drawCubicBezier(const TQPointArray&, int index=0); void drawPixmap(int x, int y, const TQPixmap&, int sx=0, int sy=0, int sw=-1, int sh=-1); diff --git a/chalk/ui/kis_opengl_canvas_painter.h b/chalk/ui/kis_opengl_canvas_painter.h index ff7c841c5..16b997b80 100644 --- a/chalk/ui/kis_opengl_canvas_painter.h +++ b/chalk/ui/kis_opengl_canvas_painter.h @@ -86,7 +86,7 @@ public: virtual void setWorldXForm(bool); virtual const TQWMatrix&worldMatrix() const; - virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); + virtual void setWorldMatrix(const TQWMatrix&, bool combine=false); virtual void saveWorldMatrix(); virtual void restoreWorldMatrix(); @@ -143,7 +143,7 @@ public: virtual void drawChord(const TQRect&, int a, int alen); virtual void drawLineSegments(const TQPointArray&, int index=0, int nlines=-1); virtual void drawPolyline(const TQPointArray&, int index=0, int npoints=-1); - virtual void drawPolygon(const TQPointArray&, bool winding=FALSE, int index=0, int npoints=-1); + virtual void drawPolygon(const TQPointArray&, bool winding=false, int index=0, int npoints=-1); virtual void drawConvexPolygon(const TQPointArray&, int index=0, int npoints=-1); virtual void drawCubicBezier(const TQPointArray&, int index=0); virtual void drawPixmap(int x, int y, const TQPixmap&, int sx=0, int sy=0, int sw=-1, int sh=-1); diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.h b/chalk/ui/kis_qpaintdevice_canvas_painter.h index 704cbfff9..547de9e1d 100644 --- a/chalk/ui/kis_qpaintdevice_canvas_painter.h +++ b/chalk/ui/kis_qpaintdevice_canvas_painter.h @@ -81,7 +81,7 @@ public: virtual void setWorldXForm(bool); virtual const TQWMatrix&worldMatrix() const; - virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); + virtual void setWorldMatrix(const TQWMatrix&, bool combine=false); virtual void saveWorldMatrix(); virtual void restoreWorldMatrix(); @@ -138,7 +138,7 @@ public: virtual void drawChord(const TQRect&, int a, int alen); virtual void drawLineSegments(const TQPointArray&, int index=0, int nlines=-1); virtual void drawPolyline(const TQPointArray&, int index=0, int npoints=-1); - virtual void drawPolygon(const TQPointArray&, bool winding=FALSE, int index=0, int npoints=-1); + virtual void drawPolygon(const TQPointArray&, bool winding=false, int index=0, int npoints=-1); virtual void drawConvexPolygon(const TQPointArray&, int index=0, int npoints=-1); virtual void drawCubicBezier(const TQPointArray&, int index=0); virtual void drawPixmap(int x, int y, const TQPixmap&, int sx=0, int sy=0, int sw=-1, int sh=-1); diff --git a/doc/kugar/progguide.docbook b/doc/kugar/progguide.docbook index a61faf07c..27e82c5d3 100644 --- a/doc/kugar/progguide.docbook +++ b/doc/kugar/progguide.docbook @@ -511,7 +511,7 @@ TQString KugarWidgetPlugin::whatsThis (const TQString & feature) const bool KugarWidgetPlugin::isContainer (const TQString &) const { - return FALSE; + return false; } TQ_EXPORT_PLUGIN( KugarWidgetPlugin ) diff --git a/example/example_part.cpp b/example/example_part.cpp index 4afc46b0e..c2637d01a 100644 --- a/example/example_part.cpp +++ b/example/example_part.cpp @@ -43,7 +43,7 @@ bool ExamplePart::initDoc(InitDocFlags flags, TQWidget* parentWidget) KoTemplateChooseDia::ReturnType ret = KoTemplateChooseDia::choose( .... ) */ - return TRUE; + return true; } KoView* ExamplePart::createViewInstance( TQWidget* parent, const char* name ) diff --git a/example/example_part.h b/example/example_part.h index 5e44499df..6870d5beb 100644 --- a/example/example_part.h +++ b/example/example_part.h @@ -29,7 +29,7 @@ class ExamplePart : public KoDocument public: ExamplePart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); - virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); + virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 ); virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0); diff --git a/example/example_view.cpp b/example/example_view.cpp index a0ab2bdb3..d78ecd266 100644 --- a/example/example_view.cpp +++ b/example/example_view.cpp @@ -51,7 +51,7 @@ void ExampleView::paintEvent( TQPaintEvent* ev ) // ### TODO: Scaling // Let the document do the drawing - koDocument()->paintEverything( painter, ev->rect(), FALSE, this ); + koDocument()->paintEverything( painter, ev->rect(), false, this ); painter.end(); } 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& listPa, bool winding=FALSE ); + void drawPolyPolygon( TQPtrList& 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 4e88e6be5..c1b48ef71 100644 --- a/filters/kspread/gnumeric/gnumericexport.cpp +++ b/filters/kspread/gnumeric/gnumericexport.cpp @@ -1406,7 +1406,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 46bc8749d..c1770694f 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 6df44c563..f37203723 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 += "\n"; result += "\n"; - m_bold = m_italic = m_underline = FALSE; + m_bold = m_italic = m_underline = false; - return TRUE; + return true; } bool WMLWorker::doCloseDocument(void) { result += "\n"; result += ""; - 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 += "

" + wmlText + "

\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( "\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

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

before ? - 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

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 += ""; - 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 f0cbcbeba..d6347ec19 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 7b79efd1b..764170401 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; } diff --git a/karbon/render/vqpainter.cpp b/karbon/render/vqpainter.cpp index 2519bf838..85f7e00de 100644 --- a/karbon/render/vqpainter.cpp +++ b/karbon/render/vqpainter.cpp @@ -153,7 +153,7 @@ VTQPainter::fillPath() { // we probably dont need filling for qpainter //m_index = 0; - m_painter->drawPolygon( m_pa, FALSE, 0, m_index ); + m_painter->drawPolygon( m_pa, false, 0, m_index ); } void diff --git a/karbon/widgets/vcolorslider.cpp b/karbon/widgets/vcolorslider.cpp index 0e5e2786d..ec210d763 100644 --- a/karbon/widgets/vcolorslider.cpp +++ b/karbon/widgets/vcolorslider.cpp @@ -142,7 +142,7 @@ bool VColorSlider::eventFilter( TQObject *obj, TQEvent *ev ) else if( ev->type() == TQEvent::MouseButtonRelease ) m_isDragging = false; } - return FALSE; + return false; } #include "vcolorslider.moc" diff --git a/kchart/kchartPageLayout.cpp b/kchart/kchartPageLayout.cpp index 714174589..65b678d44 100644 --- a/kchart/kchartPageLayout.cpp +++ b/kchart/kchartPageLayout.cpp @@ -31,7 +31,7 @@ namespace KChart { KChartPageLayout::KChartPageLayout( KChartParams* _params, TQWidget* parent, const char* name ) - : KDialogBase( parent, name, TRUE,i18n("Page Layout"),KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 | KDialogBase::Apply , KDialogBase::Ok,true ) + : KDialogBase( parent, name, true,i18n("Page Layout"),KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 | KDialogBase::Apply , KDialogBase::Ok,true ) { params=_params; #if 0 diff --git a/kchart/kchartPieConfigPage.cpp b/kchart/kchartPieConfigPage.cpp index a56a96c8c..b69416109 100644 --- a/kchart/kchartPieConfigPage.cpp +++ b/kchart/kchartPieConfigPage.cpp @@ -53,7 +53,7 @@ KChartPieConfigPage::KChartPieConfigPage( KChartParams* params, list->resize( list->sizeHint() ); grid->addMultiCellWidget(list,0,9,0,0); list->addColumn( i18n("Hide Piece") ); - list->setRootIsDecorated( TRUE ); + list->setRootIsDecorated( true ); TQLabel* label = new TQLabel( i18n( "Column active:" ), this ); label->resize( label->sizeHint() ); diff --git a/kchart/kchartWizard.cpp b/kchart/kchartWizard.cpp index 9145c1754..cfd26c8dc 100644 --- a/kchart/kchartWizard.cpp +++ b/kchart/kchartWizard.cpp @@ -35,7 +35,7 @@ KChartWizard::KChartWizard ( KChartPart* _chart, TQWidget *parent, const char* n // Second page: select the major chart type m_chartTypePage = new KChartWizardSelectChartTypePage( this, m_chart ); addPage( m_chartTypePage, i18n( "Select Chart Type" ) ); - //finishButton()->setEnabled( TRUE ); + //finishButton()->setEnabled( true ); setFinishEnabled(m_chartTypePage, true); setHelpEnabled(m_chartTypePage, false); diff --git a/kchart/kchart_part.cpp b/kchart/kchart_part.cpp index c552f3caf..f39385155 100644 --- a/kchart/kchart_part.cpp +++ b/kchart/kchart_part.cpp @@ -596,7 +596,7 @@ void KChartPart::analyzeHeaders( const KDChartTableData& data ) // label text => prevents crash. #if 1 if ( data.cols() == 1 ) - isStringFirstRow = FALSE; + isStringFirstRow = false; #endif bool hasColHeader = false; diff --git a/kchart/kdchart/KDChart.cpp b/kchart/kdchart/KDChart.cpp index eb85bf2ea..7c2690cb5 100644 --- a/kchart/kdchart/KDChart.cpp +++ b/kchart/kdchart/KDChart.cpp @@ -260,7 +260,7 @@ void KDChart::paint( TQPainter* painter, const TQRect* rect, bool mustCalculateGeometry ) { -//tqDebug("KDChart::paint() mustCalculateGeometry: "+TQString(mustCalculateGeometry?"TRUE":"FALSE") ); +//tqDebug("KDChart::paint() mustCalculateGeometry: "+TQString(mustCalculateGeometry?"true":"false") ); #if defined KDAB_EVAL EvalDialog::checkEvalLicense( "KD Chart" ); #endif @@ -346,7 +346,7 @@ void KDChart::paint( TQPainter* painter, like the paint() method described above but additionally it takes care for the output mode flag: Before painting is started the internal optimizeOutputForScreen flag is set - to FALSE and after painting is done it is restored to + to false and after painting is done it is restored to it's previous value. \sa paint diff --git a/kchart/kdchart/KDChartAxesPainter.cpp b/kchart/kdchart/KDChartAxesPainter.cpp index e3fc93840..2058e51a0 100644 --- a/kchart/kdchart/KDChartAxesPainter.cpp +++ b/kchart/kdchart/KDChartAxesPainter.cpp @@ -692,7 +692,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, if(!iAxis){ tqDebug("nTxtHeight: "+TQString::number(cv.nTxtHeight)+" nRotation: "+TQString::number(nRotation)+ - " matching: "+TQString(textsMatching ? "TRUE":"FALSE")); + " matching: "+TQString(textsMatching ? "true":"false")); tqDebug("nUsableAxisHeight: %f, unitedRegions.boundingRect().height(): %i ", nUsableAxisHeight, unitedRegions.boundingRect().height()); } @@ -704,7 +704,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, } } else { if( nUsableAxisWidth < unitedRegions.boundingRect().width() ){ - //tqDebug("textsMatching: %s",textsMatching ? "TRUE" : "FALSE"); + //tqDebug("textsMatching: %s",textsMatching ? "true" : "false"); textsMatching = false; textsDontFitIntoArea = true; //tqDebug("too wide"); @@ -2022,7 +2022,7 @@ void KDChartAxesPainter::calculateLabelTexts( pYDelimDeltaFaktor = 1.0; pXDeltaFactor = bDecreasing ? -1.0 : 1.0; //tqDebug("\nsetting pXDeltaFactor for axis %x", axisNumber); - //tqDebug(bDecreasing ? "bDecreasing = TRUE" : "bDecreasing = FALSE"); + //tqDebug(bDecreasing ? "bDecreasing = true" : "bDecreasing = false"); //tqDebug("pXDeltaFactor = %f\n",pXDeltaFactor); } break; @@ -4105,8 +4105,8 @@ void KDChartAxesPainter::calculateAbscissaInfos( const KDChartParams& params, ? ( infos.abscissaSpan / infos.numLabels ) : infos.abscissaSpan ); - //tqDebug( bAbscissaDecreasing ? "bAbscissaDecreasing = TRUE" : "bAbscissaDecreasing = FALSE"); - //tqDebug( abscissaHasTrueAxisValues ? "abscissaHasTrueAxisValues = TRUE" : "abscissaHasTrueAxisValues = FALSE"); + //tqDebug( bAbscissaDecreasing ? "bAbscissaDecreasing = true" : "bAbscissaDecreasing = false"); + //tqDebug( abscissaHasTrueAxisValues ? "abscissaHasTrueAxisValues = true" : "abscissaHasTrueAxisValues = false"); //tqDebug( "abscissaDelta = %f", abscissaDelta); infos.bAbscissaHasTrueAxisDtValues = @@ -4217,8 +4217,8 @@ void KDChartAxesPainter::calculateAbscissaInfos( const KDChartParams& params, "\nabscissaPara: OK" : "\nabscissaPara: leer"); tqDebug(abscissaHasTrueAxisValues ? - "abscissaHasTrueAxisValues: TRUE" : - "abscissaHasTrueAxisValues: FALSE"); + "abscissaHasTrueAxisValues: true" : + "abscissaHasTrueAxisValues: false"); tqDebug("abscissaStart: %f", abscissaStart); tqDebug("abscissaEnd : %f", abscissaEnd); tqDebug("abscissaPara->trueAxisDelta(): %f", abscissaPara->trueAxisDelta()); diff --git a/kchart/kdchart/KDChartAxisParams.cpp b/kchart/kdchart/KDChartAxisParams.cpp index 559037c6c..15fbd2c33 100644 --- a/kchart/kdchart/KDChartAxisParams.cpp +++ b/kchart/kdchart/KDChartAxisParams.cpp @@ -1928,12 +1928,12 @@ void KDChartAxisParams::setAxisValues( bool axisSteadyValueCalc, the default, KD Chart just takes the value specified by you, e.g. if you specify 75003.00 as start value you will get exactly this. - By setting this flag to FALSE you let KD Chart find a better + By setting this flag to false you let KD Chart find a better value for you: if your value is not Zero the axis will start with the next value lower than your start value that can be divided by the delta factor. - \param isExactValue set this to FALSE if KD Chart shall find + \param isExactValue set this to false if KD Chart shall find a better value than the one you have specified by setAxisValueStart() \sa setAxisValues, setAxisValueEnd, setAxisValueDelta \sa axisValueStartIsExact, axisValueStart diff --git a/kchart/kdchart/KDChartCustomBox.h b/kchart/kdchart/KDChartCustomBox.h index 26e3bc981..a26bed168 100644 --- a/kchart/kdchart/KDChartCustomBox.h +++ b/kchart/kdchart/KDChartCustomBox.h @@ -159,7 +159,7 @@ public: Note: If greater 0, the value is taken as exact offset, if less than 0, it is interpreted as being a per-mille value of the size of the drawing area (or as percent value of the actual font size - (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is FALSE, resp.). + (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is false, resp.). Actual drawing position/size is calculated dynamically in methode trueRect. \param deltaY The Y distance between the box and its anchor. \param width The width of the box. @@ -270,13 +270,13 @@ public: Note: If greater 0, the value is taken as exact offset, if less than 0, it is interpreted as being a per-mille value of the width of the drawing area (or as percent value of the actual font size - (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is FALSE, resp.). + (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is false, resp.). Actual drawing position/size is calculated dynamically in method trueRect. \param deltaY The Y distance between the box and its anchor. Note: If greater 0, the value is taken as exact offset, if less than 0, it is interpreted as being a per-mille value of the height of the drawing area (or as percent value of the actual font size - (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is FALSE, resp.). + (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is false, resp.). Actual drawing position/size is calculated dynamically in method trueRect. \param width The width of the box. \param height The height of the box. @@ -571,7 +571,7 @@ public slots: // PENDING(blackie) merge slots sections. Note: If greater 0, the value is taken as exact offset, if less than 0, it is interpreted as being a per-mille value of the size of the drawing area (or as percent value of the actual font size - (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is FALSE, resp.). + (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is false, resp.). Actual drawing position/size is calculated dynamically in methode trueRect. \param deltaY The Y distance between the box and its anchor. \param width The width of the drawing region. @@ -614,7 +614,7 @@ public slots: // PENDING(blackie) merge slots sections. Note: If greater 0, the value is taken as exact offset, if less than 0, it is interpreted as being a per-mille value of the size of the drawing area (or as percent value of the actual font size - (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is FALSE, resp.). + (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is false, resp.). Actual drawing position/size is calculated dynamically in methode trueRect. \param deltaY The Y distance between the box and its anchor. \param align the way how the values specified for deltaX and/or deltaY @@ -838,7 +838,7 @@ public slots: // PENDING(blackie) merge slots sections. Note: If greater 0, the value is taken as exact offset, if less than 0, it is interpreted as being a per-mille value of the size of the drawing area (or as percent value of the actual font size - (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is FALSE, resp.). + (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is false, resp.). Actual drawing position/size is calculated dynamically in methode trueRect. \sa deltaY, deltaAlign, deltaScaleGlobal @@ -853,7 +853,7 @@ public slots: // PENDING(blackie) merge slots sections. Note: If greater 0, the value is taken as exact offset, if less than 0, it is interpreted as being a per-mille value of the size of the drawing area (or as percent value of the actual font size - (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is FALSE, resp.). + (as returned by TQFontMetrics::lineSpacing() ) if deltaScaleGlobal is false, resp.). Actual drawing position/size is calculated dynamically in methode trueRect. \sa deltaX, deltaAlign, deltaScaleGlobal diff --git a/kchart/kdchart/KDChartPainter.h b/kchart/kdchart/KDChartPainter.h index cb4530797..642569b5f 100644 --- a/kchart/kdchart/KDChartPainter.h +++ b/kchart/kdchart/KDChartPainter.h @@ -241,7 +241,7 @@ class KDCHART_EXPORT KDChartPainter const KDChartAxisParams* ordinatePara, const double areaWidthP1000, const double areaHeightP1000, - bool bDrawInFront = FALSE ); + bool bDrawInFront = false ); static KDChartDataRegion* drawMarker( TQPainter* painter, const KDChartParams* params, diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp index aa2090e29..6182522b8 100644 --- a/kchart/kdchart/KDChartParams.cpp +++ b/kchart/kdchart/KDChartParams.cpp @@ -500,8 +500,8 @@ int KDChartParams::registerProperties( KDChartPropertySet& rSet ) in general it is better to use the registerProperties function to initially obtain a unique ID number for your new property set. - \returns TRUE if the property set had been stored before, - or FALSE if the set was now stored initially. + \returns true if the property set had been stored before, + or false if the set was now stored initially. \sa KDCHART_PROPSET_TRANSPARENT_DATA \sa KDCHART_PROPSET_HORI_LINE, KDCHART_PROPSET_VERT_LINE @@ -523,7 +523,7 @@ void KDChartParams::setProperties( int id, KDChartPropertySet& rSet ) function calls using KDCHART_PROPSET_NORMAL_DATA as ID will be ignored. - \returns TRUE if the property set was found and removed, or FALSE + \returns true if the property set was found and removed, or false if the set was not found or KDCHART_PROPSET_NORMAL_DATA was specified as ID value. @@ -555,7 +555,7 @@ bool KDChartParams::removeProperties( int id ) stored therein. To change a stored property set you may use the setProperties() function. - \returns TRUE if the property set was found, FALSE + \returns true if the property set was found, false if it no property set was registred with this ID. \sa registerProperties, KDChartData::setPropertySet @@ -610,7 +610,7 @@ KDChartPropertySet* KDChartParams::properties( int id ) Don't use this function to retrieve the exact specification of a property set but use KDChartParams::properties() instead. - \returns TRUE if the property set was found, FALSE + \returns true if the property set was found, false if it no property set was registred with this ID. \sa registerProperties, KDChartData::setPropertySet @@ -2255,7 +2255,7 @@ void KDChartParams::activateDefaultAxes() screen output or whether other routines should be used to obtain best quality when using a printer. - \note The default of this flag is TRUE, so make sure to deactivate + \note The default of this flag is true, so make sure to deactivate it before painting your KDChart onto a TQPrinter device! \note This setting is NOT stored together with the other parameters, @@ -2553,9 +2553,9 @@ void KDChartParams::setGlobalLeading( int left, int top, int right, int bottom ) \param newData3rd The third table coordinate of the new cell (parameter not used, its value will be ignored, set to 0, reserved for future use). \note Using KDCHART_NO_DATASET for the newDataRow parameter will not - result in returning FALSE because it is an allowed action: the frame is just removed then. + result in returning false because it is an allowed action: the frame is just removed then. - \return TRUE if the frame could be moved or was removed; FALSE if either there was no frame around the old cell or the target cell does not exist. + \return true if the frame could be moved or was removed; false if either there was no frame around the old cell or the target cell does not exist. */ bool KDChartParams::moveDataRegionFrame( uint oldDataRow, uint oldDataCol, @@ -2575,7 +2575,7 @@ bool KDChartParams::moveDataRegionFrame( uint oldDataRow, frame->setDataRow( newDataRow ); frame->setDataCol( newDataCol ); frame->setData3rd( 0 ); // newData3rd ); - _areaDict.setAutoDelete( TRUE ); + _areaDict.setAutoDelete( true ); _areaDict.replace( dataRegionFrameAreaName( newDataRow, newDataCol, 0 ), //data3rd 5 ), frame ); @@ -3226,7 +3226,7 @@ void KDChartParams::setAdditionalChartType( ChartType chartType ) Specifies whether a data value text may be drawn even if it's region intersects with another data value text's region. - By default this is FALSE to prevent ugly mutual overwriting of + By default this is false to prevent ugly mutual overwriting of data value texts and to speed up drawing of cahrts containing thousands of data points. */ @@ -3238,7 +3238,7 @@ void KDChartParams::setAdditionalChartType( ChartType chartType ) Returns whether a data value text may be drawn even if it's region intersects with another data value text's region. - By default this is FALSE to prevent ugly mutual overwriting of data + By default this is false to prevent ugly mutual overwriting of data value texts and to speed up drawing of cahrts containing thousands of data points. */ @@ -8509,7 +8509,7 @@ int KDChartParams::headerFooterFontRelSize( uint pos ) const Stores whether a data value may be drawn near it's respective entry even if it's region intersects with another data value text's region. - By default this is FALSE to prevent ugly mutual overwriting of data + By default this is false to prevent ugly mutual overwriting of data value texts and to speed up drawing of cahrts containing thousands of data points. */ @@ -9153,9 +9153,9 @@ int KDChartParams::headerFooterFontRelSize( uint pos ) const your custom box will become the default axis title text box: you then can access/modify its properties using these convenience functions. - \return TRUE if a KDChartCustomBox was found that is anchored to axis \c n. + \return true if a KDChartCustomBox was found that is anchored to axis \c n. \param n the axis number, this could be KDChartAxisParams::AxisPosLeft or KDChartAxisParams::AxisPosBottom... - \param boxID will obtain the respective KDChartCustomBox's ID if return value is TRUE, otherwise the parameter's value remains unchanged. + \param boxID will obtain the respective KDChartCustomBox's ID if return value is true, otherwise the parameter's value remains unchanged. \sa setAxisTitle, setAxisTitleColor, setAxisTitleFont, setAxisTitleFontUseRelSize, setAxisTitleFontRelSize */ bool KDChartParams::findFirstAxisCustomBoxID( uint n, uint& boxID ) const @@ -9510,7 +9510,7 @@ bool KDChartParams::axisTitleFontUseRelSize( uint n ) const /** Specifies whether a relative size to be used for the default axis title text instead of the fixed size of the font. - Calling this function implicitely sets this axis's \c axisTitleFontUseRelSize flag to TRUE. + Calling this function implicitely sets this axis's \c axisTitleFontUseRelSize flag to true. \param axisTitleFontRelSize the size to be used, this is interpreted as per mil value of the printable area size. \sa setAxisTitle, setAxisTitleColor,setAxisTitleFont, setAxisTitleFontUseRelSize diff --git a/kchart/kdchart/KDChartParams.h b/kchart/kdchart/KDChartParams.h index f44c887df..8d8b094ad 100644 --- a/kchart/kdchart/KDChartParams.h +++ b/kchart/kdchart/KDChartParams.h @@ -388,7 +388,7 @@ public slots: bool addFrameWidthToLayout = true, bool addFrameHeightToLayout = true ) { - _areaDict.setAutoDelete( TRUE ); + _areaDict.setAutoDelete( true ); _areaDict.replace( TQString( "%1/-----/-----/-----" ).arg( area, 5 ), new KDChartFrameSettings(0,0,0, frame, @@ -420,7 +420,7 @@ public slots: int shadowWidth = 0, KDFrame::CornerName sunPos = KDFrame::CornerTopLeft ) { - _areaDict.setAutoDelete( TRUE ); + _areaDict.setAutoDelete( true ); KDFrame frame( TQRect(0,0,0,0), simpleFrame, lineWidth, @@ -461,7 +461,7 @@ public slots: int shadowWidth = 0, KDFrame::CornerName sunPos = KDFrame::CornerTopLeft ) { - _areaDict.setAutoDelete( TRUE ); + _areaDict.setAutoDelete( true ); KDFrame frame( TQRect(0,0,0,0), simpleFrame, lineWidth, diff --git a/kchart/kdchart/KDChartPolarPainter.cpp b/kchart/kdchart/KDChartPolarPainter.cpp index 5bcd621f3..0c7cfc84e 100644 --- a/kchart/kdchart/KDChartPolarPainter.cpp +++ b/kchart/kdchart/KDChartPolarPainter.cpp @@ -254,7 +254,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter, // calculate font size actFont = paraCircular.axisLabelsFont(); if ( paraCircular.axisLabelsFontUseRelSize() ) { -//tqDebug("paraCircular.axisLabelsFontUseRelSize() is TRUE"); +//tqDebug("paraCircular.axisLabelsFontUseRelSize() is true"); actFont.setPointSizeFloat( nTxtHeight ); } TQFontMetrics fm( actFont ); diff --git a/kchart/kdchart/KDChartPropertySet.h b/kchart/kdchart/KDChartPropertySet.h index 63c9d7f09..1f3921f02 100644 --- a/kchart/kdchart/KDChartPropertySet.h +++ b/kchart/kdchart/KDChartPropertySet.h @@ -187,7 +187,7 @@ class KDCHART_EXPORT KDChartPropertySet :public TQObject after calling \c load() if you want to use the loaded property set in the context of KDChartParam settings. - \returns TRUE if the property set could be read. + \returns true if the property set could be read. \sa id, saveXLM */ @@ -252,13 +252,13 @@ public slots: \note This function should be used for Bar Charts only, otherwise the settings specified here will be ignored. - \returns TRUE if this property set is specifying it's own showBar flag, - FALSE if the settings of another property set are to be used instead. + \returns true if this property set is specifying it's own showBar flag, + false if the settings of another property set are to be used instead. - \note The return value will also be FALSE if the 'default' properties + \note The return value will also be false if the 'default' properties are to be used: in this case idShowBar will be KDChartParams::NormalData - \param idShowBar to be ignored if return value is TRUE. + \param idShowBar to be ignored if return value is true. If idShowBar is KDChartPropertySet::UndefinedID then neither a property set ID nor an own flag were specified (so no special @@ -266,10 +266,10 @@ public slots: respective data cell), else idShowBar contains the ID of another property set that is specifying the flag to be used. - \param showBar this parameter's value is not modified if return value is FALSE. + \param showBar this parameter's value is not modified if return value is false. Parameter showBar contains the showBar flag associated with the respective data cell. - If return value is FALSE the showBar + If return value is false the showBar flag is not set (so the parameter keeps its previous value) but this is to be overridden by the respective value of another property set that is indicated @@ -324,23 +324,23 @@ public slots: \note This function should be used for Bar Charts only, otherwise the settings specified here will be ignored. - \returns TRUE if this property set is specifying it's own bar color settings, - FALSE if the settings of another property set are to be used instead. + \returns true if this property set is specifying it's own bar color settings, + false if the settings of another property set are to be used instead. - \note The return value will also be FALSE if the 'default' properties + \note The return value will also be false if the 'default' properties are to be used: in this case idBarColor will be KDChartParams::NormalData - \param idBarColor to be ignored if return value is TRUE. + \param idBarColor to be ignored if return value is true. If idBarColor is KDChartPropertySet::UndefinedID then neither a property set ID nor an own bar color were specified (so no special Bar color is associated to the respective data cell), else idBarColor contains the ID of another property set that is specifying the Bar color to be used. - \param barColor this parameter's value is not modified if return value is FALSE. + \param barColor this parameter's value is not modified if return value is false. Parameter barColor contains the bar color value associated with the respective data cell. - If return value is FALSE the barColor + If return value is false the barColor value is not set (so the parameter keeps its previous value) but this is to be overridden by the respective value of another property set that is indicated @@ -394,20 +394,20 @@ public slots: \note This function should be used for Line Charts only. - \returns TRUE if this property set is specifying it's own line width settings, - FALSE if the settings of another property set are to be used instead. + \returns true if this property set is specifying it's own line width settings, + false if the settings of another property set are to be used instead. - \param idLineWidth to be ignored if return value is TRUE. + \param idLineWidth to be ignored if return value is true. If idLineWidth is KDChartPropertySet::UndefinedID then neither a property set ID nor an own line width were specified (so no special line width is associated to the respective data cell), else idLineWidth contains the ID of another property set that is specifying the line width to be used. - \param lineWidth this parameter's value is not modified if return value is FALSE. + \param lineWidth this parameter's value is not modified if return value is false. Parameter lineWidth contains the line width value associated with the respective data cell. - If return value is FALSE the lineWidth + If return value is false the lineWidth value is not set (so the parameter keeps its previous value) but this is to be overridden by the respective value of another property set that is indicated @@ -462,23 +462,23 @@ public slots: \note This function should be used for Line Charts only, otherwise the settings specified here will be ignored. - \returns TRUE if this property set is specifying it's own line color settings, - FALSE if the settings of another property set are to be used instead. + \returns true if this property set is specifying it's own line color settings, + false if the settings of another property set are to be used instead. - \note The return value will also be FALSE if the 'default' properties + \note The return value will also be false if the 'default' properties are to be used: in this case idLineColor will be KDChartParams::NormalData - \param idLineColor to be ignored if return value is TRUE. + \param idLineColor to be ignored if return value is true. If idLineColor is KDChartPropertySet::UndefinedID then neither a property set ID nor an own line color were specified (so no special line color is associated to the respective data cell), else idLineColor contains the ID of another property set that is specifying the line color to be used. - \param lineColor this parameter's value is not modified if return value is FALSE. + \param lineColor this parameter's value is not modified if return value is false. Parameter lineColor contains the line color value associated with the respective data cell. - If return value is FALSE the lineColor + If return value is false the lineColor value is not set (so the parameter keeps its previous value) but this is to be overridden by the respective value of another property set that is indicated @@ -533,23 +533,23 @@ public slots: \note This function should be used for Line Charts only, otherwise the settings specified here will be ignored. - \returns TRUE if this property set is specifying it's own line style settings, - FALSE if the settings of another property set are to be used instead. + \returns true if this property set is specifying it's own line style settings, + false if the settings of another property set are to be used instead. - \note The return value will also be FALSE if the 'default' properties + \note The return value will also be false if the 'default' properties are to be used: in this case idLineStyle will be KDChartParams::NormalData - \param idLineStyle to be ignored if return value is TRUE. + \param idLineStyle to be ignored if return value is true. If idLineStyle is KDChartPropertySet::UndefinedID then neither a property set ID nor an own line style were specified (so no special line style is associated to the respective data cell), else idLineStyle contains the ID of another property set that is specifying the line style to be used. - \param lineStyle this parameter's value is not modified if return value is FALSE. + \param lineStyle this parameter's value is not modified if return value is false. Parameter lineStyle contains the line style value associated with the respective data cell. - If return value is FALSE the lineStyle + If return value is false the lineStyle value is not set (so the parameter keeps its previous value) but this is to be overridden by the respective value of another property set that is indicated @@ -605,23 +605,23 @@ public slots: \note This function should be used for Area Charts in Normal mode only, otherwise the settings specified here will be ignored. - \returns TRUE if this property set is specifying it's own area brush settings, - FALSE if the settings of another property set are to be used instead. + \returns true if this property set is specifying it's own area brush settings, + false if the settings of another property set are to be used instead. - \note The return value will also be FALSE if the 'default' properties + \note The return value will also be false if the 'default' properties are to be used: in this case idAreaBrush will be KDChartParams::NormalData - \param idAreaBrush to be ignored if return value is TRUE. + \param idAreaBrush to be ignored if return value is true. If idAreaBrush is KDChartPropertySet::UndefinedID then neither a property set ID nor an own area brush were specified (so no special area brush is associated to the respective data cell), else idAreaBrush contains the ID of another property set that is specifying the area brush to be used. - \param areaBrush this parameter's value is not modified if return value is FALSE. + \param areaBrush this parameter's value is not modified if return value is false. Parameter areaBrush contains the area brush value associated with the respective data cell. - If return value is FALSE the areaBrush + If return value is false the areaBrush value is not set (so the parameter keeps its previous value) but this is to be overridden by the respective value of another property set that is indicated @@ -682,13 +682,13 @@ public slots: \note This function should be used for Line Charts only, otherwise the settings specified here will be ignored. - \returns TRUE if this property set is specifying it's own showMarker flag, - FALSE if the settings of another property set are to be used instead. + \returns true if this property set is specifying it's own showMarker flag, + false if the settings of another property set are to be used instead. - \note The return value will also be FALSE if the 'default' properties + \note The return value will also be false if the 'default' properties are to be used: in this case idShowMarker will be KDChartParams::NormalData - \param idShowMarker to be ignored if return value is TRUE. + \param idShowMarker to be ignored if return value is true. If idShowMarker is KDChartPropertySet::UndefinedID then neither a property set ID nor an own flag were specified (so no special @@ -696,10 +696,10 @@ public slots: respective data cell), else idShowMarker contains the ID of another property set that is specifying the flag to be used. - \param showMarker this parameter's value is not modified if return value is FALSE. + \param showMarker this parameter's value is not modified if return value is false. Parameter showMarker contains the showMarker flag associated with the respective data cell. - If return value is FALSE the showMarker + If return value is false the showMarker flag is not set (so the parameter keeps its previous value) but this is to be overridden by the respective value of another property set that is indicated diff --git a/kchart/kdchart/KDChartTableBase.h b/kchart/kdchart/KDChartTableBase.h index fd3c41de9..e0b16b896 100644 --- a/kchart/kdchart/KDChartTableBase.h +++ b/kchart/kdchart/KDChartTableBase.h @@ -187,7 +187,7 @@ public slots: \param coordinate the number of the coordinate to be retrieved, normally 1 is the Y value and 2 is the X value. - \returns TRUE if the row and col are addressing a cell in the table. + \returns true if the row and col are addressing a cell in the table. \sa cellCoords, cellProp, cellContent, cellVal, setCell, setProp */ @@ -232,7 +232,7 @@ const double xVal = data.cellVal( r, c, 2 ).toDouble(); \endverbatim \param _prop the property set ID of the cell to be retrieved. - \returns TRUE if the row and col are addressing a cell in the table. + \returns true if the row and col are addressing a cell in the table. \sa cellCoord, cellCoords, cellContent, setCell, setProp */ @@ -373,7 +373,7 @@ const double xVal = data.cellVal( r, c, 2 ).toDouble(); \endverbatim special value KDCHART_POS_INFINITE to indicate positive infinite values - \returns TRUE if the value given is a positive infinite value. + \returns true if the value given is a positive infinite value. */ virtual bool isPosInfinite( double value ) const { @@ -389,7 +389,7 @@ const double xVal = data.cellVal( r, c, 2 ).toDouble(); \endverbatim special value KDCHART_NEG_INFINITE to indicate negative infinite values - \returns TRUE if the value given is a negative infinite value. + \returns true if the value given is a negative infinite value. */ virtual bool isNegInfinite( double value ) const { @@ -406,7 +406,7 @@ const double xVal = data.cellVal( r, c, 2 ).toDouble(); \endverbatim \note To improve runtime speed this virtual function may be reimplemented by classes derived from KDChartTableDataBase. - \returns TRUE if the value given is neither positive infinite nor negativr infinite. + \returns true if the value given is neither positive infinite nor negativr infinite. */ virtual bool isNormalDouble( double value ) const { @@ -423,7 +423,7 @@ const double xVal = data.cellVal( r, c, 2 ).toDouble(); \endverbatim \param value The TQVariant value to be tested and converted. \param dVal Points to the double variable to be filled with the converted value. - \returns TRUE if the value given is neither positive infinite nor negative + \returns true if the value given is neither positive infinite nor negative infinite, \c value is set to the converted value if the type of \c value is TQVariant::Double, otherwise it is not modified. */ diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index e499faf6b..26f9eac94 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -297,7 +297,7 @@ public: class TQSplitterData { public: - TQSplitterData() : opaque( FALSE ), firstShow( TRUE ) {} + TQSplitterData() : opaque( false ), firstShow( true ) {} TQPtrList list; bool opaque; @@ -342,7 +342,7 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, i that a widget should keep its size when the splitter is resized. Although KDGanttMinimizeSplitter normally resizes the children only - at the end of a resize operation, if you call setOpaqueResize( TRUE + at the end of a resize operation, if you call setOpaqueResize( true ) the widgets are resized as often as possible. The initial distribution of size between the widgets is determined @@ -406,7 +406,7 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQt::Orientation o, TQWidget * */ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter() { - data->list.setAutoDelete( TRUE ); + data->list.setAutoDelete( true ); delete data; } @@ -460,11 +460,11 @@ void KDGanttMinimizeSplitter::resizeEvent( TQResizeEvent * ) /* Inserts the widget \a w at the end (or at the beginning if \a first - is TRUE) of the splitter's list of widgets. + is true) of the splitter's list of widgets. It is the responsibility of the caller of this function to make sure that \a w is not already in the splitter and to call recalcId if - needed. (If \a first is TRUE, then recalcId is very probably + needed. (If \a first is true, then recalcId is very probably needed.) */ KDGanttSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool first ) @@ -479,7 +479,7 @@ KDGanttSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bo newHandle = new KDGanttSplitterHandle( orientation(), this, tmp.latin1() ); s->wid = newHandle; newHandle->setId(data->list.count()); - s->isSplitter = TRUE; + s->isSplitter = true; s->sizer = pick( newHandle->sizeHint() ); if ( first ) data->list.insert( 0, s ); @@ -493,7 +493,7 @@ KDGanttSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bo s->sizer = pick( w->sizeHint() ); else s->sizer = pick( w->size() ); - s->isSplitter = FALSE; + s->isSplitter = false; if ( first ) data->list.insert( 0, s ); else @@ -587,7 +587,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e ) if ( e->type() == TQEvent::LayoutHint || ( e->type() == TQEvent::Show && data->firstShow ) ) { recalc( isVisible() ); if ( e->type() == TQEvent::Show ) - data->firstShow = FALSE; + data->firstShow = false; } return TQWidget::event( e ); } @@ -617,12 +617,12 @@ void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p, int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const { KDGanttSplitterLayoutStruct *s = data->list.first(); - bool seen_w = FALSE; + bool seen_w = false; while ( s ) { if ( s->isSplitter && seen_w ) return data->list.at(); if ( !s->isSplitter && s->wid == w ) - seen_w = TRUE; + seen_w = true; s = data->list.next(); } return 0; @@ -698,11 +698,11 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) pos1 = pos2 + 1; } if ( upLeft ) { - setG( w, pos1, dd, TRUE ); + setG( w, pos1, dd, true ); moveBefore( pos2, id-1, upLeft ); } else { moveBefore( pos2, id-1, upLeft ); - setG( w, pos1, dd, TRUE ); + setG( w, pos1, dd, true ); } } else { int dd, newLeft, nextPos; @@ -717,7 +717,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) newLeft = pos-dd+1; nextPos = newLeft - 1; } - setG( w, newLeft, dd, TRUE ); + setG( w, newLeft, dd, true ); moveBefore( nextPos, id-1, upLeft ); } } @@ -751,11 +751,11 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) pos2 = pos + dd; } if ( upLeft ) { - setG( w, pos1, dd, TRUE ); + setG( w, pos1, dd, true ); moveAfter( pos2, id+1, upLeft ); } else { moveAfter( pos2, id+1, upLeft ); - setG( w, pos1, dd, TRUE ); + setG( w, pos1, dd, true ); } } else { int left = pick( w->pos() ); @@ -773,7 +773,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) newLeft = pos; nextPos = newLeft + dd; } - setG( w, newLeft, dd, TRUE ); + setG( w, newLeft, dd, true ); /*if( right != newRight )*/ moveAfter( nextPos, id+1, upLeft ); } @@ -886,23 +886,23 @@ void KDGanttMinimizeSplitter::doResize() } else if ( s->isSplitter ) { a[i].stretch = 0; a[i].sizeHint = a[i].minimumSize = a[i].maximumSize = s->sizer; - a[i].empty = FALSE; + a[i].empty = false; } else if ( s->mode == KeepSize ) { a[i].stretch = 0; a[i].minimumSize = pick( minSize(s->wid) ); a[i].sizeHint = s->sizer; a[i].maximumSize = pick( s->wid->maximumSize() ); - a[i].empty = FALSE; + a[i].empty = false; } else if ( s->mode == FollowSizeHint ) { a[i].stretch = 0; a[i].minimumSize = a[i].sizeHint = pick( s->wid->sizeHint() ); a[i].maximumSize = pick( s->wid->maximumSize() ); - a[i].empty = FALSE; + a[i].empty = false; } else { //proportional a[i].stretch = s->sizer; a[i].maximumSize = pick( s->wid->maximumSize() ); a[i].sizeHint = a[i].minimumSize = pick( minSize(s->wid) ); - a[i].empty = FALSE; + a[i].empty = false; } } @@ -924,7 +924,7 @@ void KDGanttMinimizeSplitter::recalc( bool update ) int maxt = TQWIDGETSIZE_MAX; int mint = fi; int n = data->list.count(); - bool first = TRUE; + bool first = true; /* The splitter before a hidden widget is always hidden. The splitter before the first visible widget is hidden. @@ -940,15 +940,15 @@ void KDGanttMinimizeSplitter::recalc( bool update ) else p->wid->show(); //may trigger new recalc if ( !s->wid->isHidden() ) - first = FALSE; + first = false; } } - bool empty=TRUE; + bool empty=true; for ( int j = 0; j< n; j++ ) { KDGanttSplitterLayoutStruct *s = data->list.at(j); if ( !s->wid->isHidden() ) { - empty = FALSE; + empty = false; if ( s->isSplitter ) { minl += s->sizer; maxl += s->sizer; @@ -1005,13 +1005,13 @@ void KDGanttMinimizeSplitter::setResizeMode( TQWidget *w, ResizeMode mode ) } s = data->list.next(); } - s = addWidget( w, TRUE ); + s = addWidget( w, true ); s->mode = mode; } /*! - Returns TRUE if opaque resize is on; otherwise returns FALSE. + Returns true if opaque resize is on; otherwise returns false. \sa setOpaqueResize() */ @@ -1023,7 +1023,7 @@ bool KDGanttMinimizeSplitter::opaqueResize() const /*! - If \a on is TRUE then opaque resizing is turned on; otherwise + If \a on is true then opaque resizing is turned on; otherwise opaque resizing is turned off. Opaque resizing is initially turned off. @@ -1043,11 +1043,11 @@ void KDGanttMinimizeSplitter::setOpaqueResize( bool on ) void KDGanttMinimizeSplitter::moveToFirst( TQWidget *w ) { processChildEvents(); - bool found = FALSE; + bool found = false; KDGanttSplitterLayoutStruct *s = data->list.first(); while ( s ) { if ( s->wid == w ) { - found = TRUE; + found = true; KDGanttSplitterLayoutStruct *p = data->list.prev(); if ( p ) { // not already at first place data->list.take(); //take p @@ -1060,7 +1060,7 @@ void KDGanttMinimizeSplitter::moveToFirst( TQWidget *w ) s = data->list.next(); } if ( !found ) - addWidget( w, TRUE ); + addWidget( w, true ); recalcId(); } @@ -1072,11 +1072,11 @@ void KDGanttMinimizeSplitter::moveToFirst( TQWidget *w ) void KDGanttMinimizeSplitter::moveToLast( TQWidget *w ) { processChildEvents(); - bool found = FALSE; + bool found = false; KDGanttSplitterLayoutStruct *s = data->list.first(); while ( s ) { if ( s->wid == w ) { - found = TRUE; + found = true; data->list.take(); // take s KDGanttSplitterLayoutStruct *p = data->list.current(); if ( p ) { // the splitter handle after s @@ -1181,7 +1181,7 @@ void KDGanttMinimizeSplitter::storeSizes() #if 0 // ### remove this code ASAP /*! - Hides \a w if \a hide is TRUE and updates the splitter. + Hides \a w if \a hide is true and updates the splitter. \warning Due to a limitation in the current implementation, calling TQWidget::hide() will not work. @@ -1203,7 +1203,7 @@ void KDGanttMinimizeSplitter::setHidden( TQWidget *w, bool hide ) w->hide(); else w->show(); - recalc( TRUE ); + recalc( true ); } @@ -1221,7 +1221,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const else tqWarning( "KDGanttMinimizeSplitter::isHidden(), unknown widget" ); #endif - return FALSE; + return false; } #endif @@ -1360,12 +1360,12 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, i int sumStretch = 0; int spacerCount = 0; - bool wannaGrow = FALSE; // anyone who really wants to grow? - // bool canShrink = FALSE; // anyone who could be persuaded to shrink? + bool wannaGrow = false; // anyone who really wants to grow? + // bool canShrink = false; // anyone who could be persuaded to shrink? int i; for ( i = start; i < start + count; i++ ) { - chain[i].done = FALSE; + chain[i].done = false; cHint += chain[i].sizeHint; cMin += chain[i].minimumSize; cMax += chain[i].maximumSize; @@ -1382,7 +1382,7 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, i // tqDebug("not enough space"); for ( i = start; i < start+count; i++ ) { chain[i].size = chain[i].minimumSize; - chain[i].done = TRUE; + chain[i].done = true; } } else if ( space < cHint + spacerCount*spacer ) { // Less space than sizeHint, but more than minimum. @@ -1395,7 +1395,7 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, i for ( i = start; i < start+count; i++ ) { if ( !chain[i].done && chain[i].minimumSize >= chain[i].sizeHint) { chain[i].size = chain[i].sizeHint; - chain[i].done = TRUE; + chain[i].done = true; space_left -= chain[i].sizeHint; // sumStretch -= chain[i].stretch; n--; @@ -1403,7 +1403,7 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, i } bool finished = n == 0; while ( !finished ) { - finished = TRUE; + finished = true; fixed fp_over = toFixed( overdraft ); fixed fp_w = 0; @@ -1418,9 +1418,9 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, i chain[i].size = chain[i].sizeHint - w; fp_w -= toFixed( w ); //give the difference to the next if ( chain[i].size < chain[i].minimumSize ) { - chain[i].done = TRUE; + chain[i].done = true; chain[i].size = chain[i].minimumSize; - finished = FALSE; + finished = false; overdraft -= chain[i].sizeHint - chain[i].minimumSize; // sumStretch -= chain[i].stretch; n--; @@ -1436,7 +1436,7 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, i if ( !chain[i].done && (chain[i].maximumSize <= chain[i].sizeHint || wannaGrow && !chain[i].expansive) ) { chain[i].size = chain[i].sizeHint; - chain[i].done = TRUE; + chain[i].done = true; space_left -= chain[i].sizeHint; sumStretch -= chain[i].stretch; n--; @@ -1481,7 +1481,7 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, i if ( !chain[i].done && chain[i].size < chain[i].sizeHint ) { chain[i].size = chain[i].sizeHint; - chain[i].done = TRUE; + chain[i].done = true; space_left -= chain[i].sizeHint; sumStretch -= chain[i].stretch; n--; @@ -1494,7 +1494,7 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, i if ( !chain[i].done && chain[i].size > chain[i].maximumSize ) { chain[i].size = chain[i].maximumSize; - chain[i].done = TRUE; + chain[i].done = true; space_left -= chain[i].maximumSize; sumStretch -= chain[i].stretch; n--; diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h index b70c51818..3a60c8b12 100644 --- a/kdgantt/KDGanttMinimizeSplitter.h +++ b/kdgantt/KDGanttMinimizeSplitter.h @@ -65,13 +65,13 @@ public: Direction minimizeDirection() const; virtual void setResizeMode( TQWidget *w, ResizeMode ); - virtual void setOpaqueResize( bool = TRUE ); + virtual void setOpaqueResize( bool = true ); bool opaqueResize() const; void moveToFirst( TQWidget * ); void moveToLast( TQWidget * ); - void refresh() { recalc( TRUE ); } + void refresh() { recalc( true ); } virtual TQSize sizeHint() const; virtual TQSize minimumSizeHint() const; @@ -97,15 +97,15 @@ protected: private: void init(); - void recalc( bool update = FALSE ); + void recalc( bool update = false ); void doResize(); void storeSizes(); void processChildEvents(); - KDGanttSplitterLayoutStruct *addWidget( TQWidget*, bool first = FALSE ); + KDGanttSplitterLayoutStruct *addWidget( TQWidget*, bool first = false ); void recalcId(); void moveBefore( int pos, int id, bool upLeft ); void moveAfter( int pos, int id, bool upLeft ); - void setG( TQWidget *w, int p, int s, bool isSplitter = FALSE ); + void setG( TQWidget *w, int p, int s, bool isSplitter = false ); TQCOORD pick( const TQPoint &p ) const { return orient ==TQt::Horizontal ? p.x() : p.y(); } diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h index 1aa73652b..479232406 100644 --- a/kdgantt/qlayoutengine_p.h +++ b/kdgantt/qlayoutengine_p.h @@ -59,7 +59,7 @@ struct QLayoutStruct { void initParameters() { minimumSize = sizeHint = 0; - maximumSize = TQWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; } + maximumSize = TQWIDGETSIZE_MAX; expansive = false; empty = true; } void init() { stretch = 0; initParameters(); } //permanent storage: int stretch; diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index 9d0eb85be..bef697604 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -286,7 +286,7 @@ HINT: removing WStaticContents from KexiTableView ctor fixed repaint problem offer copy/cut/paste/copy-to-file/clear for such selections - tooltips: -- implement tooltip manager (this will allow to create custom tooltips) --- use if ( QApplication::isEffectEnabled( UI_AnimateTooltip ) == FALSE ||.... +-- use if ( QApplication::isEffectEnabled( UI_AnimateTooltip ) == false ||.... as in qtooltip.cpp:564 -- implement custom tooltip for large texts and BLOB, add "zoom" option at the bottom of the tooltip (zooming should not show a modal dialog but rather a widget inside the TV) diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index ac97d6395..6f9e60d75 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -140,7 +140,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) flags |= TQStyle::Style_MouseOver; if ( width() < 5 || height() < 5 ) { - qDrawShadePanel( &p, rect(), cg, FALSE, 2, &cg.brush( TQColorGroup::Button ) ); + qDrawShadePanel( &p, rect(), cg, false, 2, &cg.brush( TQColorGroup::Button ) ); return; } @@ -242,7 +242,7 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) if ( e->button() != TQt::LeftButton || d->designMode ) return true; /*todo if ( m_discardNextMousePress ) { - d->discardNextMousePress = FALSE; + d->discardNextMousePress = false; return; }*/ @@ -250,15 +250,15 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) d->buttonPressed = false; /* if ( d->usingListBox() ) { - listBox()->blockSignals( TRUE ); + listBox()->blockSignals( true ); tqApp->sendEvent( listBox(), e ); // trigger the listbox's autoscroll listBox()->setCurrentItem(d->current); - listBox()->blockSignals( FALSE ); + listBox()->blockSignals( false ); popup(); if ( arrowRect.contains( e->pos() ) ) { - d->arrowPressed = TRUE; - d->arrowDown = TRUE; - repaint( FALSE ); + d->arrowPressed = true; + d->arrowDown = true; + repaint( false ); } } else {*/ showPopup(); @@ -318,7 +318,7 @@ void KexiDBComboBox::mousePressEvent( TQMouseEvent *e ) return; // TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout())); -// d->shortClick = TRUE; +// d->shortClick = true; // } KexiDBAutoField::mousePressEvent( e ); } diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index f0016235e..4beb4a8d5 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -190,7 +190,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, m_uniquenessTest.setAutoDelete(true); setIcon(DesktopIcon(_IMPORT_ICON)); - setSizeGripEnabled( TRUE ); + setSizeGripEnabled( true ); // m_encoding = TQString::fromLatin1(TDEGlobal::locale()->encoding()); // m_stripWhiteSpaceInTextValuesChecked = true; diff --git a/kexi/tests/gui/finddialog/kexifinddialog.h b/kexi/tests/gui/finddialog/kexifinddialog.h index d350db7a1..52de1a468 100644 --- a/kexi/tests/gui/finddialog/kexifinddialog.h +++ b/kexi/tests/gui/finddialog/kexifinddialog.h @@ -31,7 +31,7 @@ class KexiFindDialog : public KexiFindDialogBase TQ_OBJECT public: - KexiFindDialog( bool replaceMode, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE ); + KexiFindDialog( bool replaceMode, TQWidget* parent = 0, const char* name = 0, bool modal = false ); virtual ~KexiFindDialog(); #if 0 diff --git a/kformula/formulastring.cpp b/kformula/formulastring.cpp index ab4a5fa41..804d8977b 100644 --- a/kformula/formulastring.cpp +++ b/kformula/formulastring.cpp @@ -42,7 +42,7 @@ FormulaString::FormulaString( KFormulaPartView* parent, const char* name, bool m setName( "FormulaString" ); resize( 511, 282 ); setCaption( i18n( "Formula String" ) ); - setSizeGripEnabled( TRUE ); + setSizeGripEnabled( true ); TQVBoxLayout* FormulaStringLayout = new TQVBoxLayout( this, 11, 6, "FormulaStringLayout"); textWidget = new TQTextEdit( this, "textWidget" ); @@ -61,20 +61,20 @@ FormulaString::FormulaString( KFormulaPartView* parent, const char* name, bool m buttonHelp = new KPushButton( KStdGuiItem::help(), this, "buttonHelp" ); buttonHelp->setAccel( 4144 ); - buttonHelp->setAutoDefault( TRUE ); + buttonHelp->setAutoDefault( true ); Layout1->addWidget( buttonHelp ); spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); Layout1->addItem( spacer ); buttonOk = new KPushButton( KStdGuiItem::ok(), this, "buttonOk" ); buttonOk->setAccel( 0 ); - buttonOk->setAutoDefault( TRUE ); - buttonOk->setDefault( TRUE ); + buttonOk->setAutoDefault( true ); + buttonOk->setDefault( true ); Layout1->addWidget( buttonOk ); buttonCancel = new KPushButton( KStdGuiItem::cancel(), this, "buttonCancel" ); buttonCancel->setAccel( 0 ); - buttonCancel->setAutoDefault( TRUE ); + buttonCancel->setAutoDefault( true ); Layout1->addWidget( buttonCancel ); FormulaStringLayout->addLayout( Layout1 ); diff --git a/kformula/formulastring.h b/kformula/formulastring.h index 95dd3d2b3..5060916f4 100644 --- a/kformula/formulastring.h +++ b/kformula/formulastring.h @@ -38,7 +38,7 @@ class FormulaString : public TQDialog public: - FormulaString( KFormulaPartView* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + FormulaString( KFormulaPartView* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~FormulaString(); TQTextEdit* textWidget; diff --git a/kformula/kformula_doc.cpp b/kformula/kformula_doc.cpp index dbbb1bad1..8fbcbe80c 100644 --- a/kformula/kformula_doc.cpp +++ b/kformula/kformula_doc.cpp @@ -209,7 +209,7 @@ void KFormulaDoc::documentRestored() bool KFormulaDoc::initDoc(InitDocFlags /*flags*/, TQWidget* /*parentWidget*/) { // If nothing is loaded, do initialize here - return TRUE; + return true; } void KFormulaDoc::showStartUpWidget(KoMainWindow* parent, bool /*alwaysShow*/) diff --git a/kivio/kiviopart/kivio_icon_view.cpp b/kivio/kiviopart/kivio_icon_view.cpp index 6e8e6b213..d9333bf3c 100644 --- a/kivio/kiviopart/kivio_icon_view.cpp +++ b/kivio/kiviopart/kivio_icon_view.cpp @@ -160,12 +160,12 @@ TQDragObject *KivioIconView::dragObject() id.setData( TQCString(full.ascii())); drag->append( id, - TQRect( item->pixmapRect(FALSE).x() - orig.x(), - item->pixmapRect(FALSE).y() - orig.y(), + TQRect( item->pixmapRect(false).x() - orig.x(), + item->pixmapRect(false).y() - orig.y(), item->pixmapRect().width(), item->pixmapRect().height() ), - TQRect( item->textRect(FALSE).x() - orig.x(), - item->textRect(FALSE).y() - orig.y(), + TQRect( item->textRect(false).x() - orig.x(), + item->textRect(false).y() - orig.y(), item->textRect().width(), item->textRect().height() ), *(item->spawner()) ); diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index 5b070e821..fa1a2ff1f 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -450,7 +450,7 @@ void KivioView::setupActions() this, TQ_SLOT( textAlignCenter() ), actionCollection(), "textAlignCenter" ); m_textAlignCenter->setExclusiveGroup( "align" ); - m_textAlignCenter->setChecked( TRUE ); + m_textAlignCenter->setChecked( true ); m_textAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "format-text-direction-rtl", CTRL + ALT + Key_R, this, TQ_SLOT( textAlignRight() ), actionCollection(), "textAlignRight" ); @@ -847,7 +847,7 @@ int KivioView::canvasYOffset() const void KivioView::print(KPrinter& ptr) { - ptr.setFullPage(TRUE); + ptr.setFullPage(true); m_pDoc->printContent( ptr ); } diff --git a/kivio/kiviopart/kiviosdk/kivio_layers.h b/kivio/kiviopart/kiviosdk/kivio_layers.h index 0cb3e4175..8d0471e66 100644 --- a/kivio/kiviopart/kiviosdk/kivio_layers.h +++ b/kivio/kiviopart/kiviosdk/kivio_layers.h @@ -29,7 +29,7 @@ void insertLayer( int i, KivioLayer *l ) { page->insertLayer(i,l); } KivioLayer *layerAt( int i ) { return page->layerAt(i); } - bool addStencil( KivioStencil *s ) { page->addStencil(s); return TRUE; } + bool addStencil( KivioStencil *s ) { page->addStencil(s); return true; } void deleteSelectedStencils() { page->deleteSelectedStencils(); } void groupSelectedStencils() { page->groupSelectedStencils(); } diff --git a/kounavail/kounavail.cpp b/kounavail/kounavail.cpp index 47bfd5036..f48de60bb 100644 --- a/kounavail/kounavail.cpp +++ b/kounavail/kounavail.cpp @@ -120,7 +120,7 @@ void KoUnavailView::paintEvent( TQPaintEvent* ev ) // ### TODO: Scaling // Let the document do the drawing - koDocument()->paintEverything( painter, ev->rect(), FALSE, this ); + koDocument()->paintEverything( painter, ev->rect(), false, this ); painter.end(); } diff --git a/kounavail/kounavail.h b/kounavail/kounavail.h index e03365d49..000df77b5 100644 --- a/kounavail/kounavail.h +++ b/kounavail/kounavail.h @@ -32,7 +32,7 @@ class KoUnavailPart : public KoDocument public: KoUnavailPart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0 ); - virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); + virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 ); virtual bool initDoc(InitDocFlags, TQWidget* = 0) { return true; } virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* ); diff --git a/kplato/kptcalendareditbase.cpp b/kplato/kptcalendareditbase.cpp index c30d11dc1..487523aba 100644 --- a/kplato/kptcalendareditbase.cpp +++ b/kplato/kptcalendareditbase.cpp @@ -69,7 +69,7 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f layout8 = new TQHBoxLayout( 0, 0, 6, "layout8"); - state = new TQComboBox( FALSE, day, "state" ); + state = new TQComboBox( false, day, "state" ); layout8->addWidget( state ); bApply = new TQPushButton( day, "bApply" ); diff --git a/kplato/kptcalendarpanel.cpp b/kplato/kptcalendarpanel.cpp index c6bb6da83..416f25b72 100644 --- a/kplato/kptcalendarpanel.cpp +++ b/kplato/kptcalendarpanel.cpp @@ -137,7 +137,7 @@ CalendarPanel::eventFilter(TQObject *o, TQEvent *e ) { TQApplication::sendEvent( table, e ); table->setFocus(); - return TRUE; // eat event + return true; // eat event } } return TQFrame::eventFilter( o, e ); diff --git a/kplato/kptpart.h b/kplato/kptpart.h index 63b58bdef..4e8058cce 100644 --- a/kplato/kptpart.h +++ b/kplato/kptpart.h @@ -55,7 +55,7 @@ public: ~Part(); virtual void paintContent(TQPainter& painter, const TQRect& rect, - bool transparent = FALSE, + bool transparent = false, double zoomX = 1.0, double zoomY = 1.0); virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0); diff --git a/kpresenter/KPrAutoformObject.h b/kpresenter/KPrAutoformObject.h index 863ae7d8d..89336ce14 100644 --- a/kpresenter/KPrAutoformObject.h +++ b/kpresenter/KPrAutoformObject.h @@ -71,7 +71,7 @@ protected: virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; virtual void paint( TQPainter *_painter, KoTextZoomHandler *_zoomHandler, - int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); + int /* pageNum */, bool drawingShadow, bool drawContour = false ); TQString filename; diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 8afa94d18..476107360 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -211,7 +211,7 @@ void KPrCanvas::scrollY( int y ) bool KPrCanvas::eventFilter( TQObject *o, TQEvent *e ) { if ( !o || !e ) - return TRUE; + return true; if ( m_currentTextObjectView ) KCursor::autoHideEventFilter( o, e ); switch ( e->type() ) @@ -219,11 +219,11 @@ bool KPrCanvas::eventFilter( TQObject *o, TQEvent *e ) case TQEvent::FocusIn: if ( m_currentTextObjectView ) m_currentTextObjectView->focusInEvent(); - return TRUE; + return true; case TQEvent::FocusOut: if ( m_currentTextObjectView ) m_currentTextObjectView->focusOutEvent(); - return TRUE; + return true; case TQEvent::KeyPress: { TQKeyEvent * keyev = static_cast(e); @@ -277,7 +277,7 @@ bool KPrCanvas::eventFilter( TQObject *o, TQEvent *e ) bool KPrCanvas::focusNextPrevChild( bool ) { - return TRUE; // Don't allow to go out of the canvas widget by pressing "Tab" + return true; // Don't allow to go out of the canvas widget by pressing "Tab" } void KPrCanvas::paintEvent( TQPaintEvent* paintEvent ) @@ -1173,7 +1173,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) switch ( toolEditMode ) { case TEM_MOUSE: { - drawContour = FALSE; + drawContour = false; switch ( modType ) { case MT_NONE: { if ( drawRubber ) { @@ -1259,7 +1259,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) } break; case TEM_ZOOM:{ - drawContour = FALSE; + drawContour = false; if( modType == MT_NONE && drawRubber ) { TQPainter p; @@ -1283,7 +1283,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) } }break; case TEM_ROTATE: { - drawContour = FALSE; + drawContour = false; if ( !m_rotateObject ) break; if ( m_angleBeforeRotate != m_rotateObject->getAngle() ) { @@ -1465,7 +1465,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e ) } else if ( mousePressed ) { switch ( toolEditMode ) { case TEM_MOUSE: { - drawContour = TRUE; + drawContour = true; if ( modType == MT_NONE ) { if ( drawRubber ) { @@ -1528,7 +1528,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e ) case TEM_ROTATE: { if ( m_rotateObject ) { - drawContour = TRUE; + drawContour = true; // angle to mouse pos double angle = KoPoint::getAngle( m_rotateCenter, docPoint ); // angle to start of mouse pos @@ -4472,7 +4472,7 @@ void KPrCanvas::setTextBackground( KPrTextObject */*obj*/ ) #if 0 TQPixmap pix( m_activePage->getZoomPageRect().size() ); TQPainter painter( &pix ); - m_activePage->background()->drawBackground( &painter, FALSE ); + m_activePage->background()->drawBackground( &painter, false ); TQPixmap bpix( obj->getSize().toTQSize() ); // ## zoom it ! bitBlt( &bpix, 0, 0, &pix, obj->getOrig().x(), obj->getOrig().y() - m_activePage->getZoomPageRect().height() * ( m_view->getCurrPgNum() - 1 ), bpix.width(), bpix.height() ); diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index afdce4511..0b1726a9c 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -257,7 +257,7 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje objStartY = 0; _presPen = TQPen( red, 3, SolidLine ); - ignoreSticky = TRUE; + ignoreSticky = true; m_gridColor=TQt::black; @@ -1567,7 +1567,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles TQTime dt; dt.start(); m_loadingInfo = new KPrLoadingInfo; - ignoreSticky = FALSE; + ignoreSticky = false; emit sigProgress( 0 ); lastObj = -1; @@ -1772,7 +1772,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles if (!settings.isNull() && _clean /*don't load settings when we copy/paste a page*/) loadOasisPresentationSettings( settings ); - ignoreSticky = TRUE; + ignoreSticky = true; kdDebug()<<" _clean :"<<_clean<setRadioButtonExclusive( TRUE ); + group->setRadioButtonExclusive( true ); group->layout(); m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group ); m_rbVert = new TQRadioButton( i18n("Vertical"), group ); diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h index f5dce5349..d34284b28 100644 --- a/kpresenter/KPrObject.h +++ b/kpresenter/KPrObject.h @@ -239,7 +239,7 @@ public: // the main drawing method. virtual void draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, - int /*pageNum*/, SelectionMode selectionMode, bool drawContour = FALSE ); + int /*pageNum*/, SelectionMode selectionMode, bool drawContour = false ); /** * @brief Check if point lies in rect of object @@ -420,7 +420,7 @@ public: virtual double load(const TQDomElement &element); virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); virtual void draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, - int pageNum, SelectionMode selectionMode, bool drawContour = FALSE ); + int pageNum, SelectionMode selectionMode, bool drawContour = false ); virtual void saveOasisStrokeElement( KoGenStyles& mainStyles, KoGenStyle &styleobjectauto ) const; TQString saveOasisStrokeStyle( KoGenStyles& mainStyles ) const; @@ -471,7 +471,7 @@ protected: * This method isn't pure virtual because some objects implement draw() directly. */ virtual void paint( TQPainter* /* painter */, KoTextZoomHandler* /* zoomHandler */, - int /* pageNum */, bool drawingShadow, bool /* drawContour */ = FALSE ); + int /* pageNum */, bool drawingShadow, bool /* drawContour */ = false ); KoPen pen; }; @@ -521,7 +521,7 @@ public: virtual double load(const TQDomElement &element); virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); virtual void draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, - int pageNum, SelectionMode selectionMode, bool drawContour = FALSE ); + int pageNum, SelectionMode selectionMode, bool drawContour = false ); virtual void flip(bool horizontal ); diff --git a/kpresenter/KPrPartObject.h b/kpresenter/KPrPartObject.h index 1f4b48f83..98401814f 100644 --- a/kpresenter/KPrPartObject.h +++ b/kpresenter/KPrPartObject.h @@ -43,7 +43,7 @@ public: virtual TQString getTypeString() const { return i18n("Embedded Object"); } virtual void draw( TQPainter *_painter, KoTextZoomHandler *_zoomhandler, - int pageNum, SelectionMode selectionMode, bool drawContour = FALSE ); + int pageNum, SelectionMode selectionMode, bool drawContour = false ); void activate( TQWidget *_widget ); void deactivate(); @@ -61,7 +61,7 @@ protected: void updateChildGeometry(); virtual void paint( TQPainter *_painter,KoTextZoomHandler*_zoomHandler, - int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); + int /* pageNum */, bool drawingShadow, bool drawContour = false ); bool _enableDrawing; KPrChild *child; diff --git a/kpresenter/KPrPixmapObject.h b/kpresenter/KPrPixmapObject.h index 23917ef5b..8af906b24 100644 --- a/kpresenter/KPrPixmapObject.h +++ b/kpresenter/KPrPixmapObject.h @@ -76,7 +76,7 @@ public: virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); virtual void draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, - int /* page */, SelectionMode selectionMode, bool drawContour = FALSE ); + int /* page */, SelectionMode selectionMode, bool drawContour = false ); TQPixmap getOriginalPixmap(); PictureMirrorType getPictureMirrorType() const { return mirrorType; } diff --git a/kpresenter/KPrPointObject.h b/kpresenter/KPrPointObject.h index a0039f551..e4464306c 100644 --- a/kpresenter/KPrPointObject.h +++ b/kpresenter/KPrPointObject.h @@ -63,7 +63,7 @@ protected: virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; virtual void paint( TQPainter *_painter,KoTextZoomHandler*_zoomHandler, - int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); + int /* pageNum */, bool drawingShadow, bool drawContour = false ); virtual void updatePoints( double _fx, double _fy ); virtual KoPointArray getDrawingPoints() const; diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index 9917f97d5..d3b6d7929 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -265,7 +265,7 @@ void KPrThumbBar::setCurrentPage( int pg ) if ( it->text().toInt() - 1 == pg ) { blockSignals( true ); setCurrentItem( it ); - setSelected( it, FALSE ); // to avoid the blue "selected"-mark + setSelected( it, false ); // to avoid the blue "selected"-mark ensureItemVisible(it); refreshItems(); blockSignals( false ); @@ -283,7 +283,7 @@ TQRect KPrThumbBar::tip(const TQPoint &pos, TQString &title) int pagenr = item->index(); title = m_doc->pageList().at(pagenr)->pageTitle(); - TQRect r = item->pixmapRect(FALSE); + TQRect r = item->pixmapRect(false); r = TQRect(contentsToViewport(TQPoint(r.x(), r.y())), TQSize(r.width(), r.height())); return r; } diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 18844e432..b160fd527 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -1402,7 +1402,7 @@ void KPrTextObject::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursorV TQMAX(0, iPoint.x() - 5), // negative values create problems iPoint.y(), clip.width(), clip.height(), pix, cg, m_doc->zoomHandler(), - cursorVisible, cursor, FALSE /*resetChanged*/, drawingFlags ); + cursorVisible, cursor, false /*resetChanged*/, drawingFlags ); if ( wasChanged ) // Maybe we have more changes to draw, than those in the small cliprect cursor->parag()->setLineChanged( oldLineChanged ); // -1 = all diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 24582ff93..e35f1966f 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -441,7 +441,7 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) } - setAcceptDrops( TRUE ); + setAcceptDrops( true ); } DCOPObject* KPrView::dcopObject() @@ -717,15 +717,15 @@ void KPrView::editDelPage() void KPrView::insertPage() { - InsertPageDia dia( this, 0, TRUE ); + InsertPageDia dia( this, 0, true ); #if COPYOASISFORMAT TQString templ = locateLocal( "data", "kpresenter/default.oop" ); #else TQString templ = locateLocal( "data", "kpresenter/default.kpr" ); #endif if ( !TQFile::exists( templ ) ) { - dia.radioDifferent->setChecked( TRUE ); - dia.radioDefault->setEnabled( FALSE ); + dia.radioDifferent->setChecked( true ); + dia.radioDefault->setEnabled( false ); } if ( dia.exec() != TQDialog::Accepted ) return; @@ -808,7 +808,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture) TQStringList mimetypes; mimetypes << mimetype; - KFileDialog fd( oldFile, TQString(), this, 0, TRUE ); + KFileDialog fd( oldFile, TQString(), this, 0, true ); fd.setMimeFilter( mimetypes ); fd.setCaption(i18n("Save Picture")); fd.setOperationMode(KFileDialog::Saving); @@ -1572,7 +1572,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) vert->setEnabled( false ); horz->setEnabled( false ); m_bShowGUI = false; - m_canvas->reparent( ( TQWidget* )0L, 0, TQPoint( 0, 0 ), FALSE ); + m_canvas->reparent( ( TQWidget* )0L, 0, TQPoint( 0, 0 ), false ); m_canvas->setPaletteBackgroundColor( TQt::white ); m_canvas->showFullScreen(); m_canvas->setFocusPolicy( TQWidget::StrongFocus ); @@ -2230,7 +2230,7 @@ void KPrView::createGUI() if ( sidebar ) { sidebar->outline()->setCurrentItem( sidebar->outline()->firstChild() ); - sidebar->outline()->setSelected( sidebar->outline()->firstChild(), TRUE ); + sidebar->outline()->setSelected( sidebar->outline()->firstChild(), true ); TDEConfig *config=TDEGlobal::config(); config->setGroup("Global"); if(!config->readBoolEntry("Sidebar", true)) { @@ -3756,12 +3756,12 @@ void KPrView::setupScrollbars() horz->setValue(horz->minValue()); pgNext = new TQToolButton( pageBase ); pgNext->setPixmap( TQPixmap( pagedown_xpm ) ); - pgNext->setAutoRepeat( TRUE ); + pgNext->setAutoRepeat( true ); TQToolTip::add( pgNext, i18n( "Next slide" ) ); connect( pgNext, TQ_SIGNAL( clicked() ), this, TQ_SLOT( nextPage() ) ); pgPrev = new TQToolButton( pageBase ); pgPrev->setPixmap( TQPixmap( pageup_xpm ) ); - pgPrev->setAutoRepeat( TRUE ); + pgPrev->setAutoRepeat( true ); TQToolTip::add( pgPrev, i18n( "Previous slide" ) ); connect( pgPrev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( prevPage() ) ); } @@ -3847,7 +3847,7 @@ void KPrView::skipToPage( int num ) //(Laurent) deselect object when we change page. //otherwise you can change object properties on other page deSelectAllObjects(); - m_pKPresenterDoc->repaint( FALSE ); + m_pKPresenterDoc->repaint( false ); m_pKPresenterDoc->displayActivePage( page ); } @@ -4053,11 +4053,11 @@ void KPrView::updateSideBar() { if ( sidebar ) { - sidebar->blockSignals( TRUE ); + sidebar->blockSignals( true ); sidebar->thumbBar()->uptodate = false; sidebar->outline()->rebuildItems(); sidebar->thumbBar()->rebuildItems(); - sidebar->blockSignals( FALSE ); + sidebar->blockSignals( false ); } } @@ -4072,9 +4072,9 @@ void KPrView::addSideBarItem( int pos ) { if ( sidebar ) { - sidebar->blockSignals( TRUE ); + sidebar->blockSignals( true ); sidebar->addItem( pos ); - sidebar->blockSignals( FALSE ); + sidebar->blockSignals( false ); } } @@ -4082,9 +4082,9 @@ void KPrView::moveSideBarItem( int oldPos, int newPos ) { if ( sidebar ) { - sidebar->blockSignals( TRUE ); + sidebar->blockSignals( true ); sidebar->moveItem( oldPos, newPos ); - sidebar->blockSignals( FALSE ); + sidebar->blockSignals( false ); } } @@ -4092,9 +4092,9 @@ void KPrView::removeSideBarItem( int pos ) { if ( sidebar ) { - sidebar->blockSignals( TRUE ); + sidebar->blockSignals( true ); sidebar->removeItem( pos ); - sidebar->blockSignals( FALSE ); + sidebar->blockSignals( false ); } } @@ -4627,7 +4627,7 @@ void KPrView::spellCheckerRemoveHighlight() } KPrTextView *edit=m_canvas->currentTextObjectView(); if (edit) - edit->drawCursor( TRUE ); + edit->drawCursor( true ); } @@ -6149,7 +6149,7 @@ void KPrView::autoSpellCheck() void KPrView::insertFile( ) { - KFileDialog fd( TQString(), TQString(), this, 0, TRUE ); + KFileDialog fd( TQString(), TQString(), this, 0, true ); TQStringList filter; filter<<"application/x-kpresenter"; filter<<"application/vnd.oasis.opendocument.presentation"; diff --git a/kpresenter/KoPointArray.cpp b/kpresenter/KoPointArray.cpp index 6a347ca26..30e34ecb5 100644 --- a/kpresenter/KoPointArray.cpp +++ b/kpresenter/KoPointArray.cpp @@ -60,10 +60,10 @@ bool KoPointArray::putPoints( int index, int nPoints, double firstx, double firs va_list ap; if ( index + nPoints > (int)size() ) { // extend array if ( !resize(index + nPoints) ) - return FALSE; + return false; } if ( nPoints <= 0 ) - return TRUE; + return true; setPoint( index, firstx, firsty ); // set first point int i = index + 1; double x, y; @@ -75,7 +75,7 @@ bool KoPointArray::putPoints( int index, int nPoints, double firstx, double firs setPoint( i++, x, y ); } va_end( ap ); - return TRUE; + return true; } void split(const double *p, double *l, double *r) diff --git a/kspread/dialogs/kspread_dlg_angle.cpp b/kspread/dialogs/kspread_dlg_angle.cpp index defb59bfd..50a93b583 100644 --- a/kspread/dialogs/kspread_dlg_angle.cpp +++ b/kspread/dialogs/kspread_dlg_angle.cpp @@ -39,7 +39,7 @@ using namespace KSpread; AngleDialog::AngleDialog(View* parent, const char* name, const TQPoint &_marker) - : KDialogBase( parent, name,TRUE,i18n("Change Angle" ), Ok|Cancel|Default ) + : KDialogBase( parent, name,true,i18n("Change Angle" ), Ok|Cancel|Default ) { m_pView=parent; marker=_marker; diff --git a/kspread/dialogs/kspread_dlg_area.cpp b/kspread/dialogs/kspread_dlg_area.cpp index b160cb528..7771cc4ce 100644 --- a/kspread/dialogs/kspread_dlg_area.cpp +++ b/kspread/dialogs/kspread_dlg_area.cpp @@ -38,7 +38,7 @@ using namespace KSpread; AreaDialog::AreaDialog( View * parent, const char * name, const TQPoint & _marker ) - : KDialogBase( parent, name, TRUE, i18n("Area Name"), Ok | Cancel ) + : KDialogBase( parent, name, true, i18n("Area Name"), Ok | Cancel ) { m_pView = parent; m_marker = _marker; diff --git a/kspread/dialogs/kspread_dlg_comment.cpp b/kspread/dialogs/kspread_dlg_comment.cpp index 7c9bdb1c5..d3227bfc2 100644 --- a/kspread/dialogs/kspread_dlg_comment.cpp +++ b/kspread/dialogs/kspread_dlg_comment.cpp @@ -39,7 +39,7 @@ using namespace KSpread; CommentDialog::CommentDialog( View* parent, const char* name,const TQPoint &_marker) - : KDialogBase( parent, name,TRUE,i18n("Cell Comment"),Ok|Cancel ) + : KDialogBase( parent, name,true,i18n("Cell Comment"),Ok|Cancel ) { m_pView = parent; marker= _marker; diff --git a/kspread/dialogs/kspread_dlg_csv.cpp b/kspread/dialogs/kspread_dlg_csv.cpp index a93db2281..893c3c726 100644 --- a/kspread/dialogs/kspread_dlg_csv.cpp +++ b/kspread/dialogs/kspread_dlg_csv.cpp @@ -63,7 +63,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod if ( !name ) setName( "CSV" ); - setSizeGripEnabled( TRUE ); + setSizeGripEnabled( true ); TQWidget* page = new TQWidget( this ); setMainWidget( page ); @@ -102,7 +102,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_radioComma = new TQRadioButton( m_delimiterBox, "m_radioComma" ); m_radioComma->setText( i18n( "Comma" ) ); - m_radioComma->setChecked( TRUE ); + m_radioComma->setChecked( true ); m_delimiterBoxLayout->addWidget( m_radioComma, 0, 0 ); m_radioSemicolon = new TQRadioButton( m_delimiterBox, "m_radioSemicolon" ); @@ -144,7 +144,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_radioText = new TQRadioButton( m_formatBox, "m_radioText" ); m_radioText->setText( i18n( "Text" ) ); - m_radioText->setChecked( TRUE ); + m_radioText->setChecked( true ); m_formatBoxLayout->addWidget( m_radioText, 0, 0 ); m_radioCurrency = new TQRadioButton( m_formatBox, "m_radioCurrency" ); @@ -155,13 +155,13 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_radioDate->setText( i18n( "Date" ) ); m_formatBoxLayout->addWidget( m_radioDate, 1, 2 ); - m_comboLine = new TQComboBox( FALSE, page, "m_comboLine" ); + m_comboLine = new TQComboBox( false, page, "m_comboLine" ); m_comboLine->insertItem( i18n( "1" ) ); m_comboLine->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) ); MyDialogLayout->addWidget( m_comboLine, 1, 3 ); - m_comboQuote = new TQComboBox( FALSE, page, "m_comboQuote" ); + m_comboQuote = new TQComboBox( false, page, "m_comboQuote" ); m_comboQuote->insertItem( i18n( "\"" ) ); m_comboQuote->insertItem( i18n( "'" ) ); m_comboQuote->insertItem( i18n( "None" ) ); diff --git a/kspread/dialogs/kspread_dlg_database.cpp b/kspread/dialogs/kspread_dlg_database.cpp index a8c882493..41e15d6e2 100644 --- a/kspread/dialogs/kspread_dlg_database.cpp +++ b/kspread/dialogs/kspread_dlg_database.cpp @@ -104,7 +104,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * TextLabel2->setText( i18n( "Host:" ) ); Frame16Layout->addWidget( TextLabel2, 2, 0 ); - m_driver = new TQComboBox( FALSE, Frame16, "m_driver" ); + m_driver = new TQComboBox( false, Frame16, "m_driver" ); Frame16Layout->addWidget( m_driver, 0, 1 ); m_username = new TQLineEdit( Frame16, "m_username" ); @@ -172,7 +172,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * // TextLabel12_2->setText( i18n( "Database:" ) ); // Layout21->addWidget( TextLabel12_2 ); - // m_databaseList = new TQComboBox( FALSE, Frame5_2, "m_databaseList" ); + // m_databaseList = new TQComboBox( false, Frame5_2, "m_databaseList" ); // Layout21->addWidget( m_databaseList ); // m_connectButton = new KPushButton( Frame5_2, "m_connectButton" ); @@ -191,7 +191,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_sheetView = new TDEListView( Frame5_2, "m_tableView" ); m_sheetView->addColumn( i18n( "Sheet" ) ); - m_sheetView->setRootIsDecorated( FALSE ); + m_sheetView->setRootIsDecorated( false ); Frame5_2Layout->addWidget( m_sheetView, 2, 0 ); @@ -223,7 +223,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_columnView->addColumn( i18n( "Column" ) ); m_columnView->addColumn( i18n( "Sheet" ) ); m_columnView->addColumn( i18n( "Data Type" ) ); - m_columnView->setRootIsDecorated( FALSE ); + m_columnView->setRootIsDecorated( false ); Frame5_2_2Layout->addWidget( m_columnView, 1, 0 ); @@ -271,13 +271,13 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_operatorValue_1 = new TQLineEdit( optionsFrame, "m_operatorValue" ); optionsFrameLayout->addWidget( m_operatorValue_1, 2, 2 ); - m_columns_2 = new TQComboBox( FALSE, optionsFrame, "m_columns_2" ); + m_columns_2 = new TQComboBox( false, optionsFrame, "m_columns_2" ); optionsFrameLayout->addWidget( m_columns_2, 3, 0 ); m_operatorValue_3 = new TQLineEdit( optionsFrame, "m_operatorValue_3" ); optionsFrameLayout->addWidget( m_operatorValue_3, 4, 2 ); - m_operator_1 = new TQComboBox( FALSE, optionsFrame, "m_operator_1" ); + m_operator_1 = new TQComboBox( false, optionsFrame, "m_operator_1" ); m_operator_1->insertItem( i18n( "equals" ) ); m_operator_1->insertItem( i18n( "not equal" ) ); m_operator_1->insertItem( i18n( "in" ) ); @@ -290,7 +290,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * optionsFrameLayout->addWidget( m_operator_1, 2, 1 ); - m_operator_2 = new TQComboBox( FALSE, optionsFrame, "m_operator_2" ); + m_operator_2 = new TQComboBox( false, optionsFrame, "m_operator_2" ); m_operator_2->insertItem( i18n( "equals" ) ); m_operator_2->insertItem( i18n( "not equal" ) ); m_operator_2->insertItem( i18n( "in" ) ); @@ -301,7 +301,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * optionsFrameLayout->addWidget( m_operator_2, 3, 1 ); - m_operator_3 = new TQComboBox( FALSE, optionsFrame, "m_operator_3" ); + m_operator_3 = new TQComboBox( false, optionsFrame, "m_operator_3" ); m_operator_3->insertItem( i18n( "equals" ) ); m_operator_3->insertItem( i18n( "not equal" ) ); m_operator_3->insertItem( i18n( "in" ) ); @@ -395,7 +395,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_startingCell = new TQRadioButton( Frame12, "m_startingCell" ); m_startingCell->setText( i18n( "Starting in cell" ) ); - m_startingCell->setChecked( TRUE ); + m_startingCell->setChecked( true ); Frame12Layout->addWidget( m_startingCell, 1, 0 ); Frame5_2_2_3Layout->addWidget( Frame12, 2, 0 ); diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h index 03d49e9ac..4a90bfebc 100644 --- a/kspread/dialogs/kspread_dlg_database.h +++ b/kspread/dialogs/kspread_dlg_database.h @@ -55,7 +55,7 @@ class DatabaseDialog : public KWizard public: enum PageId { eDatabase = 0, eSheets = 1, eColumns = 2, eOptions = 3, eResult = 4 }; - DatabaseDialog( View * parent, TQRect const & rect, const char * name = 0, bool modal = FALSE, WFlags fl = 0 ); + DatabaseDialog( View * parent, TQRect const & rect, const char * name = 0, bool modal = false, WFlags fl = 0 ); virtual ~DatabaseDialog(); private slots: diff --git a/kspread/dialogs/kspread_dlg_format.cpp b/kspread/dialogs/kspread_dlg_format.cpp index c4135655d..e6e568075 100644 --- a/kspread/dialogs/kspread_dlg_format.cpp +++ b/kspread/dialogs/kspread_dlg_format.cpp @@ -48,7 +48,7 @@ using namespace KSpread; FormatDialog::FormatDialog( View* view, const char* name ) - : KDialogBase( view, name, TRUE,i18n("Sheet Style"),Ok|Cancel ) + : KDialogBase( view, name, true,i18n("Sheet Style"),Ok|Cancel ) { for( int i = 0; i < 16; ++i ) m_cells[ i ] = 0; @@ -67,12 +67,12 @@ FormatDialog::FormatDialog( View* view, const char* name ) vbox->addWidget( m_label ); - TQStringList lst = Factory::global()->dirs()->findAllResources( "sheet-styles", "*.ksts", TRUE ); + TQStringList lst = Factory::global()->dirs()->findAllResources( "sheet-styles", "*.ksts", true ); TQStringList::Iterator it = lst.begin(); for( ; it != lst.end(); ++it ) { - KSimpleConfig cfg( *it, TRUE ); + KSimpleConfig cfg( *it, true ); cfg.setGroup( "Sheet-Style" ); Entry e; @@ -346,7 +346,7 @@ bool FormatDialog::parseXML( const TQDomDocument& doc ) } } - return TRUE; + return true; } #include "kspread_dlg_format.moc" diff --git a/kspread/dialogs/kspread_dlg_formula.cpp b/kspread/dialogs/kspread_dlg_formula.cpp index 324df02d8..24f90cd74 100644 --- a/kspread/dialogs/kspread_dlg_formula.cpp +++ b/kspread/dialogs/kspread_dlg_formula.cpp @@ -159,7 +159,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for grid2->addStretch( 10 ); m_tabwidget->addTab( m_input, i18n("&Parameters") ); - m_tabwidget->setTabEnabled( m_input, FALSE ); + m_tabwidget->setTabEnabled( m_input, false ); m_tabwidget->setCurrentPage( index ); @@ -282,12 +282,12 @@ bool FormulaDialog::eventFilter( TQObject* obj, TQEvent* ev ) else if ( obj == fiveElement && ev->type() == TQEvent::FocusIn ) m_focus = fiveElement; else - return FALSE; + return false; if ( m_focus ) m_pView->canvasWidget()->startChoose(); - return FALSE; + return false; } void FormulaDialog::slotOk() @@ -391,19 +391,19 @@ TQString FormulaDialog::createFormula() if ( !m_desc ) return TQString(); - bool first = TRUE; + bool first = true; int count = m_desc->params(); if(!firstElement->text().isEmpty() && count >= 1 ) { tmp=tmp+createParameter(firstElement->text(), 0 ); - first = FALSE; + first = false; } if(!secondElement->text().isEmpty() && count >= 2 ) { - first = FALSE; + first = false; if ( !first ) tmp=tmp+";"+createParameter(secondElement->text(), 1 ); else @@ -411,7 +411,7 @@ TQString FormulaDialog::createFormula() } if(!thirdElement->text().isEmpty() && count >= 3 ) { - first = FALSE; + first = false; if ( !first ) tmp=tmp+";"+createParameter(thirdElement->text(), 2 ); else @@ -419,7 +419,7 @@ TQString FormulaDialog::createFormula() } if(!fourElement->text().isEmpty() && count >= 4 ) { - first = FALSE; + first = false; if ( !first ) tmp=tmp+";"+createParameter(fourElement->text(), 3 ); else @@ -427,7 +427,7 @@ TQString FormulaDialog::createFormula() } if(!fiveElement->text().isEmpty() && count >= 5 ) { - first = FALSE; + first = false; if ( !first ) tmp=tmp+";"+createParameter(fiveElement->text(), 4 ); else @@ -570,7 +570,7 @@ void FormulaDialog::slotDoubleClicked( TQListBoxItem* item ) // Dont change order of these function calls due to a bug in TQt 2.2 m_browser->setText( m_desc->toTQML() ); - m_tabwidget->setTabEnabled( m_input, TRUE ); + m_tabwidget->setTabEnabled( m_input, true ); m_tabwidget->setCurrentPage( 1 ); // @@ -678,7 +678,7 @@ void FormulaDialog::slotSelected( const TQString& function ) } if( functions->currentItem() !=- 1 ) - selectFunction->setEnabled( TRUE ); + selectFunction->setEnabled( true ); // Lock refresh_result = false; @@ -693,7 +693,7 @@ void FormulaDialog::slotSelected( const TQString& function ) m_focus=0; m_tabwidget->setCurrentPage( 0 ); - m_tabwidget->setTabEnabled( m_input, FALSE ); + m_tabwidget->setTabEnabled( m_input, false ); // Unlock refresh_result=true; diff --git a/kspread/dialogs/kspread_dlg_goalseek.cpp b/kspread/dialogs/kspread_dlg_goalseek.cpp index 1a2dbb378..1f49ae3ae 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.cpp +++ b/kspread/dialogs/kspread_dlg_goalseek.cpp @@ -111,13 +111,13 @@ GoalSeekDialog::GoalSeekDialog( View * parent, TQPoint const & marker, m_buttonOk = new TQPushButton( this, "m_buttonOk" ); m_buttonOk->setText( i18n( "&Start" ) ); m_buttonOk->setAccel( 276824143 ); - m_buttonOk->setAutoDefault( TRUE ); - m_buttonOk->setDefault( TRUE ); + m_buttonOk->setAutoDefault( true ); + m_buttonOk->setDefault( true ); Layout5->addWidget( m_buttonOk ); m_buttonCancel = new KPushButton( KStdGuiItem::cancel(), this, "m_buttonCancel" ); m_buttonCancel->setAccel( 276824131 ); - m_buttonCancel->setAutoDefault( TRUE ); + m_buttonCancel->setAutoDefault( true ); Layout5->addWidget( m_buttonCancel ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); Layout5->addItem( spacer ); @@ -204,12 +204,12 @@ bool GoalSeekDialog::eventFilter( TQObject* obj, TQEvent* ev ) else if ( obj == m_sourceEdit && ev->type() == TQEvent::FocusIn ) m_focus = m_sourceEdit; else - return FALSE; + return false; if ( m_focus ) m_pView->canvasWidget()->startChoose(); - return FALSE; + return false; } void GoalSeekDialog::closeEvent ( TQCloseEvent * e ) diff --git a/kspread/dialogs/kspread_dlg_goalseek.h b/kspread/dialogs/kspread_dlg_goalseek.h index 32ac2d9e6..371e488ca 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.h +++ b/kspread/dialogs/kspread_dlg_goalseek.h @@ -52,7 +52,7 @@ class GoalSeekDialog : public KDialog public: GoalSeekDialog( View * parent, TQPoint const & marker, const char * name = 0, - bool modal = FALSE, WFlags fl = 0 ); + bool modal = false, WFlags fl = 0 ); ~GoalSeekDialog(); /** diff --git a/kspread/dialogs/kspread_dlg_goto.cpp b/kspread/dialogs/kspread_dlg_goto.cpp index 4c74c9b93..67a0ec133 100644 --- a/kspread/dialogs/kspread_dlg_goto.cpp +++ b/kspread/dialogs/kspread_dlg_goto.cpp @@ -39,7 +39,7 @@ using namespace KSpread; GotoDialog::GotoDialog( View* parent, const char* name ) - : KDialogBase( parent, name, TRUE, i18n("Goto Cell"), Ok|Cancel ) + : KDialogBase( parent, name, true, i18n("Goto Cell"), Ok|Cancel ) { m_pView = parent; TQWidget *page = new TQWidget( this ); diff --git a/kspread/dialogs/kspread_dlg_insert.cpp b/kspread/dialogs/kspread_dlg_insert.cpp index 8e4e3ae35..e6d2cc0e1 100644 --- a/kspread/dialogs/kspread_dlg_insert.cpp +++ b/kspread/dialogs/kspread_dlg_insert.cpp @@ -43,7 +43,7 @@ using namespace KSpread; InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,Mode _mode) - : KDialogBase( parent, name, TRUE,"",Ok|Cancel ) + : KDialogBase( parent, name, true,"",Ok|Cancel ) { m_pView = parent; rect=_rect; @@ -54,7 +54,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,M TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n("Insert"),page); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); lay1->addWidget(grp); if( insRem==Insert) diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h index 1360f1c88..a42df77ef 100644 --- a/kspread/dialogs/kspread_dlg_layout.h +++ b/kspread/dialogs/kspread_dlg_layout.h @@ -110,7 +110,7 @@ public: void setPattern( const TQColor &_color, int _width, TQt::PenStyle _style ); void setUndefined(); - void setDefined() { undefined = FALSE; repaint(); } + void setDefined() { undefined = false; repaint(); } bool isDefined() { return !undefined; } diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cpp b/kspread/dialogs/kspread_dlg_pasteinsert.cpp index b966f6eb2..e5c6c394f 100644 --- a/kspread/dialogs/kspread_dlg_pasteinsert.cpp +++ b/kspread/dialogs/kspread_dlg_pasteinsert.cpp @@ -38,7 +38,7 @@ using namespace KSpread; PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRect &_rect) - : KDialogBase( parent, name, TRUE,i18n("Paste Inserting Cells"),Ok|Cancel ) + : KDialogBase( parent, name, true,i18n("Paste Inserting Cells"),Ok|Cancel ) { m_pView = parent; rect=_rect; @@ -48,7 +48,7 @@ PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRec TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n("Insert"),page); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); lay1->addWidget(grp); rb1 = new TQRadioButton( i18n("Move towards right"), grp ); diff --git a/kspread/dialogs/kspread_dlg_reference.cpp b/kspread/dialogs/kspread_dlg_reference.cpp index 96d0d5b59..bb30c244c 100644 --- a/kspread/dialogs/kspread_dlg_reference.cpp +++ b/kspread/dialogs/kspread_dlg_reference.cpp @@ -52,7 +52,7 @@ using namespace KSpread; reference::reference( View* parent, const char* name ) - : TQDialog( parent, name,TRUE ) + : TQDialog( parent, name,true ) { m_pView = parent; TQVBoxLayout *lay1 = new TQVBoxLayout( this ); @@ -74,7 +74,7 @@ reference::reference( View* parent, const char* name ) m_pEdit = bb->addButton( i18n("&Edit...") ); m_pOk = bb->addButton( KStdGuiItem::ok() ); m_pCancel = bb->addButton( KStdGuiItem::cancel() ); - m_pOk->setDefault( TRUE ); + m_pOk->setDefault( true ); bb->layout(); lay1->addWidget( bb ); @@ -285,7 +285,7 @@ EditAreaName::EditAreaName( View * parent, EditAreaNameLayout->addWidget( TextLabel1, 1, 0 ); - m_sheets = new TQComboBox( FALSE, page, "m_sheets" ); + m_sheets = new TQComboBox( false, page, "m_sheets" ); EditAreaNameLayout->addWidget( m_sheets, 1, 1 ); diff --git a/kspread/dialogs/kspread_dlg_series.cpp b/kspread/dialogs/kspread_dlg_series.cpp index d424f8253..e31eb9a00 100644 --- a/kspread/dialogs/kspread_dlg_series.cpp +++ b/kspread/dialogs/kspread_dlg_series.cpp @@ -48,7 +48,7 @@ using namespace KSpread; SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) - : KDialogBase( parent, name,TRUE,i18n("Series"),Ok|Cancel ) + : KDialogBase( parent, name,true,i18n("Series"),Ok|Cancel ) { m_pView = parent; marker=_marker; diff --git a/kspread/dialogs/kspread_dlg_show.cpp b/kspread/dialogs/kspread_dlg_show.cpp index 4cea9f115..76ef7dbb3 100644 --- a/kspread/dialogs/kspread_dlg_show.cpp +++ b/kspread/dialogs/kspread_dlg_show.cpp @@ -39,7 +39,7 @@ using namespace KSpread; ShowDialog::ShowDialog( View* parent, const char* name ) - : KDialogBase( parent, name,TRUE,i18n("Show Sheet"),Ok|Cancel ) + : KDialogBase( parent, name,true,i18n("Show Sheet"),Ok|Cancel ) { m_pView = parent; TQWidget *page = new TQWidget( this ); diff --git a/kspread/dialogs/kspread_dlg_showColRow.cpp b/kspread/dialogs/kspread_dlg_showColRow.cpp index 0828667f1..5bf192543 100644 --- a/kspread/dialogs/kspread_dlg_showColRow.cpp +++ b/kspread/dialogs/kspread_dlg_showColRow.cpp @@ -36,7 +36,7 @@ using namespace KSpread; ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) - : KDialogBase( parent, name,TRUE,"",Ok|Cancel ) + : KDialogBase( parent, name,true,"",Ok|Cancel ) { m_pView = parent; typeShow=_type; diff --git a/kspread/dialogs/kspread_dlg_special.cpp b/kspread/dialogs/kspread_dlg_special.cpp index 2b854f217..34554fb42 100644 --- a/kspread/dialogs/kspread_dlg_special.cpp +++ b/kspread/dialogs/kspread_dlg_special.cpp @@ -37,7 +37,7 @@ using namespace KSpread; SpecialDialog::SpecialDialog( View* parent, const char* name ) - : KDialogBase( parent, name, TRUE,i18n("Special Paste"),Ok|Cancel ) + : KDialogBase( parent, name, true,i18n("Special Paste"),Ok|Cancel ) { m_pView = parent; TQWidget *page = new TQWidget( this ); @@ -45,7 +45,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Paste What" ),page ); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); lay1->addWidget(grp); rb1 = new TQRadioButton( i18n("Everything"), grp ); @@ -58,7 +58,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) rb1->setChecked(true); grp = new TQButtonGroup( 1, TQt::Horizontal, i18n("Operation"),page); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); lay1->addWidget(grp); diff --git a/kspread/dialogs/kspread_dlg_styles.cpp b/kspread/dialogs/kspread_dlg_styles.cpp index 1aae08149..3e4a38cc6 100644 --- a/kspread/dialogs/kspread_dlg_styles.cpp +++ b/kspread/dialogs/kspread_dlg_styles.cpp @@ -49,7 +49,7 @@ StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl ) m_styleList->setResizeMode( TDEListView::AllColumns ); layout->addWidget( m_styleList ); - m_displayBox = new KComboBox( FALSE, this, "m_displayBox" ); + m_displayBox = new KComboBox( false, this, "m_displayBox" ); layout->addWidget( m_displayBox ); m_styleList->header()->setLabel( 0, i18n( "Styles" ) ); diff --git a/kspread/functions.cpp b/kspread/functions.cpp index 69f96fa0b..bfc724596 100644 --- a/kspread/functions.cpp +++ b/kspread/functions.cpp @@ -208,7 +208,7 @@ FunctionRepository* FunctionRepository::self() // find all XML description files TQStringList files = Factory::global()->dirs()->findAllResources - ("extensions", "*.xml", TRUE); + ("extensions", "*.xml", true); // load desc/help from XML file for( TQStringList::Iterator it = files.begin(); it != files.end(); ++it ) @@ -324,7 +324,7 @@ static ParameterType toType( const TQString& type ) return KSpread_Float; } -static TQString toString (ParameterType type, bool range = FALSE) +static TQString toString (ParameterType type, bool range = false) { if ( !range ) { @@ -363,7 +363,7 @@ static TQString toString (ParameterType type, bool range = FALSE) FunctionParameter::FunctionParameter() { m_type = KSpread_Float; - m_range = FALSE; + m_range = false; } FunctionParameter::FunctionParameter (const FunctionParameter& param) @@ -376,7 +376,7 @@ FunctionParameter::FunctionParameter (const FunctionParameter& param) FunctionParameter::FunctionParameter (const TQDomElement& element) { m_type = KSpread_Float; - m_range = FALSE; + m_range = false; TQDomNode n = element.firstChild(); for( ; !n.isNull(); n = n.nextSibling() ) @@ -391,7 +391,7 @@ FunctionParameter::FunctionParameter (const TQDomElement& element) if ( e.hasAttribute( "range" )) { if (e.attribute("range").lower() == "true") - m_range = TRUE; + m_range = true; } } } diff --git a/kspread/kspread_object.h b/kspread/kspread_object.h index 2aaab4008..03ca9243a 100644 --- a/kspread/kspread_object.h +++ b/kspread/kspread_object.h @@ -356,7 +356,7 @@ class EmbeddedPictureObject : public EmbeddedObject //virtual void loadOasis(const TQDomElement &element, KoOasisLoadingContext & context, KPRLoadingInfo *info); // virtual void draw( TQPainter *_painter, KoZoomHandler*_zoomHandler, -// int /* page */, SelectionMode selectionMode, bool drawContour = FALSE ); +// int /* page */, SelectionMode selectionMode, bool drawContour = false ); TQPixmap getOriginalPixmap(); PictureMirrorType getPictureMirrorType() const { return mirrorType; } diff --git a/kspread/kspread_toolbox.cpp b/kspread/kspread_toolbox.cpp index 82373f893..76dc09db5 100644 --- a/kspread/kspread_toolbox.cpp +++ b/kspread/kspread_toolbox.cpp @@ -53,14 +53,14 @@ void ToolBox::setEnabled( bool enable ) { ++it; if ( w->isWidgetType() ) - w->setEnabled( TRUE ); + w->setEnabled( true ); } } } else { if ( focusWidget() == this ) - focusNextPrevChild( TRUE ); + focusNextPrevChild( true ); TQObjectList clo = childrenListObject(); if ( !clo.isEmpty() ) { @@ -71,7 +71,7 @@ void ToolBox::setEnabled( bool enable ) ++it; if ( w->isWidgetType() ) { - w->setEnabled( FALSE ); + w->setEnabled( false ); // w->clearWState( WState_ForceDisabled ); } } diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp index 0fa438850..23f70bff2 100644 --- a/kspread/kspread_view.cpp +++ b/kspread/kspread_view.cpp @@ -4974,7 +4974,7 @@ void View::print( KPrinter &prt ) continue; } - setActiveSheet(sheet,FALSE); + setActiveSheet(sheet,false); SheetPrint* print = d->activeSheet->print(); diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index 8451224e9..44a0f2f93 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -72,7 +72,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char pb = new TQPushButton( this, "helpbutton" ); pb->setText( "kCalc" ); - pb->setFont( TQFont("times",12,TQFont::Bold,FALSE) ); + pb->setFont( TQFont("times",12,TQFont::Bold,false) ); TQToolTip::add( pb, i18n("KCalc Setup/Help") ); connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(configclicked()) ); @@ -111,7 +111,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char anglebutton[0] = new TQRadioButton( angle_group ); anglebutton[0]->setText( "&Deg" ) ; - anglebutton[0]->setChecked( TRUE); + anglebutton[0]->setChecked( true); accel->connectItem( accel->insertItem(Key_D + ALT), this , TQ_SLOT(Deg_Selected()) ); @@ -145,7 +145,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char basebutton[1] = new TQRadioButton( base_group ); basebutton[1]->setText( "D&ec" ); - basebutton[1]->setChecked(TRUE); + basebutton[1]->setChecked(true); accel->connectItem( accel->insertItem(Key_E + ALT), this , TQ_SLOT(Dec_Selected()) ); @@ -173,203 +173,203 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char pbhyp = new TQPushButton("Hyp", mSmallPage, "hypbutton" ); connect( pbhyp, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbhyptoggled(bool))); - pbhyp->setToggleButton(TRUE); + pbhyp->setToggleButton(true); pbinv = new TQPushButton( "Inv", mSmallPage, "InverseButton" ); connect( pbinv, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbinvtoggled(bool))); - pbinv->setToggleButton(TRUE); + pbinv->setToggleButton(true); pbA = new TQPushButton("A",mSmallPage, "Abutton" ); connect( pbA, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbAtoggled(bool))); - pbA->setToggleButton(TRUE); + pbA->setToggleButton(true); pbSin = new TQPushButton("Sin",mSmallPage, "Sinbutton" ); connect( pbSin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbSintoggled(bool))); - pbSin->setToggleButton(TRUE); + pbSin->setToggleButton(true); pbplusminus = new TQPushButton( "+/-", mSmallPage, "plusminusbutton" ); connect( pbplusminus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbplusminustoggled(bool))); - pbplusminus->setToggleButton(TRUE); + pbplusminus->setToggleButton(true); pbplusminus->setFont(buttonfont); pbB = new TQPushButton("B", mSmallPage, "Bbutton" ); connect( pbB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbBtoggled(bool))); - pbB->setToggleButton(TRUE); + pbB->setToggleButton(true); pbCos = new TQPushButton("Cos",mSmallPage, "Cosbutton" ); pbCos->setText( "Cos" ); connect( pbCos, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbCostoggled(bool))); - pbCos->setToggleButton(TRUE); + pbCos->setToggleButton(true); pbreci = new TQPushButton("1/x",mSmallPage, "recibutton" ); connect( pbreci, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbrecitoggled(bool))); - pbreci->setToggleButton(TRUE); + pbreci->setToggleButton(true); pbC = new TQPushButton( "C", mSmallPage, "Cbutton" ); connect( pbC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbCtoggled(bool))); - pbC->setToggleButton(TRUE); + pbC->setToggleButton(true); pbTan = new TQPushButton("Tan" ,mSmallPage, "Tanbutton" ); connect( pbTan, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbTantoggled(bool))); - pbTan->setToggleButton(TRUE); + pbTan->setToggleButton(true); pbfactorial = new TQPushButton("x!",mSmallPage, "factorialbutton" ); connect( pbfactorial, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbfactorialtoggled(bool))); - pbfactorial->setToggleButton(TRUE); + pbfactorial->setToggleButton(true); pbD = new TQPushButton("D",mSmallPage, "Dbutton" ); connect( pbD, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbDtoggled(bool))); - pbD->setToggleButton(TRUE); + pbD->setToggleButton(true); pblog = new TQPushButton("Log",mSmallPage, "logbutton" ); connect( pblog, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pblogtoggled(bool))); - pblog->setToggleButton(TRUE); + pblog->setToggleButton(true); pbsquare = new TQPushButton( "x^2", mSmallPage, "squarebutton" ); connect( pbsquare, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbsquaretoggled(bool))); - pbsquare->setToggleButton(TRUE); + pbsquare->setToggleButton(true); pbE = new TQPushButton("E",mSmallPage, "Ebutton" ); connect( pbE, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbEtoggled(bool))); - pbE->setToggleButton(TRUE); + pbE->setToggleButton(true); pbln = new TQPushButton( "Ln", mSmallPage, "lnbutton" ); connect( pbln, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pblntoggled(bool))); - pbln->setToggleButton(TRUE); + pbln->setToggleButton(true); pbpower = new TQPushButton("x^y",mSmallPage, "powerbutton" ); connect( pbpower, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbpowertoggled(bool))); - pbpower->setToggleButton(TRUE); + pbpower->setToggleButton(true); pbF = new TQPushButton("F",mSmallPage, "Fbutton" ); connect( pbF, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbFtoggled(bool))); - pbF->setToggleButton(TRUE); + pbF->setToggleButton(true); pbEE = new TQPushButton("EE",mLargePage, "EEbutton" ); - pbEE->setToggleButton(TRUE); + pbEE->setToggleButton(true); connect( pbEE, TQ_SIGNAL(toggled(bool)), TQ_SLOT(EEtoggled(bool))); pbMR = new TQPushButton("MR",mLargePage, "MRbutton" ); connect( pbMR, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbMRtoggled(bool))); - pbMR->setToggleButton(TRUE); + pbMR->setToggleButton(true); pbMR->setFont(buttonfont); pbMplusminus = new TQPushButton("M+-",mLargePage, "Mplusminusbutton" ); connect( pbMplusminus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbMplusminustoggled(bool))); - pbMplusminus->setToggleButton(TRUE); + pbMplusminus->setToggleButton(true); pbMC = new TQPushButton("MC",mLargePage, "MCbutton" ); connect( pbMC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbMCtoggled(bool))); - pbMC->setToggleButton(TRUE); + pbMC->setToggleButton(true); pbClear = new TQPushButton("C",mLargePage, "Clearbutton" ); connect( pbClear, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbCleartoggled(bool))); - pbClear->setToggleButton(TRUE); + pbClear->setToggleButton(true); pbAC = new TQPushButton("AC", mLargePage, "ACbutton" ); connect( pbAC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbACtoggled(bool))); - pbAC->setToggleButton(TRUE); + pbAC->setToggleButton(true); pb7 = new TQPushButton("7",mLargePage, "7button" ); connect( pb7, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb7toggled(bool))); - pb7->setToggleButton(TRUE); + pb7->setToggleButton(true); pb8 = new TQPushButton("8",mLargePage, "8button" ); connect( pb8, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb8toggled(bool))); - pb8->setToggleButton(TRUE); + pb8->setToggleButton(true); pb9 = new TQPushButton("9",mLargePage,"9button" ); connect( pb9, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb9toggled(bool))); - pb9->setToggleButton(TRUE); + pb9->setToggleButton(true); pbparenopen = new TQPushButton("(",mLargePage, "parenopenbutton" ); connect( pbparenopen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbparenopentoggled(bool))); - pbparenopen->setToggleButton(TRUE); + pbparenopen->setToggleButton(true); pbparenclose = new TQPushButton(")",mLargePage, "parenclosebutton" ); connect( pbparenclose, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbparenclosetoggled(bool))); - pbparenclose->setToggleButton(TRUE); + pbparenclose->setToggleButton(true); pband = new TQPushButton("And",mLargePage, "andbutton" ); connect( pband, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbandtoggled(bool))); - pband->setToggleButton(TRUE); + pband->setToggleButton(true); pband->setFont(buttonfont); pb4 = new TQPushButton("4",mLargePage, "4button" ); connect( pb4, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb4toggled(bool))); - pb4->setToggleButton(TRUE); + pb4->setToggleButton(true); pb5 = new TQPushButton("5",mLargePage, "5button" ); connect( pb5, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb5toggled(bool))); - pb5->setToggleButton(TRUE); + pb5->setToggleButton(true); pb6 = new TQPushButton("6",mLargePage, "6button" ); connect( pb6, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb6toggled(bool))); - pb6->setToggleButton(TRUE); + pb6->setToggleButton(true); pbX = new TQPushButton("X",mLargePage, "Multiplybutton" ); connect( pbX, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbXtoggled(bool))); - pbX->setToggleButton(TRUE); + pbX->setToggleButton(true); pbdivision = new TQPushButton("/",mLargePage, "divisionbutton" ); connect( pbdivision, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbdivisiontoggled(bool))); - pbdivision->setToggleButton(TRUE); + pbdivision->setToggleButton(true); pbor = new TQPushButton("Or",mLargePage, "orbutton" ); connect( pbor, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbortoggled(bool))); - pbor->setToggleButton(TRUE); + pbor->setToggleButton(true); pb1 = new TQPushButton("1",mLargePage, "1button" ); connect( pb1, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb1toggled(bool))); - pb1->setToggleButton(TRUE); + pb1->setToggleButton(true); pb2 = new TQPushButton("2",mLargePage, "2button" ); connect( pb2, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb2toggled(bool))); - pb2->setToggleButton(TRUE); + pb2->setToggleButton(true); pb3 = new TQPushButton("3",mLargePage, "3button" ); connect( pb3, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb3toggled(bool))); - pb3->setToggleButton(TRUE); + pb3->setToggleButton(true); pbplus = new TQPushButton("+",mLargePage, "plusbutton" ); connect( pbplus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbplustoggled(bool))); - pbplus->setToggleButton(TRUE); + pbplus->setToggleButton(true); pbminus = new TQPushButton("-",mLargePage, "minusbutton" ); connect( pbminus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbminustoggled(bool))); - pbminus->setToggleButton(TRUE); + pbminus->setToggleButton(true); pbshift = new TQPushButton("Lsh",mLargePage, "shiftbutton" ); connect( pbshift, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbshifttoggled(bool))); - pbshift->setToggleButton(TRUE); + pbshift->setToggleButton(true); pbperiod = new TQPushButton(".",mLargePage, "periodbutton" ); connect( pbperiod, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbperiodtoggled(bool))); - pbperiod->setToggleButton(TRUE); + pbperiod->setToggleButton(true); pb0 = new TQPushButton("0",mLargePage, "0button" ); connect( pb0, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb0toggled(bool))); - pb0->setToggleButton(TRUE); + pb0->setToggleButton(true); pbequal = new TQPushButton("=",mLargePage, "equalbutton" ); connect( pbequal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbequaltoggled(bool))); - pbequal->setToggleButton(TRUE); + pbequal->setToggleButton(true); pbpercent = new TQPushButton("%",mLargePage, "percentbutton" ); connect( pbpercent, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbpercenttoggled(bool))); - pbpercent->setToggleButton(TRUE); + pbpercent->setToggleButton(true); pbnegate = new TQPushButton("Cmp",mLargePage, "OneComplementbutton" ); connect( pbnegate, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbnegatetoggled(bool))); - pbnegate->setToggleButton(TRUE); + pbnegate->setToggleButton(true); pbmod = new TQPushButton("Mod",mLargePage, "modbutton" ); connect( pbmod, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbmodtoggled(bool))); - pbmod->setToggleButton(TRUE); + pbmod->setToggleButton(true); TQGridLayout *smallBtnLayout = new TQGridLayout(mSmallPage, 6, 3, 0, mInternalSpacing); @@ -631,30 +631,30 @@ void TQtCalculator::exit() void TQtCalculator::Hex_Selected() { - basebutton[0]->setChecked(TRUE); - basebutton[1]->setChecked(FALSE); - basebutton[2]->setChecked(FALSE); - basebutton[3]->setChecked(FALSE); + basebutton[0]->setChecked(true); + basebutton[1]->setChecked(false); + basebutton[2]->setChecked(false); + basebutton[3]->setChecked(false); SetHex(); } void TQtCalculator::Dec_Selected() { - basebutton[0]->setChecked(FALSE); - basebutton[1]->setChecked(TRUE); - basebutton[2]->setChecked(FALSE); - basebutton[3]->setChecked(FALSE); + basebutton[0]->setChecked(false); + basebutton[1]->setChecked(true); + basebutton[2]->setChecked(false); + basebutton[3]->setChecked(false); SetDec(); } void TQtCalculator::Oct_Selected() { - basebutton[0]->setChecked(FALSE); - basebutton[1]->setChecked(FALSE); - basebutton[2]->setChecked(TRUE); - basebutton[3]->setChecked(FALSE); + basebutton[0]->setChecked(false); + basebutton[1]->setChecked(false); + basebutton[2]->setChecked(true); + basebutton[3]->setChecked(false); SetOct(); } @@ -662,27 +662,27 @@ void TQtCalculator::Oct_Selected() void TQtCalculator::Bin_Selected() { - basebutton[0]->setChecked(FALSE); - basebutton[1]->setChecked(FALSE); - basebutton[2]->setChecked(FALSE); - basebutton[3]->setChecked(TRUE); + basebutton[0]->setChecked(false); + basebutton[1]->setChecked(false); + basebutton[2]->setChecked(false); + basebutton[3]->setChecked(true); SetBin(); } void TQtCalculator::Deg_Selected() { - anglebutton[0]->setChecked(TRUE); - anglebutton[1]->setChecked(FALSE); - anglebutton[2]->setChecked(FALSE); + anglebutton[0]->setChecked(true); + anglebutton[1]->setChecked(false); + anglebutton[2]->setChecked(false); SetDeg(); } void TQtCalculator::Rad_Selected() { - anglebutton[0]->setChecked(FALSE); - anglebutton[1]->setChecked(TRUE); - anglebutton[2]->setChecked(FALSE); + anglebutton[0]->setChecked(false); + anglebutton[1]->setChecked(true); + anglebutton[2]->setChecked(false); SetRad(); } @@ -690,9 +690,9 @@ void TQtCalculator::Rad_Selected() void TQtCalculator::Gra_Selected() { - anglebutton[0]->setChecked(FALSE); - anglebutton[1]->setChecked(FALSE); - anglebutton[2]->setChecked(TRUE); + anglebutton[0]->setChecked(false); + anglebutton[1]->setChecked(false); + anglebutton[2]->setChecked(true); SetGra(); } @@ -727,211 +727,211 @@ void TQtCalculator::keyPressEvent( TQKeyEvent *e ){ break; case Key_Next: - key_pressed = TRUE; - pbAC->setOn(TRUE); + key_pressed = true; + pbAC->setOn(true); break; case Key_Prior: - key_pressed = TRUE; - pbClear->setOn(TRUE); + key_pressed = true; + pbClear->setOn(true); break; case Key_H: - key_pressed = TRUE; - pbhyp->setOn(TRUE); + key_pressed = true; + pbhyp->setOn(true); break; case Key_I: - key_pressed = TRUE; - pbinv->setOn(TRUE); + key_pressed = true; + pbinv->setOn(true); break; case Key_A: - key_pressed = TRUE; - pbA->setOn(TRUE); + key_pressed = true; + pbA->setOn(true); break; case Key_E: - key_pressed = TRUE; + key_pressed = true; if (current_base == NB_HEX) - pbE->setOn(TRUE); + pbE->setOn(true); else - pbEE->setOn(TRUE); + pbEE->setOn(true); break; case Key_Escape: - key_pressed = TRUE; - pbClear->setOn(TRUE); + key_pressed = true; + pbClear->setOn(true); break; case Key_Delete: - key_pressed = TRUE; - pbAC->setOn(TRUE); + key_pressed = true; + pbAC->setOn(true); break; case Key_S: - key_pressed = TRUE; - pbSin->setOn(TRUE); + key_pressed = true; + pbSin->setOn(true); break; case Key_Backslash: - key_pressed = TRUE; - pbplusminus->setOn(TRUE); + key_pressed = true; + pbplusminus->setOn(true); break; case Key_B: - key_pressed = TRUE; - pbB->setOn(TRUE); + key_pressed = true; + pbB->setOn(true); break; case Key_7: - key_pressed = TRUE; - pb7->setOn(TRUE); + key_pressed = true; + pb7->setOn(true); break; case Key_8: - key_pressed = TRUE; - pb8->setOn(TRUE); + key_pressed = true; + pb8->setOn(true); break; case Key_9: - key_pressed = TRUE; - pb9->setOn(TRUE); + key_pressed = true; + pb9->setOn(true); break; case Key_ParenLeft: - key_pressed = TRUE; - pbparenopen->setOn(TRUE); + key_pressed = true; + pbparenopen->setOn(true); break; case Key_ParenRight: - key_pressed = TRUE; - pbparenclose->setOn(TRUE); + key_pressed = true; + pbparenclose->setOn(true); break; case Key_Ampersand: - key_pressed = TRUE; - pband->setOn(TRUE); + key_pressed = true; + pband->setOn(true); break; case Key_C: - key_pressed = TRUE; + key_pressed = true; if (current_base == NB_HEX) - pbC->setOn(TRUE); + pbC->setOn(true); else - pbCos->setOn(TRUE); + pbCos->setOn(true); break; case Key_4: - key_pressed = TRUE; - pb4->setOn(TRUE); + key_pressed = true; + pb4->setOn(true); break; case Key_5: - key_pressed = TRUE; - pb5->setOn(TRUE); + key_pressed = true; + pb5->setOn(true); break; case Key_6: - key_pressed = TRUE; - pb6->setOn(TRUE); + key_pressed = true; + pb6->setOn(true); break; case Key_Asterisk: - key_pressed = TRUE; - pbX->setOn(TRUE); + key_pressed = true; + pbX->setOn(true); break; case Key_Slash: - key_pressed = TRUE; - pbdivision->setOn(TRUE); + key_pressed = true; + pbdivision->setOn(true); break; case Key_O: - key_pressed = TRUE; - pbor->setOn(TRUE); + key_pressed = true; + pbor->setOn(true); break; case Key_T: - key_pressed = TRUE; - pbTan->setOn(TRUE); + key_pressed = true; + pbTan->setOn(true); break; case Key_Exclam: - key_pressed = TRUE; - pbfactorial->setOn(TRUE); + key_pressed = true; + pbfactorial->setOn(true); break; case Key_D: - key_pressed = TRUE; + key_pressed = true; if(kcalcdefaults.style == 0) - pbD->setOn(TRUE); // trig mode + pbD->setOn(true); // trig mode else - pblog->setOn(TRUE); // stat mode + pblog->setOn(true); // stat mode break; case Key_1: - key_pressed = TRUE; - pb1->setOn(TRUE); + key_pressed = true; + pb1->setOn(true); break; case Key_2: - key_pressed = TRUE; - pb2->setOn(TRUE); + key_pressed = true; + pb2->setOn(true); break; case Key_3: - key_pressed = TRUE; - pb3->setOn(TRUE); + key_pressed = true; + pb3->setOn(true); break; case Key_Plus: - key_pressed = TRUE; - pbplus->setOn(TRUE); + key_pressed = true; + pbplus->setOn(true); break; case Key_Minus: - key_pressed = TRUE; - pbminus->setOn(TRUE); + key_pressed = true; + pbminus->setOn(true); break; case Key_Less: - key_pressed = TRUE; - pbshift->setOn(TRUE); + key_pressed = true; + pbshift->setOn(true); break; case Key_N: - key_pressed = TRUE; - pbln->setOn(TRUE); + key_pressed = true; + pbln->setOn(true); break; case Key_L: - key_pressed = TRUE; - pblog->setOn(TRUE); + key_pressed = true; + pblog->setOn(true); break; case Key_AsciiCircum: - key_pressed = TRUE; - pbpower->setOn(TRUE); + key_pressed = true; + pbpower->setOn(true); break; case Key_F: - key_pressed = TRUE; - pbF->setOn(TRUE); + key_pressed = true; + pbF->setOn(true); break; case Key_Period: - key_pressed = TRUE; - pbperiod->setOn(TRUE); + key_pressed = true; + pbperiod->setOn(true); break; case Key_Comma: - key_pressed = TRUE; - pbperiod->setOn(TRUE); + key_pressed = true; + pbperiod->setOn(true); break; case Key_0: - key_pressed = TRUE; - pb0->setOn(TRUE); + key_pressed = true; + pb0->setOn(true); break; case Key_Equal: - key_pressed = TRUE; - pbequal->setOn(TRUE); + key_pressed = true; + pbequal->setOn(true); break; case Key_Return: - key_pressed = TRUE; - pbequal->setOn(TRUE); + key_pressed = true; + pbequal->setOn(true); break; case Key_Enter: - key_pressed = TRUE; - pbequal->setOn(TRUE); + key_pressed = true; + pbequal->setOn(true); break; case Key_Percent: - key_pressed = TRUE; - pbpercent->setOn(TRUE); + key_pressed = true; + pbpercent->setOn(true); break; case Key_AsciiTilde: - key_pressed = TRUE; - pbnegate->setOn(TRUE); + key_pressed = true; + pbnegate->setOn(true); break; case Key_Colon: - key_pressed = TRUE; - pbmod->setOn(TRUE); + key_pressed = true; + pbmod->setOn(true); break; case Key_BracketLeft: - key_pressed = TRUE; - pbsquare->setOn(TRUE); + key_pressed = true; + pbsquare->setOn(true); break; case Key_Backspace: - key_pressed = TRUE; - pbAC->setOn(TRUE); + key_pressed = true; + pbAC->setOn(true); break; case Key_R: - key_pressed = TRUE; - pbreci->setOn(TRUE); + key_pressed = true; + pbreci->setOn(true); break; } } @@ -940,210 +940,210 @@ void TQtCalculator::keyReleaseEvent( TQKeyEvent *e ){ switch (e->key() ){ case Key_Next: - key_pressed = FALSE; - pbAC->setOn(FALSE); + key_pressed = false; + pbAC->setOn(false); break; case Key_Prior: - key_pressed = FALSE; - pbClear->setOn(FALSE); + key_pressed = false; + pbClear->setOn(false); break; case Key_H: - key_pressed = FALSE; - pbhyp->setOn(FALSE); + key_pressed = false; + pbhyp->setOn(false); break; case Key_I: - key_pressed = FALSE; - pbinv->setOn(FALSE); + key_pressed = false; + pbinv->setOn(false); break; case Key_A: - key_pressed = FALSE; - pbA->setOn(FALSE); + key_pressed = false; + pbA->setOn(false); break; case Key_E: - key_pressed = FALSE; + key_pressed = false; if (current_base == NB_HEX) - pbE->setOn(FALSE); + pbE->setOn(false); else - pbEE->setOn(FALSE); + pbEE->setOn(false); break; case Key_Escape: - key_pressed = FALSE; - pbClear->setOn(FALSE); + key_pressed = false; + pbClear->setOn(false); break; case Key_Delete: - key_pressed = FALSE; - pbAC->setOn(FALSE); + key_pressed = false; + pbAC->setOn(false); break; case Key_S: - key_pressed = FALSE; - pbSin->setOn(FALSE); + key_pressed = false; + pbSin->setOn(false); break; case Key_Backslash: - key_pressed = FALSE; - pbplusminus->setOn(FALSE); + key_pressed = false; + pbplusminus->setOn(false); break; case Key_B: - key_pressed = FALSE; - pbB->setOn(FALSE); + key_pressed = false; + pbB->setOn(false); break; case Key_7: - key_pressed = FALSE; - pb7->setOn(FALSE); + key_pressed = false; + pb7->setOn(false); break; case Key_8: - key_pressed = FALSE; - pb8->setOn(FALSE); + key_pressed = false; + pb8->setOn(false); break; case Key_9: - key_pressed = FALSE; - pb9->setOn(FALSE); + key_pressed = false; + pb9->setOn(false); break; case Key_ParenLeft: - key_pressed = FALSE; - pbparenopen->setOn(FALSE); + key_pressed = false; + pbparenopen->setOn(false); break; case Key_ParenRight: - key_pressed = FALSE; - pbparenclose->setOn(FALSE); + key_pressed = false; + pbparenclose->setOn(false); break; case Key_Ampersand: - key_pressed = FALSE; - pband->setOn(FALSE); + key_pressed = false; + pband->setOn(false); break; case Key_C: - key_pressed = FALSE; + key_pressed = false; if (current_base == NB_HEX) - pbC->setOn(FALSE); + pbC->setOn(false); else - pbCos->setOn(FALSE); + pbCos->setOn(false); break; case Key_4: - key_pressed = FALSE; - pb4->setOn(FALSE); + key_pressed = false; + pb4->setOn(false); break; case Key_5: - key_pressed = FALSE; - pb5->setOn(FALSE); + key_pressed = false; + pb5->setOn(false); break; case Key_6: - key_pressed = FALSE; - pb6->setOn(FALSE); + key_pressed = false; + pb6->setOn(false); break; case Key_Asterisk: - key_pressed = FALSE; - pbX->setOn(FALSE); + key_pressed = false; + pbX->setOn(false); break; case Key_Slash: - key_pressed = FALSE; - pbdivision->setOn(FALSE); + key_pressed = false; + pbdivision->setOn(false); break; case Key_O: - key_pressed = FALSE; - pbor->setOn(FALSE); + key_pressed = false; + pbor->setOn(false); break; case Key_T: - key_pressed = FALSE; - pbTan->setOn(FALSE); + key_pressed = false; + pbTan->setOn(false); break; case Key_Exclam: - key_pressed = FALSE; - pbfactorial->setOn(FALSE); + key_pressed = false; + pbfactorial->setOn(false); break; case Key_D: - key_pressed = FALSE; + key_pressed = false; if(kcalcdefaults.style == 0) - pbD->setOn(FALSE); // trig mode + pbD->setOn(false); // trig mode else - pblog->setOn(FALSE);// stat mode + pblog->setOn(false);// stat mode break; case Key_1: - key_pressed = FALSE; - pb1->setOn(FALSE); + key_pressed = false; + pb1->setOn(false); break; case Key_2: - key_pressed = FALSE; - pb2->setOn(FALSE); + key_pressed = false; + pb2->setOn(false); break; case Key_3: - key_pressed = FALSE; - pb3->setOn(FALSE); + key_pressed = false; + pb3->setOn(false); break; case Key_Plus: - key_pressed = FALSE; - pbplus->setOn(FALSE); + key_pressed = false; + pbplus->setOn(false); break; case Key_Minus: - key_pressed = FALSE; - pbminus->setOn(FALSE); + key_pressed = false; + pbminus->setOn(false); break; case Key_Less: - key_pressed = FALSE; - pbshift->setOn(FALSE); + key_pressed = false; + pbshift->setOn(false); break; case Key_N: - key_pressed = FALSE; - pbln->setOn(FALSE); + key_pressed = false; + pbln->setOn(false); break; case Key_L: - key_pressed = FALSE; - pblog->setOn(FALSE); + key_pressed = false; + pblog->setOn(false); break; case Key_AsciiCircum: - key_pressed = FALSE; - pbpower->setOn(FALSE); + key_pressed = false; + pbpower->setOn(false); break; case Key_F: - key_pressed = FALSE; - pbF->setOn(FALSE); + key_pressed = false; + pbF->setOn(false); break; case Key_Period: - key_pressed = FALSE; - pbperiod->setOn(FALSE); + key_pressed = false; + pbperiod->setOn(false); break; case Key_Comma: - key_pressed = FALSE; - pbperiod->setOn(FALSE); + key_pressed = false; + pbperiod->setOn(false); break; case Key_0: - key_pressed = FALSE; - pb0->setOn(FALSE); + key_pressed = false; + pb0->setOn(false); break; case Key_Equal: - key_pressed = FALSE; - pbequal->setOn(FALSE); + key_pressed = false; + pbequal->setOn(false); break; case Key_Return: - key_pressed = FALSE; - pbequal->setOn(FALSE); + key_pressed = false; + pbequal->setOn(false); break; case Key_Enter: - key_pressed = FALSE; - pbequal->setOn(FALSE); + key_pressed = false; + pbequal->setOn(false); break; case Key_Percent: - key_pressed = FALSE; - pbpercent->setOn(FALSE); + key_pressed = false; + pbpercent->setOn(false); break; case Key_AsciiTilde: - key_pressed = FALSE; - pbnegate->setOn(FALSE); + key_pressed = false; + pbnegate->setOn(false); break; case Key_Colon: - key_pressed = FALSE; - pbmod->setOn(FALSE); + key_pressed = false; + pbmod->setOn(false); break; case Key_BracketLeft: - key_pressed = FALSE; - pbsquare->setOn(FALSE); + key_pressed = false; + pbsquare->setOn(false); break; case Key_Backspace: - key_pressed = FALSE; - pbAC->setOn(FALSE); + key_pressed = false; + pbAC->setOn(false); break; case Key_R: - key_pressed = FALSE; - pbreci->setOn(FALSE); + key_pressed = false; + pbreci->setOn(false); break; } @@ -1159,300 +1159,300 @@ void TQtCalculator::EEtoggled(bool myboolean){ if(myboolean) EE(); if(pbEE->isOn() && (!key_pressed)) - pbEE->setOn(FALSE); + pbEE->setOn(false); } void TQtCalculator::pbinvtoggled(bool myboolean){ if(myboolean) SetInverse(); if(pbinv->isOn() && (!key_pressed)) - pbinv->setOn(FALSE); + pbinv->setOn(false); } void TQtCalculator::pbhyptoggled(bool myboolean){ if(myboolean) EnterHyp(); if(pbhyp->isOn() && (!key_pressed)) - pbhyp->setOn(FALSE); + pbhyp->setOn(false); } void TQtCalculator::pbMRtoggled(bool myboolean){ if(myboolean) MR(); if(pbMR->isOn() && (!key_pressed)) - pbMR->setOn(FALSE); + pbMR->setOn(false); } void TQtCalculator::pbAtoggled(bool myboolean){ if(myboolean) buttonA(); if(pbA->isOn() && (!key_pressed)) - pbA->setOn(FALSE); + pbA->setOn(false); } void TQtCalculator::pbSintoggled(bool myboolean){ if(myboolean) ExecSin(); if(pbSin->isOn() && (!key_pressed)) - pbSin->setOn(FALSE); + pbSin->setOn(false); } void TQtCalculator::pbplusminustoggled(bool myboolean){ if(myboolean) EnterNegate(); if(pbplusminus->isOn() && (!key_pressed)) - pbplusminus->setOn(FALSE); + pbplusminus->setOn(false); } void TQtCalculator::pbMplusminustoggled(bool myboolean){ if(myboolean) Mplusminus(); if(pbMplusminus->isOn() && (!key_pressed)) - pbMplusminus->setOn(FALSE); + pbMplusminus->setOn(false); } void TQtCalculator::pbBtoggled(bool myboolean){ if(myboolean) buttonB(); if(pbB->isOn() && (!key_pressed)) - pbB->setOn(FALSE); + pbB->setOn(false); } void TQtCalculator::pbCostoggled(bool myboolean){ if(myboolean) ExecCos(); if(pbCos->isOn() && (!key_pressed)) - pbCos->setOn(FALSE); + pbCos->setOn(false); } void TQtCalculator::pbrecitoggled(bool myboolean){ if(myboolean) EnterRecip(); if(pbreci->isOn() && (!key_pressed)) - pbreci->setOn(FALSE); + pbreci->setOn(false); } void TQtCalculator::pbCtoggled(bool myboolean){ if(myboolean) buttonC(); if(pbC->isOn() && (!key_pressed)) - pbC->setOn(FALSE); + pbC->setOn(false); } void TQtCalculator::pbTantoggled(bool myboolean){ if(myboolean) ExecTan(); if(pbTan->isOn() && (!key_pressed)) - pbTan->setOn(FALSE); + pbTan->setOn(false); } void TQtCalculator::pbfactorialtoggled(bool myboolean){ if(myboolean) EnterFactorial(); if(pbfactorial->isOn() && (!key_pressed)) - pbfactorial->setOn(FALSE); + pbfactorial->setOn(false); } void TQtCalculator::pbDtoggled(bool myboolean){ if(myboolean) buttonD(); if(pbD->isOn() && (!key_pressed)) - pbD->setOn(FALSE); + pbD->setOn(false); } void TQtCalculator::pblogtoggled(bool myboolean){ if(myboolean) EnterLogr(); if(pblog->isOn() && (!key_pressed)) - pblog->setOn(FALSE); + pblog->setOn(false); } void TQtCalculator::pbsquaretoggled(bool myboolean){ if(myboolean) EnterSquare(); if(pbsquare->isOn() && (!key_pressed)) - pbsquare->setOn(FALSE); + pbsquare->setOn(false); } void TQtCalculator::pbEtoggled(bool myboolean){ if(myboolean) buttonE(); if(pbE->isOn() && (!key_pressed)) - pbE->setOn(FALSE); + pbE->setOn(false); } void TQtCalculator::pblntoggled(bool myboolean){ if(myboolean) EnterLogn(); if(pbln->isOn() && (!key_pressed)) - pbln->setOn(FALSE); + pbln->setOn(false); } void TQtCalculator::pbpowertoggled(bool myboolean){ if(myboolean) Power(); if(pbpower->isOn() && (!key_pressed)) - pbpower->setOn(FALSE); + pbpower->setOn(false); } void TQtCalculator::pbFtoggled(bool myboolean){ if(myboolean) buttonF(); if(pbF->isOn() && (!key_pressed)) - pbF->setOn(FALSE); + pbF->setOn(false); } void TQtCalculator::pbMCtoggled(bool myboolean){ if(myboolean) MC(); if(pbMC->isOn() && (!key_pressed)) - pbMC->setOn(FALSE); + pbMC->setOn(false); } void TQtCalculator::pbCleartoggled(bool myboolean){ if(myboolean) Clear(); if(pbClear->isOn() && (!key_pressed)) - pbClear->setOn(FALSE); + pbClear->setOn(false); } void TQtCalculator::pbACtoggled(bool myboolean){ if(myboolean) ClearAll(); if(pbAC->isOn() && (!key_pressed)) - pbAC->setOn(FALSE); + pbAC->setOn(false); } void TQtCalculator::pb7toggled(bool myboolean){ if(myboolean) button7(); if(pb7->isOn() && (!key_pressed)) - pb7->setOn(FALSE); + pb7->setOn(false); } void TQtCalculator::pb8toggled(bool myboolean){ if(myboolean) button8(); if(pb8->isOn() && (!key_pressed)) - pb8->setOn(FALSE); + pb8->setOn(false); } void TQtCalculator::pb9toggled(bool myboolean){ if(myboolean) button9(); if(pb9->isOn() && (!key_pressed)) - pb9->setOn(FALSE); + pb9->setOn(false); } void TQtCalculator::pbparenopentoggled(bool myboolean){ if(myboolean) EnterOpenParen(); if(pbparenopen->isOn() && (!key_pressed)) - pbparenopen->setOn(FALSE); + pbparenopen->setOn(false); } void TQtCalculator::pbparenclosetoggled(bool myboolean){ if(myboolean) EnterCloseParen(); if(pbparenclose->isOn() && (!key_pressed)) - pbparenclose->setOn(FALSE); + pbparenclose->setOn(false); } void TQtCalculator::pbandtoggled(bool myboolean){ if(myboolean) And(); if(pband->isOn() && (!key_pressed)) - pband->setOn(FALSE); + pband->setOn(false); } void TQtCalculator::pb4toggled(bool myboolean){ if(myboolean) button4(); if(pb4->isOn() && (!key_pressed)) - pb4->setOn(FALSE); + pb4->setOn(false); } void TQtCalculator::pb5toggled(bool myboolean){ if(myboolean) button5(); if(pb5->isOn() && (!key_pressed)) - pb5->setOn(FALSE); + pb5->setOn(false); } void TQtCalculator::pb6toggled(bool myboolean){ if(myboolean) button6(); if(pb6->isOn() && (!key_pressed)) - pb6->setOn(FALSE); + pb6->setOn(false); } void TQtCalculator::pbXtoggled(bool myboolean){ if(myboolean) Multiply(); if(pbX->isOn() && (!key_pressed)) - pbX->setOn(FALSE); + pbX->setOn(false); } void TQtCalculator::pbdivisiontoggled(bool myboolean){ if(myboolean) Divide(); if(pbdivision->isOn() && (!key_pressed)) - pbdivision->setOn(FALSE); + pbdivision->setOn(false); } void TQtCalculator::pbortoggled(bool myboolean){ if(myboolean) Or(); if(pbor->isOn() && (!key_pressed)) - pbor->setOn(FALSE); + pbor->setOn(false); } void TQtCalculator::pb1toggled(bool myboolean){ if(myboolean) button1(); if(pb1->isOn() && (!key_pressed)) - pb1->setOn(FALSE); + pb1->setOn(false); } void TQtCalculator::pb2toggled(bool myboolean){ if(myboolean) button2(); if(pb2->isOn() && (!key_pressed)) - pb2->setOn(FALSE); + pb2->setOn(false); } void TQtCalculator::pb3toggled(bool myboolean){ if(myboolean) button3(); if(pb3->isOn() && (!key_pressed)) - pb3->setOn(FALSE); + pb3->setOn(false); } void TQtCalculator::pbplustoggled(bool myboolean){ if(myboolean) Plus(); if(pbplus->isOn() && (!key_pressed)) - pbplus->setOn(FALSE); + pbplus->setOn(false); } void TQtCalculator::pbminustoggled(bool myboolean){ if(myboolean) Minus(); if(pbminus->isOn() && (!key_pressed)) - pbminus->setOn(FALSE); + pbminus->setOn(false); } void TQtCalculator::pbshifttoggled(bool myboolean){ if(myboolean) Shift(); if(pbshift->isOn() && (!key_pressed)) - pbshift->setOn(FALSE); + pbshift->setOn(false); } void TQtCalculator::pbperiodtoggled(bool myboolean){ if(myboolean) EnterDecimal(); if(pbperiod->isOn() && (!key_pressed)) - pbperiod->setOn(FALSE); + pbperiod->setOn(false); } void TQtCalculator::pb0toggled(bool myboolean){ if(myboolean) button0(); if(pb0->isOn() && (!key_pressed)) - pb0->setOn(FALSE); + pb0->setOn(false); } void TQtCalculator::pbequaltoggled(bool myboolean){ if(myboolean) EnterEqual(); if(pbequal->isOn() && (!key_pressed)) - pbequal->setOn(FALSE); + pbequal->setOn(false); } void TQtCalculator::pbpercenttoggled(bool myboolean){ if(myboolean) EnterPercent(); if(pbpercent->isOn() && (!key_pressed)) - pbpercent->setOn(FALSE); + pbpercent->setOn(false); } void TQtCalculator::pbnegatetoggled(bool myboolean){ if(myboolean) EnterNotCmp(); if(pbnegate->isOn() && (!key_pressed)) - pbnegate->setOn(FALSE); + pbnegate->setOn(false); } void TQtCalculator::pbmodtoggled(bool myboolean) { if(myboolean) Mod(); if(pbmod->isOn() && (!key_pressed)) - pbmod->setOn(FALSE); + pbmod->setOn(false); } void TQtCalculator::configclicked(){ TQTabDialog * tabdialog; - tabdialog = new TQTabDialog(0,"tabdialog",TRUE); + tabdialog = new TQTabDialog(0,"tabdialog",true); tabdialog->setCaption( i18n("KCalc Configuration") ); tabdialog->resize( 360, 390 ); @@ -1659,7 +1659,7 @@ void TQtCalculator::selection_timed_out(){ // printf("selection timed out\n"); selection_timer->stop(); - calc_display->setLit(FALSE); + calc_display->setLit(false); invertColors(); @@ -1675,7 +1675,7 @@ void TQtCalculator::clear_status_label(){ void TQtCalculator::setStatusLabel(const TQString& string){ statusERRORLabel->setText(string); - status_timer->start(3000,TRUE); + status_timer->start(3000,true); } diff --git a/kspread/plugins/calculator/main.cpp b/kspread/plugins/calculator/main.cpp index b791f36a1..7b5fa1669 100644 --- a/kspread/plugins/calculator/main.cpp +++ b/kspread/plugins/calculator/main.cpp @@ -112,7 +112,7 @@ Calculator::~Calculator() bool Calculator::eventFilter( TQObject*, TQEvent* ev ) { if ( !m_calc ) - return FALSE; + return false; if ( SelectionChanged::test( ev ) ) { @@ -120,18 +120,18 @@ bool Calculator::eventFilter( TQObject*, TQEvent* ev ) // Selection cleared ? if (!event->region().isValid()) - return FALSE; + return false; Sheet* sheet = m_view->doc()->map()->findSheet( event->sheet() ); if ( !sheet ) - return FALSE; + return false; // A single cell selected ? if (event->region().isSingular()) { Cell* cell = sheet->cellAt( event->rect().left(), event->rect().top(), false ); if ( !cell ) - return FALSE; + return false; double d; if ( cell->isEmpty() ) @@ -140,7 +140,7 @@ bool Calculator::eventFilter( TQObject*, TQEvent* ev ) d = cell->value().asFloat(); m_calc->setValue( d ); - return FALSE; + return false; } // Multiple cells selected ? @@ -148,10 +148,10 @@ bool Calculator::eventFilter( TQObject*, TQEvent* ev ) TQString str = util_rangeName( sheet, event->rect() ); m_calc->setLabel( str.latin1() ); - return FALSE; + return false; } - return FALSE; + return false; } /*************************************************** diff --git a/kspread/plugins/calculator/stats.cpp b/kspread/plugins/calculator/stats.cpp index 5413701b8..df7e1576b 100644 --- a/kspread/plugins/calculator/stats.cpp +++ b/kspread/plugins/calculator/stats.cpp @@ -31,8 +31,8 @@ KStats::KStats(){ - error_flag = FALSE; - data.setAutoDelete(TRUE); + error_flag = false; + data.setAutoDelete(true); } @@ -164,7 +164,7 @@ CALCAMNT KStats::median(){ bound = list.count(); if (bound == 0){ - error_flag = TRUE; + error_flag = true; return 0.0; } @@ -234,7 +234,7 @@ CALCAMNT KStats::mean(){ CALCAMNT result = 0.0; if(data.count() == 0){ - error_flag = TRUE; + error_flag = true; return 0.0; } @@ -253,7 +253,7 @@ CALCAMNT KStats::std(){ CALCAMNT result = 0.0; if(data.count() == 0){ - error_flag = TRUE; + error_flag = true; #ifdef DEBUG_STATS printf("set stats error\n"); @@ -283,7 +283,7 @@ CALCAMNT KStats::sample_std(){ CALCAMNT result = 0.0; if(data.count() < 2 ){ - error_flag = TRUE; + error_flag = true; return 0.0; } @@ -306,7 +306,7 @@ bool KStats::error(){ bool value; value = error_flag; - error_flag = FALSE; + error_flag = false; return value; diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp index e0fc5b1a2..d89350db0 100644 --- a/kugar/kudesigner/kudesigner_doc.cpp +++ b/kugar/kudesigner/kudesigner_doc.cpp @@ -69,7 +69,7 @@ void KudesignerDoc::addCommand( KCommand *cmd ) bool KudesignerDoc::initDoc( InitDocFlags flags, TQWidget* parentWidget ) { // If nothing is loaded, do initialize here - bool ok = FALSE; + bool ok = false; // TODO if (flags==KoDocument::InitDocEmpty) @@ -105,7 +105,7 @@ bool KudesignerDoc::initDoc( InitDocFlags flags, TQWidget* parentWidget ) showLoadingErrorDialog(); setEmpty(); } - setModified( FALSE ); + setModified( false ); return ok; } @@ -143,7 +143,7 @@ void KudesignerDoc::paintContent( TQPainter& painter, const TQRect& rect, bool / // Need to draw only the document rectangle described in the parameter rect. - canvas() ->drawArea( rect, &painter, TRUE ); + canvas() ->drawArea( rect, &painter, true ); } diff --git a/kugar/kudesigner/kudesigner_doc.h b/kugar/kudesigner/kudesigner_doc.h index 38c82e37c..bf5d2a3ab 100644 --- a/kugar/kudesigner/kudesigner_doc.h +++ b/kugar/kudesigner/kudesigner_doc.h @@ -43,7 +43,7 @@ public: ~KudesignerDoc(); - virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); + virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 ); virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget ); diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp index d38e0da37..2d0c57e9d 100644 --- a/kugar/kudesigner/kudesigner_view.cpp +++ b/kugar/kudesigner/kudesigner_view.cpp @@ -166,7 +166,7 @@ void KudesignerView::paintEvent( TQPaintEvent* ev ) // ### TODO: Scaling // Let the document do the drawing - koDocument() ->paintEverything( painter, ev->rect(), FALSE, this ); + koDocument() ->paintEverything( painter, ev->rect(), false, this ); painter.end(); } diff --git a/kugar/kudesigner_lib/band.h b/kugar/kudesigner_lib/band.h index c45cc18e6..844dde1f7 100644 --- a/kugar/kudesigner_lib/band.h +++ b/kugar/kudesigner_lib/band.h @@ -51,7 +51,7 @@ public: int minHeight(); TQRect bottomMiddleResizableRect(); - void arrange( int base, bool destructive = TRUE ); + void arrange( int base, bool destructive = true ); virtual void updateGeomProps(); TQCanvasItemList items; diff --git a/kugar/kudesigner_lib/canvas.cpp b/kugar/kudesigner_lib/canvas.cpp index 930d57b8d..6db812f82 100644 --- a/kugar/kudesigner_lib/canvas.cpp +++ b/kugar/kudesigner_lib/canvas.cpp @@ -189,7 +189,7 @@ bool Canvas::loadXML( const TQDomNode &report ) setReportFooterAttributes( &child ); } } - templ->arrangeSections( FALSE ); + templ->arrangeSections( false ); TQCanvasItemList l = allItems(); for ( TQCanvasItemList::Iterator it = l.begin(); it != l.end(); ++it ) { diff --git a/kugar/lib/inputmask.cpp b/kugar/lib/inputmask.cpp index 850b7a73a..4d9319eb8 100644 --- a/kugar/lib/inputmask.cpp +++ b/kugar/lib/inputmask.cpp @@ -89,19 +89,19 @@ void InputMask::parseInputMask( const TQString &maskFields ) MaskInputData::Casemode m = MaskInputData::NoCaseMode; c = 0; bool s; - bool escape = FALSE; + bool escape = false; int index = 0; for ( i = 0; i < m_mask.length(); i++ ) { c = m_mask.at( i ); if ( escape ) { - s = TRUE; + s = true; m_maskData[ index ].maskChar = c; m_maskData[ index ].separator = s; m_maskData[ index ].caseMode = m; index++; - escape = FALSE; + escape = false; } else if ( c == '<' || c == '>' || c == '!' ) { @@ -133,12 +133,12 @@ void InputMask::parseInputMask( const TQString &maskFields ) case 'D': case 'd': case '#': - s = FALSE; + s = false; break; case '\\': - escape = TRUE; + escape = true; default: - s = TRUE; + s = true; break; } @@ -159,52 +159,52 @@ bool InputMask::isValidInput( TQChar key, TQChar mask ) const { case 'A': if ( key.isLetter() && key != m_blank ) - return TRUE; + return true; break; case 'a': if ( key.isLetter() || key == m_blank ) - return TRUE; + return true; break; case 'N': if ( key.isLetterOrNumber() && key != m_blank ) - return TRUE; + return true; break; case 'n': if ( key.isLetterOrNumber() || key == m_blank ) - return TRUE; + return true; break; case 'X': if ( key.isPrint() && key != m_blank ) - return TRUE; + return true; break; case 'x': if ( key.isPrint() || key == m_blank ) - return TRUE; + return true; break; case '9': if ( key.isNumber() && key != m_blank ) - return TRUE; + return true; break; case '0': if ( key.isNumber() || key == m_blank ) - return TRUE; + return true; break; case 'D': if ( key.isNumber() && key.digitValue() > 0 && key != m_blank ) - return TRUE; + return true; break; case 'd': if ( ( key.isNumber() && key.digitValue() > 0 ) || key == m_blank ) - return TRUE; + return true; break; case '#': if ( key.isNumber() || key == '+' || key == '-' || key == m_blank ) - return TRUE; + return true; break; default: break; } - return FALSE; + return false; } TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) const @@ -249,7 +249,7 @@ TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) cons else { // search for separator first - int n = findInMask( i, TRUE, TRUE, str[ ( int ) strIndex ] ); + int n = findInMask( i, true, true, str[ ( int ) strIndex ] ); if ( n != -1 ) { if ( str.length() != 1 || i == 0 || ( i > 0 && ( !m_maskData[ i - 1 ].separator || m_maskData[ i - 1 ].maskChar != str[ ( int ) strIndex ] ) ) ) @@ -261,7 +261,7 @@ TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) cons else { // search for valid m_blank if not - n = findInMask( i, TRUE, FALSE, str[ ( int ) strIndex ] ); + n = findInMask( i, true, false, str[ ( int ) strIndex ] ); if ( n != -1 ) { s += fill.mid( i, n - i ); diff --git a/kugar/lib/inputmask.h b/kugar/lib/inputmask.h index 52ca2b9f5..e4e3f7812 100644 --- a/kugar/lib/inputmask.h +++ b/kugar/lib/inputmask.h @@ -37,7 +37,7 @@ public: private: void parseInputMask( const TQString &maskFields ); bool isValidInput( TQChar key, TQChar mask ) const; - TQString maskString( uint pos, const TQString &str, bool clear = FALSE ) 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; int findInMask( int pos, bool forward, bool findSeparator, TQChar searchChar = TQChar() ) const; diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index ea1f60f7b..0a8d12357 100644 --- a/kugar/part/kugar_part.cpp +++ b/kugar/part/kugar_part.cpp @@ -135,7 +135,7 @@ bool KugarPart::initDoc( InitDocFlags /*flags*/, TQWidget* /*parentWidget*/ ) return ok; // If nothing is loaded, do initialize here - return TRUE; + return true; } KoView* KugarPart::createViewInstance( TQWidget* parent, const char* name ) diff --git a/kword/KWAnchor.cpp b/kword/KWAnchor.cpp index a291999e1..5b83efc3c 100644 --- a/kword/KWAnchor.cpp +++ b/kword/KWAnchor.cpp @@ -298,9 +298,9 @@ void KWAnchor::saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const bool KWAnchor::ownLine() const { if ( m_deleted ) - return FALSE; + return false; if ( m_frameset) return m_frameset->ownLine(); - return FALSE; + return false; } diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index e006903cd..2de097a5f 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -105,10 +105,10 @@ KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KW m_temporaryStatusBarTextShown = false; viewport()->setBackgroundMode( PaletteBase ); - viewport()->setAcceptDrops( TRUE ); + viewport()->setAcceptDrops( true ); - setKeyCompression( TRUE ); - viewport()->setMouseTracking( TRUE ); + setKeyCompression( true ); + viewport()->setMouseTracking( true ); m_scrollTimer = new TQTimer( this ); connect( m_scrollTimer, TQ_SIGNAL( timeout() ), @@ -403,7 +403,7 @@ void KWCanvas::mpCreatePixmap( const TQPoint& normalPoint, bool noGrid ) } emit docStructChanged(Pictures); if ( !m_doc->showGrid() && m_doc->snapToGrid() ) - repaintContents( FALSE ); //draw the grid over the whole canvas + repaintContents( false ); //draw the grid over the whole canvas } } @@ -812,7 +812,7 @@ void KWCanvas::contentsMouseMoveEvent( TQMouseEvent *e ) m_currentTable->resizeColumn( m_rowColResized, docPoint.x() ); // Repaint only the changed rects (oldRect U newRect) TQRect newRect( m_viewMode->normalToView( m_doc->zoomRect( m_currentTable->boundingRect() ) ) ); - repaintContents( TQRegion(oldRect).unite(newRect).boundingRect(), FALSE ); + repaintContents( TQRegion(oldRect).unite(newRect).boundingRect(), false ); } else if (m_interactionPolicy) { m_interactionPolicy->handleMouseMove(e->state(), @@ -1127,7 +1127,7 @@ void KWCanvas::contentsMouseReleaseEvent( TQMouseEvent * e ) } if ( old_mouseMove != MM_EDIT && !m_doc->showGrid() && m_doc->snapToGrid() ) - repaintContents( FALSE ); //draw the grid over the whole canvas + repaintContents( false ); //draw the grid over the whole canvas m_mousePressed = false; } } @@ -1404,7 +1404,7 @@ void KWCanvas::setMouseMode( MouseMode newMouseMode ) m_mouseMode = newMouseMode; if ( !m_doc->showGrid() && m_doc->snapToGrid() ) - repaintContents( FALSE ); //draw the grid over the whole canvas + repaintContents( false ); //draw the grid over the whole canvas } else m_mouseMode = newMouseMode; @@ -1778,11 +1778,11 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) // Activate this code (and in focusNextPreviousChild() to allow Shift+Tab // out of document window. Disabled because it conflicts with Shift+Tab inside a table. // else if ( keyev->key() == TQt::Key_BackTab ) - // return FALSE; + // return false; else if ( keyev->key() == TDEGlobalSettings::contextMenuKey() ) { // The popups are not available in readonly mode, since the GUI isn't built... - if(!m_doc->isReadWrite()) return TRUE; - if (m_mouseMode != MM_EDIT) return TRUE; + if(!m_doc->isReadWrite()) return true; + if (m_mouseMode != MM_EDIT) return true; KoPoint docPoint = m_doc->unzoomPoint( TQCursor::pos() ); if ( viewMode()->type()=="ModeText") { @@ -1804,9 +1804,9 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) // around before they click or hit Enter. if (m_frameInline) m_lastCaretPos = caretPos(); - if (m_lastCaretPos.isNull()) return TRUE; + if (m_lastCaretPos.isNull()) return true; int page = m_doc->pageManager()->pageNumber(m_lastCaretPos); - if(page == -1) return TRUE; + if(page == -1) return true; TQPoint normalPoint = m_doc->zoomPoint(m_lastCaretPos); // Coordinate is at the very top of the caret. In the case of an // inline frame, adjust slightly down and to the right in order @@ -1862,7 +1862,7 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) } else m_currentFrameSetEdit->keyPressEvent( keyev ); - return TRUE; + return true; } // Because of the dependency on the control key, we need to update the mouse cursor here @@ -1891,7 +1891,7 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) if ( m_currentFrameSetEdit && m_mouseMode == MM_EDIT && m_doc->isReadWrite() && !m_printing ) { m_currentFrameSetEdit->keyReleaseEvent( keyev ); - return TRUE; + return true; } } break; @@ -1923,9 +1923,9 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) bool KWCanvas::focusNextPrevChild( bool next) { Q_UNUSED(next); - return TRUE; // Don't allow to go out of the canvas widget by pressing "Tab" + return true; // Don't allow to go out of the canvas widget by pressing "Tab" // Don't allow to go out of the canvas widget by pressing Tab, but do allow Shift+Tab. - // if (next) return TRUE; + // if (next) return true; // return TQWidget::focusNextPrevChild( next ); } @@ -2372,7 +2372,7 @@ void FrameMovePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint & kdDebug() << " point.x()=" << point.x() << endl; */ TQPtrList tablesMoved; - tablesMoved.setAutoDelete( FALSE ); + tablesMoved.setAutoDelete( false ); TQRegion repaintRegion; KoPoint _move=m_boundingRect.topLeft() - oldBoundingRect.topLeft(); diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp index f00232cba..c72bd5dba 100644 --- a/kword/KWCommand.cpp +++ b/kword/KWCommand.cpp @@ -121,7 +121,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) { // Create new parag // Lowlevel method: - c->splitAndInsertEmptyParag( FALSE, TRUE ); + c->splitAndInsertEmptyParag( false, true ); // Highlevel method: //c->insert( "\n", true ); } @@ -159,7 +159,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) KoTextFormat * defaultFormat = doc->formatCollection()->format( &f ); // Last paragraph (i.e. only one in all) : some of the text might be from before the paste int endIndex = (item == count-1) ? c->index() : parag->string()->length() - 1; - parag->setFormat( m_idx, endIndex - m_idx, defaultFormat, TRUE ); + parag->setFormat( m_idx, endIndex - m_idx, defaultFormat, true ); } } @@ -176,11 +176,11 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) // Last paragraph: some of the text might be from before the paste int len = (item == count-1) ? c->index() : parag->string()->length(); // Apply default format - parag->setFormat( 0, len, parag->paragFormat(), TRUE ); + parag->setFormat( 0, len, parag->paragFormat(), true ); parag->loadFormatting( paragElem, 0, (textFs->isMainFrameset()) ); } parag->invalidate(0); // the formatting will be done by caller (either KWTextFrameSet::pasteOasis or KoTextObject::undo/redo) - parag->setChanged( TRUE ); + parag->setChanged( true ); parag = static_cast(parag->next()); //kdDebug() << "KWPasteTextCommand::execute going to next parag: " << parag << endl; } diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 78c927688..7844a12f8 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -503,7 +503,7 @@ bool KWDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget) m_pageHeaderFooter.ptFooterBodySpacing = 10; m_pageHeaderFooter.ptFootNoteBodySpacing = 10; - bool ok = FALSE; + bool ok = false; if ( isEmbedded() ) { @@ -513,7 +513,7 @@ bool KWDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget) if ( !ok ) showLoadingErrorDialog(); setEmpty(); - setModified( FALSE ); + setModified( false ); return ok; } else if (flags==KoDocument::InitDocEmpty) @@ -524,7 +524,7 @@ bool KWDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget) if ( !ok ) showLoadingErrorDialog(); setEmpty(); - setModified( FALSE ); + setModified( false ); return ok; } @@ -558,7 +558,7 @@ bool KWDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget) showLoadingErrorDialog(); setEmpty(); } - setModified( FALSE ); + setModified( false ); return ok; } @@ -606,7 +606,7 @@ void KWDocument::initEmpty() if ( !ok ) showLoadingErrorDialog(); resetURL(); - setModified( FALSE ); + setModified( false ); setEmpty(); } @@ -999,10 +999,10 @@ bool KWDocument::loadChildren( KoStore *store ) TQPtrListIterator it( children() ); for( ; it.current(); ++it ) { if ( !it.current()->loadDocument( store ) ) - return FALSE; + return false; } - return TRUE; + return true; } void KWDocument::loadPictureMap ( TQDomElement& domElement ) @@ -3699,7 +3699,7 @@ TQValueList KWDocument::savePictureList() bool KWDocument::completeSaving( KoStore *store ) { if ( !store ) - return TRUE; + return true; TQString u = KURL( url() ).path(); @@ -3876,7 +3876,7 @@ KWPartFrameSet* KWDocument::insertObject( const KoRect& rect, KoDocumentEntry& e return 0; KWDocumentChild* ch = createChildDoc( rect, doc ); - setModified( TRUE ); + setModified( true ); KWPartFrameSet *frameset = new KWPartFrameSet( this, ch, TQString() ); KWFrame *frame = new KWFrame(frameset, rect.x(), rect.y(), rect.width(), rect.height() ); @@ -4103,7 +4103,7 @@ kdDebug() << "KWDocument::canRemovePage " << num<< endl; return false; } #ifdef DEBUG_PAGES - kdDebug(32002) << "KWDocument::canRemovePage " << num << "-> TRUE" << endl; + kdDebug(32002) << "KWDocument::canRemovePage " << num << "-> true" << endl; #endif return true; } diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index d141935b3..0aeb8efee 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -857,7 +857,7 @@ void KWFrameDia::setupTab3(){ // TAB Frameset item->setText( 1, fs->name() ); amount++; if( m_frame && m_frame->frameSet() == fs ) { - m_lFrameSList->setSelected(item, TRUE ); + m_lFrameSList->setSelected(item, true ); m_oldFrameSetName = fs->name(); m_rExistingFrameset->setChecked(true); } diff --git a/kword/KWFrameSet.h b/kword/KWFrameSet.h index 4f98ec24f..00d807d0c 100644 --- a/kword/KWFrameSet.h +++ b/kword/KWFrameSet.h @@ -76,7 +76,7 @@ public: virtual FrameSetType type() const { return FT_BASE; } virtual void addTextFrameSets( TQPtrList & /*lst*/, bool /*onlyReadWrite*/ = false ) {}; - virtual bool ownLine() const { return FALSE;} + virtual bool ownLine() const { return false;} /** The different types of textFramesets (that TEXT is important here!) * FI_BODY = normal text frames.
diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp index b31f9789f..8de83f60d 100644 --- a/kword/KWImportStyleDia.cpp +++ b/kword/KWImportStyleDia.cpp @@ -50,7 +50,7 @@ KWImportStyleDia::~KWImportStyleDia() void KWImportStyleDia::loadFile() { - KFileDialog fd( TQString(), TQString(), 0, 0, TRUE ); + KFileDialog fd( TQString(), TQString(), 0, 0, true ); TQStringList lst = "application/x-kword"; #if 0 lst << "application/vnd.oasis.opendocument.text"; @@ -206,7 +206,7 @@ TQString KWImportFrameTableStyleDia::generateStyleName( const TQString & templat void KWImportFrameTableStyleDia::loadFile() { - KFileDialog fd( TQString(), TQString(), 0, 0, TRUE ); + KFileDialog fd( TQString(), TQString(), 0, 0, true ); TQStringList lst = "application/x-kword"; #if 0 lst << "application/vnd.oasis.opendocument.text"; diff --git a/kword/KWInsertPageDia.cpp b/kword/KWInsertPageDia.cpp index 97fb081d4..129ee6a1a 100644 --- a/kword/KWInsertPageDia.cpp +++ b/kword/KWInsertPageDia.cpp @@ -28,17 +28,17 @@ #include KWInsertPageDia::KWInsertPageDia( TQWidget *parent, const char* name ) - : KDialogBase( parent, name,TRUE,i18n("Insert Page"),Ok|Cancel ) + : KDialogBase( parent, name,true,i18n("Insert Page"),Ok|Cancel ) { TQVBox *page = makeVBoxMainWidget(); TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Insert Page" ),page ); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); m_after = new TQRadioButton( i18n("After"), grp ); m_before = new TQRadioButton( i18n("Before"), grp ); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); m_after->setChecked( true ); resize( 200, 150 ); setFocus(); diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp index 002b0bf0c..fb0e52387 100644 --- a/kword/KWInsertPicDia.cpp +++ b/kword/KWInsertPicDia.cpp @@ -150,7 +150,7 @@ KoPicture KWInsertPicDia::selectPictureDia( const TQString & _path, TQWidget* pa TQStringList mimetypes ( KImageIO::mimeTypes( KImageIO::Reading ) ); mimetypes += KoPictureFilePreview::clipartMimeTypes(); - KFileDialog fd( _path, TQString(), parent, 0, TRUE ); + KFileDialog fd( _path, TQString(), parent, 0, true ); fd.setMimeFilter( mimetypes ); fd.setCaption(i18n("Choose Picture")); return selectPicture( fd, parent ); diff --git a/kword/KWSortDia.cpp b/kword/KWSortDia.cpp index 9a8c5ecf5..4390661a3 100644 --- a/kword/KWSortDia.cpp +++ b/kword/KWSortDia.cpp @@ -28,17 +28,17 @@ #include KWSortDia::KWSortDia( TQWidget *parent, const char* name ) - : KDialogBase( parent, name,TRUE,i18n("Sort Text"),Ok|Cancel ) + : KDialogBase( parent, name,true,i18n("Sort Text"),Ok|Cancel ) { TQVBox *page = makeVBoxMainWidget(); TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Sort" ),page ); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); m_increase = new TQRadioButton( i18n("Increase"), grp ); m_decrease = new TQRadioButton( i18n("Decrease"), grp ); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); m_increase->setChecked( true ); resize( 200, 150 ); setFocus(); diff --git a/kword/KWTableDia.cpp b/kword/KWTableDia.cpp index 06cf3860d..392772208 100644 --- a/kword/KWTableDia.cpp +++ b/kword/KWTableDia.cpp @@ -120,7 +120,7 @@ void KWTableDia::setupTab1( int rows, int cols, CellSize wid, CellSize hei, bool lHei = new TQLabel( i18n( "Cell heights:" ), tab1 ); grid->addWidget( lHei, 4, 0 ); - cHei = new TQComboBox( FALSE, tab1 ); + cHei = new TQComboBox( false, tab1 ); cHei->insertItem( i18n( "Automatic" ) ); cHei->insertItem( i18n( "Manual" ) ); cHei->setCurrentItem( (int)hei ); @@ -129,7 +129,7 @@ void KWTableDia::setupTab1( int rows, int cols, CellSize wid, CellSize hei, bool lWid = new TQLabel( i18n( "Cell widths:" ), tab1 ); grid->addWidget( lWid, 6, 0 ); - cWid = new TQComboBox( FALSE, tab1 ); + cWid = new TQComboBox( false, tab1 ); cWid->insertItem( i18n( "Automatic" ) ); cWid->insertItem( i18n( "Manual" ) ); cWid->setCurrentItem( (int)wid ); diff --git a/kword/KWTextDocument.h b/kword/KWTextDocument.h index 30aa9b3f7..13bea7d9d 100644 --- a/kword/KWTextDocument.h +++ b/kword/KWTextDocument.h @@ -44,7 +44,7 @@ public: ~KWTextDocument(); - virtual KoTextParag * createParag( KoTextDocument *d, KoTextParag *pr = 0, KoTextParag *nx = 0, bool updateIds = TRUE ); + virtual KoTextParag * createParag( KoTextDocument *d, KoTextParag *pr = 0, KoTextParag *nx = 0, bool updateIds = true ); /** Return the text frameset in which this document is. * Note that this can be 0L (e.g. for paragraphs in the paragdia preview) */ diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index d0fbff38c..79b781b7d 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -806,7 +806,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor TQMAX(0, iPoint.x() - 5), // negative values create problems iPoint.y(), clip.width(), clip.height(), pix, cg, m_doc, // TODO view's zoom handler - cursorVisible, cursor, FALSE /*resetChanged*/, drawingFlags ); + cursorVisible, cursor, false /*resetChanged*/, drawingFlags ); if ( wasChanged ) // Maybe we have more changes to draw, than those in the small cliprect parag->setLineChanged( oldLineChanged ); // -1 = all @@ -1540,7 +1540,7 @@ KWFrame * KWTextFrameSet::internalToDocument( const KoPoint &relPoint, KoPoint & int n2 = len - 1; double internalY = 0.0; int mid = 0; - bool found = FALSE; + bool found = false; while ( n1 <= n2 ) { double res; mid = (n1 + n2)/2; @@ -3506,7 +3506,7 @@ void KWTextFrameSetEdit::mousePressEvent( TQMouseEvent *e, const TQPoint &, cons if ( addParag ) frameSet()->kWordDocument()->setModified(true ); } - // else mightStartDrag = FALSE; necessary? + // else mightStartDrag = false; necessary? if ( e->button() != TQt::LeftButton ) return; diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp index aae68085d..86f7598d2 100644 --- a/kword/KWTextParag.cpp +++ b/kword/KWTextParag.cpp @@ -592,7 +592,7 @@ void KWTextParag::load( TQDomElement &attributes ) //kdDebug() << "KWTextParag::load '" << element.text() << "'" << endl; append( element.text() ); // Apply default format - this should be automatic !! - setFormat( 0, string()->length(), paragFormat(), TRUE ); + setFormat( 0, string()->length(), paragFormat(), true ); } if ( attributes.attribute( "toc" ) == "true" ) diff --git a/kword/KWTextParag.h b/kword/KWTextParag.h index de484a485..379fdf5b9 100644 --- a/kword/KWTextParag.h +++ b/kword/KWTextParag.h @@ -40,7 +40,7 @@ typedef KoParagLayout KWParagLayout; class KWTextParag : public KoTextParag { public: - KWTextParag( KoTextDocument *d, KoTextParag *pr = 0, KoTextParag *nx = 0, bool updateIds = TRUE ) + KWTextParag( KoTextDocument *d, KoTextParag *pr = 0, KoTextParag *nx = 0, bool updateIds = true ) : KoTextParag( d, pr, nx, updateIds ) { } ~KWTextParag() { } diff --git a/kword/KWView.cpp b/kword/KWView.cpp index e332b4c53..023119b60 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -270,8 +270,8 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW TQObject::connect( this, TQ_SIGNAL( embeddImage( const TQString & ) ), this, TQ_SLOT( slotEmbedImage( const TQString & ) ) ); - setKeyCompression( TRUE ); - setAcceptDrops( TRUE ); + setKeyCompression( true ); + setAcceptDrops( true ); setupActions(); @@ -501,7 +501,7 @@ void KWView::initGui() m_gui->canvasWidget()->setMouseMode( m_gui->canvasWidget()->mouseMode() ); bool editingFormula = dynamic_cast( m_gui->canvasWidget()->currentFrameSetEdit() ) != 0; - //showFormulaToolbar( FALSE ); // not called, to avoid creating the formula-document if not necessary + //showFormulaToolbar( false ); // not called, to avoid creating the formula-document if not necessary if(shell()) shell()->showToolbar( "formula_toolbar", editingFormula ); @@ -929,7 +929,7 @@ void KWView::setupActions() this, TQ_SLOT( textAlignLeft() ), actionCollection(), "format_alignleft" ); m_actionFormatAlignLeft->setExclusiveGroup( "align" ); - m_actionFormatAlignLeft->setChecked( TRUE ); + m_actionFormatAlignLeft->setChecked( true ); m_actionFormatAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", TQt::CTRL + TQt::ALT + TQt::Key_C, this, TQ_SLOT( textAlignCenter() ), actionCollection(), "format_aligncenter" ); @@ -1448,7 +1448,7 @@ void KWView::loadexpressionActions( TDEActionMenu * parentMenu) } } - //TQStringList files = KWFactory::instance()->dirs()->findAllResources( "expression", "*.xml", TRUE ); + //TQStringList files = KWFactory::instance()->dirs()->findAllResources( "expression", "*.xml", true ); int i = 0; int nbFile = 0; for( TQStringList::Iterator it = files.begin(); it != files.end(); ++it,nbFile++ ) @@ -1820,22 +1820,22 @@ void KWView::print( KPrinter &prt ) //kdDebug() << "KWView::print metrics: " << metrics.logicalDpiX() << "," << metrics.logicalDpiY() << endl; //kdDebug() << "x11AppDPI: " << KoGlobal::dpiX() << "," << KoGlobal::dpiY() << endl; - bool serialLetter = FALSE; + bool serialLetter = false; TQPtrList vars = m_doc->variableCollection()->getVariables(); KoVariable *v = 0; for ( v = vars.first(); v; v = vars.next() ) { if ( v->type() == VT_MAILMERGE ) { - serialLetter = TRUE; + serialLetter = true; break; } } - if ( !m_doc->mailMergeDataBase() ) serialLetter=FALSE; + if ( !m_doc->mailMergeDataBase() ) serialLetter=false; else { m_doc->mailMergeDataBase()->refresh(false); - if (m_doc->mailMergeDataBase()->getNumRecords() == 0 ) serialLetter = FALSE; + if (m_doc->mailMergeDataBase()->getNumRecords() == 0 ) serialLetter = false; } //float left_margin = 0.0; @@ -2006,16 +2006,16 @@ void KWView::showAlign( int align ) { kdWarning() << k_funcinfo << "shouldn't be called with AlignAuto" << endl; // fallthrough case TQt::AlignLeft: - m_actionFormatAlignLeft->setChecked( TRUE ); + m_actionFormatAlignLeft->setChecked( true ); break; case TQt::AlignHCenter: - m_actionFormatAlignCenter->setChecked( TRUE ); + m_actionFormatAlignCenter->setChecked( true ); break; case TQt::AlignRight: - m_actionFormatAlignRight->setChecked( TRUE ); + m_actionFormatAlignRight->setChecked( true ); break; case TQt::AlignJustify: - m_actionFormatAlignBlock->setChecked( TRUE ); + m_actionFormatAlignBlock->setChecked( true ); break; } } @@ -2024,18 +2024,18 @@ void KWView::showSpacing( int spacing ) { switch ( spacing ) { case KoParagLayout::LS_SINGLE: - m_actionFormatSpacingSingle->setChecked( TRUE ); + m_actionFormatSpacingSingle->setChecked( true ); break; case KoParagLayout::LS_ONEANDHALF: - m_actionFormatSpacingOneAndHalf->setChecked( TRUE ); + m_actionFormatSpacingOneAndHalf->setChecked( true ); break; case KoParagLayout::LS_DOUBLE: - m_actionFormatSpacingDouble->setChecked( TRUE ); + m_actionFormatSpacingDouble->setChecked( true ); break; default: - m_actionFormatSpacingSingle->setChecked( FALSE ); - m_actionFormatSpacingOneAndHalf->setChecked( FALSE ); - m_actionFormatSpacingDouble->setChecked( FALSE ); + m_actionFormatSpacingSingle->setChecked( false ); + m_actionFormatSpacingOneAndHalf->setChecked( false ); + m_actionFormatSpacingDouble->setChecked( false ); } } @@ -2164,10 +2164,10 @@ void KWView::showMouseMode( int mouseMode ) break; } - m_actionTableJoinCells->setEnabled( FALSE ); - m_actionTableSplitCells->setEnabled( FALSE ); + m_actionTableJoinCells->setEnabled( false ); + m_actionTableSplitCells->setEnabled( false ); m_actionTableProtectCells->setEnabled( false ); - m_actionFormatFrameSet->setEnabled(FALSE); + m_actionFormatFrameSet->setEnabled(false); m_actionTablePropertiesMenu->setEnabled( false ); m_actionConvertTableToText->setEnabled( false ); } @@ -2914,7 +2914,7 @@ void KWView::editMailMergeDataBase() KWMailMergeEditor *dia = new KWMailMergeEditor( this, m_doc->mailMergeDataBase() ); dia->exec(); // Don't know if we really need this so it's commented out (SL) - // m_gui->canvasWidget()->repaintAll( FALSE ); + // m_gui->canvasWidget()->repaintAll( false ); delete dia; #endif } @@ -5677,7 +5677,7 @@ void KWView::spellCheckerRemoveHighlight() } KWTextFrameSetEdit * edit = currentTextEdit(); if (edit) - edit->drawCursor( TRUE ); + edit->drawCursor( true ); } void KWView::spellAddAutoCorrect (const TQString & originalword, const TQString & newword) @@ -6029,7 +6029,7 @@ void KWView::setViewFrameBorders(bool b) bool KWView::doubleClickActivation() const { - return TRUE; + return true; } TQWidget* KWView::canvas() const @@ -6104,7 +6104,7 @@ void KWView::savePicture() kdDebug() << "Picture has mime type: " << mimetype << endl; TQStringList mimetypes; mimetypes << mimetype; - KFileDialog fd( oldFile, TQString(), this, 0, TRUE ); + KFileDialog fd( oldFile, TQString(), this, 0, true ); fd.setMimeFilter( mimetypes ); fd.setCaption(i18n("Save Picture")); fd.setOperationMode(KFileDialog::Saving); @@ -6732,7 +6732,7 @@ void KWView::docStructSpeak() void KWView::insertFile() { - KFileDialog fd( TQString(), TQString(), this, 0, TRUE ); + KFileDialog fd( TQString(), TQString(), this, 0, true ); fd.setMimeFilter( "application/x-kword" ); fd.setCaption(i18n("Insert File")); KURL url; @@ -7660,8 +7660,8 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) connect( m_horRuler, TQ_SIGNAL( tabListChanged( const KoTabulatorList & ) ), m_view, TQ_SLOT( tabListChanged( const KoTabulatorList & ) ) ); - setKeyCompression( TRUE ); - setAcceptDrops( TRUE ); + setKeyCompression( true ); + setAcceptDrops( true ); setFocusPolicy( TQWidget::NoFocus ); } diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp index c05ad1aec..bd8f7c07d 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.cpp +++ b/kword/mailmerge/KWClassicSerialDataSource.cpp @@ -244,7 +244,7 @@ KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *parent, KW setSorting( -1 ); addColumn( i18n( "Name" ) ); addColumn( i18n( "Value" ) ); - header()->setMovingEnabled( FALSE ); + header()->setMovingEnabled( false ); connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), this, TQ_SLOT( columnSizeChange( int, int, int ) ) ); // connect( header(), TQ_SIGNAL( sectionClicked( int ) ), @@ -546,7 +546,7 @@ void KWClassicMailMergeEditor::removeRecord() } else { dbList->clear(); - records->setEnabled( FALSE ); + records->setEnabled( false ); } if ( db->getNumRecords() == 0 ) diff --git a/kword/mailmerge/KWClassicSerialDataSource.h b/kword/mailmerge/KWClassicSerialDataSource.h index 9e0581b25..aca7ae9bc 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.h +++ b/kword/mailmerge/KWClassicSerialDataSource.h @@ -114,7 +114,7 @@ public: void updateItems(); void displayRecord( int i ); - void setSorting( int, bool increasing = TRUE ) { + void setSorting( int, bool increasing = true ) { TQListView::setSorting( -1, increasing ); } diff --git a/kword/mailmerge/sql/KWMySqlCursor.h b/kword/mailmerge/sql/KWMySqlCursor.h index f08b62aea..d737c3ccf 100644 --- a/kword/mailmerge/sql/KWMySqlCursor.h +++ b/kword/mailmerge/sql/KWMySqlCursor.h @@ -38,7 +38,7 @@ class KWMySqlCursor: public TQSqlCursor { public: KWMySqlCursor( const TQString & query = TQString(), bool autopopulate = -TRUE, TQSqlDatabase* db = 0 ): TQSqlCursor( TQString(), autopopulate, db ) +true, TQSqlDatabase* db = 0 ): TQSqlCursor( TQString(), autopopulate, db ) { exec( query ); if ( autopopulate ) @@ -47,7 +47,7 @@ TRUE, TQSqlDatabase* db = 0 ): TQSqlCursor( TQString(), autopopulate, db ) setMode( TQSqlCursor::ReadOnly ); } KWMySqlCursor( const KWMySqlCursor & other ): TQSqlCursor( other ) {} - KWMySqlCursor( const TQSqlQuery & query, bool autopopulate = TRUE ): + KWMySqlCursor( const TQSqlQuery & query, bool autopopulate = true ): TQSqlCursor( TQString(), autopopulate ) { *(TQSqlQuery*)this = query; @@ -57,12 +57,12 @@ TQSqlCursor( TQString(), autopopulate ) } bool select( const TQString & /*filter*/, const TQSqlIndex & /*sort*/ = TQSqlIndex() ) { return exec( lastQuery() ); } - TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const { return + TQSqlIndex primaryIndex( bool /*prime*/ = true ) const { return TQSqlIndex(); } - int insert( bool /*invalidate*/ = TRUE ) { return FALSE; } - int update( bool /*invalidate*/ = TRUE ) { return FALSE; } - int del( bool /*invalidate*/ = TRUE ) { return FALSE; } - void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {} + int insert( bool /*invalidate*/ = true ) { return false; } + int update( bool /*invalidate*/ = true ) { return false; } + int del( bool /*invalidate*/ = true ) { return false; } + void setName( const TQString& /*name*/, bool /*autopopulate*/ = true ) {} }; diff --git a/lib/kformula/symbolaction.cpp b/lib/kformula/symbolaction.cpp index 1563ef613..8d832e40c 100644 --- a/lib/kformula/symbolaction.cpp +++ b/lib/kformula/symbolaction.cpp @@ -104,7 +104,7 @@ void SymbolComboItem::paint( TQPainter *p ) SymbolAction::SymbolAction( TQObject* parent, const char* name ) : TDESelectAction( parent, name ) { - setEditable( FALSE ); + setEditable( false ); } SymbolAction::SymbolAction( const TQString& text, const TDEShortcut& cut, @@ -112,7 +112,7 @@ SymbolAction::SymbolAction( const TQString& text, const TDEShortcut& cut, TQObject* parent, const char* name ) : TDESelectAction( text, cut, receiver, slot, parent, name ) { - setEditable( FALSE ); + setEditable( false ); } int SymbolAction::plug( TQWidget* w, int index ) diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index dca3063e4..59d160e74 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -230,7 +230,7 @@ KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObjec s_documentList->append(this); d = new Private; - m_bEmpty = TRUE; + m_bEmpty = true; connect( &d->m_autoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoSave() ) ); setAutoSave( s_defaultAutoSave ); d->m_bSingleViewMode = singleViewMode; @@ -825,7 +825,7 @@ void KoDocument::paintChild( KoDocumentChild *child, TQPainter &painter, KoView manager->activeWidget() == (TQWidget *)view ) ) { // painter.setClipRegion( rgn ); - painter.setClipping( FALSE ); + painter.setClipping( false ); painter.setPen( black ); painter.fillRect( -5, -5, w + 10, 5, white ); @@ -855,7 +855,7 @@ void KoDocument::paintChild( KoDocumentChild *child, TQPainter &painter, KoView painter.fillRect( w, h / 2 - 3, 5, 5, color ); } - painter.setClipping( TRUE ); + painter.setClipping( true ); } } } @@ -891,7 +891,7 @@ bool KoDocument::saveChildren( KoStore* _store ) { //kdDebug(30003) << "KoDocument::saveChildren internal url: /" << i << endl; if ( !childDoc->saveToStore( _store, TQString::number( i++ ) ) ) - return FALSE; + return false; if (!isExporting ()) childDoc->setModified( false ); @@ -1968,7 +1968,7 @@ void KoDocument::setModified( bool mod ) KParts::ReadWritePart::setModified( mod ); if ( mod ) { - m_bEmpty = FALSE; + m_bEmpty = false; } else { // When saving this document, all non-external child documents get saved too. TQPtrListIterator it = children(); @@ -2278,15 +2278,15 @@ void KoDocument::setupXmlReader( TQXmlSimpleReader& reader, bool namespaceProces { if ( namespaceProcessing ) { - reader.setFeature( "http://xml.org/sax/features/namespaces", TRUE ); - reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", FALSE ); + reader.setFeature( "http://xml.org/sax/features/namespaces", true ); + reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", false ); } else { - reader.setFeature( "http://xml.org/sax/features/namespaces", FALSE ); - reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", TRUE ); + reader.setFeature( "http://xml.org/sax/features/namespaces", false ); + reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", true ); } - reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", TRUE ); + reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", true ); } diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp index 90a992801..f68378166 100644 --- a/lib/kofficecore/KoDocumentChild.cpp +++ b/lib/kofficecore/KoDocumentChild.cpp @@ -158,7 +158,7 @@ bool KoDocumentChild::load( const TQDomElement& element, bool uppercase ) return false; } - bool brect = FALSE; + bool brect = false; TQDomNode n = element.firstChild(); for( ; !n.isNull(); n = n.nextSibling() ) { diff --git a/lib/kofficecore/KoDocumentIface.h b/lib/kofficecore/KoDocumentIface.h index 546859ce3..46b2b42c7 100644 --- a/lib/kofficecore/KoDocumentIface.h +++ b/lib/kofficecore/KoDocumentIface.h @@ -64,12 +64,12 @@ k_dcop: void openURL( TQString url ); /** - * @return TRUE is the document is still loading + * @return true is the document is still loading */ bool isLoading(); /** - * @return TRUE is the document has been modified + * @return true is the document has been modified */ bool isModified(); diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h index 9befc71e8..06269db12 100644 --- a/lib/kofficecore/KoMainWindow.h +++ b/lib/kofficecore/KoMainWindow.h @@ -106,7 +106,7 @@ public: void showToolbar( const char * tbName, bool shown ); /** - * @return TRUE if the toolbar @p tbName is visible + * @return true if the toolbar @p tbName is visible */ bool toolbarIsVisible(const char *tbName); @@ -130,7 +130,7 @@ public: * Load the desired document and show it. * @param url the URL to open * - * @return TRUE on success. + * @return true on success. */ virtual bool openDocument( const KURL & url ); @@ -309,11 +309,11 @@ protected: // protected methods are mostly for koshell, it's the only one derivi /** * Saves the document, asking for a filename if necessary. * - * @param saveas if set to TRUE the user is always prompted for a filename + * @param saveas if set to true the user is always prompted for a filename * - * @param silent if set to TRUE rootDocument()->setTitleModified will not be called. + * @param silent if set to true rootDocument()->setTitleModified will not be called. * - * @return TRUE on success, false on error or cancel + * @return true on success, false on error or cancel * (don't display anything in this case, the error dialog box is also implemented here * but restore the original URL in slotFileSaveAs) */ diff --git a/lib/kofficecore/KoPicture.h b/lib/kofficecore/KoPicture.h index 63dd9c596..83481d333 100644 --- a/lib/kofficecore/KoPicture.h +++ b/lib/kofficecore/KoPicture.h @@ -194,7 +194,7 @@ public: TQImage generateImage(const TQSize& size); /** - * @return TRUE if the alpha channel processing has been enabled + * @return true if the alpha channel processing has been enabled */ bool hasAlphaBuffer() const; diff --git a/lib/kofficecore/KoQueryTrader.h b/lib/kofficecore/KoQueryTrader.h index 511bd9188..a9841fe64 100644 --- a/lib/kofficecore/KoQueryTrader.h +++ b/lib/kofficecore/KoQueryTrader.h @@ -46,7 +46,7 @@ public: KService::Ptr service() const { return m_service; } /** - * @return TRUE if the service pointer is null + * @return true if the service pointer is null */ bool isEmpty() const { return m_service == 0L; } @@ -61,7 +61,7 @@ public: TQStringList mimeTypes() const { return m_service->serviceTypes(); } /** - * @return TRUE if the document can handle the requested mimetype. + * @return true if the document can handle the requested mimetype. */ bool supportsMimeType( const TQString & _mimetype ) const { return mimeTypes().contains( _mimetype ); } @@ -149,13 +149,13 @@ public: TQString available; /** - * @return TRUE if the filter can import the requested mimetype. + * @return true if the filter can import the requested mimetype. */ bool imports( const TQString& _mimetype ) const { return ( import.contains( _mimetype ) ); } /** - * @return TRUE if the filter can export the requested mimetype. + * @return true if the filter can export the requested mimetype. */ bool exports( const TQString& _m ) const { return ( export_.contains( _m ) ); } diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index ddff05f49..5c7d09e8c 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -563,7 +563,7 @@ void KoView::slotChildActivated( bool a ) // #### HACK // We want to delete as many views as possible and this // trick is used to go upwards in the view-tree. - emit activated( FALSE ); + emit activated( false ); } void KoView::slotChildChanged( KoDocumentChild *child ) @@ -658,12 +658,12 @@ bool KoView::isInOperation() const void KoView::beginOperation() { d->m_inOperation = true; - canvas()->setUpdatesEnabled(FALSE); + canvas()->setUpdatesEnabled(false); } void KoView::endOperation() { - canvas()->setUpdatesEnabled(TRUE); + canvas()->setUpdatesEnabled(true); d->m_inOperation = false; // canvas()->update(); diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h index 49615973b..b6f5334dd 100644 --- a/lib/kofficecore/KoView.h +++ b/lib/kofficecore/KoView.h @@ -237,7 +237,7 @@ public: virtual void paintEverything( TQPainter &painter, const TQRect &rect, bool transparent = false ); /** - * @return TRUE if the document @p doc is represented in this view by + * @return true if the document @p doc is represented in this view by * some KoViewChild. * * This is just a convenience function for @ref #child. diff --git a/lib/kofficecore/tests/kodomtest.cpp b/lib/kofficecore/tests/kodomtest.cpp index f4f197a38..ef9c60793 100644 --- a/lib/kofficecore/tests/kodomtest.cpp +++ b/lib/kofficecore/tests/kodomtest.cpp @@ -119,8 +119,8 @@ int main( int argc, char** argv ) { "\n"; TQDomDocument doc; //TQXmlSimpleReader reader; - //reader.setFeature( "http://xml.org/sax/features/namespaces", TRUE ); - //reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", FALSE ); + //reader.setFeature( "http://xml.org/sax/features/namespaces", true ); + //reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", false ); bool ok = doc.setContent( xml, true /* namespace processing */ ); assert( ok ); diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp index 8119ade35..6b124182a 100644 --- a/lib/kofficeui/KoPartSelectDia.cpp +++ b/lib/kofficeui/KoPartSelectDia.cpp @@ -30,13 +30,13 @@ ****************************************************/ KoPartSelectDia::KoPartSelectDia( TQWidget* parent, const char* name ) : - KDialogBase( parent, name, TRUE, i18n("Insert Object"), KDialogBase::Ok | KDialogBase::Cancel ) + KDialogBase( parent, name, true, i18n("Insert Object"), KDialogBase::Ok | KDialogBase::Cancel ) { listview = new TQListView( this ); listview->addColumn( i18n( "Object" ) ); listview->addColumn( i18n( "Comment" ) ); - listview->setAllColumnsShowFocus( TRUE ); - listview->setShowSortIndicator( TRUE ); + listview->setAllColumnsShowFocus( true ); + listview->setShowSortIndicator( true ); setMainWidget( listview ); connect( listview, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), this, TQ_SLOT( slotOk() ) ); diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index e03ce56c2..8ce383a9d 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -366,7 +366,7 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * } delete l; - d->m_filedialog->setSizeGripEnabled ( FALSE ); + d->m_filedialog->setSizeGripEnabled ( false ); TQStringList mimeFilter = KoFilterManager::mimeFilter( d->m_format, KoFilterManager::Import ); TQStringList::Iterator mimeFilterIt = mimeFilter.at( 1 ); @@ -810,7 +810,7 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item ) toolTip->move(toolTip->x(), screen.bottom()-toolTip->y()-toolTip->height()+toolTip->y()); } toolTip->setFont( TQToolTip::font() ); - toolTip->setPalette( TQToolTip::palette(), TRUE ); + toolTip->setPalette( TQToolTip::palette(), true ); toolTip->show(); } diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index 79be55da3..3306798d1 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -456,7 +456,7 @@ void KoAutoFormat::readAutoCorrectConfig() for(uint i = 0; i < nl.count() ; i++) { //bug in qmap we overwrite = false doesn't work //so we can't add multiple "othernb" - m_superScriptEntries.insert( nl.item(i).toElement().attribute("find"), KoAutoFormatEntry(nl.item(i).toElement().attribute("super")),FALSE ); + m_superScriptEntries.insert( nl.item(i).toElement().attribute("find"), KoAutoFormatEntry(nl.item(i).toElement().attribute("super")),false ); } } diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp index 6bffac9b7..db2be128c 100644 --- a/lib/kotext/KoChangeCaseDia.cpp +++ b/lib/kotext/KoChangeCaseDia.cpp @@ -35,7 +35,7 @@ KoChangeCaseDia::KoChangeCaseDia( TQWidget *parent, const char *name ) TQVBox *page = makeVBoxMainWidget(); TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Case" ),page ); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); m_upperCase=new TQRadioButton( i18n("&Uppercase"), grp ); m_lowerCase=new TQRadioButton( i18n("&Lowercase"), grp ); @@ -47,7 +47,7 @@ KoChangeCaseDia::KoChangeCaseDia( TQWidget *parent, const char *name ) TQWhatsThis::add( m_sentenceCase, i18n("Convert first letter of a sentence to uppercase.")); m_upperCase->setChecked(true); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); } diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp index 475f439da..e63ac40c5 100644 --- a/lib/kotext/KoComplexText.cpp +++ b/lib/kotext/KoComplexText.cpp @@ -897,7 +897,7 @@ TQPtrList *KoComplexText::bidiReorderLine( KoBidiControl *control, co //printf("doing BiDi reordering from %d to %d!\n", start, last); TQPtrList *runs = new TQPtrList; - runs->setAutoDelete(TRUE); + runs->setAutoDelete(true); KoBidiContext *context = control->context; if ( !context ) { @@ -982,7 +982,7 @@ TQPtrList *KoComplexText::bidiReorderLine( KoBidiControl *control, co if(level < 61) { runs->append( new KoTextRun(sor, eor, context, dir) ); ++eor; sor = eor; dir = TQChar::DirON; status.eor = TQChar::DirON; - context = new KoBidiContext(level, TQChar::DirR, context, TRUE); + context = new KoBidiContext(level, TQChar::DirR, context, true); dir = TQChar::DirR; status.last = TQChar::DirR; status.lastStrong = TQChar::DirR; @@ -999,7 +999,7 @@ TQPtrList *KoComplexText::bidiReorderLine( KoBidiControl *control, co if(level < 61) { runs->append( new KoTextRun(sor, eor, context, dir) ); ++eor; sor = eor; dir = TQChar::DirON; status.eor = TQChar::DirON; - context = new KoBidiContext(level, TQChar::DirL, context, TRUE); + context = new KoBidiContext(level, TQChar::DirL, context, true); dir = TQChar::DirL; status.last = TQChar::DirL; status.lastStrong = TQChar::DirL; diff --git a/lib/kotext/KoComplexText.h b/lib/kotext/KoComplexText.h index 8a22d152b..2a2867b96 100644 --- a/lib/kotext/KoComplexText.h +++ b/lib/kotext/KoComplexText.h @@ -75,7 +75,7 @@ struct TQ_EXPORT KoBidiStatus { struct TQ_EXPORT KoBidiContext : public TQShared { // ### ref and deref parent? - KoBidiContext( uchar level, TQChar::Direction embedding, KoBidiContext *parent = 0, bool override = FALSE ); + KoBidiContext( uchar level, TQChar::Direction embedding, KoBidiContext *parent = 0, bool override = false ); ~KoBidiContext(); unsigned char level; diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index 41c2f5df7..ff18a1d41 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -38,14 +38,14 @@ ******************************************************************/ KoVariableNameDia::KoVariableNameDia( TQWidget *parent ) - : KDialogBase( parent, "", TRUE,i18n( "Entry Name" ),Ok|Cancel ) + : KDialogBase( parent, "", true,i18n( "Entry Name" ),Ok|Cancel ) { init(); } KoVariableNameDia::KoVariableNameDia( TQWidget *parent, const TQPtrList& vars ) - : KDialogBase( parent, "", TRUE, i18n( "Variable Name" ), Ok|Cancel ) + : KDialogBase( parent, "", true, i18n( "Variable Name" ), Ok|Cancel ) { init(); @@ -68,7 +68,7 @@ void KoVariableNameDia::init() TQLabel *l = new TQLabel( i18n( "Name:" ), row1 ); l->setFixedSize( l->sizeHint() ); - names = new TQComboBox( TRUE, row1 ); + names = new TQComboBox( true, row1 ); names->setFocus(); connect( names, TQ_SIGNAL( textChanged ( const TQString & )), @@ -161,7 +161,7 @@ int KoCustomVariablesListItem::width( const TQFontMetrics & fm, const TQListView KoCustomVariablesList::KoCustomVariablesList( TQWidget *parent ) : TDEListView( parent ) { - header()->setMovingEnabled( FALSE ); + header()->setMovingEnabled( false ); addColumn( i18n( "Variable" ) ); addColumn( i18n( "Value" ) ); connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), @@ -205,7 +205,7 @@ void KoCustomVariablesList::updateItems() ******************************************************************/ KoCustomVariablesDia::KoCustomVariablesDia( TQWidget *parent, const TQPtrList &variables ) - : KDialogBase( parent, "", TRUE,i18n( "Variable Value Editor" ), Ok|Cancel ) + : KDialogBase( parent, "", true,i18n( "Variable Value Editor" ), Ok|Cancel ) { back = makeVBoxMainWidget(); @@ -249,7 +249,7 @@ void KoCustomVariablesDia::slotOk() ******************************************************************/ KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent ) - : KDialogBase( parent, "", TRUE,i18n( "Add Variable" ), Ok|Cancel ) + : KDialogBase( parent, "", true,i18n( "Add Variable" ), Ok|Cancel ) { init(); m_name->setFocus(); @@ -269,7 +269,7 @@ KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent ) } // edit existing variable KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent, KoCustomVariable *var ) - : KDialogBase( parent, "", TRUE,i18n( "Edit Variable" ), Ok|Cancel ) + : KDialogBase( parent, "", true,i18n( "Edit Variable" ), Ok|Cancel ) { m_var = var; init(); diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index c9ed078bd..f9b6dc49c 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -462,7 +462,7 @@ int KoSpinBox::mapTextToValue( bool * ok ) int ret; TQString txt = text(); - *ok = TRUE; + *ok = true; switch(m_Etype) { case NUM: @@ -487,7 +487,7 @@ int KoSpinBox::mapTextToValue( bool * ok ) } if (ret == -1) - *ok = FALSE; + *ok = false; return ret; } @@ -1849,7 +1849,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram TextLabel2->setAlignment( AlignRight ); fillingGrid->addWidget( TextLabel2, 0, 0 ); - cFilling = new TQComboBox( FALSE, gTabLeader); + cFilling = new TQComboBox( false, gTabLeader); cFilling->insertItem( i18n( "Blank" ) ); cFilling->insertItem( "_ _ _ _ _ _"); // DOT cFilling->insertItem( "_________"); // SOLID diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index c007d3022..286d97aa6 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -60,7 +60,7 @@ void KoTextDocCommandHistory::addCommand( KoTextDocCommand *cmd ) { if ( current < (int)history.count() - 1 ) { TQPtrList commands; - commands.setAutoDelete( FALSE ); + commands.setAutoDelete( false ); for( int i = 0; i <= current; ++i ) { commands.insert( i, history.at( 0 ) ); @@ -70,7 +70,7 @@ void KoTextDocCommandHistory::addCommand( KoTextDocCommand *cmd ) commands.append( cmd ); history.clear(); history = commands; - history.setAutoDelete( TRUE ); + history.setAutoDelete( true ); } else { history.append( cmd ); } @@ -187,7 +187,7 @@ KoTextCursor *KoTextDocDeleteCommand::unexecute( KoTextCursor *c ) cursor.setParag( s ); cursor.setIndex( index ); TQString str = KoTextString::toString( text ); - cursor.insert( str, TRUE, &text ); + cursor.insert( str, true, &text ); cursor.setParag( s ); cursor.setIndex( index ); if ( c ) { @@ -200,7 +200,7 @@ KoTextCursor *KoTextDocDeleteCommand::unexecute( KoTextCursor *c ) s = cursor.parag(); while ( s ) { s->format(); - s->setChanged( TRUE ); + s->setChanged( true ); if ( c && s == c->parag() ) break; s = s->next(); @@ -377,7 +377,7 @@ void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArrayinvalidate( idx ); tmpIndex = -1; - bool justInsert = TRUE; + bool justInsert = true; TQString s( str ); #if defined(TQ_WS_WIN) if ( checkNewLine ) @@ -391,27 +391,27 @@ void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArrayat( i ).format() ) { formatting->at( i ).format()->addRef(); - string->string()->setFormat( idx + i, formatting->at( i ).format(), TRUE ); + string->string()->setFormat( idx + i, formatting->at( i ).format(), true ); } } } idx += s.length(); } else { - TQStringList lst = TQStringList::split( '\n', s, TRUE ); + TQStringList lst = TQStringList::split( '\n', s, true ); TQStringList::Iterator it = lst.begin(); //int y = string->rect().y() + string->rect().height(); int lastIndex = 0; KoTextFormat *lastFormat = 0; for ( ; it != lst.end(); ) { if ( it != lst.begin() ) { - splitAndInsertEmptyParag( FALSE, TRUE ); + splitAndInsertEmptyParag( false, true ); //string->setEndState( -1 ); #if 0 // no! - string->prev()->format( -1, FALSE ); + string->prev()->format( -1, false ); #endif if ( lastFormat && formatting && string->prev() ) { lastFormat->addRef(); - string->prev()->string()->setFormat( string->prev()->length() - 1, lastFormat, TRUE ); + string->prev()->string()->setFormat( string->prev()->length() - 1, lastFormat, true ); } } lastFormat = 0; @@ -427,7 +427,7 @@ void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArrayat( i + lastIndex ).format() ) { formatting->at( i + lastIndex ).format()->addRef(); - string->string()->setFormat( i + idx, formatting->at( i + lastIndex ).format(), TRUE ); + string->string()->setFormat( i + idx, formatting->at( i + lastIndex ).format(), true ); } } if ( it != lst.end() ) @@ -439,7 +439,7 @@ void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArrayformat( -1, FALSE ); + string->format( -1, false ); int dy = string->rect().y() + string->rect().height() - y; #endif KoTextParag *p = string; @@ -455,7 +455,7 @@ void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArrayrect().height(); - string->format( -1, TRUE ); + string->format( -1, true ); #endif fixCursorPosition(); } @@ -499,9 +499,9 @@ bool KoTextCursor::place( const TQPoint &p, KoTextParag *s, bool link, int *cust } if ( !s ) - return FALSE; + return false; - setParag( s, FALSE ); + setParag( s, false ); int y = s->rect().y(); int lines = s->lines(); KoTextStringChar *chr = 0; @@ -514,7 +514,7 @@ bool KoTextCursor::place( const TQPoint &p, KoTextParag *s, bool link, int *cust cy = s->lineY( i ); //ch = s->lineHeight( i ); if ( !chr ) - return FALSE; + return false; if ( i < lines - 1 && pos.y() >= y + cy && pos.y() <= y + s->lineY( i+1 ) ) break; } @@ -545,7 +545,7 @@ bool KoTextCursor::place( const TQPoint &p, KoTextParag *s, bool link, int *cust cpos += cw; int d = cpos - pos.x(); bool dm = d < 0 ? !chr->rightToLeft : chr->rightToLeft; - if ( (TQABS( d ) < dist || (dist == d && dm == TRUE )) && string->string()->validCursorPosition( i ) ) { + if ( (TQABS( d ) < dist || (dist == d && dm == true )) && string->string()->validCursorPosition( i ) ) { dist = TQABS( d ); if ( !link || pos.x() >= x + chr->x ) { curpos = i; @@ -553,9 +553,9 @@ bool KoTextCursor::place( const TQPoint &p, KoTextParag *s, bool link, int *cust } i++; } - setIndex( curpos, FALSE ); + setIndex( curpos, false ); - return TRUE; + return true; } void KoTextCursor::gotoRight() @@ -781,7 +781,7 @@ void KoTextCursor::gotoPreviousWord() gotoPreviousLetter(); tmpIndex = -1; KoTextString *s = string->string(); - bool allowSame = FALSE; + bool allowSame = false; if ( idx == ( (int)s->length()-1 ) ) return; for ( int i = idx; i >= 0; --i ) { @@ -794,7 +794,7 @@ void KoTextCursor::gotoPreviousWord() } if ( !allowSame && !( s->at( i ).c.isSpace() || s->at( i ).c == '\t' || s->at( i ).c == '.' || s->at( i ).c == ',' || s->at( i ).c == ':' || s->at( i ).c == ';' ) ) - allowSame = TRUE; + allowSame = true; } idx = 0; } @@ -803,7 +803,7 @@ void KoTextCursor::gotoNextWord() { tmpIndex = -1; KoTextString *s = string->string(); - bool allowSame = FALSE; + bool allowSame = false; for ( int i = idx; i < (int)s->length(); ++i ) { if ( ! ( s->at( i ).c.isSpace() || s->at( i ).c == '\t' || s->at( i ).c == '.' || s->at( i ).c == ',' || s->at( i ).c == ':' || s->at( i ).c == ';' ) ) { @@ -814,7 +814,7 @@ void KoTextCursor::gotoNextWord() } if ( !allowSame && ( s->at( i ).c.isSpace() || s->at( i ).c == '\t' || s->at( i ).c == '.' || s->at( i ).c == ',' || s->at( i ).c == ':' || s->at( i ).c == ';' ) ) - allowSame = TRUE; + allowSame = true; } if ( idx < ((int)s->length()-1) ) { @@ -860,7 +860,7 @@ void KoTextCursor::splitAndInsertEmptyParag( bool ind, bool updateIds ) KoTextParag *n = string->next(); KoTextParag *s = doc->createParag( doc, string, n, updateIds ); if ( f ) - s->setFormat( 0, 1, f, TRUE ); + s->setFormat( 0, 1, f, true ); s->copyParagData( string ); #if 0 if ( ind ) { @@ -878,7 +878,7 @@ void KoTextCursor::splitAndInsertEmptyParag( bool ind, bool updateIds ) KoTextParag *p = string->prev(); KoTextParag *s = doc->createParag( doc, p, string, updateIds ); if ( f ) - s->setFormat( 0, 1, f, TRUE ); + s->setFormat( 0, 1, f, true ); s->copyParagData( string ); if ( ind ) { //s->indent(); @@ -892,10 +892,10 @@ void KoTextCursor::splitAndInsertEmptyParag( bool ind, bool updateIds ) KoTextParag *s = doc->createParag( doc, string, n, updateIds ); s->copyParagData( string ); s->remove( 0, 1 ); - s->append( str, TRUE ); + s->append( str, true ); for ( uint i = 0; i < str.length(); ++i ) { KoTextStringChar* tsc = string->at( idx + i ); - s->setFormat( i, 1, tsc->format(), TRUE ); + s->setFormat( i, 1, tsc->format(), true ); if ( tsc->isCustom() ) { KoTextCustomItem * item = tsc->customItem(); s->at( i )->setCustomItem( item ); @@ -932,17 +932,17 @@ bool KoTextCursor::removePreviousChar() idx--; // shouldn't be needed, just to make sure. fixCursorPosition(); - string->format( -1, TRUE ); + string->format( -1, true ); //else if ( string->document() && string->document()->parent() ) - // string->document()->nextDoubleBuffered = TRUE; - return FALSE; + // string->document()->nextDoubleBuffered = true; + return false; } else if ( string->prev() ) { string = string->prev(); string->join( string->next() ); string->invalidateCounters(); - return TRUE; + return true; } - return FALSE; + return false; } bool KoTextCursor::remove() @@ -951,10 +951,10 @@ bool KoTextCursor::remove() if ( !atParagEnd() ) { int next = string->string()->nextCursorPosition( idx ); string->remove( idx, next-idx ); - string->format( -1, TRUE ); + string->format( -1, true ); //else if ( doc && doc->parent() ) - // doc->nextDoubleBuffered = TRUE; - return FALSE; + // doc->nextDoubleBuffered = true; + return false; } else if ( string->next() ) { if ( string->length() == 1 ) { string->next()->setPrev( string->prev() ); @@ -971,17 +971,17 @@ bool KoTextCursor::remove() while ( s ) { s->id = s->p ? s->p->id + 1 : 0; //s->state = -1; - //s->needPreProcess = TRUE; - s->changed = TRUE; + //s->needPreProcess = true; + s->changed = true; s = s->n; } string->format(); } else { string->join( string->next() ); } - return TRUE; + return true; } - return FALSE; + return false; } void KoTextCursor::killLine() @@ -989,9 +989,9 @@ void KoTextCursor::killLine() if ( atParagEnd() ) return; string->remove( idx, string->length() - idx - 1 ); - string->format( -1, TRUE ); + string->format( -1, true ); //else if ( doc && doc->parent() ) - //doc->nextDoubleBuffered = TRUE; + //doc->nextDoubleBuffered = true; } #if 0 @@ -1069,10 +1069,10 @@ void KoTextCursor::fixCursorPosition() KoTextString::KoTextString() { - bidiDirty = TRUE; + bidiDirty = true; bNeedsSpellCheck = true; - bidi = FALSE; - rightToLeft = FALSE; + bidi = false; + rightToLeft = false; dir = TQChar::DirON; } @@ -1117,7 +1117,7 @@ void KoTextString::insert( int index, const TQString &s, KoTextFormat *f ) #endif ch.setFormat( f ); } - bidiDirty = TRUE; + bidiDirty = true; bNeedsSpellCheck = true; } @@ -1145,7 +1145,7 @@ void KoTextString::insert( int index, KoTextStringChar *c ) ch.d.format = 0; ch.type = KoTextStringChar::Regular; ch.setFormat( c->format() ); - bidiDirty = TRUE; + bidiDirty = true; bNeedsSpellCheck = true; } @@ -1168,7 +1168,7 @@ void KoTextString::truncate( int index ) } } data.truncate( index ); - bidiDirty = TRUE; + bidiDirty = true; bNeedsSpellCheck = true; } @@ -1189,7 +1189,7 @@ void KoTextString::remove( int index, int len ) memmove( data.data() + index, data.data() + index + len, sizeof( KoTextStringChar ) * ( data.size() - index - len ) ); data.resize( data.size() - len, TQGArray::SpeedOptim ); - bidiDirty = TRUE; + bidiDirty = true; bNeedsSpellCheck = true; } @@ -1232,10 +1232,10 @@ void KoTextString::setFormat( int index, KoTextFormat *f, bool useCollection, bo void KoTextString::checkBidi() const { KoTextString *that = (KoTextString *)this; - that->bidiDirty = FALSE; + that->bidiDirty = false; int length = data.size(); if ( !length ) { - that->bidi = FALSE; + that->bidi = false; that->rightToLeft = dir == TQChar::DirR; return; } @@ -1251,7 +1251,7 @@ void KoTextString::checkBidi() const TQScriptItem *item = &textEngine.items[textEngine.items.size()-1]; unsigned char bidiLevel = item->analysis.bidiLevel; if ( bidiLevel ) - that->bidi = TRUE; + that->bidi = true; int pos = length-1; while ( ch >= start ) { if ( item->position > pos ) { @@ -1260,7 +1260,7 @@ void KoTextString::checkBidi() const Q_ASSERT( item < &textEngine.items[textEngine.items.size()] ); bidiLevel = item->analysis.bidiLevel; if ( bidiLevel ) - that->bidi = TRUE; + that->bidi = true; } ch->softBreak = ca->softBreak; ch->whiteSpace = ca->whiteSpace; @@ -1274,10 +1274,10 @@ void KoTextString::checkBidi() const } if ( dir == TQChar::DirR ) { - that->bidi = TRUE; - that->rightToLeft = TRUE; + that->bidi = true; + that->rightToLeft = true; } else if ( dir == TQChar::DirL ) { - that->rightToLeft = FALSE; + that->rightToLeft = false; } else { that->rightToLeft = (textEngine.direction == TQChar::DirR); } @@ -1476,7 +1476,7 @@ int KoTextStringChar::descent() const // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ KoTextFormatterBase::KoTextFormatterBase() - : wrapColumn( -1 ), //wrapEnabled( TRUE ), + : wrapColumn( -1 ), //wrapEnabled( true ), m_bViewFormattingChars( false ), biw( true /*default in kotext*/ ) { @@ -1533,7 +1533,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para } } int toAdd = 0; - bool first = TRUE; + bool first = true; KoTextRun *r = runs->first(); int xmax = -0xffffff; while ( r ) { @@ -1548,13 +1548,13 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para space -= s; numSpaces--; } else if ( first ) { - first = FALSE; + first = false; if ( c->c == ' ' ) x -= c->format()->width( ' ' ); } c->x = x + toAdd; - c->rightToLeft = TRUE; - c->startOfRun = FALSE; + c->rightToLeft = true; + c->startOfRun = false; int ww = 0; if ( c->c.unicode() >= 32 || c->c == '\t' || c->c == '\n' || c->isCustom() ) { ww = c->width; @@ -1575,13 +1575,13 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para space -= s; numSpaces--; } else if ( first ) { - first = FALSE; + first = false; if ( c->c == ' ' ) x -= c->format()->width( ' ' ); } c->x = x + toAdd; - c->rightToLeft = FALSE; - c->startOfRun = FALSE; + c->rightToLeft = false; + c->startOfRun = false; int ww = 0; if ( c->c.unicode() >= 32 || c->c == '\t' || c->isCustom() ) { ww = c->width; @@ -1594,7 +1594,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para pos++; } } - text->at( r->start + start ).startOfRun = TRUE; + text->at( r->start + start ).startOfRun = true; r = runs->next(); } @@ -1617,7 +1617,7 @@ bool KoTextFormatterBase::isStretchable( KoTextString *string, int pos ) const bool KoTextFormatterBase::isBreakable( KoTextString *string, int pos ) const { //if (string->at(pos).nobreak) - // return FALSE; + // return false; return (pos < string->length()-1 && string->at(pos+1).softBreak); } @@ -1662,12 +1662,12 @@ int KoTextFormatterBase::formatVertically( KoTextDocument* doc, KoTextParag* par int delta = c->customItem()->height - h; ls->h += delta; if ( delta ) - parag->setMovedDown( TRUE ); + parag->setMovedDown( true ); } else { int shift = doc->flow()->adjustFlow( parag->rect().y() + ls->y, ls->w, ls->h ); ls->y += shift; if ( shift ) - parag->setMovedDown( TRUE ); + parag->setMovedDown( true ); } h = ls->y + ls->h; } @@ -1696,8 +1696,8 @@ KoTextCustomItem::~KoTextCustomItem() KoTextFlow::KoTextFlow() { w = 0; - leftItems.setAutoDelete( FALSE ); - rightItems.setAutoDelete( FALSE ); + leftItems.setAutoDelete( false ); + rightItems.setAutoDelete( false ); } KoTextFlow::~KoTextFlow() diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h index c6ebceeb3..ac9297ed5 100644 --- a/lib/kotext/KoRichText.h +++ b/lib/kotext/KoRichText.h @@ -116,7 +116,7 @@ public: bool isCustom() const { return type == Custom; } KoTextFormat *format() const; KoTextCustomItem *customItem() const; - void setFormat( KoTextFormat *f,bool setFormatAgain=TRUE ); + void setFormat( KoTextFormat *f,bool setFormatAgain=true ); void setCustomItem( KoTextCustomItem *i ); void loseCustomItem(); struct CustomData @@ -171,13 +171,13 @@ public: void remove( int index, int len ); void clear(); - void setFormat( int index, KoTextFormat *f, bool useCollection, bool setFormatAgain = FALSE ); + void setFormat( int index, KoTextFormat *f, bool useCollection, bool setFormatAgain = false ); void setBidi( bool b ) { bidi = b; } bool isBidi() const; bool isRightToLeft() const; TQChar::Direction direction() const; - void setDirection( TQChar::Direction d ) { dir = d; bidiDirty = TRUE; } + void setDirection( TQChar::Direction d ) { dir = d; bidiDirty = true; } /** Set dirty flag for background spell-checking */ void setNeedsSpellCheck( bool b ) { bNeedsSpellCheck = b; } @@ -245,7 +245,7 @@ public: KoTextParag *parag() const; int index() const; - void setParag( KoTextParag *s, bool restore = TRUE ); + void setParag( KoTextParag *s, bool restore = true ); void gotoLeft(); void gotoRight(); @@ -265,7 +265,7 @@ public: void gotoWordRight(); void insert( const TQString &s, bool checkNewLine, TQMemArray *formatting = 0 ); - void splitAndInsertEmptyParag( bool ind = TRUE, bool updateIds = TRUE ); + void splitAndInsertEmptyParag( bool ind = true, bool updateIds = true ); bool remove(); bool removePreviousChar(); void killLine(); @@ -274,7 +274,7 @@ public: bool atParagStart() const; bool atParagEnd() const; - void setIndex( int i, bool restore = TRUE ); + void setIndex( int i, bool restore = true ); //void checkIndex(); @@ -323,7 +323,7 @@ template class TQPtrList; class KoTextDocCommandHistory { public: - KoTextDocCommandHistory( int s ) : current( -1 ), steps( s ) { history.setAutoDelete( TRUE ); } + KoTextDocCommandHistory( int s ) : current( -1 ), steps( s ) { history.setAutoDelete( true ); } virtual ~KoTextDocCommandHistory() { clear(); } void clear() { history.clear(); current = -1; } @@ -396,7 +396,7 @@ public: void draw(TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ); TQString richText() const; - bool ownLine() const { return TRUE; } + bool ownLine() const { return true; } private: int tmpheight; @@ -547,15 +547,15 @@ public: void draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ); - bool noErase() const { return TRUE; } - bool ownLine() const { return TRUE; } + bool noErase() const { return true; } + bool ownLine() const { return true; } Placement placement() const { return place; } - bool isNested() const { return TRUE; } + bool isNested() const { return true; } void resize( int nwidth ); virtual void invalidate(); /// ## TQString anchorAt( TQPainter* p, int x, int y ); - virtual bool enter( KoTextCursor *c, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy, bool atEnd = FALSE ); + virtual bool enter( KoTextCursor *c, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy, bool atEnd = false ); virtual bool enterAt( KoTextCursor *c, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy, const TQPoint &pos ); virtual bool next( KoTextCursor *c, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy ); virtual bool prev( KoTextCursor *c, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy ); diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 554a68058..dcc26eeda 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -604,25 +604,25 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC TQButtonGroup *grpBold = new TQButtonGroup( 1, TQt::Vertical, page ); - grpBold->setRadioButtonExclusive( TRUE ); + grpBold->setRadioButtonExclusive( true ); grpBold->layout(); m_boldYes=new TQRadioButton( i18n("Yes"), grpBold ); m_boldNo=new TQRadioButton( i18n("No"), grpBold ); TQButtonGroup *grpItalic = new TQButtonGroup( 1, TQt::Vertical, page ); - grpItalic->setRadioButtonExclusive( TRUE ); + grpItalic->setRadioButtonExclusive( true ); grpItalic->layout(); m_italicYes=new TQRadioButton( i18n("Yes"), grpItalic ); m_italicNo=new TQRadioButton( i18n("No"), grpItalic ); TQButtonGroup *grpShadow = new TQButtonGroup( 1, TQt::Vertical, page ); - grpShadow->setRadioButtonExclusive( TRUE ); + grpShadow->setRadioButtonExclusive( true ); grpShadow->layout(); m_shadowYes=new TQRadioButton( i18n("Yes"), grpShadow ); m_shadowNo=new TQRadioButton( i18n("No"), grpShadow ); TQButtonGroup *grpWordByWord = new TQButtonGroup( 1, TQt::Vertical, page ); - grpWordByWord->setRadioButtonExclusive( TRUE ); + grpWordByWord->setRadioButtonExclusive( true ); grpWordByWord->layout(); m_wordByWordYes=new TQRadioButton( i18n("Yes"), grpWordByWord ); m_wordByWordNo=new TQRadioButton( i18n("No"), grpWordByWord ); diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index f00fe0f1e..f5d90be11 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -197,7 +197,7 @@ void KoStyleManager::addGeneralTab( int flags ) { tabLayout->addWidget( nameLabel, 0, 0 ); - m_styleCombo = new TQComboBox( FALSE, tab, "styleCombo" ); + m_styleCombo = new TQComboBox( false, tab, "styleCombo" ); tabLayout->addWidget( m_styleCombo, 1, 1 ); @@ -207,7 +207,7 @@ void KoStyleManager::addGeneralTab( int flags ) { tabLayout->addWidget( nextStyleLabel, 1, 0 ); - m_inheritCombo = new TQComboBox( FALSE, tab, "inheritCombo" ); + m_inheritCombo = new TQComboBox( false, tab, "inheritCombo" ); tabLayout->addWidget( m_inheritCombo, 2, 1 ); TQLabel *inheritStyleLabel = new TQLabel( tab ); diff --git a/lib/kotext/KoTextCustomItem.cpp b/lib/kotext/KoTextCustomItem.cpp index 4b567e0be..ff83414fa 100644 --- a/lib/kotext/KoTextCustomItem.cpp +++ b/lib/kotext/KoTextCustomItem.cpp @@ -31,28 +31,28 @@ bool KoTextCustomItem::enter( KoTextCursor *, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy, bool atEnd ) { - doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; Q_UNUSED( atEnd ) return TRUE; + doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; Q_UNUSED( atEnd ) return true; } bool KoTextCustomItem::enterAt( KoTextCursor *, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy, const TQPoint & ) { - doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return TRUE; + doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return true; } bool KoTextCustomItem::next( KoTextCursor *, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy ) { - doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return TRUE; + doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return true; } bool KoTextCustomItem::prev( KoTextCursor *, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy ) { - doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return TRUE; + doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return true; } bool KoTextCustomItem::down( KoTextCursor *, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy ) { - doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return TRUE; + doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return true; } bool KoTextCustomItem::up( KoTextCursor *, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy ) { - doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return TRUE; + doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return true; } int KoTextCustomItem::index() const diff --git a/lib/kotext/KoTextCustomItem.h b/lib/kotext/KoTextCustomItem.h index 73ee8942b..42496c634 100644 --- a/lib/kotext/KoTextCustomItem.h +++ b/lib/kotext/KoTextCustomItem.h @@ -53,12 +53,12 @@ public: virtual Placement placement() const { return PlaceInline; } bool placeInline() { return placement() == PlaceInline; } - virtual bool ownLine() const { return FALSE; } + virtual bool ownLine() const { return false; } // Called for "ownline" items virtual void resize( int nwidth ) { width = nwidth; } virtual void invalidate() {}; - virtual bool isNested() const { return FALSE; } + virtual bool isNested() const { return false; } virtual int minimumWidth() const { return 0; } virtual int widthHint() const { return 0; } virtual int ascent() const { return height; } @@ -70,7 +70,7 @@ public: TQRect geometry() const { return TQRect( xpos, ypos, width, height ); } - virtual bool enter( KoTextCursor *, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy, bool atEnd = FALSE ); + virtual bool enter( KoTextCursor *, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy, bool atEnd = false ); virtual bool enterAt( KoTextCursor *, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy, const TQPoint & ); virtual bool next( KoTextCursor *, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy ); virtual bool prev( KoTextCursor *, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy ); diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp index 35adf8143..bb72478cf 100644 --- a/lib/kotext/KoTextDocument.cpp +++ b/lib/kotext/KoTextDocument.cpp @@ -69,7 +69,7 @@ KoTextDocument::KoTextDocument( KoTextZoomHandler *zoomHandler, KoTextFormatColl void KoTextDocument::init() { //pProcessor = 0; - useFC = TRUE; + useFC = true; pFormatter = 0; fParag = 0; m_pageBreakEnabled = false; @@ -77,15 +77,15 @@ void KoTextDocument::init() align = TQt::AlignAuto; nSelections = 2; - underlLinks = TRUE; + underlLinks = true; backBrush = 0; buf_pixmap = 0; - //nextDoubleBuffered = FALSE; + //nextDoubleBuffered = false; //if ( par ) // withoutDoubleBuffer = par->withoutDoubleBuffer; // else - withoutDoubleBuffer = FALSE; + withoutDoubleBuffer = false; lParag = fParag = createParag( this, 0, 0 ); @@ -102,9 +102,9 @@ void KoTextDocument::init() rightmargin = 0; // 4 in TQRT selectionColors[ Standard ] = TQApplication::palette().color( TQPalette::Active, TQColorGroup::Highlight ); - selectionText[ Standard ] = TRUE; + selectionText[ Standard ] = true; assert( Standard < nSelections ); - selectionText[ InputMethodPreedit ] = FALSE; + selectionText[ InputMethodPreedit ] = false; assert( InputMethodPreedit < nSelections ); commandHistory = new KoTextDocCommandHistory( 100 ); tStopWidth = formatCollection()->defaultFormat()->width( 'x' ) * 8; @@ -186,8 +186,8 @@ KoTextParag *KoTextDocument::createParag( KoTextDocument *d, KoTextParag *pr, Ko void KoTextDocument::setPlainText( const TQString &text ) { clear(); - //preferRichText = FALSE; - //oTextValid = TRUE; + //preferRichText = false; + //oTextValid = true; //oText = text; int lastNl = 0; @@ -387,7 +387,7 @@ bool KoTextDocument::setSelectionEnd( int id, KoTextCursor *cursor ) { TQMap::Iterator it = selections.find( id ); if ( it == selections.end() ) - return FALSE; + return false; KoTextDocumentSelection &sel = *it; KoTextCursor start = sel.startCursor; @@ -396,15 +396,15 @@ bool KoTextDocument::setSelectionEnd( int id, KoTextCursor *cursor ) if ( start == end ) { removeSelection( id ); setSelectionStart( id, cursor ); - return TRUE; + return true; } if ( sel.endCursor.parag() == end.parag() ) { setSelectionEndHelper( id, sel, start, end ); - return TRUE; + return true; } - bool inSelection = FALSE; + bool inSelection = false; KoTextCursor c( this ); KoTextCursor tmp = sel.startCursor; if ( sel.swapped ) @@ -412,32 +412,32 @@ bool KoTextDocument::setSelectionEnd( int id, KoTextCursor *cursor ) KoTextCursor tmp2 = *cursor; c.setParag( tmp.parag()->paragId() < tmp2.parag()->paragId() ? tmp.parag() : tmp2.parag() ); KoTextCursor old; - bool hadStart = FALSE; - bool hadEnd = FALSE; - bool hadStartParag = FALSE; - bool hadEndParag = FALSE; - bool hadOldStart = FALSE; - bool hadOldEnd = FALSE; - bool leftSelection = FALSE; - sel.swapped = FALSE; + bool hadStart = false; + bool hadEnd = false; + bool hadStartParag = false; + bool hadEndParag = false; + bool hadOldStart = false; + bool hadOldEnd = false; + bool leftSelection = false; + sel.swapped = false; for ( ;; ) { if ( c == start ) - hadStart = TRUE; + hadStart = true; if ( c == end ) - hadEnd = TRUE; + hadEnd = true; if ( c.parag() == start.parag() ) - hadStartParag = TRUE; + hadStartParag = true; if ( c.parag() == end.parag() ) - hadEndParag = TRUE; + hadEndParag = true; if ( c == sel.startCursor ) - hadOldStart = TRUE; + hadOldStart = true; if ( c == sel.endCursor ) - hadOldEnd = TRUE; + hadOldEnd = true; if ( !sel.swapped && ( hadEnd && !hadStart || hadEnd && hadStart && start.parag() == end.parag() && start.index() > end.index() ) ) - sel.swapped = TRUE; + sel.swapped = true; if ( c == end && hadStartParag || c == start && hadEndParag ) { @@ -451,9 +451,9 @@ bool KoTextDocument::setSelectionEnd( int id, KoTextCursor *cursor ) if ( inSelection && ( c == end && hadStart || c == start && hadEnd ) ) - leftSelection = TRUE; + leftSelection = true; else if ( !leftSelection && !inSelection && ( hadStart || hadEnd ) ) - inSelection = TRUE; + inSelection = true; bool noSelectionAnymore = hadOldStart && hadOldEnd && leftSelection && !inSelection && !c.parag()->hasSelection( id ) && c.atParagEnd(); c.parag()->removeSelection( id ); @@ -474,7 +474,7 @@ bool KoTextDocument::setSelectionEnd( int id, KoTextCursor *cursor ) } if ( leftSelection ) - inSelection = FALSE; + inSelection = false; old = c; c.gotoNextLetter(); @@ -492,7 +492,7 @@ bool KoTextDocument::setSelectionEnd( int id, KoTextCursor *cursor ) setSelectionEndHelper( id, sel, start, end ); - return TRUE; + return true; } void KoTextDocument::selectAll( int id ) @@ -500,7 +500,7 @@ void KoTextDocument::selectAll( int id ) removeSelection( id ); KoTextDocumentSelection sel; - sel.swapped = FALSE; + sel.swapped = false; KoTextCursor c( this ); c.setParag( fParag ); @@ -534,7 +534,7 @@ bool KoTextDocument::removeSelection( int id ) { TQMap::Iterator it = selections.find( id ); if ( it == selections.end() ) - return FALSE; + return false; KoTextDocumentSelection &sel = *it; @@ -544,25 +544,25 @@ bool KoTextDocument::removeSelection( int id ) tmp = sel.endCursor; c.setParag( tmp.parag() ); KoTextCursor old; - bool hadStart = FALSE; - bool hadEnd = FALSE; + bool hadStart = false; + bool hadEnd = false; KoTextParag *lastParag = 0; - bool leftSelection = FALSE; - bool inSelection = FALSE; - sel.swapped = FALSE; + bool leftSelection = false; + bool inSelection = false; + sel.swapped = false; for ( ;; ) { if ( !hadStart && c.parag() == sel.startCursor.parag() ) - hadStart = TRUE; + hadStart = true; if ( !hadEnd && c.parag() == sel.endCursor.parag() ) - hadEnd = TRUE; + hadEnd = true; if ( !leftSelection && !inSelection && ( c.parag() == sel.startCursor.parag() || c.parag() == sel.endCursor.parag() ) ) - inSelection = TRUE; + inSelection = true; if ( inSelection && ( c == sel.endCursor && hadStart || c == sel.startCursor && hadEnd ) ) { - leftSelection = TRUE; - inSelection = FALSE; + leftSelection = true; + inSelection = false; } bool noSelectionAnymore = leftSelection && !inSelection && !c.parag()->hasSelection( id ) && c.atParagEnd(); @@ -578,7 +578,7 @@ bool KoTextDocument::removeSelection( int id ) } selections.remove( id ); - return TRUE; + return true; } TQString KoTextDocument::selectedText( int id, bool withCustom ) const @@ -710,17 +710,17 @@ void KoTextDocument::setFormat( int id, const KoTextFormat *f, int flags ) } if ( c1.parag() == c2.parag() ) { - c1.parag()->setFormat( c1.index(), c2.index() - c1.index(), f, TRUE, flags ); + c1.parag()->setFormat( c1.index(), c2.index() - c1.index(), f, true, flags ); return; } - c1.parag()->setFormat( c1.index(), c1.parag()->length() - c1.index(), f, TRUE, flags ); + c1.parag()->setFormat( c1.index(), c1.parag()->length() - c1.index(), f, true, flags ); KoTextParag *p = c1.parag()->next(); while ( p && p != c2.parag() ) { - p->setFormat( 0, p->length(), f, TRUE, flags ); + p->setFormat( 0, p->length(), f, true, flags ); p = p->next(); } - c2.parag()->setFormat( 0, c2.index(), f, TRUE, flags ); + c2.parag()->setFormat( 0, c2.index(), f, true, flags ); } /*void KoTextDocument::copySelectedText( int id ) @@ -760,13 +760,13 @@ void KoTextDocument::removeSelectedText( int id, KoTextCursor *cursor ) bool valid = true; if ( c1.parag() == fParag && c1.index() == 0 && c2.parag() == lParag && c2.index() == lParag->length() - 1 ) - valid = FALSE; + valid = false; - bool didGoLeft = FALSE; + bool didGoLeft = false; if ( c1.index() == 0 && c1.parag() != fParag ) { cursor->gotoPreviousLetter(); if ( valid ) - didGoLeft = TRUE; + didGoLeft = true; } c1.parag()->remove( c1.index(), c1.parag()->length() - 1 - c1.index() ); @@ -821,7 +821,7 @@ bool KoTextDocument::find( const TQString &expr, bool cs, bool wo, bool forward, p = paragAt( *parag ); else if ( cursor ) p = cursor->parag(); - bool first = TRUE; + bool first = true; while ( p ) { TQString s = p->string()->toString(); @@ -834,26 +834,26 @@ bool KoTextDocument::find( const TQString &expr, bool cs, bool wo, bool forward, if ( !forward && first ) { start -= expr.length() + 1; if ( start < 0 ) { - first = FALSE; + first = false; p = p->prev(); continue; } } - first = FALSE; + first = false; for ( ;; ) { int res = forward ? s.find( expr, start, cs ) : s.findRev( expr, start, cs ); if ( res == -1 ) break; - bool ok = TRUE; + bool ok = true; if ( wo ) { int end = res + expr.length(); if ( ( res == 0 || s[ res - 1 ].isSpace() || s[ res - 1 ].isPunct() ) && ( end == (int)s.length() || s[ end ].isSpace() || s[ end ].isPunct() ) ) - ok = TRUE; + ok = true; else - ok = FALSE; + ok = false; } if ( ok ) { cursor->setParag( p ); @@ -865,7 +865,7 @@ bool KoTextDocument::find( const TQString &expr, bool cs, bool wo, bool forward, *parag = p->paragId(); if ( index ) *index = res; - return TRUE; + return true; } if ( forward ) { start = res + 1; @@ -878,21 +878,21 @@ bool KoTextDocument::find( const TQString &expr, bool cs, bool wo, bool forward, p = forward ? p->next() : p->prev(); } - return FALSE; + return false; } bool KoTextDocument::inSelection( int selId, const TQPoint &pos ) const { TQMap::ConstIterator it = selections.find( selId ); if ( it == selections.end() ) - return FALSE; + return false; KoTextDocumentSelection sel = *it; KoTextParag *startParag = sel.startCursor.parag(); KoTextParag *endParag = sel.endCursor.parag(); if ( sel.startCursor.parag() == sel.endCursor.parag() && sel.startCursor.parag()->selectionStart( selId ) == sel.endCursor.parag()->selectionEnd( selId ) ) - return FALSE; + return false; if ( sel.endCursor.parag()->paragId() < sel.startCursor.parag()->paragId() ) { endParag = sel.startCursor.parag(); startParag = sel.endCursor.parag(); @@ -901,14 +901,14 @@ bool KoTextDocument::inSelection( int selId, const TQPoint &pos ) const KoTextParag *p = startParag; while ( p ) { if ( p->rect().contains( pos ) ) { - bool inSel = FALSE; + bool inSel = false; int selStart = p->selectionStart( selId ); int selEnd = p->selectionEnd( selId ); int y = 0; int h = 0; for ( int i = 0; i < p->length(); ++i ) { if ( i == selStart ) - inSel = TRUE; + inSel = true; if ( i == selEnd ) break; if ( p->at( i )->lineStart ) { @@ -918,7 +918,7 @@ bool KoTextDocument::inSelection( int selId, const TQPoint &pos ) const if ( pos.y() - p->rect().y() >= y && pos.y() - p->rect().y() <= y + h ) { if ( inSel && pos.x() >= p->at( i )->x && pos.x() <= p->at( i )->x + p->at( i )->width /*p->at( i )->format()->width( p->at( i )->c )*/ ) - return TRUE; + return true; } } } @@ -929,7 +929,7 @@ bool KoTextDocument::inSelection( int selId, const TQPoint &pos ) const p = p->next(); } - return FALSE; + return false; } TQPixmap *KoTextDocument::bufferPixmap( const TQSize &s ) @@ -1000,7 +1000,7 @@ void KoTextDocument::setSelectionStart( int id, KoTextCursor *cursor ) KoTextDocumentSelection sel; sel.startCursor = *cursor; sel.endCursor = *cursor; - sel.swapped = FALSE; + sel.swapped = false; selections[ id ] = sel; } @@ -1078,12 +1078,12 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw, // This stuff relies on doLayout()... simpler to just test for Printer. // If someone understand doLayout() please tell me (David) /*if ( isWithoutDoubleBuffer() || par && par->withoutDoubleBuffer ) { */ - //setWithoutDoubleBuffer( TRUE ); + //setWithoutDoubleBuffer( true ); TQRect crect( cx, cy, cw, ch ); drawWithoutDoubleBuffer( p, crect, cg, zoomHandler ); return 0; } - //setWithoutDoubleBuffer( FALSE ); + //setWithoutDoubleBuffer( false ); if ( !firstParag() ) return 0; @@ -1181,7 +1181,7 @@ floating: TQRect cr( cx, cy, cw, ch ); cr = cr.intersect( TQRect( 0, pixelRect.y() + pixelRect.height(), docwidth, docheight - ( pixelRect.y() + pixelRect.height() ) ) ); - flow()->drawFloatingItems( p, cr.x(), cr.y(), cr.width(), cr.height(), cg, FALSE ); + flow()->drawFloatingItems( p, cr.x(), cr.y(), cr.width(), cr.height(), cg, false ); } } @@ -1238,7 +1238,7 @@ void KoTextDocument::drawWithoutDoubleBuffer( TQPainter *p, const TQRect &cr, co p->fillRect( TQRect( 0, 0, pr.width(), pr.height() ), brush ); //p->setBrushOrigin( p->brushOrigin() + TQPoint( 0, pr.y() ) ); - parag->paint( *p, cg, 0, FALSE, + parag->paint( *p, cg, 0, false, crect_lu.x(), crect_lu.y(), crect_lu.width(), crect_lu.height() ); p->translate( 0, -pr.y() ); @@ -1290,7 +1290,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx, bool useDoubleBuffer = !parag->document()->parent(); if ( is_printer(p) ) - useDoubleBuffer = FALSE; + useDoubleBuffer = false; // Can't handle transparency using double-buffering, in case of rotation/scaling (due to bitBlt) // The test on mat is almost like isIdentity(), but allows for translation. //// ##### The way to fix this: initialize the pixmap to be fully transparent instead @@ -1298,7 +1298,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx, TQWMatrix mat = p->worldMatrix(); if ( ( mat.m11() != 1.0 || mat.m22() != 1.0 || mat.m12() != 0.0 || mat.m21() != 0.0 ) && brush.style() != TQt::SolidPattern ) - useDoubleBuffer = FALSE; + useDoubleBuffer = false; #ifdef DEBUG_PAINTING kdDebug(32500) << "KoTextDocument::drawParagWYSIWYG parag->rect=" << parag->rect() @@ -1399,7 +1399,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx, } if ( resetChanged ) - parag->setChanged( FALSE ); + parag->setChanged( false ); } diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h index b1a1a17ee..55597c4fd 100644 --- a/lib/kotext/KoTextDocument.h +++ b/lib/kotext/KoTextDocument.h @@ -121,7 +121,7 @@ public: int numSelections() const { return nSelections; } void addSelection( int id ); - TQString selectedText( int id, bool withCustom = TRUE ) const; + TQString selectedText( int id, bool withCustom = true ) const; //void copySelectedText( int id ); void removeSelectedText( int id, KoTextCursor *cursor ); @@ -152,10 +152,10 @@ public: void draw( TQPainter *p, const TQRect& rect, const TQColorGroup &cg, const TQBrush *paper = 0 ); void drawParag( TQPainter *p, KoTextParag *parag, int cx, int cy, int cw, int ch, TQPixmap *&doubleBuffer, const TQColorGroup &cg, - bool drawCursor, KoTextCursor *cursor, bool resetChanged = TRUE ); + bool drawCursor, KoTextCursor *cursor, bool resetChanged = true ); KoTextParag *draw( TQPainter *p, int cx, int cy, int cw, int ch, const TQColorGroup &cg, - bool onlyChanged = FALSE, bool drawCursor = FALSE, KoTextCursor *cursor = 0, - bool resetChanged = TRUE ); + bool onlyChanged = false, bool drawCursor = false, KoTextCursor *cursor = 0, + bool resetChanged = true ); #endif //void setDefaultFont( const TQFont &f ); @@ -200,7 +200,7 @@ public: int undoDepth() const { return commandHistory->undoDepth(); } int length() const; - void clear( bool createEmptyParag = FALSE ); + void clear( bool createEmptyParag = false ); KoTextParag* loadList( const TQDomElement& list, KoOasisContext& context, KoTextParag* lastParagraph, KoStyleCollection * styleColl, KoTextParag* nextParagraph ); @@ -211,7 +211,7 @@ public: void saveOasisContent( KoXmlWriter& writer, KoSavingContext& context ) const; - virtual KoTextParag *createParag( KoTextDocument *d, KoTextParag *pr = 0, KoTextParag *nx = 0, bool updateIds = TRUE ); + virtual KoTextParag *createParag( KoTextDocument *d, KoTextParag *pr = 0, KoTextParag *nx = 0, bool updateIds = true ); // Whether margins are added or max'ed. int addMargins() const { return true; } @@ -292,9 +292,9 @@ public: /** The main drawing method. Equivalent to KoTextDocument::draw, but reimplemented * for wysiwyg */ KoTextParag *drawWYSIWYG( TQPainter *p, int cx, int cy, int cw, int ch, const TQColorGroup &cg, - KoTextZoomHandler* zoomHandler, bool onlyChanged = FALSE, - bool drawCursor = FALSE, KoTextCursor *cursor = 0, - bool resetChanged = TRUE, uint drawingFlags = KoTextDocument::DrawSelections ); + KoTextZoomHandler* zoomHandler, bool onlyChanged = false, + bool drawCursor = false, KoTextCursor *cursor = 0, + bool resetChanged = true, uint drawingFlags = KoTextDocument::DrawSelections ); /** Draw a single paragraph (used by drawWYSIWYG and by KWTextFrameSet::drawCursor). * Equivalent to KoTextDocument::draw, but modified for wysiwyg */ @@ -302,7 +302,7 @@ public: TQPixmap *&doubleBuffer, const TQColorGroup &cg, KoTextZoomHandler* zoomHandler, bool drawCursor, KoTextCursor *cursor, - bool resetChanged = TRUE, + bool resetChanged = true, uint drawingFlags = KoTextDocument::DrawSelections ); /** Set by drawParagWYSIWYG, used by KoTextParag::drawParagString */ diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 4648898d0..bb0992b29 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -54,9 +54,9 @@ void KoTextFormat::zoomChanged() KoTextFormat::KoTextFormat() { - //linkColor = TRUE; + //linkColor = true; ref = 0; - missp = FALSE; + missp = false; va = AlignNormal; collection = 0; //// kotext: WYSIWYG works much much better with scalable fonts -> force it to be scalable @@ -83,7 +83,7 @@ KoTextFormat::KoTextFormat() } KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language, bool hyphenation, KoTextFormatCollection *parent ) - : fn( f ), col( c ) /*fm( TQFontMetrics( f ) ),*/ //linkColor( TRUE ) + : fn( f ), col( c ) /*fm( TQFontMetrics( f ) ),*/ //linkColor( true ) { #ifdef DEBUG_COLLECTION kdDebug(32500) << "KoTextFormat with font & color & parent (" << parent << "), addRef. " << this << endl; @@ -103,7 +103,7 @@ KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_ //hei = fm.height(); //asc = fm.ascent(); //dsc = fm.descent(); - missp = FALSE; + missp = false; va = AlignNormal; //// kotext d = new KoTextFormatPrivate; @@ -1681,7 +1681,7 @@ KoTextFormatCollection::KoTextFormatCollection() defFormat = new KoTextFormat( TQApplication::font(), TQColor(), TDEGlobal::locale()->language(), false ); lastFormat = cres = 0; cflags = -1; - cKey.setAutoDelete( TRUE ); + cKey.setAutoDelete( true ); cachedFormat = 0; } @@ -1694,7 +1694,7 @@ KoTextFormatCollection::KoTextFormatCollection( const TQFont& defaultFont, const defFormat = new KoTextFormat( defaultFont, defaultColor, defaultLanguage, defaultHyphenation ); lastFormat = cres = 0; cflags = -1; - cKey.setAutoDelete( TRUE ); + cKey.setAutoDelete( true ); cachedFormat = 0; } @@ -1813,7 +1813,7 @@ KoTextFormat *KoTextFormatCollection::format( const TQFont &f, const TQColor &c, return cachedFormat; } - TQString key = KoTextFormat::getKey( f, c, FALSE, KoTextFormat::AlignNormal ); + TQString key = KoTextFormat::getKey( f, c, false, KoTextFormat::AlignNormal ); cachedFormat = cKey.find( key ); cfont = f; ccol = c; diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp index 5fb9cdc28..c1df5e032 100644 --- a/lib/kotext/KoTextFormatter.cpp +++ b/lib/kotext/KoTextFormatter.cpp @@ -225,7 +225,7 @@ bool KoTextFormatterCore::format() if ( maxY == 0 ) kdDebug(32500) << "KoTextFormatter::format " << parag->paragId() << " warning, maxY=0" << endl; #endif - bool fullWidth = TRUE; + bool fullWidth = true; //int marg = left + initialRMargin; // minw is the really minimum width needed for this paragraph, i.e. @@ -248,7 +248,7 @@ bool KoTextFormatterCore::format() int tmpBaseLine = 0, tmph = 0; //int tminw = marg; int tmpWused = 0; - bool lastWasNonInlineCustom = FALSE; + bool lastWasNonInlineCustom = false; bool abort = false; int align = parag->alignment(); @@ -281,9 +281,9 @@ bool KoTextFormatterCore::format() } if ( c->isCustom() && c->customItem()->placement() != KoTextCustomItem::PlaceInline ) - lastWasNonInlineCustom = TRUE; + lastWasNonInlineCustom = true; else - lastWasNonInlineCustom = FALSE; + lastWasNonInlineCustom = false; TQPair widths = determineCharWidth(); ww = widths.first; @@ -457,7 +457,7 @@ bool KoTextFormatterCore::format() ww = nx - x; } if ( x != left || availableWidth != dw ) - fullWidth = FALSE; + fullWidth = false; lineStart->y = y; parag->insertLineStart( i, lineStart ); tempWordData.clear(); @@ -550,7 +550,7 @@ bool KoTextFormatterCore::format() initialLMargin = x; availableWidth = dw - initialRMargin; if ( x != left || availableWidth != dw ) - fullWidth = FALSE; + fullWidth = false; lineStart->y = y; parag->insertLineStart( i + 1, lineStart ); tempWordData.clear(); @@ -976,7 +976,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( int pixelx = zh->layoutUnitToPixelX( x ); int toAdd = 0; int toAddPix = 0; - bool first = TRUE; + bool first = true; KoTextRun *r = runs->first(); int xmax = -0xffffff; while ( r ) { @@ -997,7 +997,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( chr.width += s; chr.pixelwidth += zh->layoutUnitToPixelX( s ); // ### rounding problem, recalculate } else if ( first ) { - first = FALSE; + first = false; if ( chr.c == ' ' ) // trailing space { //x -= chr.format()->width( ' ' ); @@ -1010,8 +1010,8 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( #ifdef DEBUG_FORMATTER kdDebug(32500) << "koBidiReorderLine: pos=" << pos << " x(LU)=" << x << " toAdd(LU)=" << toAdd << " -> chr.x=" << chr.x << " pixelx=" << pixelx << "+" << zh->layoutUnitToPixelX( toAdd ) << ", pixelxadj=" << pixelx+zh->layoutUnitToPixelX( toAdd )-zh->layoutUnitToPixelX( chr.x ) << endl; #endif - chr.rightToLeft = TRUE; - chr.startOfRun = FALSE; + chr.rightToLeft = true; + chr.startOfRun = false; int ww = chr.width; if ( xmax < x + toAdd + ww ) xmax = x + toAdd + ww; x += ww; @@ -1032,7 +1032,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( space -= s; numSpaces--; } else if ( first ) { - first = FALSE; + first = false; if ( chr.c == ' ' ) // trailing space { //x -= chr.format()->width( ' ' ); @@ -1042,8 +1042,8 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( } chr.x = x + toAdd; chr.pixelxadj = pixelx + toAddPix - zh->layoutUnitToPixelX( chr.x ); - chr.rightToLeft = FALSE; - chr.startOfRun = FALSE; + chr.rightToLeft = false; + chr.startOfRun = false; int ww = chr.width; //kdDebug(32500) << "setting char " << pos << " at pos " << chr.x << endl; if ( xmax < x + toAdd + ww ) xmax = x + toAdd + ww; @@ -1052,7 +1052,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( pos++; } } - text->at( r->start + start ).startOfRun = TRUE; + text->at( r->start + start ).startOfRun = true; r = runs->next(); } diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index 336d5bbda..8cadc7a4c 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -1063,7 +1063,7 @@ KCommand * KoTextObject::setFormatCommand( KoTextCursor * cursor, KoTextFormat * //kdDebug(32500) << "KoTextObject::setFormatCommand index=" << cursor->index() << " length-1=" << cursor->parag()->length() - 1 << endl; if ( cursor && cursor->index() == cursor->parag()->length() - 1 ) { newFormat->addRef(); - cursor->parag()->string()->setFormat( cursor->index(), newFormat, TRUE ); + cursor->parag()->string()->setFormat( cursor->index(), newFormat, true ); if ( cursor->parag()->length() == 1 ) { newFormat->addRef(); cursor->parag()->setFormat( newFormat ); @@ -1751,7 +1751,7 @@ bool KoTextObject::formatMore( int count /* = 10 */, bool emitAfterFormatting /* if ( count == 0 ) { - formatTimer->start( interval, TRUE ); + formatTimer->start( interval, true ); return true; } @@ -1859,7 +1859,7 @@ bool KoTextObject::formatMore( int count /* = 10 */, bool emitAfterFormatting /* // Now let's see when we'll need to get back here. if ( m_lastFormatted ) { - formatTimer->start( interval, TRUE ); + formatTimer->start( interval, true ); #ifdef DEBUG_FORMAT_MORE kdDebug(32500) << name() << " formatMore: will have to format more. formatTimer->start with interval=" << interval << endl; #endif @@ -1899,7 +1899,7 @@ void KoTextObject::typingStarted() void KoTextObject::typingDone() { - changeIntervalTimer->start( 100, TRUE ); + changeIntervalTimer->start( 100, true ); } @@ -2173,7 +2173,7 @@ KoTextCursor KoTextObject::pasteOasisText( const TQDomElement &bodyElem, KoOasis // Now split this parag, to make room for the next paragraphs resultCursor.setParag( lastParagraph ); resultCursor.setIndex( pos ); - resultCursor.splitAndInsertEmptyParag( FALSE, TRUE ); + resultCursor.splitAndInsertEmptyParag( false, true ); removeNewline = true; // Done with first parag, remove it and exit loop diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index b3e92c9eb..28a1975ab 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -40,11 +40,11 @@ KoTextParag::KoTextParag( KoTextDocument *d, KoTextParag *pr, KoTextParag *nx, bool updateIds ) : p( pr ), n( nx ), doc( d ), m_invalid( true ), - changed( FALSE ), - fullWidth( TRUE ), - newLinesAllowed( TRUE ), // default in kotext - visible( TRUE ), //breakable( TRUE ), - movedDown( FALSE ), + changed( false ), + fullWidth( true ), + newLinesAllowed( true ), // default in kotext + visible( true ), //breakable( true ), + movedDown( false ), m_toc( false ), align( 0 ), m_lineChanged( -1 ), @@ -71,10 +71,10 @@ KoTextParag::KoTextParag( KoTextDocument *d, KoTextParag *pr, KoTextParag *nx, b if ( !n && doc ) doc->setLastParag( this ); - //firstFormat = TRUE; //// unused - //firstPProcess = TRUE; + //firstFormat = true; //// unused + //firstPProcess = true; //state = -1; - //needPreProcess = FALSE; + //needPreProcess = false; if ( p ) id = p->id + 1; @@ -187,14 +187,14 @@ void KoTextParag::insert( int index, const TQString &s ) { str->insert( index, s, formatCollection()->defaultFormat() ); invalidate( index ); - //needPreProcess = TRUE; + //needPreProcess = true; } void KoTextParag::truncate( int index ) { str->truncate( index ); insert( length(), " " ); - //needPreProcess = TRUE; + //needPreProcess = true; } void KoTextParag::remove( int index, int len ) @@ -210,7 +210,7 @@ void KoTextParag::remove( int index, int len ) } str->remove( index, len ); invalidate( 0 ); - //needPreProcess = TRUE; + //needPreProcess = true; } void KoTextParag::join( KoTextParag *s ) @@ -228,12 +228,12 @@ void KoTextParag::join( KoTextParag *s ) remove( length() - 1, 1 ); --start; } - append( s->str->toString(), TRUE ); + append( s->str->toString(), true ); for ( int i = 0; i < s->length(); ++i ) { if ( doc->useFormatCollection() ) { s->str->at( i ).format()->addRef(); - str->setFormat( i + start, s->str->at( i ).format(), TRUE ); + str->setFormat( i + start, s->str->at( i ).format(), true ); } if ( s->str->at( i ).isCustom() ) { KoTextCustomItem * item = s->str->at( i ).customItem(); @@ -257,14 +257,14 @@ void KoTextParag::join( KoTextParag *s ) invalidateCounters(); //// r.setHeight( oh ); - //needPreProcess = TRUE; + //needPreProcess = true; if ( n ) { KoTextParag *s = n; while ( s ) { s->id = s->p->id + 1; //s->state = -1; - //s->needPreProcess = TRUE; - s->changed = TRUE; + //s->needPreProcess = true; + s->changed = true; s = s->n; } } @@ -277,7 +277,7 @@ void KoTextParag::move( int &dy ) //kdDebug(32500) << "KoTextParag::move paragId=" << paragId() << " dy=" << dy << endl; if ( dy == 0 ) return; - changed = TRUE; + changed = true; r.moveBy( 0, dy ); if ( mFloatingItems ) { for ( KoTextCustomItem *i = mFloatingItems->first(); i; i = mFloatingItems->next() ) { @@ -285,16 +285,16 @@ void KoTextParag::move( int &dy ) } } //if ( p ) - // p->lastInFrame = TRUE; // TQt does this, but the loop at the end of format() calls move a lot! + // p->lastInFrame = true; // TQt does this, but the loop at the end of format() calls move a lot! - movedDown = FALSE; + movedDown = false; // do page breaks if required if ( doc && doc->isPageBreakEnabled() ) { int shift; if ( ( shift = doc->formatter()->formatVertically( doc, this ) ) ) { if ( p ) - p->setChanged( TRUE ); + p->setChanged( true ); dy += shift; } } @@ -312,10 +312,10 @@ void KoTextParag::format( int start, bool doMove ) r.moveTopLeft( TQPoint( documentX(), p ? p->r.y() + p->r.height() : documentY() ) ); //if ( p ) - // p->lastInFrame = FALSE; + // p->lastInFrame = false; - movedDown = FALSE; - bool formattedAgain = FALSE; + movedDown = false; + bool formattedAgain = false; formatAgain: r.setWidth( documentWidth() ); @@ -388,7 +388,7 @@ void KoTextParag::format( int start, bool doMove ) int shift = doc->formatter()->formatVertically( doc, this ); //kdDebug(32500) << "formatVertically returned shift=" << shift << endl; if ( shift && !formattedAgain ) { - formattedAgain = TRUE; + formattedAgain = true; goto formatAgain; } } @@ -408,12 +408,12 @@ void KoTextParag::format( int start, bool doMove ) break; } if ( !s->isFullWidth() ) - makeInvalid = TRUE; + makeInvalid = true; if ( makeInvalid ) s->invalidate( 0 ); s->move( dy ); //if ( s->lastInFrame ) - // makeInvalid = TRUE; + // makeInvalid = true; s = s->n; } } @@ -455,13 +455,13 @@ void KoTextParag::format( int start, bool doMove ) } } - //firstFormat = FALSE; //// unused + //firstFormat = false; //// unused if ( formatterWorked ) // only if it worked, i.e. we had some width to format it { m_invalid = false; } - changed = TRUE; - //#### str->setTextChanged( FALSE ); + changed = true; + //#### str->setTextChanged( false ); } int KoTextParag::lineHeightOfChar( int i, int *bl, int *y ) const @@ -581,7 +581,7 @@ void KoTextParag::setFormat( int index, int len, const KoTextFormat *_f, bool us for ( int i = 0; i < len; ++i ) { of = str->at( i + index ).format(); if ( !changed && _f->key() != of->key() ) - changed = TRUE; + changed = true; // Check things that need the textformatter to run // (e.g. not color changes) // ######## Is this test exhaustive? @@ -676,14 +676,14 @@ void KoTextParag::show() { if ( visible || !doc ) return; - visible = TRUE; + visible = true; } void KoTextParag::hide() { if ( !visible || !doc ) return; - visible = FALSE; + visible = false; } void KoTextParag::setDirection( TQChar::Direction d ) @@ -715,7 +715,7 @@ void KoTextParag::setSelection( int id, int start, int end ) sel.start = start; sel.end = end; (*mSelections)[ id ] = sel; - setChanged( TRUE, TRUE ); + setChanged( true, true ); } void KoTextParag::removeSelection( int id ) @@ -724,7 +724,7 @@ void KoTextParag::removeSelection( int id ) return; if ( mSelections ) mSelections->remove( id ); - setChanged( TRUE, TRUE ); + setChanged( true, true ); } int KoTextParag::selectionStart( int id ) const @@ -750,20 +750,20 @@ int KoTextParag::selectionEnd( int id ) const bool KoTextParag::hasSelection( int id ) const { if ( !mSelections ) - return FALSE; + return false; TQMap::ConstIterator it = mSelections->find( id ); if ( it == mSelections->end() ) - return FALSE; + return false; return ( *it ).start != ( *it ).end || length() == 1; } bool KoTextParag::fullSelected( int id ) const { if ( !mSelections ) - return FALSE; + return false; TQMap::ConstIterator it = mSelections->find( id ); if ( it == mSelections->end() ) - return FALSE; + return false; return ( *it ).start == 0 && ( *it ).end == str->length() - 1; } @@ -845,9 +845,9 @@ uint KoTextParag::alignment() const void KoTextParag::setFormat( KoTextFormat *fm ) { #if 0 - bool doUpdate = FALSE; + bool doUpdate = false; if (defFormat && (defFormat != formatCollection()->defaultFormat())) - doUpdate = TRUE; + doUpdate = true; #endif defFormat = formatCollection()->format( fm ); #if 0 @@ -1515,13 +1515,13 @@ void KoTextParag::paintLines( TQPainter &painter, const TQColorGroup &cg, KoText TQMemArray selectionStarts( nSels ); TQMemArray selectionEnds( nSels ); if ( drawSelections ) { - bool hasASelection = FALSE; + bool hasASelection = false; for ( int i = 0; i < nSels; ++i ) { if ( !hasSelection( i ) ) { selectionStarts[ i ] = -1; selectionEnds[ i ] = -1; } else { - hasASelection = TRUE; + hasASelection = true; selectionStarts[ i ] = selectionStart( i ); int end = selectionEnd( i ); if ( end == length() - 1 && n && n->hasSelection( i ) ) @@ -1530,7 +1530,7 @@ void KoTextParag::paintLines( TQPainter &painter, const TQColorGroup &cg, KoText } } if ( !hasASelection ) - drawSelections = FALSE; + drawSelections = false; } // Draw the lines! @@ -1614,7 +1614,7 @@ void KoTextParag::paintLines( TQPainter &painter, const TQColorGroup &cg, KoText // we flush when the selection state changes if ( drawSelections ) { // check if selection state changed - TODO update from TQRT - bool selectionChange = FALSE; + bool selectionChange = false; if ( drawSelections ) { for ( int j = 0; j < nSels; ++j ) { selectionChange = selectionStarts[ j ] == i+1 || selectionEnds[ j ] == i+1; @@ -1786,7 +1786,7 @@ void KoTextParag::drawParagString( TQPainter &painter, const TQString &str, int drawParagStringInternal( painter, str, start, draw_len, draw_startX_pix, lastY_pix, baseLine_pix, draw_bw, - h_pix, FALSE /*drawSelections*/, + h_pix, false /*drawSelections*/, format, selectionStarts, selectionEnds, cg, rightToLeft, line, zh, true ); painter.restore(); @@ -2516,7 +2516,7 @@ void KoTextParag::drawFontEffects( TQPainter * p, KoTextFormat *format, KoTextZo p->drawLine( startX, y, startX + bw, y ); p->restore(); if ( font.underline() ) { // can this happen? - font.setUnderline( FALSE ); + font.setUnderline( false ); p->setFont( font ); } } @@ -2553,7 +2553,7 @@ void KoTextParag::drawFontEffects( TQPainter * p, KoTextFormat *format, KoTextZo p->drawLine( startX, y, startX + bw, y ); p->restore(); - font.setUnderline( FALSE ); + font.setUnderline( false ); p->setFont( font ); } else if ( format->waveUnderline() ) @@ -2586,7 +2586,7 @@ void KoTextParag::drawFontEffects( TQPainter * p, KoTextFormat *format, KoTextZo anc=acos(1.0-2*(static_cast((startX+bw)%offset)/static_cast(offset)))/3.1415*180; p->drawArc( zigzag_x, y, offset, offset, 180*16, -tqRound(pos*anc*16) ); p->restore(); - font.setUnderline( FALSE ); + font.setUnderline( false ); p->setFont( font ); } @@ -2626,7 +2626,7 @@ void KoTextParag::drawFontEffects( TQPainter * p, KoTextFormat *format, KoTextZo y -= static_cast(5*dimd); p->drawLine( startX, y, startX + bw, y ); p->restore(); - font.setStrikeOut( FALSE ); + font.setStrikeOut( false ); p->setFont( font ); } else if ( format->strikeOutType() == KoTextFormat::S_DOUBLE ) @@ -2660,7 +2660,7 @@ void KoTextParag::drawFontEffects( TQPainter * p, KoTextFormat *format, KoTextZo y -= static_cast(2*dimd); p->drawLine( startX, y, startX + bw, y); p->restore(); - font.setStrikeOut( FALSE ); + font.setStrikeOut( false ); p->setFont( font ); } @@ -2840,7 +2840,7 @@ void KoTextParag::loadOasisSpan( const TQDomElement& parent, KoOasisContext& con KoTextFormat f; f.load( context ); //kdDebug(32500) << "loadOasisSpan: applying formatting from " << pos << " to " << pos+length << "\n format=" << f.key() << endl; - setFormat( pos, length, document()->formatCollection()->format( &f ), TRUE ); + setFormat( pos, length, document()->formatCollection()->format( &f ), true ); pos += length; } context.styleStack().restore(); @@ -2903,7 +2903,7 @@ void KoTextParag::loadOasis( const TQDomElement& parent, KoOasisContext& context // Apply default format to trailing space const int len = str->length(); Q_ASSERT( len >= 1 ); - setFormat( len - 1, 1, paragFormat(), TRUE ); + setFormat( len - 1, 1, paragFormat(), true ); setChanged( true ); invalidate( 0 ); diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h index c89582c5e..89f5cba66 100644 --- a/lib/kotext/KoTextParag.h +++ b/lib/kotext/KoTextParag.h @@ -52,7 +52,7 @@ class KOTEXT_EXPORT KoTextParag friend class KoTextCursor; public: - KoTextParag( KoTextDocument *d, KoTextParag *pr = 0, KoTextParag *nx = 0, bool updateIds = TRUE ); + KoTextParag( KoTextDocument *d, KoTextParag *pr = 0, KoTextParag *nx = 0, bool updateIds = true ); virtual ~KoTextParag(); KoTextString *string() const; @@ -82,12 +82,12 @@ public: void setNext( KoTextParag *s ); void insert( int index, const TQString &s ); - void append( const TQString &s, bool reallyAtEnd = FALSE ); + void append( const TQString &s, bool reallyAtEnd = false ); void truncate( int index ); void remove( int index, int len ); void move( int &dy ); - void format( int start = -1, bool doMove = TRUE ); + void format( int start = -1, bool doMove = true ); /// Call this to ensure that format() will be called on this paragraph later on void invalidate( int chr /*ignored*/ = 0 ); @@ -96,7 +96,7 @@ public: /// 'changed' tells the painting code what it needs to paint bool hasChanged() const; - void setChanged( bool b, bool recursive = FALSE ); + void setChanged( bool b, bool recursive = false ); short int lineChanged(); // first line that has been changed. void setLineChanged( short int line ); @@ -125,7 +125,7 @@ public: TQMap &lineStartList(); - void setFormat( int index, int len, const KoTextFormat *f, bool useCollection = TRUE, int flags = -1 ); + void setFormat( int index, int len, const KoTextFormat *f, bool useCollection = true, int flags = -1 ); void setAlignment( uint a ); void setAlignmentDirect( uint a ) { align = a; } @@ -475,7 +475,7 @@ inline KoTextParag *KoTextParag::next() const inline bool KoTextParag::hasAnySelection() const { - return mSelections ? !selections().isEmpty() : FALSE; + return mSelections ? !selections().isEmpty() : false; } /*inline void KoTextParag::setEndState( int s ) diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index 866eb0f02..a883acba5 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -92,11 +92,11 @@ KoTextView::KoTextView( KoTextObject *textobj ) m_textobj->formatMore( 2 ); - blinkCursorVisible = FALSE; - inDoubleClick = FALSE; - mightStartDrag = FALSE; - possibleTripleClick = FALSE; - afterTripleClick = FALSE; + blinkCursorVisible = false; + inDoubleClick = false; + mightStartDrag = false; + possibleTripleClick = false; + afterTripleClick = false; m_currentFormat = 0; m_variablePosition =-1; m_overwriteMode = false; @@ -165,30 +165,30 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ { textObject()->typingStarted(); - /* bool selChanged = FALSE; + /* bool selChanged = false; for ( int i = 1; i < textDocument()->numSelections(); ++i ) selChanged = textDocument()->removeSelection( i ) || selChanged; if ( selChanged ) { - // m_cursor->parag()->document()->nextDoubleBuffered = TRUE; ######## we need that only if we have nested items/documents + // m_cursor->parag()->document()->nextDoubleBuffered = true; ######## we need that only if we have nested items/documents textFrameSet()->selectionChangedNotify(); }*/ - bool clearUndoRedoInfo = TRUE; + bool clearUndoRedoInfo = true; if ( TDEShortcut( KKey( e ) ) == TDEStdAccel::deleteWordBack() ) { if ( m_cursor->parag()->string()->isRightToLeft() ) deleteWordRight(); else deleteWordLeft(); - clearUndoRedoInfo = TRUE; + clearUndoRedoInfo = true; } else if ( TDEShortcut( KKey( e ) ) == TDEStdAccel::deleteWordForward() ) { if ( m_cursor->parag()->string()->isRightToLeft() ) deleteWordLeft(); else deleteWordRight(); - clearUndoRedoInfo = TRUE; + clearUndoRedoInfo = true; } else switch ( e->key() ) { @@ -233,7 +233,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ { if ( textObject()->hasSelection() ) textObject()->removeSelectedText( m_cursor ); - clearUndoRedoInfo = FALSE; + clearUndoRedoInfo = false; textObject()->doKeyboardAction( m_cursor, m_currentFormat, KoTextObject::ActionReturn ); Q_ASSERT( m_cursor->parag()->prev() ); if ( m_cursor->parag()->prev() ) @@ -250,7 +250,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ textObject()->doKeyboardAction( m_cursor, m_currentFormat, KoTextObject::ActionDelete ); - clearUndoRedoInfo = FALSE; + clearUndoRedoInfo = false; break; case Key_Backtab: if (e->state() & ShiftButton && m_cursor->parag() && m_cursor->atParagStart() && m_cursor->parag()->counter() && textDecreaseIndent()) @@ -263,7 +263,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ } textObject()->doKeyboardAction( m_cursor, m_currentFormat, KoTextObject::ActionBackspace ); - clearUndoRedoInfo = FALSE; + clearUndoRedoInfo = false; break; case Key_F16: // Copy key on Sun keyboards emit copy(); @@ -311,7 +311,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ if ( e->text().length() && ( !e->ascii() || e->ascii() >= 32 ) || ( e->text() == "\t" && !( e->state() & ControlButton ) ) ) { - clearUndoRedoInfo = FALSE; + clearUndoRedoInfo = false; TQString text = e->text(); if ( d->m_backSpeller ) { @@ -382,13 +382,13 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ insertNonbreakingSpace(); break; default: - clearUndoRedoInfo = FALSE; + clearUndoRedoInfo = false; break; } } else // e.g. just Key_Shift -> don't do anything (#129481) { - clearUndoRedoInfo = FALSE; + clearUndoRedoInfo = false; } } break; @@ -656,7 +656,7 @@ void KoTextView::extendParagraphSelection( const TQPoint& iPoint ) KoTextCursor oldCursor = *m_cursor; placeCursor( iPoint ); - bool redraw = FALSE; + bool redraw = false; if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) { redraw = textDocument()->setSelectionEnd( KoTextDocument::Standard, m_cursor ); @@ -689,7 +689,7 @@ TQString KoTextView::wordUnderCursor( const KoTextCursor& cursor ) bool KoTextView::handleMousePressEvent( TQMouseEvent *e, const TQPoint &iPoint, bool canStartDrag, bool insertDirectCursor ) { bool addParag = false; - mightStartDrag = FALSE; + mightStartDrag = false; hideCursor(); if (possibleTripleClick) @@ -716,14 +716,14 @@ bool KoTextView::handleMousePressEvent( TQMouseEvent *e, const TQPoint &iPoint, KoTextDocument * textdoc = textDocument(); if ( canStartDrag && textdoc->inSelection( KoTextDocument::Standard, iPoint ) ) { - mightStartDrag = TRUE; + mightStartDrag = true; m_textobj->emitShowCursor(); - dragStartTimer->start( TQApplication::startDragTime(), TRUE ); + dragStartTimer->start( TQApplication::startDragTime(), true ); dragStartPos = e->pos(); return addParag; } - bool redraw = FALSE; + bool redraw = false; if ( textdoc->hasSelection( KoTextDocument::Standard ) ) { if ( !( e->state() & ShiftButton ) ) { redraw = textdoc->removeSelection( KoTextDocument::Standard ); @@ -778,7 +778,7 @@ void KoTextView::handleMouseMoveEvent( TQMouseEvent*, const TQPoint& iPoint ) *m_cursor = oldCursor; } - bool redraw = FALSE; + bool redraw = false; if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) redraw = textDocument()->setSelectionEnd( KoTextDocument::Standard, m_cursor ) || redraw; else // it may be that the initial click was out of the frame @@ -795,7 +795,7 @@ void KoTextView::handleMouseReleaseEvent() if ( dragStartTimer->isActive() ) dragStartTimer->stop(); if ( mightStartDrag ) { - textObject()->selectAll( FALSE ); + textObject()->selectAll( false ); mightStartDrag = false; } else @@ -813,7 +813,7 @@ void KoTextView::handleMouseReleaseEvent() TQApplication::clipboard()->setSelectionMode( false ); } - inDoubleClick = FALSE; + inDoubleClick = false; m_textobj->emitShowCursor(); } @@ -827,7 +827,7 @@ void KoTextView::handleMouseDoubleClickEvent( TQMouseEvent*ev, const TQPoint& i return; } - inDoubleClick = TRUE; + inDoubleClick = true; *m_cursor = selectWordUnderCursor( *m_cursor ); textObject()->selectionChangedNotify(); // Copy the selection. @@ -853,7 +853,7 @@ void KoTextView::handleMouseTripleClickEvent( TQMouseEvent*ev, const TQPoint& /* return; } afterTripleClick= true; - inDoubleClick = FALSE; + inDoubleClick = false; *m_cursor = selectParagUnderCursor( *m_cursor ); TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(afterTripleClickTimeout())); } @@ -888,7 +888,7 @@ bool KoTextView::insertParagraph(const TQPoint &pos) for (int i = 0; i < nbParag ;i++) { KoTextParag *s=textDocument()->createParag( textDocument(), last ); - s->setFormat( 0, 1, f, TRUE ); + s->setFormat( 0, 1, f, true ); if ( style ) s->setStyle( style ); s->setCounter( counter ); @@ -978,8 +978,8 @@ KCommand* KoTextView::setFormatCommand( const KoTextFormat * newFormat, int flag void KoTextView::dragStarted() { - mightStartDrag = FALSE; - inDoubleClick = FALSE; + mightStartDrag = false; + inDoubleClick = false; } void KoTextView::applyStyle( const KoParagStyle * style ) diff --git a/lib/kwmf/kowmfpaint.h b/lib/kwmf/kowmfpaint.h index 58b27b186..6622a3980 100644 --- a/lib/kwmf/kowmfpaint.h +++ b/lib/kwmf/kowmfpaint.h @@ -99,12 +99,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& listPa, bool winding=FALSE ); + void drawPolyPolygon( TQPtrList& 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 functions @@ -113,7 +113,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 ); private: TQPainter mPainter; diff --git a/lib/kwmf/kowmfread.h b/lib/kwmf/kowmfread.h index ca1183b11..b4b7b92bf 100644 --- a/lib/kwmf/kowmfread.h +++ b/lib/kwmf/kowmfread.h @@ -131,10 +131,10 @@ public: virtual void drawPie( int x, int y, int w, int h, int a, int alen ) = 0; virtual void drawChord( int x, int y, int w, int h, int a, int alen ) = 0; virtual void drawPolyline( const TQPointArray &pa ) = 0; - virtual void drawPolygon( const TQPointArray &pa, bool winding=FALSE ) = 0; + virtual void drawPolygon( const TQPointArray &pa, bool winding=false ) = 0; // drawPolyPolygon draw the XOR of a list of polygons // listPa : list of polygons - virtual void drawPolyPolygon( TQPtrList& listPa, bool winding=FALSE ) = 0; + virtual void drawPolyPolygon( TQPtrList& listPa, bool winding=false ) = 0; virtual void drawImage( int x, int y, const TQImage &, int sx = 0, int sy = 0, int sw = -1, int sh = -1 ) = 0; // Text drawing functions @@ -143,7 +143,7 @@ public: virtual void drawText( int x, int y, int w, int h, int flags, const TQString &s, double rotation ) = 0; // matrix transformation : only used for bitmap manipulation - virtual void setWorldMatrix( const TQWMatrix &, bool combine=FALSE ) = 0; + virtual void setWorldMatrix( const TQWMatrix &, bool combine=false ) = 0; private: KoWmfReadPrivate *mKwmf; diff --git a/lib/kwmf/kowmfwrite.h b/lib/kwmf/kowmfwrite.h index 04ce2c3a2..6972191ba 100644 --- a/lib/kwmf/kowmfwrite.h +++ b/lib/kwmf/kowmfwrite.h @@ -104,10 +104,10 @@ public: void drawPie( int left, int top, int width, int height, int a, int alen ); void drawChord( int left, int top, int width, int height, 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& listPa, bool winding=FALSE ); + void drawPolyPolygon( TQPtrList& listPa, bool winding=false ); void drawImage( int left, int top, const TQImage &, int sx = 0, int sy = 0, int sw = -1, int sh = -1 ); // Text drawing functions diff --git a/tools/spell/main.cpp b/tools/spell/main.cpp index 4dc980d80..c37ac3632 100644 --- a/tools/spell/main.cpp +++ b/tools/spell/main.cpp @@ -56,20 +56,20 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat { kdDebug(31000) << "SpellChecker does only accept the command 'spellcheck'" << endl; kdDebug(31000) << " The commands " << command << " is not accepted" << endl; - return FALSE; + return false; } // Check wether we can accept the data if ( datatype != "TQString" ) { kdDebug(31000) << "SpellChecker only accepts datatype TQString" << endl; - return FALSE; + return false; } if ( mimetype != "text/plain" && mimetype != "application/x-singleword" ) { kdDebug(31000) << "SpellChecker only accepts mimetype text/plain and application/x-singleword" << endl; - return FALSE; + return false; } // Get data @@ -91,13 +91,13 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat kosconfig.setNoRootAffix(config->readNumEntry ("KSpell_NoRootAffix", 0)); kosconfig.setRunTogether(config->readNumEntry ("KSpell_RunTogether", 0)); kosconfig.setDictionary(config->readEntry ("KSpell_Dictionary", "")); - kosconfig.setDictFromList(config->readNumEntry ("KSpell_DictFromList", FALSE)); + kosconfig.setDictFromList(config->readNumEntry ("KSpell_DictFromList", false)); kosconfig.setEncoding(config->readNumEntry ("KSpell_Encoding", KOS_E_ASCII)); kosconfig.setClient(config->readNumEntry ("KSpell_Client", KOS_CLIENT_ISPELL)); kosconfig.setNoRootAffix(config->readNumEntry ("KSpell_NoRootAffix", 0)); kosconfig.setRunTogether(config->readNumEntry ("KSpell_RunTogether", 0)); kosconfig.setDictionary(config->readEntry ("KSpell_Dictionary", "")); - kosconfig.setDictFromList(config->readNumEntry ("KSpell_DictFromList", FALSE)); + kosconfig.setDictFromList(config->readNumEntry ("KSpell_DictFromList", false)); kosconfig.setIgnoreCase( config->readNumEntry( "KSpell_IgnoreCase", 0)); kosconfig.setIgnoreAccent( config->readNumEntry( "KSpell_IgnoreAccent", 0)); @@ -131,7 +131,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat *((TQString*)data) = buffer; } #endif - return TRUE; + return true; } #include "main.moc" diff --git a/tools/thesaurus/main.cpp b/tools/thesaurus/main.cpp index 622314c5b..73de57eed 100644 --- a/tools/thesaurus/main.cpp +++ b/tools/thesaurus/main.cpp @@ -238,11 +238,11 @@ bool Thesaurus::run(const TQString& command, void* data, const TQString& datatyp // Check whether we can accept the data if ( datatype != "TQString" ) { kdDebug(31000) << "Thesaurus only accepts datatype TQString" << endl; - return FALSE; + return false; } if ( mimetype != "text/plain" ) { kdDebug(31000) << "Thesaurus only accepts mimetype text/plain" << endl; - return FALSE; + return false; } if ( command == "thesaurus" ) { @@ -260,7 +260,7 @@ bool Thesaurus::run(const TQString& command, void* data, const TQString& datatyp } else { kdDebug(31000) << "Thesaurus does only accept the command 'thesaurus' or 'thesaurus_standalone'" << endl; kdDebug(31000) << "The command " << command << " is not accepted" << endl; - return FALSE; + return false; } // Get data and clean it up: @@ -284,7 +284,7 @@ bool Thesaurus::run(const TQString& command, void* data, const TQString& datatyp *((TQString*)data) = m_replace->text(); } - return TRUE; + return true; }